kune-commits

Download

[email protected]

1587 discussions

01 Apr '11

Author: vjrj_ Date: 2011-04-02 00:07:25 +0200 (Sat, 02 Apr 2011) New Revision: 1301 Added: trunk/src/main/java/cc/kune/chat/KuneChat.gwt.xml trunk/src/main/java/cc/kune/common/client/utils/Pair.java trunk/src/main/java/cc/kune/common/public/images/ trunk/src/main/java/cc/kune/common/public/images/hborder.png trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceConfEvent.java trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java Removed: trunk/src/main/java/cc/kune/chat/Chat.gwt.xml trunk/src/main/java/cc/kune/common/public/img/ trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java Modified: trunk/.classpath trunk/pom.xml trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java Log: NEW - # 35: Spaces selector integration with login/logout and history http://kune.ourproject.org/issues/ticket/35 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/.classpath 2011-04-01 22:07:25 UTC (rev 1301) @@ -49,7 +49,7 @@ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.0-SNAPSHOT/gwt-util-src-0.3.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.6.0/gwt-voices-1.6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.7.0/gwt-voices-1.7.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/pom.xml 2011-04-01 22:07:25 UTC (rev 1301) @@ -284,7 +284,7 @@ <dependency> <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> <artifactId>gwt-voices</artifactId> - <version>1.6.0</version> + <version>1.7.0</version> </dependency>  <dependency> @@ -1069,8 +1069,6 @@ </execution> </executions> </plugin> - -    Modified: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/script/mvn-eclipse.sh 2011-04-01 22:07:25 UTC (rev 1301) @@ -1,7 +1,16 @@ mvn eclipse:eclipse -Dgwt.compiler.skip=true - +RESULT=$? perl -p -i -e 's/<\/classpath>//g' .classpath perl -p -i -e 's/\/home\/vjrj\/nfsdev\///g' .classpath #echo -en " <classpathentry kind=\"src\" path=\"target/generated-sources/apt\" including=\"**/*.java\"/>" >> .classpath echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath - +which kdialog > /dev/null 2>&1 +if [[ $? == 0 ]] +then + if [[ $RESULT == 0 ]] + then + kdialog --msgbox "mvn finished successfully" 2>/dev/null & + else + kdialog --error "mvn finished with errors" 2>/dev/null & + fi +fi Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-04-01 22:07:25 UTC (rev 1301) @@ -5,7 +5,7 @@ <inherits name='com.google.gwt.logging.Logging' /> <inherits name="cc.kune.core.Core" /> <inherits name="cc.kune.wave.KuneWave" /> - <inherits name="cc.kune.chat.Chat" /> + <inherits name="cc.kune.chat.KuneChat" /> <inherits name="cc.kune.docs.KuneDocs" /> <inherits name="cc.kune.pspace.PSpace" /> <inherits name="com.calclab.suco.Suco" /> Deleted: trunk/src/main/java/cc/kune/chat/Chat.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/chat/Chat.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/chat/Chat.gwt.xml 2011-04-01 22:07:25 UTC (rev 1301) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.1/distro-source/core/…"> -<module> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.calclab.hablar.Hablar" /> - <inherits name='com.calclab.hablar.console.HablarConsole' /> - <inherits name='com.calclab.hablar.login.HablarLogin' /> - <inherits name='com.calclab.hablar.icons.def.HablarDefaultIcons' /> - <inherits name='com.calclab.hablar.icons.ie6gif.HablarIE6GifIcons' /> - <inherits name='com.calclab.hablar.icons.alt.HablarAltIcons' /> - <source path="client" /> - <set-property name="user.agent" value="safari,gecko1_8" /> - <public path="public" /> -</module> \ No newline at end of file Copied: trunk/src/main/java/cc/kune/chat/KuneChat.gwt.xml (from rev 1299, trunk/src/main/java/cc/kune/chat/Chat.gwt.xml) =================================================================== --- trunk/src/main/java/cc/kune/chat/KuneChat.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/chat/KuneChat.gwt.xml 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.1/distro-source/core/…"> +<module> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.calclab.hablar.Hablar" /> + <inherits name='com.calclab.hablar.console.HablarConsole' /> + <inherits name='com.calclab.hablar.login.HablarLogin' /> + <inherits name='com.calclab.hablar.icons.def.HablarDefaultIcons' /> + <inherits name='com.calclab.hablar.icons.ie6gif.HablarIE6GifIcons' /> + <inherits name='com.calclab.hablar.icons.alt.HablarAltIcons' /> + <source path="client" /> + <public path="public" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -65,7 +65,10 @@ @Override public void onGroupChanged(final RosterGroupChangedEvent event) { - setState(session.getCurrentState()); + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState != null) { + setState(currentState); + } } }); putValue(Action.NAME, i18n.t("Add as a buddie")); Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -44,6 +44,7 @@ import cc.kune.core.client.sn.UserSNPresenter; import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.TokenMatcher; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -135,6 +136,8 @@ AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); + TokenMatcher getTokenMatcher(); + AsyncProvider<ToolSelectorPresenter> getToolSelectorPresenter(); AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); Added: trunk/src/main/java/cc/kune/common/client/utils/Pair.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/Pair.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/Pair.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,86 @@ +/* + * Copyright 2008 Google Inc. + * + * 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.common.client.utils; + +/** + * @param <L> + * @param <R> + */ +public class Pair<L, R> { + public static <L, R> Pair<L, R> create(final L l, final R r) { + return new Pair<L, R>(l, r); + } + + public final L left; + public final R right; + + private Pair(final L left, final R right) { + this.left = left; + this.right = right; + } + + @SuppressWarnings("unchecked") + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Pair other = (Pair) obj; + if (left == null) { + if (other.left != null) { + return false; + } + } else if (!left.equals(other.left)) { + return false; + } + if (right == null) { + if (other.right != null) { + return false; + } + } else if (!right.equals(other.right)) { + return false; + } + return true; + } + + public L getLeft() { + return left; + } + + public R getRight() { + return right; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((left == null) ? 0 : left.hashCode()); + result = prime * result + ((right == null) ? 0 : right.hashCode()); + return result; + } + + @Override + public String toString() { + return "(" + left + "," + right + ")"; + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/utils/Pair.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/common/public/images (from rev 1299, trunk/src/main/java/cc/kune/common/public/img) Added: trunk/src/main/java/cc/kune/common/public/images/hborder.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/public/images/hborder.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-01 22:07:25 UTC (rev 1301) @@ -205,7 +205,7 @@ } .oc-testico { - background-image: url(/common/img/ico.png) !important; + background-image: url(images/ico.png) !important; -moz-background-clip: border; -moz-background-inline-policy: continuous; -moz-background-origin: padding; @@ -364,7 +364,7 @@ } .oc-testico { - background-image: url(/common/img/ico.png) !important; + background-image: url(images/ico.png) !important; -moz-background-clip: border; -moz-background-inline-policy: continuous; -moz-background-origin: padding; @@ -464,4 +464,9 @@ .gwt-MenuBar-vertical .subMenuIcon-selected { background: none repeat scroll 0 0 #808080; +} + +.gwt-Button { + background: url("images/hborder.png") repeat-x scroll 0 -27px + transparent; } \ 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 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -85,11 +85,14 @@ import cc.kune.core.client.state.ContentCacheDefault; import cc.kune.core.client.state.HistoryWrapper; import cc.kune.core.client.state.HistoryWrapperDefault; +import cc.kune.core.client.state.ReservedWordsRegistry; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SessionDefault; import cc.kune.core.client.state.SiteTokenListeners; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.StateManagerDefault; +import cc.kune.core.client.state.TokenMatcher; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.client.ws.entheader.EntityHeader; @@ -130,7 +133,7 @@ bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class); bind(RootPresenter.class).asEagerSingleton(); bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); - bind(I18nUITranslationService.class).in(Singleton.class); + s(I18nUITranslationService.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); @@ -175,48 +178,63 @@ bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); bind(EntityHeader.class).to(EntityHeaderPresenter.class).in(Singleton.class); - bind(UserMessagesPresenter.class).in(Singleton.class); - bind(UserMessagesPanel.class).in(Singleton.class); + s(UserMessagesPresenter.class); + s(UserMessagesPanel.class); // bind(MessagePanelView.class).to(MessagePanel.class); // UI - bind(WsArmorImpl.class).in(Singleton.class); + s(WsArmorImpl.class); bind(WsArmor.class).to(WsArmorImpl.class).in(Singleton.class); bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); - bind(GxtGuiProvider.class).in(Singleton.class); - bind(GwtGuiProvider.class).in(Singleton.class); + s(GxtGuiProvider.class); + s(GwtGuiProvider.class); bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class); // Core App bind(Session.class).to(SessionDefault.class).in(Singleton.class); - bind(ErrorHandler.class).in(Singleton.class); - bind(StateManagerDefault.class).in(Singleton.class); + s(ErrorHandler.class); + s(StateManagerDefault.class); bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); - bind(AccessRightsClientManager.class).in(Singleton.class); + s(AccessRightsClientManager.class); bind(ContentCache.class).to(ContentCacheDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); - bind(PrefetchUtilities.class).in(Singleton.class); + s(PrefetchUtilities.class); bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); - bind(BeforeSignOut.class).in(Singleton.class); - bind(SiteTokenListeners.class).asEagerSingleton(); - bind(ActionRegistries.class).in(Singleton.class); - bind(CoreParts.class).asEagerSingleton(); + s(BeforeSignOut.class); + eagle(SiteTokenListeners.class); + s(SiteTokens.class); + s(ReservedWordsRegistry.class); + eagle(TokenMatcher.class); + s(ActionRegistries.class); + eagle(CoreParts.class); // SN - bind(GroupSNAdminsMenuItemsRegistry.class).in(Singleton.class); - bind(GroupSNCollabsMenuItemsRegistry.class).in(Singleton.class); - bind(GroupSNPendingsMenuItemsRegistry.class).in(Singleton.class); - bind(UserSNMenuItemsRegistry.class).in(Singleton.class); - bind(GroupSNConfActions.class).in(Singleton.class); - bind(UserSNConfActions.class).in(Singleton.class); + s(GroupSNAdminsMenuItemsRegistry.class); + s(GroupSNCollabsMenuItemsRegistry.class); + s(GroupSNPendingsMenuItemsRegistry.class); + s(UserSNMenuItemsRegistry.class); + s(GroupSNConfActions.class); + s(UserSNConfActions.class); - bind(SiteUserOptionsPresenter.class).in(Singleton.class); - bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class); - bind(SitebarNewGroupLink.class).in(Singleton.class); - bind(SitebarSignInLink.class).in(Singleton.class); - bind(SitebarSignOutLink.class).in(Singleton.class); + s(SiteUserOptionsPresenter.class); + s(SiteUserOptions.class, SiteUserOptionsPresenter.class); + s(SitebarNewGroupLink.class); + s(SitebarSignInLink.class); + s(SitebarSignOutLink.class); } + + private void eagle(final Class<?> type) { + bind(type).asEagerSingleton(); + } + + private void s(final Class<?> type) { + bind(type).in(Singleton.class); + } + + private <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) { + bind(type).to(typeImpl).in(Singleton.class); + } } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -32,7 +32,7 @@ import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; @@ -119,7 +119,7 @@ getView().reset(); getView().hideMessages(); getView().hide(); - stateManager.gotoToken(SiteCommonTokens.REGISTER); + stateManager.gotoToken(SiteTokens.REGISTER); } @Override Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -25,7 +25,7 @@ import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -55,7 +55,7 @@ } private void goHome() { - stateManager.gotoToken(SiteCommonTokens.GROUP_HOME); + stateManager.gotoToken(SiteTokens.GROUP_HOME); } private void logException(final Throwable caught) { Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -30,7 +30,7 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.HistoryTokenCallback; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; @@ -77,7 +77,7 @@ this.groupService = groupService; this.signIn = signIn; - stateManager.addSiteToken(SiteCommonTokens.NEWGROUP, new HistoryTokenCallback() { + stateManager.addSiteToken(SiteTokens.NEWGROUP, new HistoryTokenCallback() { @Override public void onHistoryToken() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -44,7 +44,7 @@ @Override public void actionPerformed(final ActionEvent event) { - stateManager.gotoToken(SiteCommonTokens.NEWGROUP); + stateManager.gotoToken(SiteTokens.NEWGROUP); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; @@ -51,7 +51,7 @@ @Override public void actionPerformed(final ActionEvent event) { - stateManager.gotoToken(SiteCommonTokens.SIGNIN); + stateManager.gotoToken(SiteTokens.SIGNIN); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -20,7 +20,7 @@ package cc.kune.core.client.sitebar.logo; import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import com.google.gwt.event.shared.EventBus; @@ -61,7 +61,7 @@ @Override public void onClick() { - stateManager.gotoToken(SiteCommonTokens.GROUP_HOME); + stateManager.gotoToken(SiteTokens.GROUP_HOME); } @Override Added: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceConfEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceConfEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceConfEvent.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,99 @@ +package cc.kune.core.client.sitebar.spaces; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class SpaceConfEvent extends GwtEvent<SpaceConfEvent.SpaceConfHandler> { + + public interface HasSpaceConfHandlers extends HasHandlers { + HandlerRegistration addSpaceConfHandler(SpaceConfHandler handler); + } + + public interface SpaceConfHandler extends EventHandler { + public void onSpaceConf(SpaceConfEvent event); + } + + private static final Type<SpaceConfHandler> TYPE = new Type<SpaceConfHandler>(); + + public static void fire(final HasHandlers source, final cc.kune.core.client.sitebar.spaces.Space space, + final String token) { + source.fireEvent(new SpaceConfEvent(space, token)); + } + + public static Type<SpaceConfHandler> getType() { + return TYPE; + } + + private cc.kune.core.client.sitebar.spaces.Space space; + private String token; + + protected SpaceConfEvent() { + // Possibly for serialization. + } + + public SpaceConfEvent(final cc.kune.core.client.sitebar.spaces.Space space, final String token) { + this.space = space; + this.token = token; + } + + @Override + protected void dispatch(final SpaceConfHandler handler) { + handler.onSpaceConf(this); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final SpaceConfEvent other = (SpaceConfEvent) obj; + if (space == null) { + if (other.space != null) { + return false; + } + } else if (!space.equals(other.space)) { + return false; + } + if (token == null) { + if (other.token != null) { + return false; + } + } else if (!token.equals(other.token)) { + return false; + } + return true; + } + + @Override + public Type<SpaceConfHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.client.sitebar.spaces.Space getSpace() { + return space; + } + + public String getToken() { + return token; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (space == null ? 1 : space.hashCode()) + (token == null ? 1 : token.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "SpaceConfEvent[" + space + "/" + token + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceConfEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -22,12 +22,19 @@ import cc.kune.common.client.noti.NotifyLevel; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.state.HistoryWrapper; import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.client.state.TokenUtils; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignOutEvent; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.google.inject.Provider; @@ -47,6 +54,14 @@ public interface SpaceSelectorView extends View { + HasClickHandlers getGroupBtn(); + + HasClickHandlers getHomeBtn(); + + HasClickHandlers getPublicBtn(); + + HasClickHandlers getUserBtn(); + void setGroupBtnDown(boolean down); void setHomeBtnDown(boolean down); @@ -57,59 +72,65 @@ } private final WsArmor armor; + private Space currentSpace; + private String groupToken; + private String homeToken; private final I18nTranslationService i18n; + private boolean nextUserSpace; + private String publicToken; private final Session session; private final Provider<SignIn> signIn; - private Space currentSpace; - private boolean nextUserSpace; + private String userToken; @Inject public SpaceSelectorPresenter(final EventBus eventBus, final SpaceSelectorView view, final SpaceSelectorProxy proxy, final WsArmor armor, final Session session, final Provider<SignIn> sigIn, - final I18nTranslationService i18n) { + final I18nTranslationService i18n, final HistoryWrapper history) { super(eventBus, view, proxy); this.armor = armor; this.session = session; this.signIn = sigIn; this.i18n = i18n; nextUserSpace = false; - } - - @ProxyEvent - public void onUserSignIn(UserSignInEvent event) { - if (nextUserSpace) { - onUserSpaceSelect(); - nextUserSpace = false; - } - } - - @ProxyEvent - public void onUserSignOut(UserSignOutEvent event) { - if (currentSpace == Space.userSpace) - nextUserSpace = false; - onHomeSpaceSelect(); - } - - @ProxyEvent - public void onSpaceSelect(SpaceSelectEvent event) { - Space space = event.getSpace(); - if (space != currentSpace) { - switch (space) { - case homeSpace: - onHomeSpaceSelect(); - break; - case userSpace: - onUserSpaceSelect(); - break; - case groupSpace: + homeToken = SiteTokens.HOME; + userToken = SiteTokens.WAVEINBOX; + groupToken = SiteTokens.GROUP_HOME; + publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); + view.getHomeBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + gotoTokenIfDifferent(history, homeToken); + } + }); + view.getUserBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + gotoTokenIfDifferent(history, userToken); + } + }); + view.getGroupBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + gotoTokenIfDifferent(history, groupToken); onGroupSpaceSelect(); - break; - case publicSpace: + } + }); + view.getPublicBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + gotoTokenIfDifferent(history, publicToken); onPublicSpaceSelect(); - break; - default: - break; } + }); + } + + private void gotoTokenIfDifferent(final HistoryWrapper history, final String token) { + if (!history.getToken().equals(token)) { + if ((new StateToken(token)).equals(session.getCurrentStateToken())) { + history.newItem(token, false); + } else { + history.newItem(token); + } } } @@ -152,6 +173,65 @@ nextUserSpace = false; } + @ProxyEvent + public void onSpaceConf(final SpaceConfEvent event) { + final Space space = event.getSpace(); + final String token = event.getToken(); + switch (space) { + case homeSpace: + homeToken = token; + break; + case userSpace: + userToken = token; + break; + case groupSpace: + groupToken = token; + break; + case publicSpace: + publicToken = token; + break; + } + } + + @ProxyEvent + public void onSpaceSelect(final SpaceSelectEvent event) { + final Space space = event.getSpace(); + if (space != currentSpace) { + switch (space) { + case homeSpace: + onHomeSpaceSelect(); + break; + case userSpace: + onUserSpaceSelect(); + break; + case groupSpace: + onGroupSpaceSelect(); + break; + case publicSpace: + onPublicSpaceSelect(); + break; + default: + break; + } + } + } + + @ProxyEvent + public void onUserSignIn(final UserSignInEvent event) { + if (nextUserSpace) { + onUserSpaceSelect(); + nextUserSpace = false; + } + } + + @ProxyEvent + public void onUserSignOut(final UserSignOutEvent event) { + if (currentSpace == Space.userSpace) { + nextUserSpace = false; + onHomeSpaceSelect(); + } + } + private void onUserSpaceSelect() { if (session.isLogged()) { armor.selectUserSpace(); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -20,17 +20,15 @@ package cc.kune.core.client.sitebar.spaces; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; -import cc.kune.core.client.state.SiteCommonTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.ToggleButton; import com.google.gwt.user.client.ui.Widget; @@ -41,22 +39,23 @@ interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> { } private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class); + private final EventBus eventBus; @UiField ToggleButton groupButton; @UiField ToggleButton homeButton; @UiField HorizontalPanel panel; + @UiField ToggleButton publicButton; - + private final StateManager stateManager; @UiField ToggleButton userButton; - private final StateManager stateManager; - private final EventBus eventBus; @Inject - public SpaceSelectorViewImpl(final WsArmor armor, final I18nTranslationService i18n, StateManager stateManager, EventBus eventBus) { + public SpaceSelectorViewImpl(final WsArmor armor, final I18nTranslationService i18n, + final StateManager stateManager, final EventBus eventBus) { this.stateManager = stateManager; this.eventBus = eventBus; armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); @@ -71,24 +70,24 @@ return panel; } - @UiHandler("groupButton") - void onGroupSpaceClick(final ClickEvent event) { - SpaceSelectEvent.fire(eventBus, Space.groupSpace); - } + @Override + public HasClickHandlers getGroupBtn() { + return groupButton; + } - @UiHandler("homeButton") - void onHomeSpaceClick(final ClickEvent event) { - stateManager.gotoToken(SiteCommonTokens.HOME); + @Override + public HasClickHandlers getHomeBtn() { + return homeButton; } - @UiHandler("publicButton") - void onPublicSpaceClick(final ClickEvent event) { - SpaceSelectEvent.fire(eventBus, Space.publicSpace); + @Override + public HasClickHandlers getPublicBtn() { + return publicButton; } - @UiHandler("userButton") - void onUserSpaceClick(final ClickEvent event) { - SpaceSelectEvent.fire(eventBus, Space.userSpace); + @Override + public HasClickHandlers getUserBtn() { + return userButton; } @Override Modified: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -25,4 +25,6 @@ void newItem(final String historyToken); + void newItem(String historyToken, boolean issueEvent); + } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -30,8 +30,12 @@ @Override public void newItem(final String historyToken) { - // NotifyUser.info("New history token: " + historyToken); History.newItem(historyToken); } + @Override + public void newItem(final String historyToken, final boolean issueEvent) { + History.newItem(historyToken, issueEvent); + } + } Added: trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,8 @@ +package cc.kune.core.client.state; + +import java.util.ArrayList; + +@SuppressWarnings("serial") +public class ReservedWordsRegistry extends ArrayList<String> { + +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.state; - -/** - * Some common history tokens like {@link #SIGNIN} and {@link #NEWGROUP} - * - */ -public final class SiteCommonTokens { - public static final String ABOUTKUNE = "about"; - public final static String GROUP_HOME = ""; - public final static String NEWGROUP = "newgroup"; - public final static String REGISTER = "register"; - public final static String SIGNIN = "signin"; - public final static String TRANSLATE = "translate"; - public final static String HOME = "home"; - - private SiteCommonTokens() { - } -} Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -36,11 +36,11 @@ @Singleton public class SiteTokenListeners { private final Provider<AboutKuneDialog> aboutKuneDialog; + private final EventBus eventBus; private final Provider<NewGroup> newGroup; private final Provider<Register> register; private final Provider<SignIn> signIn; private final Provider<StateManager> stateManager; - private final EventBus eventBus; @Inject public SiteTokenListeners(final Session session, final EventBus eventBus, @@ -63,31 +63,37 @@ } private void init() { - stateManager.get().addSiteToken(SiteCommonTokens.HOME, new HistoryTokenCallback() { + stateManager.get().addSiteToken(SiteTokens.HOME, new HistoryTokenCallback() { @Override public void onHistoryToken() { SpaceSelectEvent.fire(eventBus, Space.homeSpace); } }); - stateManager.get().addSiteToken(SiteCommonTokens.SIGNIN, new HistoryTokenCallback() { + stateManager.get().addSiteToken(SiteTokens.WAVEINBOX, new HistoryTokenCallback() { @Override public void onHistoryToken() { + SpaceSelectEvent.fire(eventBus, Space.userSpace); + } + }); + stateManager.get().addSiteToken(SiteTokens.SIGNIN, new HistoryTokenCallback() { + @Override + public void onHistoryToken() { signIn.get().showSignInDialog(); } }); - stateManager.get().addSiteToken(SiteCommonTokens.REGISTER, new HistoryTokenCallback() { + stateManager.get().addSiteToken(SiteTokens.REGISTER, new HistoryTokenCallback() { @Override public void onHistoryToken() { register.get().doRegister(); } }); - stateManager.get().addSiteToken(SiteCommonTokens.NEWGROUP, new HistoryTokenCallback() { + stateManager.get().addSiteToken(SiteTokens.NEWGROUP, new HistoryTokenCallback() { @Override public void onHistoryToken() { newGroup.get().doNewGroup(); } }); - stateManager.get().addSiteToken(SiteCommonTokens.ABOUTKUNE, new HistoryTokenCallback() { + stateManager.get().addSiteToken(SiteTokens.ABOUTKUNE, new HistoryTokenCallback() { @Override public void onHistoryToken() { // FIXME, something to come back Copied: trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java (from rev 1299, trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,51 @@ +/* + * + * Copyright (C) 2007-2011 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.state; + +import com.google.inject.Inject; + +/** + * Some common history tokens like {@link #SIGNIN} and {@link #NEWGROUP} + * + */ +public final class SiteTokens { + public static final String ABOUTKUNE = "about"; + public final static String GROUP_HOME = ""; + public final static String HOME = "home"; + public final static String NEWGROUP = "newgroup"; + public static final String PREVIEW = "preview"; + public final static String REGISTER = "register"; + public final static String SIGNIN = "signin"; + public final static String TRANSLATE = "translate"; + public final static String WAVEINBOX = "inbox"; + + @Inject + public SiteTokens(final ReservedWordsRegistry reserverdWords) { + reserverdWords.add(ABOUTKUNE); + reserverdWords.add(GROUP_HOME); + reserverdWords.add(HOME); + reserverdWords.add(NEWGROUP); + reserverdWords.add(PREVIEW); + reserverdWords.add(REGISTER); + reserverdWords.add(SIGNIN); + reserverdWords.add(TRANSLATE); + reserverdWords.add(WAVEINBOX); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -22,15 +22,17 @@ import java.util.HashMap; -import org.waveprotocol.box.webclient.client.HistorySupport; +import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.BeforeActionListener; import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.log.Log; +import cc.kune.common.client.utils.Pair; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.sitebar.spaces.Space; +import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.sitebar.spaces.SpaceSelectEvent; import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; import cc.kune.core.client.state.SocialNetworkChangedEvent.SocialNetworkChangedHandler; @@ -60,16 +62,19 @@ private StateToken resumedToken; private final Session session; private final HashMap<String, HistoryTokenCallback> siteTokens; + private final TokenMatcher tokenMatcher; @Inject public StateManagerDefault(final ContentCache contentProvider, final Session session, final HistoryWrapper history, - final EventBus eventBus) { + final TokenMatcher tokenMatcher, final EventBus eventBus) { + this.tokenMatcher = tokenMatcher; this.eventBus = eventBus; this.contentProvider = contentProvider; this.session = session; this.history = history; this.previousToken = null; this.resumedToken = null; + tokenMatcher.init(GwtWaverefEncoder.INSTANCE); siteTokens = new HashMap<String, HistoryTokenCallback>(); beforeStateChangeCollection = new BeforeActionCollection(); session.onUserSignIn(true, new UserSignInEvent.UserSignInHandler() { @@ -165,26 +170,49 @@ }); } - void onHistoryChanged(final String historyToken) { + void onHistoryChanged(final String newHistoryToken) { // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory if (beforeStateChangeCollection.checkBeforeAction()) { - final HistoryTokenCallback tokenListener = siteTokens.get(historyToken != null ? historyToken.toLowerCase() - : historyToken); - Log.debug("StateManager: on history changed (" + historyToken + ")"); + HistoryTokenCallback tokenListener = null; + if (newHistoryToken != null) { + final String nToken = newHistoryToken.toLowerCase(); + tokenListener = siteTokens.get(nToken); + } + Log.debug("StateManager: on history changed (" + newHistoryToken + ")"); if (tokenListener == null) { - // Ok, normal token change - // Is a Wave token? - if (historyToken == null || HistorySupport.waveRefFromHistoryToken(historyToken) == null) { - // Non wave token + // token is not one of #newgroup #signin #translate ... + final String nToken = newHistoryToken.toLowerCase(); + if (tokenMatcher.hasRedirect(nToken)) { + final Pair<String, String> redirect = tokenMatcher.getRedirect(nToken); + final String firstToken = redirect.getLeft(); + final String sndToken = redirect.getRight(); + if (firstToken.equals(SiteTokens.PREVIEW)) { + SpaceSelectEvent.fire(eventBus, Space.publicSpace); + SpaceConfEvent.fire(eventBus, Space.groupSpace, sndToken); + SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(sndToken)); + onHistoryChanged(new StateToken(sndToken)); + } + } else if (tokenMatcher.isWaveToken(newHistoryToken)) { + if (session.isLogged()) { + SpaceSelectEvent.fire(eventBus, Space.userSpace); + } else { + history.newItem(TokenUtils.addRedirect(SiteTokens.SIGNIN, newHistoryToken)); + } + if (previousToken == null) { + // Starting application (with Wave url) + onHistoryChanged(new StateToken(SiteTokens.GROUP_HOME)); + } + } else if (tokenMatcher.isGroupToken(newHistoryToken)) { + SpaceConfEvent.fire(eventBus, Space.groupSpace, newHistoryToken); + SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(newHistoryToken)); SpaceSelectEvent.fire(eventBus, Space.groupSpace); - onHistoryChanged(new StateToken(historyToken)); + onHistoryChanged(new StateToken(newHistoryToken)); } else { - SpaceSelectEvent.fire(eventBus, Space.userSpace); - // Wave token - // spaceSelector.onUserSpaceSelect(); - if (session.isNotLogged()) { - // use r=? argument? - } + // While we don't redefine token "" as home: + SpaceSelectEvent.fire(eventBus, Space.groupSpace); + SpaceConfEvent.fire(eventBus, Space.groupSpace, SiteTokens.GROUP_HOME); + SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(SiteTokens.GROUP_HOME)); + onHistoryChanged(new StateToken(SiteTokens.GROUP_HOME)); } } else { // token is one of #newgroup #signin #translate ... @@ -197,7 +225,7 @@ tokenListener.onHistoryToken(); } } else { - resumedToken = new StateToken(historyToken); + resumedToken = new StateToken(newHistoryToken); } } Added: trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,68 @@ +package cc.kune.core.client.state; + +import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; +import org.waveprotocol.wave.model.waveref.WaverefEncoder; + +import cc.kune.common.client.utils.Pair; +import cc.kune.core.shared.domain.utils.StateToken; + +import com.google.inject.Inject; + +public class TokenMatcher { + + private WaverefEncoder encoder; + private final ReservedWordsRegistry reservedWordsRegistry; + + @Inject + public TokenMatcher(final ReservedWordsRegistry reservedWordsRegistry) { + this.reservedWordsRegistry = reservedWordsRegistry; + } + + public Pair<String, String> getRedirect(final String token) { + final String[] splited = splitRedirect(token); + if (hasRedirect(token, splited)) { + return Pair.create(splited[0], splited[1].replaceAll("\\)$", "")); + } + return null; + } + + public boolean hasRedirect(final String token) { + final String[] splited = splitRedirect(token); + if (hasRedirect(token, splited)) { + return true; + } + return false; + } + + private boolean hasRedirect(final String token, final String[] splited) { + return token.endsWith(")") && splited.length == 2; + } + + public void init(final WaverefEncoder encoder) { + assert encoder != null; + this.encoder = encoder; + } + + public boolean isGroupToken(final String token) { + return token != null && !isWaveToken(token) && !hasRedirect(token) && !reservedWordsRegistry.contains(token) + && !new StateToken(token).hasNothing(); + } + + public boolean isHomeToken(final String currentToken) { + return SiteTokens.HOME.equals(currentToken); + } + + public boolean isWaveToken(final String token) { + assert encoder != null; + try { + return token == null ? false : encoder.decodeWaveRefFromPath(token) != null; + } catch (final InvalidWaveRefException e) { + return false; + } + } + + private String[] splitRedirect(final String token) { + return token.split("\\("); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,12 @@ +package cc.kune.core.client.state; + +public class TokenUtils { + + public static String addRedirect(final String token, final String redirect) { + return new StringBuffer().append(token).append("(").append(redirect).append(")").toString(); + } + + public static String preview(final String token) { + return addRedirect(SiteTokens.PREVIEW, token); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-01 22:07:25 UTC (rev 1301) @@ -1091,7 +1091,3 @@ background-color: inherits; } -.gwt-Button { - background: url("gwt/chrome/images/hborder.png") repeat-x scroll 0 -27px - transparent; -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -13,6 +13,7 @@ import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsonUtils; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.inject.Inject; @@ -20,7 +21,7 @@ private WebClient webClient; @Inject - public WaveClientManager(final Session session, final StateManager stateManager, + public WaveClientManager(final Session session, final StateManager stateManager, final EventBus eventBus, final UserServiceAsync userService, final WsArmor wsArmor) { session.onUserSignIn(true, new UserSignInHandler() { @Override @@ -39,7 +40,7 @@ if (userSpace.getWidgetCount() > 0) { userSpace.remove(0); } - webClient = new WebClient(); + webClient = new WebClient(eventBus); userSpace.add(webClient); } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -22,10 +22,10 @@ -import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.ClientEvents; import org.waveprotocol.box.webclient.client.ClientIdGenerator; import org.waveprotocol.box.webclient.client.DebugMessagePanel; +import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; import org.waveprotocol.box.webclient.client.Session; import org.waveprotocol.box.webclient.client.SimpleWaveStore; @@ -60,11 +60,15 @@ import org.waveprotocol.wave.model.waveref.WaveRef; import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.sitebar.spaces.Space; +import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; +import cc.kune.core.client.state.SiteTokens; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -75,6 +79,7 @@ import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.UIObject; +import com.google.inject.Inject; /** * Entry point classes define <code>onModuleLoad()</code>. @@ -127,11 +132,15 @@ private RemoteViewServiceMultiplexer channel; +private final EventBus eventBus; + /** * This is the entry point method. */ - public WebClient() { + @Inject + public WebClient(EventBus eventBus) { + this.eventBus = eventBus; ErrorHandler.install(); ClientEvents.get().addWaveCreationEventHandler( @@ -284,22 +293,24 @@ } }); String encodedToken = History.getToken(); - NotifyUser.info("Open Wave: " + encodedToken + " waveRef: " + waveRef.getWaveId(), true); - if (encodedToken != null && !encodedToken.isEmpty()) { + // NotifyUser.info("Open Wave: " + encodedToken + " waveRef: " + waveRef.getWaveId(), true); + // Kune patch + if (encodedToken != null && !encodedToken.isEmpty() && !encodedToken.equals(SiteTokens.WAVEINBOX)) { WaveRef fromWaveRef = HistorySupport.waveRefFromHistoryToken(encodedToken); if (waveRef == null) { LOG.info("History token contains invalid path: " + encodedToken); return; } - // Kune patch - // if (fromWaveRef.getWaveId().equals(waveRef.getWaveId())) { - if (fromWaveRef == null || fromWaveRef.getWaveId().equals(waveRef.getWaveId())) { + if (fromWaveRef.getWaveId().equals(waveRef.getWaveId())) { // History change was caused by clicking on a link, it's already // updated by browser. + SpaceConfEvent.fire(eventBus, Space.userSpace, encodedToken); return; } } - History.newItem(HistorySupport.historyTokenFromWaveref(waveRef), false); + String tokenFromWaveref = HistorySupport.historyTokenFromWaveref(waveRef); + SpaceConfEvent.fire(eventBus, Space.userSpace, tokenFromWaveref); + History.newItem(tokenFromWaveref, false); } /** Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -203,7 +203,7 @@ import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.HistoryTokenCallback; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; @@ -948,7 +948,7 @@ }); // Register of tokens like "signin", "newgroup", "translate" etcetera - i(StateManager.class).addSiteToken(SiteCommonTokens.SIGNIN, new HistoryTokenCallback() { + i(StateManager.class).addSiteToken(SiteTokens.SIGNIN, new HistoryTokenCallback() { @Override public void onHistoryToken() { @@ -956,7 +956,7 @@ } }); - i(StateManager.class).addSiteToken(SiteCommonTokens.REGISTER, new HistoryTokenCallback() { + i(StateManager.class).addSiteToken(SiteTokens.REGISTER, new HistoryTokenCallback() { @Override public void onHistoryToken() { @@ -964,7 +964,7 @@ } }); - i(StateManager.class).addSiteToken(SiteCommonTokens.NEWGROUP, new HistoryTokenCallback() { + i(StateManager.class).addSiteToken(SiteTokens.NEWGROUP, new HistoryTokenCallback() { @Override public void onHistoryToken() { @@ -972,7 +972,7 @@ } }); - i(StateManager.class).addSiteToken(SiteCommonTokens.TRANSLATE, new HistoryTokenCallback() { + i(StateManager.class).addSiteToken(SiteTokens.TRANSLATE, new HistoryTokenCallback() { @Override public void onHistoryToken() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -22,7 +22,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.SiteTokens; import com.google.gwt.user.client.ui.Hyperlink; @@ -37,7 +37,7 @@ signInHyperlink = new Hyperlink(); signInHyperlink.ensureDebugId(SITE_SIGN_IN); signInHyperlink.setText(i18n.t("Sign in to collaborate")); - signInHyperlink.setTargetHistoryToken(SiteCommonTokens.SIGNIN); + signInHyperlink.setTargetHistoryToken(SiteTokens.SIGNIN); ws.getSiteBar().add(signInHyperlink); ws.getSiteBar().addSpacer(); } Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2011-03-30 14:56:20 UTC (rev 1300) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -47,6 +47,7 @@ private StateAbstractDTO state; private StateChangedHandler stateChangeHandler; private StateManagerDefault stateManager; + private TokenMatcher tokenMatcher; private ToolChangedHandler toolChangeHandler; @Before @@ -54,9 +55,10 @@ contentProvider = Mockito.mock(ContentCache.class); session = Mockito.mock(Session.class); history = Mockito.mock(HistoryWrapper.class); + tokenMatcher = Mockito.mock(TokenMatcher.class); spaceSelector = Mockito.mock(SpaceSelectorPresenter.class); eventBus = new EventBusTester(); - stateManager = new StateManagerDefault(contentProvider, session, history, eventBus); + stateManager = new StateManagerDefault(contentProvider, session, history, tokenMatcher, eventBus); Mockito.when(session.getUserHash()).thenReturn(HASH); state = Mockito.mock(StateAbstractDTO.class); stateChangeHandler = Mockito.mock(StateChangedHandler.class); @@ -231,7 +233,7 @@ @Test public void siteTokenFirstLoadDefContentAndFireListener() { final HistoryTokenCallback listener = Mockito.mock(HistoryTokenCallback.class); - final String token = SiteCommonTokens.SIGNIN; + final String token = SiteTokens.SIGNIN; stateManager.addSiteToken(token, listener); stateManager.onHistoryChanged(token); Mockito.verify(listener, Mockito.times(1)).onHistoryToken(); Added: trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java 2011-04-01 22:07:25 UTC (rev 1301) @@ -0,0 +1,118 @@ +package cc.kune.core.client.state; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; +import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; + +public class TokenMatcherTest { + + private static final String DEF_SITE_TOKEN = ""; + private static final String GROUP_TOKEN = "site.docs.1"; + private static final String GROUP_TOKEN_ONLY_PROJECT = "site"; + private static final String GROUP_TOKEN_ONLY_PROJECT_AND_TOOL = "site.docs"; + private static final String REDIRECT_LINK = "example.com/w+jsdKixyHhZA"; + private static final String SIGNIN_TOKEN = "signin"; + private static final String SIGNIN_TOKEN_WITH_REDIRECT = SIGNIN_TOKEN + "(" + REDIRECT_LINK + ")"; + private static final String WAVE_TOKEN_SAMPLE1 = "example.com/w+abcd"; + private static final String WAVE_TOKEN_SAMPLE2 = "example.com/w+abcd/~/conv+root"; + private static final String WAVE_TOKEN_SAMPLE3 = "example.com/w+abcd/~/conv+root/b+45kg"; + private TokenMatcher tokenMatcher; + + @Before + public void before() { + final ReservedWordsRegistry reservedWords = new ReservedWordsRegistry(); + reservedWords.add(SIGNIN_TOKEN); + tokenMatcher = new TokenMatcher(reservedWords); + tokenMatcher.init(JavaWaverefEncoder.INSTANCE); + } + + private void dontMatchGroupToken(final String token) { + assertFalse("Expected '" + token + "' dont match isGroup", tokenMatcher.isGroupToken(token)); + } + + @Test + public void dontMatchRedirect() { + dontMatchWaveToken(SIGNIN_TOKEN_WITH_REDIRECT); + dontMatchGroupToken(SIGNIN_TOKEN_WITH_REDIRECT); + assertFalse(tokenMatcher.hasRedirect(SIGNIN_TOKEN)); + } + + private void dontMatchWaveToken(final String token) { + assertFalse("Expected '" + token + "' dont match isWaveToken", tokenMatcher.isWaveToken(token)); + } + + private void matchGroupToken(final String token) { + assertTrue("Expected '" + token + "' match isGroup", tokenMatcher.isGroupToken(token)); + } + + private void matchWaveToken(final String token) { + assertTrue("Expected '" + token + "' match isWaveToken", tokenMatcher.isWaveToken(token)); + } + + @Test + public void matchWaveToken2() { + matchWaveToken(WAVE_TOKEN_SAMPLE2); + dontMatchGroupToken(WAVE_TOKEN_SAMPLE2); + } + + @Test + public void matchWaveToken3() { + matchWaveToken(WAVE_TOKEN_SAMPLE3); + dontMatchGroupToken(WAVE_TOKEN_SAMPLE3); + } + + @Test + public void shouldDontMatchNull() { + dontMatchWaveToken(null); + dontMatchWaveToken(""); + dontMatchGroupToken(null); + dontMatchGroupToken(""); + } + + @Test + public void shouldExtractRedirect() { + assertTrue(tokenMatcher.hasRedirect(SIGNIN_TOKEN_WITH_REDIRECT)); + assertEquals(SIGNIN_TOKEN, tokenMatcher.getRedirect(SIGNIN_TOKEN_WITH_REDIRECT).getLeft()); + assertEquals(REDIRECT_LINK, tokenMatcher.getRedirect(SIGNIN_TOKEN_WITH_REDIRECT).getRight()); + } + + @Test + public void shoulMatchCompleteToken() { + matchGroupToken(GROUP_TOKEN); + dontMatchWaveToken(GROUP_TOKEN); + } + + @Test + public void shoulMatchGroupToken() { + matchGroupToken(GROUP_TOKEN_ONLY_PROJECT); + dontMatchWaveToken(GROUP_TOKEN_ONLY_PROJECT); + } + + @Test + public void shoulMatchGroupToolToken() { + matchGroupToken(GROUP_TOKEN_ONLY_PROJECT_AND_TOOL); + dontMatchWaveToken(GROUP_TOKEN_ONLY_PROJECT_AND_TOOL); + } + + @Test + public void testDefSiteTokenDontMatch() { + dontMatchWaveToken(DEF_SITE_TOKEN); + dontMatchGroupToken(DEF_SITE_TOKEN); + } + + @Test + public void testMatchWaveToken1() { + matchWaveToken(WAVE_TOKEN_SAMPLE1); + dontMatchGroupToken(WAVE_TOKEN_SAMPLE1); + } + + @Test + public void testOtherSiteTokensDontMatch() { + dontMatchWaveToken(SIGNIN_TOKEN); + dontMatchGroupToken(SIGNIN_TOKEN); + } +} Property changes on: trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

1 0

30 Mar '11

Author: vjrj_ Date: 2011-03-30 16:56:20 +0200 (Wed, 30 Mar 2011) New Revision: 1300 Added: trunk/bin trunk/src/main/java/cc/kune/client/KuneGinModule.java trunk/src/main/java/cc/kune/client/OnAppStartFactory.java trunk/src/main/java/cc/kune/core/client/actions/ trunk/src/main/java/cc/kune/core/client/actions/ActionRegistries.java trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java trunk/src/main/java/cc/kune/core/client/actions/RolAction.java trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java trunk/src/main/java/cc/kune/docs/ trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/cc/kune/docs/client/ trunk/src/main/java/cc/kune/docs/client/AbstractFoldableContentActions.java trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java trunk/src/main/java/cc/kune/docs/client/DocumentClientActions.java trunk/src/main/java/cc/kune/docs/client/DocumentClientTool.java trunk/src/main/java/cc/kune/docs/client/DocumentGinModule.java trunk/src/main/java/cc/kune/docs/client/cnt/ trunk/src/main/java/cc/kune/docs/client/ctx/ trunk/src/main/java/cc/kune/docs/server/ trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java trunk/src/test/java/cc/kune/docs/ trunk/src/test/java/cc/kune/docs/DocumentToolTest.java trunk/src/test/java/cc/kune/docs/server/ Removed: trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/org/ourproject/kune/docs/client/DocsMessages.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/ trunk/src/main/java/org/ourproject/kune/docs/public/ trunk/src/main/java/org/ourproject/kune/docs/server/ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java trunk/src/test/java/org/ourproject/kune/docs/server/ Modified: trunk/ trunk/.classpath trunk/.project trunk/TODO trunk/pom.xml trunk/script/css-update.sh trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/NotInObject.java trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContent.java trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPanel.java trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentView.java trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewer.java trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPanel.java trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerView.java trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContext.java trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContextPresenter.java trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/client/WebClient.ui.xml trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java trunk/src/main/java/cc/kune/wave/server/WaveMain.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java trunk/src/test/java/testsuites/OthersTestSuite.java Log: WIAB and tools updated Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target target-local Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .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 .jdee_sources .jdee_classpath prj.el .factorypath .apt_generated target.old _accounts _certificates + pmd-eclipse.log .pmd www-test screenlog.0 client public target target-local Main-compile .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .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 .jdee_sources .jdee_classpath prj.el .factorypath .apt_generated target.old _accounts _certificates Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/.classpath 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,126 +1,122 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/appengine/appengine-api-1.0-sdk/1.3.1/appengine-api-1.0-sdk-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> - <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/crawl_htmlunit/r5662-gae/crawl_htmlunit-r5662-gae.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r07/guava-gwt-r07.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.0/gwt-util-src-0.3.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.6.0/gwt-voices-1.6.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.7.0.0/liquibase-plugin-1.7.0.0.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-gwt/0.3.7/proto-gwt-0.3.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smack/smack/3.0.4/smack-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/smackx/3.0.4/smackx-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-custom/0.3.7/waveinabox-server-custom-0.3.7.jar"/> - <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> - <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/gwt-user.jar"> - <attributes> - <attribute name="javadoc_location" value="file:/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/doc/javadoc/"/> - </attributes> - </classpathentry> - <classpathentry kind="lib" path="/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/gwt-dev.jar"> - <attributes> - <attribute name="javadoc_location" value="file:/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/doc/javadoc/"/> - </attributes> - </classpathentry> - <classpathentry kind="src" path=".apt_generated"> - <attributes> - <attribute name="optional" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/kune-0.0.7/WEB-INF/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/kune-0.0.7/WEB-INF/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/appengine/appengine-api-1.0-sdk/1.3.1/appengine-api-1.0-sdk-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.0-SNAPSHOT/box-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> + <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.0-SNAPSHOT/client-common-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.0-SNAPSHOT/client-scheduler-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.0-SNAPSHOT/client-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.0-SNAPSHOT/common-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.0-SNAPSHOT/communication-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.0-SNAPSHOT/concurrencycontrol-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/crawl_htmlunit/r5662-gae/crawl_htmlunit-r5662-gae.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r07/guava-gwt-r07.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.0-SNAPSHOT/gwt-util-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/1.6.0/gwt-voices-1.6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.7.0.0/liquibase-plugin-1.7.0.0.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.0-SNAPSHOT/media-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.0-SNAPSHOT/model-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.0-SNAPSHOT/proto-msg-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smack/smack/3.0.4/smack-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/smackx/3.0.4/smackx-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.0-SNAPSHOT/util-src-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.0-SNAPSHOT/waveinabox-server-0.3-0.3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> +</classpath> \ No newline at end of file Modified: trunk/.project =================================================================== --- trunk/.project 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/.project 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,54 +1,38 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>kune</name> - <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.ajdt.ui.ajnature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> - <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> - </natures> -</projectDescription> + <name>kune</name> + <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.ajdt.ui.ajnature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/TODO 2011-03-30 14:56:20 UTC (rev 1300) @@ -383,6 +383,12 @@ http://vafer.org/blog/20070918215154 Related info: http://java.debian.net/building.html +*** steps +**** create user kune +**** create /var/lib/kune/uploads and give permissions +**** create /var/lib/kune/lucene +**** deps: libjmagick6-jni, csstidy +**** cp -a $EXTSRC/source/locale/ src/main/java/org/ourproject/kune/app/public/js/ext/source/ ** <v> implement pubsub in emite http://xmpp.org/extensions/attic/jep-0060-1.6.html see: svn checkout svn://anonsvn.it.su.se/su-smack su-smack Added: trunk/bin =================================================================== --- trunk/bin (rev 0) +++ trunk/bin 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1 @@ +link script/ \ No newline at end of file Property changes on: trunk/bin ___________________________________________________________________ Name: svn:special + * Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/pom.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -527,18 +527,18 @@  <dependency> <groupId>org.waveprotocol</groupId> - <artifactId>waveinabox-server-custom</artifactId> - <version>0.3.7</version> + <artifactId>waveinabox-server-0.3</artifactId> + <version>0.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> - <artifactId>proto-gwt</artifactId> - <version>0.3.7</version> + <artifactId>proto-msg</artifactId> + <version>0.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.0</version> + <version>0.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -546,51 +546,56 @@ <version>r07</version> </dependency>  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>box-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>model-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-common-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>common-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>util-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>concurrencycontrol-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>client-scheduler-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>media-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>communication-src</artifactId> + <version>0.3.0-SNAPSHOT</version> + </dependency>  <dependency> <groupId>net.sourceforge.findbugs</groupId> @@ -732,7 +737,8 @@ <value>true</value> </systemProperty> <systemProperty> - <key>org.eclipse.jetty.util.log.DEBUG</key> +  + <key>org.eclipse.jetty.util.log.INFO</key> <value>true</value> </systemProperty> </systemProperties> Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/script/css-update.sh 2011-03-30 14:56:20 UTC (rev 1300) @@ -15,6 +15,6 @@ cp src/main/java/cc/kune/common/public/kune-common.css target/kune-0.0.7/ws/ cp src/main/java/cc/kune/core/public/ws.css target/kune-0.0.7/ws/ cp src/main/java/cc/kune/core/public/ws.html target/kune-0.0.7/ws/ -cp src/main/webapp/templates/basic/basic.css target/kune-0.0.7/templates/basic/basic.css -cp src/main/webapp/templates/basic/docs.liquid.html target/kune-0.0.7/templates/basic/ +#cp src/main/webapp/templates/basic/basic.css target/kune-0.0.7/templates/basic/basic.css +#cp src/main/webapp/templates/basic/docs.liquid.html target/kune-0.0.7/templates/basic/ cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-0.0.7/ws/gxt-custom/css/gxt-op-common.css Modified: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/script/mvn-eclipse.sh 2011-03-30 14:56:20 UTC (rev 1300) @@ -2,6 +2,6 @@ perl -p -i -e 's/<\/classpath>//g' .classpath perl -p -i -e 's/\/home\/vjrj\/nfsdev\///g' .classpath -echo -en " <classpathentry kind=\"src\" path=\"target/generated-sources/apt\" including=\"**/*.java\"/>" >> .classpath +#echo -en " <classpathentry kind=\"src\" path=\"target/generated-sources/apt\" including=\"**/*.java\"/>" >> .classpath echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -6,6 +6,7 @@ <inherits name="cc.kune.core.Core" /> <inherits name="cc.kune.wave.KuneWave" /> <inherits name="cc.kune.chat.Chat" /> + <inherits name="cc.kune.docs.KuneDocs" /> <inherits name="cc.kune.pspace.PSpace" /> <inherits name="com.calclab.suco.Suco" /> <inherits name="org.adamtacy.GWTEffects"></inherits> @@ -45,11 +46,11 @@ <inherits name="com.google.gwt.user.Debug" />  <extend-property name="locale" values="en" /> - <set-property name="locale" value="en"/> + <set-property name="locale" value="en" />   <set-property name="loglevel" value="none" /> -  +   <entry-point class="cc.kune.client.KuneEntryPoint" />  Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -7,7 +7,7 @@ import cc.kune.chat.client.resources.ChatResources; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.core.client.sn.actions.RolAction; +import cc.kune.core.client.actions.RolActionAutoUpdated; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; @@ -27,7 +27,7 @@ import com.calclab.suco.client.Suco; import com.google.inject.Inject; -public class OpenGroupPublicChatRoomAction extends RolAction { +public class OpenGroupPublicChatRoomAction extends RolActionAutoUpdated { private final ChatClient chatClient; private final I18nTranslationService i18n; Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -69,6 +69,7 @@ ginjector.getEventLogger(); NotifyUser.init(ginjector.getEventBus(), ginjector.getI18n()); ginjector.getCorePresenter().get().forceReveal(); + ginjector.getOnAppStartFactory(); ginjector.getStateManager(); ginjector.getSiteTokenListeners(); ginjector.getGwtGuiProvider(); @@ -79,6 +80,6 @@ ginjector.getSpacesTabPresenter(); ginjector.getChatClient(); ginjector.getCoreParts(); - ginjector.getPSpacePresenter(); + ginjector.getPSpaceParts(); } } Added: trunk/src/main/java/cc/kune/client/KuneGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/client/KuneGinModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,12 @@ +package cc.kune.client; + +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public class KuneGinModule extends AbstractPresenterModule { + + @Override + protected void configure() { + bind(OnAppStartFactory.class).asEagerSingleton(); + } + +} Property changes on: trunk/src/main/java/cc/kune/client/KuneGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -47,10 +47,12 @@ import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.docs.client.DocumentGinModule; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.tool.ToolSelectorPresenter; import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import cc.kune.pspace.client.PSpaceGinModule; +import cc.kune.pspace.client.PSpaceParts; import cc.kune.pspace.client.PSpacePresenter; import cc.kune.wave.client.WaveGinModule; import cc.kune.wave.client.WaveParts; @@ -62,7 +64,8 @@ import com.google.inject.Provider; import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; -@GinModules({ CoreGinModule.class, ChatGinModule.class, WaveGinModule.class, PSpaceGinModule.class }) +@GinModules({ KuneGinModule.class, CoreGinModule.class, ChatGinModule.class, WaveGinModule.class, + PSpaceGinModule.class, DocumentGinModule.class }) public interface KuneGinjector extends Ginjector { /* @@ -106,8 +109,12 @@ AsyncProvider<NewGroupPresenter> getNewGroupPresenter(); + OnAppStartFactory getOnAppStartFactory(); + ProxyFailureHandler getProxyFailureHandler(); + PSpaceParts getPSpaceParts(); + AsyncProvider<PSpacePresenter> getPSpacePresenter(); AsyncProvider<RegisterPresenter> getRegisterPresenter(); Added: trunk/src/main/java/cc/kune/client/OnAppStartFactory.java =================================================================== --- trunk/src/main/java/cc/kune/client/OnAppStartFactory.java (rev 0) +++ trunk/src/main/java/cc/kune/client/OnAppStartFactory.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,22 @@ +package cc.kune.client; + +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.state.Session; +import cc.kune.docs.client.DocumentClientTool; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class OnAppStartFactory { + + @Inject + public OnAppStartFactory(final Session session, final Provider<DocumentClientTool> docClientTool) { + session.onInitDataReceived(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + docClientTool.get(); + } + }); + } +} Property changes on: trunk/src/main/java/cc/kune/client/OnAppStartFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -41,6 +41,7 @@ protected void addStyle(final String style) { if (notStandAlone) { iconLabel.addStyleName(style); + button.addStyleName(style); layout(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -23,7 +23,6 @@ import com.google.inject.Provider; -@Deprecated public class GuiActionDescProviderCollection extends ArrayList<Provider<GuiActionDescrip>> { private static final long serialVersionUID = -7933642706229301169L; Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -86,5 +86,4 @@ GuiActionDescrip withText(String text); GuiActionDescrip withToolTip(String tooltip); - } Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-03-30 14:56:20 UTC (rev 1300) @@ -21,21 +21,21 @@ } .k-opacity80 { - kfilter: alpha(opacity = 80); + kfilter: alpha(opacity = 80); -moz-opacity: 0.80; -khtml-opacity: 0.80; opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); + kfilter: alpha(opacity = 95); -moz-opacity: 0.95; -khtml-opacity: 0.95; opacity: 0.95; @@ -43,7 +43,8 @@ .gwt-PopupPanelGlass { background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) !important; + kfilter: alpha(opacity = 68) + !important; -moz-opacity: 0.68 !important; -khtml-opacity: 0.68 !important; opacity: 0.68 !important; @@ -248,7 +249,7 @@ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); border: 1 px solid #BBBBBB; font: 16px 'Ubuntu', arial; - font-weight: bold; + /* font-weight: bold; */ -webkit-border-bottom-right-radius: 5px; -moz-border-radius-bottomright: 5px; border-bottom-right-radius: 5px; @@ -263,17 +264,22 @@ background-color: #280b0b; } -.oc-menu .gwt-MenuBar-vertical, .gwt-MenuBar-vertical { +.oc-menu .gwt-MenuBar-vertical,.gwt-MenuBar-vertical { background-color: #280b0b; border: 2px solid #552200; padding: 3px; + font: 16px 'Ubuntu', arial; + color: white; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; -webkit-border-bottom-right-radius: 5px; -moz-border-radius-bottomright: 5px; border-bottom-right-radius: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -291,7 +297,7 @@ } .oc-menu .gwt-MenuItem { - cursor: default; + cursor: pointer; -moz-user-select: none; -khtml-user-select: none; /* background-color: #c87137; */ @@ -416,6 +422,14 @@ background-image: none; } +.k-nobackcolor { + background-color: transparent !important; +} + +.k-noborder { + border: 0px !important; +} + .k-space-nowrap { white-space: nowrap; } @@ -429,7 +443,7 @@ .k-menuimtem-title { color: white; font-size: 15px; - font-style: italic; + font-weight: bold; padding: 2px 3px 2px 0; } @@ -445,7 +459,7 @@ .k-iconlabel-right { float: left; - /* margin-left: 5px; */ + /* margin-left: 5px; */ } .gwt-MenuBar-vertical .subMenuIcon-selected { Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -28,6 +28,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.core.client.actions.ActionRegistries; import cc.kune.core.client.auth.Register; import cc.kune.core.client.auth.RegisterPanel; import cc.kune.core.client.auth.RegisterPresenter; @@ -201,6 +202,7 @@ bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); bind(BeforeSignOut.class).in(Singleton.class); bind(SiteTokenListeners.class).asEagerSingleton(); + bind(ActionRegistries.class).in(Singleton.class); bind(CoreParts.class).asEagerSingleton(); // SN Added: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistries.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/ActionRegistries.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/ActionRegistries.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,18 @@ +package cc.kune.core.client.actions; + + +public class ActionRegistries { + + ActionRegistryByType contentFooterActions; + ActionRegistryByType contentHeaderActions; + ActionRegistryByType contentItemMenu; + ActionRegistryByType contentSubHeaderActions; + + public ActionRegistries() { + contentSubHeaderActions = new ActionRegistryByType(); + contentHeaderActions = new ActionRegistryByType(); + contentFooterActions = new ActionRegistryByType(); + contentItemMenu = new ActionRegistryByType(); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistries.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,86 @@ +package cc.kune.core.client.actions; + +import java.util.HashMap; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescProviderCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.shared.domain.utils.AccessRights; + +import com.google.inject.Provider; + +/** + * A registry of actions by content type (doc, post, etc) + * + */ +public class ActionRegistryByType { + private static final String GENERIC = "kgenacts"; + + private final HashMap<String, GuiActionDescProviderCollection> actions; + + public ActionRegistryByType() { + actions = new HashMap<String, GuiActionDescProviderCollection>(); + } + + private void add(final GuiActionDescCollection collection, final GuiActionDescrip descrip, final Object targetItem) { + descrip.setTarget(targetItem); + collection.add(descrip); + } + + public void addAction(final Provider<GuiActionDescrip> action) { + addAction(action, GENERIC); + } + + public void addAction(final Provider<GuiActionDescrip> action, final String... typeIds) { + assert action != null; + for (final String typeId : typeIds) { + final GuiActionDescProviderCollection actionColl = getActions(typeId); + actionColl.add(action); + } + } + + private GuiActionDescProviderCollection getActions(final String typeId) { + GuiActionDescProviderCollection actionColl = actions.get(typeId); + if (actionColl == null) { + actionColl = new GuiActionDescProviderCollection(); + actions.put(typeId, actionColl); + } + return actionColl; + } + + public GuiActionDescCollection getCurrentActions(final Object targetItem, final String typeId, + final boolean isLogged, final AccessRights rights) { + final GuiActionDescCollection collection = new GuiActionDescCollection(); + + for (final Provider<GuiActionDescrip> descripProv : getActions(typeId)) { + final GuiActionDescrip descrip = descripProv.get(); + final AbstractAction action = descrip.getAction(); + if (action instanceof RolAction) { + if (mustAdd((RolAction) action, isLogged, rights)) { + add(collection, descrip, targetItem); + } + } else { + add(collection, descrip, targetItem); + } + } + return collection; + } + + private boolean mustAdd(final RolAction action, final boolean isLogged, final AccessRights rights) { + if (action.isAuthNeed()) { + if (!isLogged) { + return false; + } + } + switch (action.getRolRequired()) { + case Administrator: + return rights.isAdministrable(); + case Editor: + return rights.isEditable(); + case Viewer: + default: + return rights.isVisible(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/actions/RolAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/RolAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/RolAction.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,33 @@ +package cc.kune.core.client.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.core.shared.dto.AccessRolDTO; + +import com.google.inject.Inject; + +public abstract class RolAction extends AbstractExtendedAction { + + private final boolean authNeed; + private final AccessRolDTO rolRequired; + + /** + * @param rolRequired + * the Rol required to allow this action + * @param authNeed + * if we need to be authenticated to execute this action + */ + @Inject + public RolAction(final AccessRolDTO rolRequired, final boolean authNeed) { + this.rolRequired = rolRequired; + this.authNeed = authNeed; + } + + public AccessRolDTO getRolRequired() { + return rolRequired; + } + + public boolean isAuthNeed() { + return authNeed; + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/RolAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java (from rev 1295, trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,63 @@ +package cc.kune.core.client.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.sn.actions.RolComparator; +import cc.kune.core.client.state.AccessRightsChangedEvent; +import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; + +import com.google.inject.Inject; + +/** + * This is a RolAction (a Action that store which permissions are needed to + * permit its execution) but that auto refresh its status depending on the state + * of the application (if we are authenticated, and so on) + * + */ +public abstract class RolActionAutoUpdated extends AbstractExtendedAction { + protected final Session session; + protected final StateManager stateManager; + + @Inject + public RolActionAutoUpdated(final StateManager stateManager, final Session session, + final AccessRightsClientManager rightsManager, final AccessRolDTO rolRequired, final boolean authNeed, + final boolean visibleForNonMemb, final boolean visibleForMembers) { + this.stateManager = stateManager; + this.session = session; + rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { + @Override + public void onAccessRightsChanged(final AccessRightsChangedEvent event) { + refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, visibleForNonMemb, + event.getCurrentRights()); + + } + }); + } + + public void refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, final boolean isLogged, + final boolean visibleForMembers, final boolean visibleForNonMemb, final AccessRights newRights) { + boolean newVisibility = false; + boolean newEnabled = false; + if (authNeed && !isLogged) { + newVisibility = newEnabled = false; + } else { + // Auth ok + newEnabled = RolComparator.isEnabled(rolRequired, newRights); + if (newEnabled) { + final boolean isMember = RolComparator.isMember(newRights); + newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; + } else { + newVisibility = false; + } + } + setEnabled(newEnabled); + putValue(GuiActionDescrip.VISIBLE, newVisibility); + // NotifyUser.info("Set '" + getValue(Action.NAME) + "' visible: " + + // newVisibility, true); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.registry; +import com.google.inject.Inject; public class ContentCapabilitiesRegistry { @@ -40,6 +41,7 @@ private final XmppComentableRegistry xmppComentable; private final XmppNotifyCapableRegistry xmppNotifyCapable; + @Inject public ContentCapabilitiesRegistry(final AuthorableRegistry authorableRegistry, final AclEditableRegistry aclEditableRegistry, final ContentIconsRegistry iconsRegistry, final CanBeHomepageRegistry canBeHomepage, final ComentableRegistry comentable, Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -30,6 +30,8 @@ interface AbstractSNPanelUiBinder extends UiBinder<Widget, AbstractSNPanel> { } + private static final String CATEG_HEIGHT = "80px"; + private static AbstractSNPanelUiBinder uiBinder = GWT.create(AbstractSNPanelUiBinder.class); protected final ActionSimplePanel actions; int AVATARLABELMAXSIZE = 4; @@ -124,4 +126,19 @@ public IsActionExtensible getBottomToolbar() { return bottomActionsToolbar; } + + public void setFirstCategoryVisible(final boolean visible) { + firstCategoryPanel.setVisible(visible); + firstCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + } + + public void setSndCategoryVisible(final boolean visible) { + sndCategoryPanel.setVisible(visible); + sndCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + } + + public void setTrdCategoryVisible(final boolean visible) { + trdCategoryPanel.setVisible(visible); + trdCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + } } Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -67,7 +67,7 @@ @Override public void setCollabsVisible(final boolean visible) { - sndCategoryPanel.setVisible(visible); + super.setSndCategoryVisible(visible); } @Override @@ -77,7 +77,7 @@ @Override public void setPendingVisible(final boolean visible) { - trdCategoryPanel.setVisible(visible); + super.setTrdCategoryVisible(visible); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -28,7 +28,7 @@ firstDeckLabel.setText(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); trdCategoryLabel.setText("NOT USED"); trdCategoryLabel.setTitle("NOT USED"); - trdCategoryPanel.setVisible(false); + super.setTrdCategoryVisible(false); sndDeckLabel.setText("NOT USED"); bottomActionsToolbar = new ActionFlowPanel(guiProvider); bottomPanel.add(bottomActionsToolbar); @@ -61,7 +61,7 @@ @Override public void setBuddiesVisible(final boolean visible) { - firstCategoryPanel.setVisible(visible); + super.setFirstCategoryVisible(visible); } @Override @@ -71,7 +71,7 @@ @Override public void setParticipationVisible(final boolean visible) { - sndCategoryPanel.setVisible(visible); + super.setSndCategoryVisible(visible); } @Override Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,56 +0,0 @@ -package cc.kune.core.client.sn.actions; - -import cc.kune.common.client.actions.AbstractExtendedAction; -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.core.client.state.AccessRightsChangedEvent; -import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; - -import com.google.inject.Inject; - -public abstract class RolAction extends AbstractExtendedAction { - protected final Session session; - protected final StateManager stateManager; - - @Inject - public RolAction(final StateManager stateManager, final Session session, - final AccessRightsClientManager rightsManager, final AccessRolDTO rolRequired, final boolean authNeed, - final boolean visibleForNonMemb, final boolean visibleForMembers) { - this.stateManager = stateManager; - this.session = session; - rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { - @Override - public void onAccessRightsChanged(final AccessRightsChangedEvent event) { - refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, visibleForNonMemb, - event.getCurrentRights()); - - } - }); - } - - public void refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, final boolean isLogged, - final boolean visibleForMembers, final boolean visibleForNonMemb, final AccessRights newRights) { - boolean newVisibility = false; - boolean newEnabled = false; - if (authNeed && !isLogged) { - newVisibility = newEnabled = false; - } else { - // Auth ok - newEnabled = RolComparator.isEnabled(rolRequired, newRights); - if (newEnabled) { - final boolean isMember = RolComparator.isMember(newRights); - newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; - } else { - newVisibility = false; - } - } - setEnabled(newEnabled); - putValue(GuiActionDescrip.VISIBLE, newVisibility); - // NotifyUser.info("Set '" + getValue(Action.NAME) + "' visible: " + - // newVisibility, true); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,5 +1,6 @@ package cc.kune.core.client.sn.actions; +import cc.kune.core.client.actions.RolActionAutoUpdated; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; @@ -11,7 +12,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -public abstract class SNRolAction extends RolAction { +public abstract class SNRolAction extends RolActionAutoUpdated { protected final I18nTranslationService i18n; protected final Provider<SocialNetworkServiceAsync> snServiceProvider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -39,7 +39,8 @@ final Provider<MembersModerationMenuItem> membersModeration, final CoreResources res, final IsLoggedCondition isLoggedCondition, final JoinGroupAction joinGroupAction, final IsGroupCondition isGroupCondition, final UnJoinGroupAction unJoinGroupAction) { - OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowDownSitebar()).withStyles("k-sn-options-menu"); + OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowDownSitebar()).withStyles( + "k-sn-options-menu, k-noborder, k-nobackcolor"); final GuiActionDescrip optionsTitle = new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); final MenuRadioItemDescriptor anyoneItem = membersVisibility.get().withVisibility( SocialNetworkVisibility.anyone); @@ -65,8 +66,8 @@ final ButtonDescriptor joinBtn = new ButtonDescriptor(joinGroupAction); final ButtonDescriptor unJoinBtn = new ButtonDescriptor(unJoinGroupAction); unJoinBtn.add(isLoggedCondition); - add(joinBtn.withStyles("k-no-backimage")); - add(unJoinBtn.withStyles("k-no-backimage")); + add(joinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); + add(unJoinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); stateManager.onStateChanged(true, new StateChangedHandler() { @Override Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-03-30 14:56:20 UTC (rev 1300) @@ -328,9 +328,9 @@ } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: white; + background-color: transparent; background: url("images/spliter-top.png") no-repeat scroll center bottom - white; + transparent; cursor: col-resize; } @@ -881,7 +881,9 @@ } .k-sn-adminspanel { - background-color: #a05a2c; + /* background-color: #a05a2c; */ + border-bottom:2px solid #F7EBE3; + border-top:2px solid #F7EBE3; } .k-sn-collabspanel { @@ -1078,6 +1080,7 @@ } .k-tool-item-nofocus { + } .k-tool-item-selected { @@ -1086,4 +1089,9 @@ .k-tool-item-notselected { background-color: inherits; +} + +.gwt-Button { + background: url("gwt/chrome/images/hborder.png") repeat-x scroll 0 -27px + transparent; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -21,11 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.blogs.server.BlogServerModule; -import org.ourproject.kune.chat.server.ChatServerModule; -import org.ourproject.kune.docs.server.DocumentServerModule; -import org.ourproject.kune.gallery.server.GalleryServerModule; -import org.ourproject.kune.wiki.server.WikiServerModule; import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.GroupService; @@ -51,6 +46,7 @@ import cc.kune.core.server.rest.I18nTranslationJSONService; import cc.kune.core.server.rest.TestJSONService; import cc.kune.core.server.rest.UserJSONService; +import cc.kune.docs.server.DocumentServerModule; import com.google.inject.AbstractModule; import com.google.inject.Module; @@ -143,10 +139,10 @@ builder.use(new ServletModule()); builder.use(new PlatformServerModule()); builder.use(new DocumentServerModule()); - builder.use(new BlogServerModule()); - builder.use(new WikiServerModule()); - builder.use(new ChatServerModule()); - builder.use(new GalleryServerModule()); + // builder.use(new BlogServerModule()); + // builder.use(new WikiServerModule()); + // builder.use(new ChatServerModule()); + // builder.use(new GalleryServerModule()); builder.use(new RESTServicesModule()); builder.use(configModule); } Modified: trunk/src/main/java/cc/kune/core/server/NotInObject.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/NotInObject.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/core/server/NotInObject.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -35,6 +35,7 @@ excluded = Arrays.asList(new String[] { "finalize", "toString", "hashCode", "getClass", "wait", "equals" }); } + @Override public boolean matches(final Method method) { final String name = method.getName(); Copied: trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml) =================================================================== --- trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,5 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.Core" /> + <source path="client" /> +</module> \ No newline at end of file Added: trunk/src/main/java/cc/kune/docs/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/AbstractFoldableContentActions.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/client/AbstractFoldableContentActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,102 @@ +/* + * + * Copyright (C) 2007-2011 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.docs.client; + +import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.FoldableContent; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + +import com.google.inject.Provider; + +public abstract class AbstractFoldableContentActions { + + public static final ToolbarDescriptor CONTENT_BOTTOMBAR = new ToolbarDescriptor(); + public static final ToolbarDescriptor CONTENT_TOPBAR = new ToolbarDescriptor(); + public static final ToolbarDescriptor CONTEXT_BOTTOMBAR = new ToolbarDescriptor(); + public static final ToolbarDescriptor CONTEXT_TOPBAR = new ToolbarDescriptor(); + + private static final String PUBLICATION_MENU = "Publication"; + + protected final Provider<ContentServiceAsync> contentServiceProvider; + protected final SchedulerManager deferredCommandWrapper; + protected final ErrorHandler errorHandler; + protected final Provider<FileDownloadUtils> fileDownloadProvider; + protected final FoldableContent foldableContent; + protected final Provider<GroupServiceAsync> groupServiceProvider; + protected final I18nUITranslationService i18n; + protected final Session session; + protected final StateManager stateManager; + + public AbstractFoldableContentActions(final Session session, final StateManager stateManager, + final I18nUITranslationService i18n, final ErrorHandler errorHandler, + final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<FileDownloadUtils> fileDownloadProvider, final FoldableContent foldableContent) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.errorHandler = errorHandler; + this.deferredCommandWrapper = deferredCommandWrapper; + this.groupServiceProvider = groupServiceProvider; + this.contentServiceProvider = contentServiceProvider; + this.fileDownloadProvider = fileDownloadProvider; + this.foldableContent = foldableContent; + createActions(); + session.onInitDataReceived(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + createPostSessionInitActions(); + } + }); + } + + protected abstract void createActions(); + + protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { + } + + protected void createContentRenameAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + } + + protected void createDelContainerAction(final String text, final String parentMenuTitle, + final String... registerInTypes) { + } + + protected void createDelContentAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + } + + protected void createDownloadActions(final String typeUploadedfile) { + + } + + protected abstract void createPostSessionInitActions(); + +} Property changes on: trunk/src/main/java/cc/kune/docs/client/AbstractFoldableContentActions.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,20 @@ +package cc.kune.docs.client; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.shared.dto.AccessRolDTO; + +public class ContentRenameAction extends RolAction { + + public ContentRenameAction() { + super(AccessRolDTO.Editor, true); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.info(TextUtils.IN_DEVELOPMENT); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/docs/client/DocumentClientActions.java (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java) =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocumentClientActions.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/client/DocumentClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,110 @@ +/* + * + * 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.docs.client; + +import static cc.kune.docs.client.DocumentClientTool.TYPE_DOCUMENT; +import static cc.kune.docs.client.DocumentClientTool.TYPE_FOLDER; +import static cc.kune.docs.client.DocumentClientTool.TYPE_ROOT; +import static cc.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; + + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.docs.client.cnt.DocumentViewer; + +import com.google.inject.Provider; + +public class DocumentClientActions extends AbstractFoldableContentActions { + public DocumentClientActions(final I18nUITranslationService i18n, final Session session, + final StateManager stateManager, final SchedulerManager deferredCommandWrapper, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final ContentActionRegistry contentActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final DocumentViewer docViewer, + final ErrorHandler errorHandler) { + super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, + contentServiceProvider, fileDownloadProvider, docViewer); + } + + @Override + protected void createActions() { + final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_FOLDER, }; + final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + final String[] containersNoRoot = { TYPE_FOLDER }; + final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + + // final String parentMenuTitle = i18n.t("File"); + // final String parentMenuTitleCtx = i18n.t("Folder"); + // + // createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", + // i18n.t("New folder"), parentMenuTitleCtx, + // i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, + // TYPE_FOLDER); + // + // createNewContentAction(TYPE_DOCUMENT, "images/nav/page_add.png", + // i18n.t("New document"), parentMenuTitleCtx, + // Position.ctx, TYPE_ROOT, TYPE_FOLDER); + // + // createTranslateAction(parentMenuTitle, TYPE_DOCUMENT, TYPE_FOLDER); + // createContentRenameAction(parentMenuTitle, i18n.t("Rename"), + // contents); + // createEditAction(parentMenuTitle, TYPE_DOCUMENT); + // createContentModeratedActions(parentMenuTitle, contentsModerated); + // createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), + // containersNoRoot); + // + // // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = + // // createSetAsDefContent(parentMenuTitleCtx); + // + // createRefreshCntAction(parentMenuTitle, contents); + // createRefreshCxtAction(parentMenuTitleCtx, containers); + // + // createSetAsDefContent(parentMenuTitle, contents); + // + // createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); + // + // createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", + // i18n.t("Upload files (images, PDFs...)"), + // null, containers); + // + // createDownloadActions(TYPE_UPLOADEDFILE); + // + // createGoAction(all); + // + // createGoHomeAction(containers); + // + // createDelContainerAction("Delete folder", parentMenuTitleCtx, + // containersNoRoot); + // createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + // createShowDeletedItems(parentMenuTitleCtx, all); + } + + @Override + protected void createPostSessionInitActions() { + // super.createUploadMediaAction(TYPE_GALLERY); + } +} Copied: trunk/src/main/java/cc/kune/docs/client/DocumentClientTool.java (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java) =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocumentClientTool.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/client/DocumentClientTool.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,66 @@ +/* + * + * 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.docs.client; + +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.gspace.client.tool.FoldableAbstractClientTool; +import cc.kune.gspace.client.tool.ToolSelector; + +import com.google.inject.Inject; + +public class DocumentClientTool extends FoldableAbstractClientTool { + public static final String NAME = "docs"; + public static final String TYPE_DOCUMENT = NAME + "." + "doc"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WAVE = NAME + "." + FoldableAbstractClientTool.WAVE_SUFFIX; + + @Inject + public DocumentClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry cntCapRegistry) { + super(NAME, i18n.t("documents"), toolSelector, cntCapRegistry); + + // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerAuthorableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerDragableTypes(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_UPLOADEDFILE); + registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); + registerPublishModerableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerRateableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerRenamableTypes(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_UPLOADEDFILE); + registerTageableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerTranslatableTypes(TYPE_DOCUMENT, TYPE_FOLDER); + + registerIcons(); + } + + @Override + public String getName() { + return NAME; + } + + private void registerIcons() { + registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); + registerContentTypeIcon(TYPE_DOCUMENT, "images/nav/page.png"); + registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); + } + +} Added: trunk/src/main/java/cc/kune/docs/client/DocumentGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocumentGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/client/DocumentGinModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,13 @@ +package cc.kune.docs.client; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public class DocumentGinModule extends AbstractPresenterModule { + + @Override + protected void configure() { + bind(DocumentClientTool.class).in(Singleton.class); + } + +} Property changes on: trunk/src/main/java/cc/kune/docs/client/DocumentGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/docs/client/cnt (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/client/cnt) Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContent.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContent.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; public interface DocFolderContent { } Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; import cc.kune.core.client.cnt.FoldableContentPanel; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,9 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; -import org.ourproject.kune.docs.client.DocumentClientTool; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.cnt.ActionContentToolbar; @@ -29,6 +28,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.docs.client.DocumentClientTool; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocFolderContentView.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; import cc.kune.core.client.cnt.AbstractContentView; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewer.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; import cc.kune.core.client.cnt.FoldableContent; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; import cc.kune.core.client.cnt.FoldableContentPanel; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,9 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; -import org.ourproject.kune.docs.client.DocumentClientTool; import cc.kune.core.client.cnt.ActionContentToolbar; import cc.kune.core.client.cnt.ContentActionRegistry; @@ -30,6 +29,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.docs.client.DocumentClientTool; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/cnt/DocumentViewerView.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.cnt; +package cc.kune.docs.client.cnt; import cc.kune.core.client.cnt.AbstractContentView; Copied: trunk/src/main/java/cc/kune/docs/client/ctx (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/client/ctx) Modified: trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContext.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContext.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.ctx; +package cc.kune.docs.client.ctx; public interface DocumentContext { Modified: trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/client/ctx/DocumentContextPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,21 +17,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.client.ctx; +package cc.kune.docs.client.ctx; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; -import cc.kune.core.client.state.StateManager; +public class DocumentContextPresenter { -import com.calclab.suco.client.ioc.Provider; - -public class DocumentContextPresenter extends FoldableContextPresenter implements DocumentContext { - public DocumentContextPresenter(final StateManager stateManager, - final Provider<ContextNavigator> contextNavigatorProvider, - final Provider<ContextPropEditor> contextPropEditorProvider) { - super(DocumentClientTool.NAME, stateManager, contextNavigatorProvider, contextPropEditorProvider); - } } +// extends FoldableContextPresenter implements DocumentContext { +// public DocumentContextPresenter(final StateManager stateManager, +// final Provider<ContextNavigator> contextNavigatorProvider, +// final Provider<ContextPropEditor> contextPropEditorProvider) { +// super(DocumentClientTool.NAME, stateManager, contextNavigatorProvider, +// contextPropEditorProvider); +// } + Copied: trunk/src/main/java/cc/kune/docs/server (from rev 1295, trunk/src/main/java/org/ourproject/kune/docs/server) Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerModule.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.server; +package cc.kune.docs.server; import com.google.inject.Binder; import com.google.inject.Module; Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.server; +package cc.kune.docs.server; import java.util.Date; Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -22,6 +22,8 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; @@ -82,6 +84,17 @@ groupSpace.setWidgetMinSize(splitEast, 150); tabs.setStyleName("k-spaces"); homeSpace.add(RootPanel.get("k-home-wrapper")); + // mainpanel.getWidgetContainerElement(splitEast).setAttribute("overflow", + // "visible"); + // splitEast.getWidgetContainerElement(entityToolsCenter).setPropertyString("overflow", + // "visible !important"); + // entityToolsCenter.getParent().setStyleName("k-nooverflow"); + // groupSpace.getWidgetContainerElement(splitEast).setPropertyString("overflow", + // "visible !important"); + + DOM.setStyleAttribute((Element) groupSpace.getWidgetContainerElement(splitEast), "overflow", "visible"); + DOM.setStyleAttribute((Element) splitEast.getWidgetContainerElement(entityToolsCenter), "overflow", "visible"); + } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-03-30 14:56:20 UTC (rev 1300) @@ -2,172 +2,171 @@ @external .*; .floatLeft { - float: left; + float: left; } .mainPanel { - border-top: 2px solid white; - border-bottom: 7px solid white; - border-right: 7px solid white; - border-left: 7px solid white; + border-top: 2px solid white; + border-bottom: 7px solid white; + border-right: 7px solid white; + border-left: 7px solid white; } .floatRight { - float: right; + float: right; } .siteBar { - overflow: hidden; + overflow: hidden; } .entityHeader { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - background-color: #f4e3d7; - overflow: hidden; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + background-color: #f4e3d7; + overflow: hidden; } .entityFooter { - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; - background-color: #f7ebe3; - /* padding: 7px 10px 0px 17px; */ - overflow: hidden; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + background-color: #f7ebe3; + /* padding: 7px 10px 0px 17px; */ + overflow: hidden; } .entityFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityHeader span { - font-size: 56px; - margin-left: 15px; - color: #550000; - font-weight: bold; - font: 'UbuntuBold', Arial; + font-size: 56px; + margin-left: 15px; + color: #550000; + font-weight: bold; + font: 'UbuntuBold', Arial; } .docHeader { - background-color: #c87137; - overflow: hidden; + background-color: #c87137; + overflow: hidden; } .docHeaderArrow { - position: relative; - z-index: 10; - top: -25px; - left: 10px; + position: relative; + z-index: 10; + top: -25px; + left: 10px; } .docHeader span { - color: #FFF; - font-size: 28px; - font-weight: bold; - margin-left: 15px; - font: 'UbuntuBold', Arial; + color: #FFF; + font-size: 28px; + font-weight: bold; + margin-left: 15px; + font: 'UbuntuBold', Arial; } .docSubheader { - background-color: #f7ebe3; - padding: 15px 0 0 15px; - overflow: hidden; + background-color: #f7ebe3; + padding: 15px 0 0 15px; + overflow: hidden; } .docSubheaderLeft { - position: relative; - top: 0; - left: -30px; + position: relative; + top: 0; + left: -30px; } .docSubheader span { - color: #784421; - font-size: 20px; - font-weight: bold; + color: #784421; + font-size: 20px; + font-weight: bold; } .docEditorMargin { - background-color: #f7ebe3; + background-color: #f7ebe3; } .docEditor { - background-color: #FFF; - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-top: 1px solid #959595; - -webkit-border-top-left-radius: 7px; - -moz-border-radius-topleft: 7px; - border-top-left-radius: 7px; - -webkit-border-top-right-radius: 7px; - -moz-border-radius-topright: 7px; - border-top-right-radius: 7px; - padding: 5px; + background-color: #FFF; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-top: 1px solid #959595; + -webkit-border-top-left-radius: 7px; + -moz-border-radius-topleft: 7px; + border-top-left-radius: 7px; + -webkit-border-top-right-radius: 7px; + -moz-border-radius-topright: 7px; + border-top-right-radius: 7px; + padding: 5px; } .docFooter { - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-bottom: 1px solid #959595; - background-color: #e3dbdb; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-bottomleft: 7px; - border-bottom-left-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-bottomright: 7px; - border-bottom-right-radius: 7px; - padding: 7px 7px 0 7px; - overflow: hidden; - border-collapse:separate; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-bottom: 1px solid #959595; + background-color: #e3dbdb; + -webkit-border-bottom-left-radius: 7px; + -moz-border-radius-bottomleft: 7px; + border-bottom-left-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + -moz-border-radius-bottomright: 7px; + border-bottom-right-radius: 7px; + padding: 7px 7px 0 7px; + overflow: hidden; + border-collapse: separate; } .docFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityTools { - -webkit-border-top-left-radius: 10px; - -moz-border-radius-topleft: 10px; - border-top-left-radius: 10px; - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-bottom-left-radius: 10px; - background-color: #DEAA87; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; + background-color: #DEAA87; } -.entityToolsNorth { - /* margin: 10px; */ +.entityToolsNorth { /* margin: 10px; */ + } .entityToolsNorth span { - color: #a05a2c; - /* font-size: 20px; + color: #a05a2c; + /* font-size: 20px; font-weight: bold; */ } -.entityToolsCenter { - margin: 10px; +.entityToolsCenter { /* margin: 10px; */ + overflow: visible !important; } .entityToolsCenter span { - color: #FFF; - font-size: 22px; - font-weight: bold; + color: #FFF; + font-size: 22px; + font-weight: bold; } .entityToolsSouth { - border-top: 2px solid #FFF; - padding: 10px; - border-collapse: separate; + border-top: 2px solid #FFF; + padding: 10px; + border-collapse: separate; } .entityToolsSouth span { - color: #a05a2c; - font-size: 20px; - font-weight: bold; -} - + color: #a05a2c; + font-size: 20px; + font-weight: bold; +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -5,8 +5,9 @@ .label { text-decoration: none; font-size: 22px; - color: white; + color: white; /* text-shadow: 1px 1px 6px grey; + */ } .link a:link { @@ -14,12 +15,12 @@ } .self { + } .flow { min-height: 30px; padding: 5px 10px; - } .iconLeft { @@ -29,7 +30,7 @@ .iconRight { float: right; position: relative; - right: -19px; + right: -17px; top: -6px; } </ui:style> Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -24,7 +24,7 @@ @Inject public ToolSelectorPanel(final WsArmor wsArmor) { - wsArmor.getEntityToolsSouth().add(uiBinder.createAndBindUi(this)); + wsArmor.getEntityToolsCenter().add(uiBinder.createAndBindUi(this)); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -79,7 +79,7 @@ ToolSelectorPresenter.this.onGroupChanged(event.getNewGroup()); } }); - stateManager.onToolChanged(true, new ToolChangedHandler() { + stateManager.onToolChanged(false, new ToolChangedHandler() { @Override public void onToolChanged(final ToolChangedEvent event) { ToolSelectorPresenter.this.onToolChanged(event.getPreviousTool(), event.getNewTool()); @@ -116,7 +116,7 @@ void onToolChanged(final String oldTool, final String newTool) { Log.debug("Registered tools: " + tools.keySet().toString()); - if (!oldTool.equals("")) { + if (oldTool != null && !oldTool.equals("")) { final ToolSelectorItem tool = tools.get(oldTool); checkTool(tool); tool.setSelected(false); Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -30,7 +30,6 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HasText; @@ -76,7 +75,6 @@ layer.addClassName("k-box-5shadow"); layer.addClassName("k-5corners"); icon.setResource(res.browser32()); - Window.alert("kk"); wsArmor.getPublicSpace().add(widget); } Modified: trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,43 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.1/distro-source/core/…"> <module> + <inherits name='org.waveprotocol.box.webclient.WebClient' /> + <source path="client" /> <public path="public" /> - - <inherits name="com.google.common.base.Base" /> - <inherits name='com.google.gwt.user.User' /> - <inherits name="com.google.gwt.event.EventBase" /> - -  - - <inherits name='com.glines.socketio.client.Client' /> - <inherits name='com.google.gwt.json.JSON' /> - <inherits name='com.google.gwt.websockets.WebSockets' /> - - <inherits name='org.waveprotocol.wave.client.Client' /> - <inherits name='org.waveprotocol.wave.client.editor.Editor' /> - <inherits name='org.waveprotocol.wave.client.gadget.Gadget' /> - <inherits name='org.waveprotocol.wave.client.util.ClientFlags' /> - <inherits name='org.waveprotocol.wave.model.Model' /> - <inherits name="org.waveprotocol.wave.model.account.Account" /> - <inherits name='org.waveprotocol.wave.model.conversation.Conversation' /> - - <inherits name="org.waveprotocol.box.common.Common" /> - <inherits name='org.waveprotocol.box.common.comms.WaveClientRpc' /> - <inherits name='org.waveprotocol.box.search.SearchProto' /> - <inherits - name='org.waveprotocol.box.webclient.common.communication.Communication' /> -  - <inherits name='org.waveprotocol.box.webclient.common.Common' /> - <inherits name='org.waveprotocol.box.webclient.search.Search' /> - <inherits name='org.waveprotocol.box.webclient.util.Util' /> - <inherits name='org.waveprotocol.box.webclient.search.Search' /> - <inherits name='org.waveprotocol.box.webclient.widget.error.Error' /> - -  - - - <set-configuration-property name="CssResource.obfuscationPrefix" - value="SWC" /> - -</module> \ No newline at end of file +</module> Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -22,11 +22,10 @@ - +import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.ClientEvents; import org.waveprotocol.box.webclient.client.ClientIdGenerator; import org.waveprotocol.box.webclient.client.DebugMessagePanel; -import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; import org.waveprotocol.box.webclient.client.Session; import org.waveprotocol.box.webclient.client.SimpleWaveStore; @@ -46,6 +45,8 @@ import org.waveprotocol.box.webclient.search.SimpleSearch; import org.waveprotocol.box.webclient.search.WaveStore; import org.waveprotocol.box.webclient.util.Log; +import org.waveprotocol.box.webclient.widget.frame.FramedPanel; +import org.waveprotocol.box.webclient.widget.loading.LoadingIndicator; import org.waveprotocol.wave.client.account.ProfileManager; import org.waveprotocol.wave.client.account.impl.ProfileManagerImpl; import org.waveprotocol.wave.client.common.safehtml.SafeHtml; @@ -68,11 +69,12 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.History; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.UIObject; /** * Entry point classes define <code>onModuleLoad()</code>. @@ -82,8 +84,6 @@ } interface Style extends CssResource { - String subPanel(); - String waveView(); } private static final Binder BINDER = GWT.create(Binder.class); @@ -99,10 +99,14 @@ Style style; @UiField - ImplPanel contentPanel; + FramedPanel waveFrame; + @UiField + ImplPanel waveHolder; + private final Element loading = new LoadingIndicator().getElement(); + @UiField(provided = true) - SearchPanelWidget searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); + final SearchPanelWidget searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); @UiField DebugMessagePanel logPanel; @@ -174,7 +178,6 @@ // cleared. self.getElement().getStyle().clearPosition(); splitPanel.setWidgetMinSize(searchPanel, 300); - splitPanel.setWidgetMinSize(contentPanel, 450); if (LogLevel.showDebug()) { logPanel.enable(); @@ -200,6 +203,9 @@ } 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 @@ -241,9 +247,7 @@ // XXX check formatting wrt GPE private native String getWebSocketBaseUrl(String moduleBase) /*-{return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/";}-*/; - private native boolean useSocketIO() /*-{ - return !!$wnd.__useSocketIO -}-*/; + private native boolean useSocketIO() /*-{ return !!$wnd.__useSocketIO }-*/; /** */ @@ -266,11 +270,19 @@ wave = null; } - Element holder = contentPanel.getElement().appendChild(Document.get().createDivElement()); - final StagesProvider wave = new StagesProvider(holder, - contentPanel, waveRef, channel, idGenerator, profiles, waveStore, isNewWave); + // Release the display:none. + UIObject.setVisible(waveFrame.getElement(), true); + waveHolder.getElement().appendChild(loading); + Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); + StagesProvider wave = new StagesProvider( + holder, waveHolder, waveRef, channel, idGenerator, profiles, waveStore, isNewWave); this.wave = wave; - wave.load(null); + wave.load(new Command() { + @Override + public void execute() { + loading.removeFromParent(); + } + }); String encodedToken = History.getToken(); NotifyUser.info("Open Wave: " + encodedToken + " waveRef: " + waveRef.getWaveId(), true); if (encodedToken != null && !encodedToken.isEmpty()) { @@ -338,12 +350,13 @@ // 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 Scheduler. + // 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. - DeferredCommand.addCommand(new Command() { + new Timer() { @Override - public void execute() { + public void run() { SafeHtmlBuilder stack = new SafeHtmlBuilder(); Throwable error = t; @@ -365,7 +378,7 @@ whenReady.use(stack.toSafeHtml()); } - }); + }.schedule(1); } private static String maybe(String value, String otherwise) { Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.ui.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.ui.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -3,10 +3,11 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:d='urn:import:org.waveprotocol.box.webclient.client' xmlns:s='urn:import:org.waveprotocol.box.webclient.search' + xmlns:f='urn:import:org.waveprotocol.box.webclient.widget.frame' xmlns:w='urn:import:org.waveprotocol.wave.client.widget.common'> <ui:style type="cc.kune.wave.client.WebClient.Style"> @def rootBackground #f0f0ff; - @def gap 5px; + @def gap 10px; .root { background: rootBackground; position: absolute; @@ -20,12 +21,7 @@ position: absolute; } - .subPanel { - background: white; border: thin solid silver; border-radius: gap; - } - .splitPanel { - } @external gwt-SplitLayoutPanel-HDragger; @@ -34,34 +30,50 @@ background-color: rootBackground; } - .waveList { - margin-left: gap; + .searchPanel { + /* + * GWT's drag panel separators are already huge, so no margin needed on + * sides that have drag panels. + */ + margin: gap 0 0 gap; } - .waveView { - margin-right: gap; opacity: 0; visibility: hidden; - -webkit-transition: opacity 1s ease-in-out; - } - .debugPanel { + background: white; + border: thin solid silver; + border-radius: 5px; margin: 0 gap gap gap; } - .fullGap { - margin: gap; + .wavePanel { + /* + * GWT's drag panel separators are already huge, so no margin needed on + * sides that have drag panels. + */ + margin: gap 0 0 0; } + + .waveHolder { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + } </ui:style> <g:DockLayoutPanel unit="PX" styleName="{style.root}"> <g:center> <g:SplitLayoutPanel ui:field="splitPanel" stylePrimaryName="{style.splitPanel}"> <g:south size="200"> - <d:DebugMessagePanel ui:field="logPanel" addStyleNames="{style.subPanel} {style.debugPanel}" /> + <d:DebugMessagePanel ui:field="logPanel" addStyleNames="{style.debugPanel}" /> </g:south> <g:west size="400"> - <s:SearchPanelWidget ui:field="searchPanel"/> + <s:SearchPanelWidget ui:field="searchPanel" addStyleNames="{style.searchPanel}"/> </g:west> <g:center> - <w:ImplPanel ui:field="contentPanel"/> + <f:FramedPanel ui:field="waveFrame" addStyleNames="{style.wavePanel}"> + <w:ImplPanel ui:field="waveHolder" addStyleNames="{style.waveHolder}"/> + </f:FramedPanel> </g:center> </g:SplitLayoutPanel> </g:center> Modified: trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,3 +1,4 @@ +// @formatter:off /** * Copyright 2010 Google Inc. * @@ -45,108 +46,108 @@ * * @author josephg(a)gmail.com (Joseph Gentle) */ -public class CustomUserRegistrationServlet extends HttpServlet { - private final AccountStore accountStore; - private final String domain; +public final class CustomUserRegistrationServlet extends HttpServlet { + private final AccountStore accountStore; + private final String domain; - private final Log LOG = Log.get(CustomUserRegistrationServlet.class); + private final Log LOG = Log.get(CustomUserRegistrationServlet.class); - @Inject - public CustomUserRegistrationServlet(final AccountStore accountStore, - @Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain) { - this.accountStore = accountStore; - this.domain = domain; + @Inject + public CustomUserRegistrationServlet(final AccountStore accountStore, + @Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain) { + this.accountStore = accountStore; + this.domain = domain; + } + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException { + writeRegistrationPage("", AuthenticationServlet.RESPONSE_STATUS_NONE, req.getLocale(), resp); + } + + @SuppressWarnings("unchecked") + @Override + protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws IOException { + req.setCharacterEncoding("UTF-8"); + String password = req.getParameter(HttpRequestBasedCallbackHandler.PASSWORD_FIELD); + if (password == null) { + // Register the user with an empty password. + password = ""; } + final PasswordDigest passwordDigest = new PasswordDigest(password.toCharArray()); + String message = + tryCreateUser(req.getParameter(HttpRequestBasedCallbackHandler.ADDRESS_FIELD), passwordDigest); + String responseType = AuthenticationServlet.RESPONSE_STATUS_SUCCESS; - @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException { - writeRegistrationPage("", AuthenticationServlet.RESPONSE_STATUS_NONE, req.getLocale(), resp); + if (message != null) { + resp.setStatus(HttpServletResponse.SC_FORBIDDEN); + responseType = AuthenticationServlet.RESPONSE_STATUS_FAILED; + } else { + message = "Registration complete."; + resp.setStatus(HttpServletResponse.SC_OK); } - @SuppressWarnings("unchecked") - @Override - protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws IOException { - req.setCharacterEncoding("UTF-8"); + writeRegistrationPage(message, responseType, req.getLocale(), resp); + } - final String username = req.getParameter(HttpRequestBasedCallbackHandler.ADDRESS_FIELD); - String passwd = req.getParameter(HttpRequestBasedCallbackHandler.PASSWORD_FIELD); - if (passwd == null) { - // Register the user with an empty password. - passwd = ""; - } - final PasswordDigest passwordDigest = new PasswordDigest(passwd.toCharArray()); - String message = tryCreateUser(username, passwordDigest); - String responseType = AuthenticationServlet.RESPONSE_STATUS_SUCCESS; + /** + * Try to create a user with the provided username and password. On error, + * returns a string containing an error message. On success, returns null. + */ + public String tryCreateUser(String username, final PasswordDigest passwordDigest) { + final String message = null; + ParticipantId id = null; - if (message != null) { - resp.setStatus(HttpServletResponse.SC_FORBIDDEN); - responseType = AuthenticationServlet.RESPONSE_STATUS_FAILED; - } else { - message = "Registration complete."; - resp.setStatus(HttpServletResponse.SC_OK); - } + try { + // First, some cleanup on the parameters. + if (username == null) { + return "Username portion of address cannot be less than 2 characters"; + } + username = username.trim().toLowerCase(); + if (username.contains(ParticipantId.DOMAIN_PREFIX)) { + id = ParticipantId.of(username); + } else { + id = ParticipantId.of(username + ParticipantId.DOMAIN_PREFIX + domain); + } + if (id.getAddress().indexOf("@") < 2) { + return "Username portion of address cannot be less than 2 characters"; + } + final String[] usernameSplit = id.getAddress().split("@"); + if (usernameSplit.length != 2 || !usernameSplit[0].matches("[\\w\\.]+")) { + return "Only letters (a-z), numbers (0-9), and periods (.) are allowed in Username"; + } + if (!id.getDomain().equals(domain)) { + return "You can only create users at the " + domain + " domain"; + } + } catch (final InvalidParticipantAddress e) { + return "Invalid username"; + } - writeRegistrationPage(message, responseType, req.getLocale(), resp); + try { + if (accountStore.getAccount(id) != null) { + return "Account already exists"; + } + } catch (final PersistenceException e) { + LOG.severe("Failed to retreive account data for " + id, e); + return "An unexpected error occured while trying to retrieve account status"; } - /** - * Try to create a user with the provided username and password. On error, - * returns a string containing an error message. On success, returns null. - */ - public String tryCreateUser(final String username, final PasswordDigest passwordDigest) { - String lusername = username; - // final String message = null; - ParticipantId id = null; + final HumanAccountDataImpl account = + new HumanAccountDataImpl(id, passwordDigest); + try { + accountStore.putAccount(account); + } catch (final PersistenceException e) { + LOG.severe("Failed to create new account for " + id, e); + return "An unexpected error occured while trying to create the account"; + } - try { - // First, some cleanup on the parameters. - if (lusername == null) { - return "Username portion of address cannot be less than 2 characters"; - } - lusername = lusername.trim().toLowerCase(); - if (lusername.contains(ParticipantId.DOMAIN_PREFIX)) { - id = ParticipantId.of(lusername); - } else { - id = ParticipantId.of(lusername + ParticipantId.DOMAIN_PREFIX + domain); - } - if (id.getAddress().indexOf("@") < 2) { - return "Username portion of address cannot be less than 2 characters"; - } - final String[] usernameSplit = id.getAddress().split("@"); - if (usernameSplit.length != 2 || !usernameSplit[0].matches("[\\w\\.]+")) { - return "Only letters (a-z), numbers (0-9), and periods (.) are allowed in Username"; - } - if (!id.getDomain().equals(domain)) { - return "You can only create users at the " + domain + " domain"; - } - } catch (final InvalidParticipantAddress e) { - return "Invalid username"; - } + return null; + } - try { - if (accountStore.getAccount(id) != null) { - return "An account with this name already exists"; - } - } catch (final PersistenceException e) { - LOG.severe("Failed to retreive account data for " + id, e); - return "An unexpected error occured while trying to retrieve account status"; - } - - final HumanAccountDataImpl account = new HumanAccountDataImpl(id, passwordDigest); - try { - accountStore.putAccount(account); - } catch (final PersistenceException e) { - LOG.severe("Failed to create new account for " + id, e); - return "An unexpected error occured while trying to create the account"; - } - - return null; - } - - private void writeRegistrationPage(final String message, final String responseType, final Locale locale, - final HttpServletResponse dest) throws IOException { - dest.setCharacterEncoding("UTF-8"); - dest.setContentType("text/html;charset=utf-8"); - UserRegistrationPage.write(dest.getWriter(), new GxpContext(locale), domain, message, responseType); - } + private void writeRegistrationPage(final String message, final String responseType, final Locale locale, + final HttpServletResponse dest) throws IOException { + dest.setCharacterEncoding("UTF-8"); + dest.setContentType("text/html;charset=utf-8"); + UserRegistrationPage.write(dest.getWriter(), new GxpContext(locale), domain, message, + responseType); + } } Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -160,7 +160,7 @@ server.addServlet("/auth/register", injector.getInstance(CustomUserRegistrationServlet.class)); server.addServlet("/fetch/*", injector.getInstance(FetchServlet.class)); - + server.addServlet("/search/*", injector.getInstance(SearchServlet.class)); server.addServlet("/robot/dataapi", injector.getInstance(DataApiServlet.class)); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -25,7 +25,7 @@ import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -47,7 +47,7 @@ import com.calclab.suco.client.ioc.Provider; -public class BlogClientActions extends AbstractFoldableContentActions { +public class BlogClientActions extends OldAbstractFoldableContentActions { public BlogClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import cc.kune.common.client.utils.SchedulerManager; @@ -64,7 +64,7 @@ private void createActions() { final ActionToolbarButtonDescriptor<StateToken> chatAbout = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, AbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { + AccessRolDTO.Viewer, OldAbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { @Override public void onEvent(final StateToken token) { deferredWrapper.get().addCommand(new ScheduledCommand() { @@ -85,7 +85,7 @@ chatAbout.setEnableCondition(notDeleted()); final ActionToolbarButtonDescriptor<StateToken> joinRoom = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, AbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { + AccessRolDTO.Viewer, OldAbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { @Override public void onEvent(final StateToken token) { final ChatEngine chatEngine = chatEngineProvider.get(); @@ -99,7 +99,7 @@ joinRoom.setMustBeAuthenticated(true); final ActionToolbarButtonDescriptor<StateToken> addRoom = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Administrator, AbstractFoldableContentActions.CONTEXT_TOPBAR, new Listener<StateToken>() { + AccessRolDTO.Administrator, OldAbstractFoldableContentActions.CONTEXT_TOPBAR, new Listener<StateToken>() { @Override public void onEvent(final StateToken token) { addRoomProvider.get().show(); Deleted: trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,7 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.Core" /> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> - <source path="client" /> -</module> \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/DocsMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocsMessages.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocsMessages.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,23 +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.docs.client; - -public interface DocsMessages { -} Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,117 +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.docs.client; - -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_DOCUMENT; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_FOLDER; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_ROOT; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; - -import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.cnt.ContentActionRegistry; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class DocumentClientActions extends AbstractFoldableContentActions { - public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_FOLDER, }; - final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - final String[] containersNoRoot = { TYPE_FOLDER }; - final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("File"); - final String parentMenuTitleCtx = i18n.t("Folder"); - - createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createNewContentAction(TYPE_DOCUMENT, "images/nav/page_add.png", i18n.t("New document"), parentMenuTitleCtx, - Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createTranslateAction(parentMenuTitle, TYPE_DOCUMENT, TYPE_FOLDER); - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createEditAction(parentMenuTitle, TYPE_DOCUMENT); - createContentModeratedActions(parentMenuTitle, contentsModerated); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createSetAsDefContent(parentMenuTitle, contents); - - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), - null, containers); - - createDownloadActions(TYPE_UPLOADEDFILE); - - createGoAction(all); - - createGoHomeAction(containers); - - createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - // super.createUploadMediaAction(TYPE_GALLERY); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,66 +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.docs.client; - -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.gspace.client.tool.ToolSelector; - -public class DocumentClientTool extends OldFoldableAbstractClientTool { - public static final String NAME = "docs"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_DOCUMENT = NAME + "." + "doc"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + OldFoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WAVE = NAME + "." + OldFoldableAbstractClientTool.WAVE_SUFFIX; - - public DocumentClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final WsThemeManager wsThemePresenter, final WorkspaceSkeleton ws, - final ContentCapabilitiesRegistry cntCapRegistry) { - super(NAME, i18n.t("documents"), toolSelector, wsThemePresenter, ws, cntCapRegistry); - - // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerAuthorableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerDragableTypes(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_UPLOADEDFILE); - registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); - registerPublishModerableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerRateableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerRenamableTypes(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_UPLOADEDFILE); - registerTageableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerTranslatableTypes(TYPE_DOCUMENT, TYPE_FOLDER); - - registerIcons(); - } - - public String getName() { - return NAME; - } - - private void registerIcons() { - registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); - registerContentTypeIcon(TYPE_DOCUMENT, "images/nav/page.png"); - registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - } - -} Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -24,7 +24,7 @@ import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -46,7 +46,7 @@ import com.calclab.suco.client.ioc.Provider; -public class GalleryClientActions extends AbstractFoldableContentActions { +public class GalleryClientActions extends OldAbstractFoldableContentActions { public GalleryClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -25,7 +25,7 @@ import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -47,7 +47,7 @@ import com.calclab.suco.client.ioc.Provider; -public class WikiClientActions extends AbstractFoldableContentActions { +public class WikiClientActions extends OldAbstractFoldableContentActions { public WikiClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, final Provider<ContentServiceAsync> contentServiceProvider, Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,674 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.workspace.client; - -import org.ourproject.kune.platf.client.actions.ActionCheckedCondition; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; -import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.cnt.ContentActionRegistry; -import cc.kune.core.client.cnt.FoldableContent; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.errors.SessionExpiredException; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateContentDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public abstract class AbstractFoldableContentActions { - - protected enum Position { - cnt, ctx - } - - public static final ActionToolbarPosition CONTENT_BOTTOMBAR = new ActionToolbarPosition("afca-ctn-bottom"); - - public static final ActionToolbarPosition CONTENT_TOPBAR = new ActionToolbarPosition("afca-ctn-top"); - public static final ActionToolbarPosition CONTEXT_BOTTOMBAR = new ActionToolbarPosition("afca-ctx-bottom"); - public static final ActionToolbarPosition CONTEXT_TOPBAR = new ActionToolbarPosition("afca-ctx-top"); - private static final String PUBLICATION_MENU = "Publication"; - - protected final ContentActionRegistry contentActionRegistry; - protected final Provider<ContentServiceAsync> contentServiceProvider; - protected final ContextActionRegistry contextActionRegistry; - protected final ContextNavigator contextNavigator; - protected final Provider<ContextPropEditor> contextPropEditorProvider; - protected final SchedulerManager deferredCommandWrapper; - protected final EntityHeader entityLogo; - protected final ErrorHandler errorHandler; - protected final Provider<FileDownloadUtils> fileDownloadProvider; - protected final Provider<FileUploader> fileUploaderProvider; - protected final FoldableContent foldableContent; - protected final Provider<GroupServiceAsync> groupServiceProvider; - protected final I18nUITranslationService i18n; - private final SitePublicSpaceLink publicLink; - protected final Session session; - protected final StateManager stateManager; - protected final Provider<ContentEditor> textEditorProvider; - - private final WsBackManager wsBackManager; - - public AbstractFoldableContentActions(final Session session, final StateManager stateManager, - final I18nUITranslationService i18n, final ErrorHandler errorHandler, - final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<FileUploader> fileUploaderProvider, final ContextNavigator contextNavigator, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, - final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, - final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.errorHandler = errorHandler; - this.deferredCommandWrapper = deferredCommandWrapper; - this.groupServiceProvider = groupServiceProvider; - this.contentServiceProvider = contentServiceProvider; - this.fileUploaderProvider = fileUploaderProvider; - this.contextNavigator = contextNavigator; - this.contentActionRegistry = contentActionRegistry; - this.contextActionRegistry = contextActionRegistry; - this.fileDownloadProvider = fileDownloadProvider; - this.textEditorProvider = textEditorProvider; - this.contextPropEditorProvider = contextPropEditorProvider; - this.foldableContent = foldableContent; - this.entityLogo = entityLogo; - this.publicLink = publicLink; - this.wsBackManager = wsBackManager; - createActions(); - session.onInitDataReceived(new Listener<InitDataDTO>() { - @Override - public void onEvent(final InitDataDTO parameter) { - createPostSessionInitActions(); - } - }); - } - - protected abstract void createActions(); - - protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatus.publishedOnline, - contentsModerated); - createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatus.editingInProgress, - contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatus.rejected, contentsModerated); - createSetStatusAction(AccessRolDTO.Editor, i18n.t("Submitted for publish"), - ContentStatus.submittedForEvaluation, contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatus.inTheDustbin, - contentsModerated); - } - - protected void createContentRenameAction(final String parentMenuTitle, final String textDescription, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtn.setTextDescription(textDescription); - renameCtn.setParentMenuTitle(parentMenuTitle); - renameCtn.setEnableCondition(notDeleted()); - - // contentActionRegistry.addAction(renameCtn, registerInTypes); - } - - protected void createDelContainerAction(final String text, final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - NotifyUser.info("Sorry, in development"); - } - }); - delContainer.setParentMenuTitle(parentMenuTitle); - delContainer.setTextDescription(i18n.t(text)); - delContainer.setMustBeConfirmed(true); - delContainer.setConfirmationTitle(i18n.t("Please confirm")); - delContainer.setConfirmationText(i18n.t("You will delete it with all its contents. Are you sure?")); - contextActionRegistry.addAction(delContainer, registerInTypes); - } - - protected void createDelContentAction(final String parentMenuTitle, final String textDescription, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - contentServiceProvider.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<StateContentDTO>() { - @Override - public void onSuccess(final StateContentDTO state) { - session.setCurrentState(state); - final StateToken parent = token.copy().clearDocument(); - stateManager.gotoToken(parent); - contextNavigator.clear(); - contextNavigator.refreshState(); - } - }); - } - }); - delContent.setParentMenuTitle(parentMenuTitle); - delContent.setTextDescription(textDescription); - delContent.setMustBeConfirmed(true); - delContent.setConfirmationTitle(i18n.t("Please confirm")); - delContent.setConfirmationText(i18n.t("Are you sure?")); - delContent.setEnableCondition(notDefAndNotDeleted()); - // contentActionRegistry.addAction(delContent, registerInTypes); - } - - protected void createDownloadActions(final String typeUploadedfile) { - final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - download.setMustBeAuthenticated(false); - download.setTextDescription(i18n.t("Download")); - download.setToolTip(i18n.t("Download this file")); - download.setIconUrl("images/nav/download.png"); - - final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( - AccessRolDTO.Viewer, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - downloadCtx.setMustBeAuthenticated(false); - downloadCtx.setTextDescription(i18n.t("Download")); - downloadCtx.setIconUrl("images/nav/download.png"); - - // contentActionRegistry.addAction(download, typeUploadedfile); - contextActionRegistry.addAction(downloadCtx, typeUploadedfile); - } - - protected ActionToolbarButtonDescriptor<StateToken> createEditAction(final String fileMenuTitle, - final String... registerInTypes) { - final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.showProgressProcessing(); - session.check(new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - final ContentEditor editor = textEditorProvider.get(); - foldableContent.detach(); - contextNavigator.detach(); - contextPropEditorProvider.get().attach(); - editor.edit(session.getContentState().getContent(), new Listener<String>() { - @Override - public void onEvent(final String html) { - NotifyUser.showProgressSaving(); - contentServiceProvider.get().save(session.getUserHash(), stateToken, html, - new AsyncCallback<Void>() { - @Override - public void onFailure(final Throwable caught) { - NotifyUser.hideProgress(); - if (caught instanceof SessionExpiredException) { - errorHandler.doSessionExpired(); - } else { - NotifyUser.error(i18n.t("Error saving document. Retrying...")); - errorHandler.process(caught); - editor.onSaveFailed(); - } - } - - @Override - public void onSuccess(final Void param) { - NotifyUser.hideProgress(); - session.getContentState().setContent(html); - editor.onSavedSuccessful(); - } - }); - } - }, new Listener0() { - @Override - public void onEvent() { - // onClose - deferredCommandWrapper.addCommand(new ScheduledCommand() { - @Override - public void execute() { - foldableContent.attach(); - contextPropEditorProvider.get().detach(); - contextNavigator.attach(); - if (session.inSameToken(stateToken)) { - contextNavigator.refreshState(); - foldableContent.refreshState(); - } - } - }); - } - }); - editor.setFileMenuTitle(fileMenuTitle); - NotifyUser.hideProgress(); - } - }); - } - }); - editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); - editContent.setIconUrl("images/content_edit.png"); - editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); - editContent.setEnableCondition(notDeleted()); - // contentActionRegistry.addAction(editContent, registerInTypes); - return editContent; - } - - protected ActionMenuItemDescriptor<StateToken> createGoAction(final String... registerInTypes) { - final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - stateManager.gotoToken(token); - } - }); - go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Open")); - go.setIconUrl("images/nav/go.png"); - contextActionRegistry.addAction(go, registerInTypes); - return go; - } - - protected ActionToolbarButtonDescriptor<StateToken> createGoHomeAction(final String... registerInTypes) { - final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - stateManager.gotoToken(token.getGroup()); - } - }); - goGroupHome.setMustBeAuthenticated(false); - goGroupHome.setIconUrl("images/group-home.png"); - goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); - return !session.getCurrentStateToken().equals(defContentToken); - } - }); - goGroupHome.setLeftSeparator(ActionToolbarButtonSeparator.fill); - contextActionRegistry.addAction(goGroupHome, registerInTypes); - return goGroupHome; - } - - protected void createNewContainerAction(final String contentTypeId, final String iconUrl, - final String textDescription, final String parentMenuTitle, final String parentMenuSubtitle, - final String defaultName, final Position position, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; - addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_TOPBAR, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, - contentTypeId, new AsyncCallbackSimple<StateContainerDTO>() { - @Override - public void onSuccess(final StateContainerDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addFolder.setTextDescription(textDescription); - addFolder.setParentMenuTitle(parentMenuTitle); - addFolder.setParentSubMenuTitle(parentMenuSubtitle); - addFolder.setIconUrl(iconUrl); - register(addFolder, position, registerInTypes); - } - - protected ActionToolbarMenuAndItemDescriptor<StateToken> createNewContentAction(final String typeId, - final String iconUrl, final String description, final String parentMenuTitle, final Position position, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { - @Override - public void onEvent() { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().addContent(session.getUserHash(), - session.getCurrentState().getStateToken(), description, typeId, - new AsyncCallbackSimple<StateContentDTO>() { - @Override - public void onSuccess(final StateContentDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addContent.setTextDescription(description); - addContent.setParentMenuTitle(parentMenuTitle); - addContent.setParentSubMenuTitle(i18n.t("New")); - addContent.setIconUrl(iconUrl); - register(addContent, position, registerInTypes); - return addContent; - } - - protected abstract void createPostSessionInitActions(); - - protected ActionToolbarMenuDescriptor<StateToken> createRefreshCntAction(final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCnt.setMustBeAuthenticated(false); - refreshCnt.setParentMenuTitle(parentMenuTitle); - refreshCnt.setTextDescription(i18n.t("Refresh")); - refreshCnt.setIconUrl("images/nav/refresh.png"); - // contentActionRegistry.addAction(refreshCnt, registerInTypes); - return refreshCnt; - } - - protected ActionToolbarMenuDescriptor<StateToken> createRefreshCxtAction(final String parentMenuTitleCtx, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCtx.setMustBeAuthenticated(false); - refreshCtx.setParentMenuTitle(parentMenuTitleCtx); - refreshCtx.setTextDescription(i18n.t("Refresh")); - refreshCtx.setIconUrl("images/nav/refresh.png"); - contextActionRegistry.addAction(refreshCtx, registerInTypes); - return refreshCtx; - } - - protected ActionToolbarMenuAndItemDescriptor<StateToken> createRenameContentInCtxAction( - final String parentMenuTitleCtx, final String textDescription, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtx.setTextDescription(textDescription); - renameCtx.setParentMenuTitle(parentMenuTitleCtx); - contextActionRegistry.addAction(renameCtx, registerInTypes); - return renameCtx; - } - - protected ActionToolbarMenuDescriptor<StateToken> createSetAsDefContent(final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; - setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, CONTENT_TOPBAR, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, - new AsyncCallbackSimple<ContentSimpleDTO>() { - @Override - public void onSuccess(final ContentSimpleDTO defContent) { - session.getCurrentState().getGroup().setDefaultContent(defContent); - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Content selected as the group homepage")); - } - }); - } - }); - setAsDefGroupContent.setTextDescription(i18n.t("Set this as the default group page")); - setAsDefGroupContent.setIconUrl("images/group-home.png"); - setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); - setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); - // contentActionRegistry.addAction(setAsDefGroupContent, - // registerInTypes); - return setAsDefGroupContent; - } - - protected void createSetGroupBackImageAction(final String parentMenuTitle, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupBackImage = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - groupServiceProvider.get().setGroupBackImage(session.getUserHash(), token, - new AsyncCallbackSimple<GroupDTO>() { - @Override - public void onSuccess(final GroupDTO newGroup) { - if (session.getCurrentState().getGroup().getShortName().equals( - newGroup.getShortName())) { - session.getCurrentState().setGroup(newGroup); - wsBackManager.clearBackImage(); - wsBackManager.setBackImage(newGroup.getGroupBackImage().getStateToken()); - } - } - }); - } - }); - setGroupBackImage.setParentMenuTitle(parentMenuTitle); - setGroupBackImage.setTextDescription(i18n.t("Set this as the group background image")); - setGroupBackImage.setIconUrl("images/nav/picture.png"); - setGroupBackImage.setEnableCondition(new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - return session.getContentState().getMimeType().isImage(); - } - }); - // contentActionRegistry.addAction(setGroupBackImage, registerInTypes); - } - - protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, - final ContentStatus status, final String[] contentsModerated) { - final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( - rol, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - setContentStatus(status, stateToken); - } - }, "ContentRadioStatus", new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - if (session.getContainerState() instanceof StateContentDTO) { - final ContentStatus currentStatus = session.getContentState().getStatus(); - return status.equals(currentStatus); - } - return false; - } - }); - action.setTextDescription(textDescription); - action.setParentMenuTitle(PUBLICATION_MENU); - action.setParentMenuIconUrl("images/anybody.png"); - // contentActionRegistry.addAction(action, contentsModerated); - } - - protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { - final ActionToolbarMenuCheckItemDescriptor<StateToken> showDeletedItems = new ActionToolbarMenuCheckItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { - @Override - public void onEvent() { - final boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); - session.getCurrentUserInfo().setShowDeletedContent(mustShow); - if (!mustShow && session.isCurrentStateAContent() - && session.getContentState().getStatus().equals(ContentStatus.inTheDustbin)) { - stateManager.gotoToken(session.getCurrentStateToken().getGroup()); - } - contextNavigator.clear(); - contextNavigator.refreshState(); - } - }, new ActionCheckedCondition() { - @Override - public boolean mustBeChecked() { - return session.getShowDeletedContent(); - } - }); - showDeletedItems.setParentMenuTitle(parentMenuTitle); - showDeletedItems.setTextDescription("Show deleted items"); - showDeletedItems.setMustBeAuthenticated(true); - contextActionRegistry.addAction(showDeletedItems, registerInTypes); - } - - protected ActionToolbarMenuDescriptor<StateToken> createTranslateAction(final String fileMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> translateContent = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.important(i18n.t("Sorry, this functionality is currently in development")); - } - }); - translateContent.setParentMenuTitle(fileMenuTitle); - translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); - translateContent.setToolTip(i18n.t("Translate this document to other languages")); - translateContent.setIconUrl("images/language.gif"); - translateContent.setEnableCondition(notDeleted()); - // contentActionRegistry.addAction(translateContent, registerInTypes); - return translateContent; - } - - protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadAction(final String textDescription, - final String iconUrl, final String toolTip, final String permitedExtensions, - final String... registerInTypes) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; - uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_BOTTOMBAR, - new Listener0() { - @Override - public void onEvent() { - if (permitedExtensions != null) { - // FIXME: can't be reset ... - // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); - } else { - // FIXME: can't be reset ... - // fileUploaderProvider.get().resetPermittedExtensions(); - } - fileUploaderProvider.get().show(); - } - }); - uploadFile.setTextDescription(textDescription); - uploadFile.setIconUrl(iconUrl); - uploadFile.setToolTip(toolTip); - contextActionRegistry.addAction(uploadFile, registerInTypes); - return uploadFile; - } - - protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadMediaAction(final String... registerInTypes) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n.t("Upload media"), - "images/nav/upload.png", i18n.t("Upload some media (images, videos...)"), - session.getGalleryPermittedExtensions()); - contextActionRegistry.addAction(uploadMedia, registerInTypes); - return uploadMedia; - } - - protected void downloadContent(final StateToken token) { - fileDownloadProvider.get().downloadFile(token); - } - - private ActionEnableCondition<StateToken> notDefAndNotDeleted() { - return new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final boolean isNotDefContentToken = !session.getCurrentState().getGroup().getDefaultContent().getStateToken().equals( - session.getCurrentStateToken()); - return isNotDefContentToken && notDeleted().mustBeEnabled(token); - } - }; - } - - private ActionEnableCondition<StateToken> notDeleted() { - return new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( - ContentStatus.inTheDustbin)); - return isNotDeleted; - } - }; - } - - private void register(final ActionToolbarMenuAndItemDescriptor<StateToken> action, final Position position, - final String... registerInTypes) { - if (position.equals(Position.ctx)) { - contextActionRegistry.addAction(action, registerInTypes); - } else if (position.equals(Position.cnt)) { - // contentActionRegistry.addAction(action, registerInTypes); - } - } - - private void setContentStatus(final ContentStatus status, final StateToken stateToken) { - final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { - @Override - public void onSuccess(final StateAbstractDTO state) { - if (session.inSameToken(stateToken)) { - session.setCurrentState(state); - publicLink.setState(state); - foldableContent.refreshState(); - } - contextNavigator.setItemStatus(stateToken, status); - } - }; - if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) - || status.equals(ContentStatus.inTheDustbin)) { - contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); - } else { - contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); - } - } - -} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java (from rev 1295, trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,674 @@ +/* + * + * Copyright (C) 2007-2011 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.workspace.client; + +import org.ourproject.kune.platf.client.actions.ActionCheckedCondition; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; +import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; +import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContent; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.user.client.rpc.AsyncCallback; + +public abstract class OldAbstractFoldableContentActions { + + protected enum Position { + cnt, ctx + } + + public static final ActionToolbarPosition CONTENT_BOTTOMBAR = new ActionToolbarPosition("afca-ctn-bottom"); + + public static final ActionToolbarPosition CONTENT_TOPBAR = new ActionToolbarPosition("afca-ctn-top"); + public static final ActionToolbarPosition CONTEXT_BOTTOMBAR = new ActionToolbarPosition("afca-ctx-bottom"); + public static final ActionToolbarPosition CONTEXT_TOPBAR = new ActionToolbarPosition("afca-ctx-top"); + private static final String PUBLICATION_MENU = "Publication"; + + protected final ContentActionRegistry contentActionRegistry; + protected final Provider<ContentServiceAsync> contentServiceProvider; + protected final ContextActionRegistry contextActionRegistry; + protected final ContextNavigator contextNavigator; + protected final Provider<ContextPropEditor> contextPropEditorProvider; + protected final SchedulerManager deferredCommandWrapper; + protected final EntityHeader entityLogo; + protected final ErrorHandler errorHandler; + protected final Provider<FileDownloadUtils> fileDownloadProvider; + protected final Provider<FileUploader> fileUploaderProvider; + protected final FoldableContent foldableContent; + protected final Provider<GroupServiceAsync> groupServiceProvider; + protected final I18nUITranslationService i18n; + private final SitePublicSpaceLink publicLink; + protected final Session session; + protected final StateManager stateManager; + protected final Provider<ContentEditor> textEditorProvider; + + private final WsBackManager wsBackManager; + + public OldAbstractFoldableContentActions(final Session session, final StateManager stateManager, + final I18nUITranslationService i18n, final ErrorHandler errorHandler, + final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<FileUploader> fileUploaderProvider, final ContextNavigator contextNavigator, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, + final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, + final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.errorHandler = errorHandler; + this.deferredCommandWrapper = deferredCommandWrapper; + this.groupServiceProvider = groupServiceProvider; + this.contentServiceProvider = contentServiceProvider; + this.fileUploaderProvider = fileUploaderProvider; + this.contextNavigator = contextNavigator; + this.contentActionRegistry = contentActionRegistry; + this.contextActionRegistry = contextActionRegistry; + this.fileDownloadProvider = fileDownloadProvider; + this.textEditorProvider = textEditorProvider; + this.contextPropEditorProvider = contextPropEditorProvider; + this.foldableContent = foldableContent; + this.entityLogo = entityLogo; + this.publicLink = publicLink; + this.wsBackManager = wsBackManager; + createActions(); + session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override + public void onEvent(final InitDataDTO parameter) { + createPostSessionInitActions(); + } + }); + } + + protected abstract void createActions(); + + protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatus.publishedOnline, + contentsModerated); + createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatus.editingInProgress, + contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatus.rejected, contentsModerated); + createSetStatusAction(AccessRolDTO.Editor, i18n.t("Submitted for publish"), + ContentStatus.submittedForEvaluation, contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatus.inTheDustbin, + contentsModerated); + } + + protected void createContentRenameAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtn.setTextDescription(textDescription); + renameCtn.setParentMenuTitle(parentMenuTitle); + renameCtn.setEnableCondition(notDeleted()); + + // contentActionRegistry.addAction(renameCtn, registerInTypes); + } + + protected void createDelContainerAction(final String text, final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + NotifyUser.info("Sorry, in development"); + } + }); + delContainer.setParentMenuTitle(parentMenuTitle); + delContainer.setTextDescription(i18n.t(text)); + delContainer.setMustBeConfirmed(true); + delContainer.setConfirmationTitle(i18n.t("Please confirm")); + delContainer.setConfirmationText(i18n.t("You will delete it with all its contents. Are you sure?")); + contextActionRegistry.addAction(delContainer, registerInTypes); + } + + protected void createDelContentAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + contentServiceProvider.get().delContent(session.getUserHash(), token, + new AsyncCallbackSimple<StateContentDTO>() { + @Override + public void onSuccess(final StateContentDTO state) { + session.setCurrentState(state); + final StateToken parent = token.copy().clearDocument(); + stateManager.gotoToken(parent); + contextNavigator.clear(); + contextNavigator.refreshState(); + } + }); + } + }); + delContent.setParentMenuTitle(parentMenuTitle); + delContent.setTextDescription(textDescription); + delContent.setMustBeConfirmed(true); + delContent.setConfirmationTitle(i18n.t("Please confirm")); + delContent.setConfirmationText(i18n.t("Are you sure?")); + delContent.setEnableCondition(notDefAndNotDeleted()); + // contentActionRegistry.addAction(delContent, registerInTypes); + } + + protected void createDownloadActions(final String typeUploadedfile) { + final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + download.setMustBeAuthenticated(false); + download.setTextDescription(i18n.t("Download")); + download.setToolTip(i18n.t("Download this file")); + download.setIconUrl("images/nav/download.png"); + + final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( + AccessRolDTO.Viewer, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + downloadCtx.setMustBeAuthenticated(false); + downloadCtx.setTextDescription(i18n.t("Download")); + downloadCtx.setIconUrl("images/nav/download.png"); + + // contentActionRegistry.addAction(download, typeUploadedfile); + contextActionRegistry.addAction(downloadCtx, typeUploadedfile); + } + + protected ActionToolbarButtonDescriptor<StateToken> createEditAction(final String fileMenuTitle, + final String... registerInTypes) { + final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.showProgressProcessing(); + session.check(new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + final ContentEditor editor = textEditorProvider.get(); + foldableContent.detach(); + contextNavigator.detach(); + contextPropEditorProvider.get().attach(); + editor.edit(session.getContentState().getContent(), new Listener<String>() { + @Override + public void onEvent(final String html) { + NotifyUser.showProgressSaving(); + contentServiceProvider.get().save(session.getUserHash(), stateToken, html, + new AsyncCallback<Void>() { + @Override + public void onFailure(final Throwable caught) { + NotifyUser.hideProgress(); + if (caught instanceof SessionExpiredException) { + errorHandler.doSessionExpired(); + } else { + NotifyUser.error(i18n.t("Error saving document. Retrying...")); + errorHandler.process(caught); + editor.onSaveFailed(); + } + } + + @Override + public void onSuccess(final Void param) { + NotifyUser.hideProgress(); + session.getContentState().setContent(html); + editor.onSavedSuccessful(); + } + }); + } + }, new Listener0() { + @Override + public void onEvent() { + // onClose + deferredCommandWrapper.addCommand(new ScheduledCommand() { + @Override + public void execute() { + foldableContent.attach(); + contextPropEditorProvider.get().detach(); + contextNavigator.attach(); + if (session.inSameToken(stateToken)) { + contextNavigator.refreshState(); + foldableContent.refreshState(); + } + } + }); + } + }); + editor.setFileMenuTitle(fileMenuTitle); + NotifyUser.hideProgress(); + } + }); + } + }); + editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); + editContent.setIconUrl("images/content_edit.png"); + editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + editContent.setEnableCondition(notDeleted()); + // contentActionRegistry.addAction(editContent, registerInTypes); + return editContent; + } + + protected ActionMenuItemDescriptor<StateToken> createGoAction(final String... registerInTypes) { + final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + stateManager.gotoToken(token); + } + }); + go.setMustBeAuthenticated(false); + go.setTextDescription(i18n.t("Open")); + go.setIconUrl("images/nav/go.png"); + contextActionRegistry.addAction(go, registerInTypes); + return go; + } + + protected ActionToolbarButtonDescriptor<StateToken> createGoHomeAction(final String... registerInTypes) { + final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + stateManager.gotoToken(token.getGroup()); + } + }); + goGroupHome.setMustBeAuthenticated(false); + goGroupHome.setIconUrl("images/group-home.png"); + goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); + return !session.getCurrentStateToken().equals(defContentToken); + } + }); + goGroupHome.setLeftSeparator(ActionToolbarButtonSeparator.fill); + contextActionRegistry.addAction(goGroupHome, registerInTypes); + return goGroupHome; + } + + protected void createNewContainerAction(final String contentTypeId, final String iconUrl, + final String textDescription, final String parentMenuTitle, final String parentMenuSubtitle, + final String defaultName, final Position position, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; + addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_TOPBAR, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, + contentTypeId, new AsyncCallbackSimple<StateContainerDTO>() { + @Override + public void onSuccess(final StateContainerDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addFolder.setTextDescription(textDescription); + addFolder.setParentMenuTitle(parentMenuTitle); + addFolder.setParentSubMenuTitle(parentMenuSubtitle); + addFolder.setIconUrl(iconUrl); + register(addFolder, position, registerInTypes); + } + + protected ActionToolbarMenuAndItemDescriptor<StateToken> createNewContentAction(final String typeId, + final String iconUrl, final String description, final String parentMenuTitle, final Position position, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> addContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { + @Override + public void onEvent() { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().addContent(session.getUserHash(), + session.getCurrentState().getStateToken(), description, typeId, + new AsyncCallbackSimple<StateContentDTO>() { + @Override + public void onSuccess(final StateContentDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addContent.setTextDescription(description); + addContent.setParentMenuTitle(parentMenuTitle); + addContent.setParentSubMenuTitle(i18n.t("New")); + addContent.setIconUrl(iconUrl); + register(addContent, position, registerInTypes); + return addContent; + } + + protected abstract void createPostSessionInitActions(); + + protected ActionToolbarMenuDescriptor<StateToken> createRefreshCntAction(final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCnt.setMustBeAuthenticated(false); + refreshCnt.setParentMenuTitle(parentMenuTitle); + refreshCnt.setTextDescription(i18n.t("Refresh")); + refreshCnt.setIconUrl("images/nav/refresh.png"); + // contentActionRegistry.addAction(refreshCnt, registerInTypes); + return refreshCnt; + } + + protected ActionToolbarMenuDescriptor<StateToken> createRefreshCxtAction(final String parentMenuTitleCtx, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCtx.setMustBeAuthenticated(false); + refreshCtx.setParentMenuTitle(parentMenuTitleCtx); + refreshCtx.setTextDescription(i18n.t("Refresh")); + refreshCtx.setIconUrl("images/nav/refresh.png"); + contextActionRegistry.addAction(refreshCtx, registerInTypes); + return refreshCtx; + } + + protected ActionToolbarMenuAndItemDescriptor<StateToken> createRenameContentInCtxAction( + final String parentMenuTitleCtx, final String textDescription, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtx.setTextDescription(textDescription); + renameCtx.setParentMenuTitle(parentMenuTitleCtx); + contextActionRegistry.addAction(renameCtx, registerInTypes); + return renameCtx; + } + + protected ActionToolbarMenuDescriptor<StateToken> createSetAsDefContent(final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; + setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, CONTENT_TOPBAR, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, + new AsyncCallbackSimple<ContentSimpleDTO>() { + @Override + public void onSuccess(final ContentSimpleDTO defContent) { + session.getCurrentState().getGroup().setDefaultContent(defContent); + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Content selected as the group homepage")); + } + }); + } + }); + setAsDefGroupContent.setTextDescription(i18n.t("Set this as the default group page")); + setAsDefGroupContent.setIconUrl("images/group-home.png"); + setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); + setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); + // contentActionRegistry.addAction(setAsDefGroupContent, + // registerInTypes); + return setAsDefGroupContent; + } + + protected void createSetGroupBackImageAction(final String parentMenuTitle, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupBackImage = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + groupServiceProvider.get().setGroupBackImage(session.getUserHash(), token, + new AsyncCallbackSimple<GroupDTO>() { + @Override + public void onSuccess(final GroupDTO newGroup) { + if (session.getCurrentState().getGroup().getShortName().equals( + newGroup.getShortName())) { + session.getCurrentState().setGroup(newGroup); + wsBackManager.clearBackImage(); + wsBackManager.setBackImage(newGroup.getGroupBackImage().getStateToken()); + } + } + }); + } + }); + setGroupBackImage.setParentMenuTitle(parentMenuTitle); + setGroupBackImage.setTextDescription(i18n.t("Set this as the group background image")); + setGroupBackImage.setIconUrl("images/nav/picture.png"); + setGroupBackImage.setEnableCondition(new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + return session.getContentState().getMimeType().isImage(); + } + }); + // contentActionRegistry.addAction(setGroupBackImage, registerInTypes); + } + + protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, + final ContentStatus status, final String[] contentsModerated) { + final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( + rol, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + setContentStatus(status, stateToken); + } + }, "ContentRadioStatus", new RadioMustBeChecked() { + @Override + public boolean mustBeChecked() { + if (session.getContainerState() instanceof StateContentDTO) { + final ContentStatus currentStatus = session.getContentState().getStatus(); + return status.equals(currentStatus); + } + return false; + } + }); + action.setTextDescription(textDescription); + action.setParentMenuTitle(PUBLICATION_MENU); + action.setParentMenuIconUrl("images/anybody.png"); + // contentActionRegistry.addAction(action, contentsModerated); + } + + protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { + final ActionToolbarMenuCheckItemDescriptor<StateToken> showDeletedItems = new ActionToolbarMenuCheckItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { + @Override + public void onEvent() { + final boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); + session.getCurrentUserInfo().setShowDeletedContent(mustShow); + if (!mustShow && session.isCurrentStateAContent() + && session.getContentState().getStatus().equals(ContentStatus.inTheDustbin)) { + stateManager.gotoToken(session.getCurrentStateToken().getGroup()); + } + contextNavigator.clear(); + contextNavigator.refreshState(); + } + }, new ActionCheckedCondition() { + @Override + public boolean mustBeChecked() { + return session.getShowDeletedContent(); + } + }); + showDeletedItems.setParentMenuTitle(parentMenuTitle); + showDeletedItems.setTextDescription("Show deleted items"); + showDeletedItems.setMustBeAuthenticated(true); + contextActionRegistry.addAction(showDeletedItems, registerInTypes); + } + + protected ActionToolbarMenuDescriptor<StateToken> createTranslateAction(final String fileMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> translateContent = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.important(i18n.t("Sorry, this functionality is currently in development")); + } + }); + translateContent.setParentMenuTitle(fileMenuTitle); + translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); + translateContent.setToolTip(i18n.t("Translate this document to other languages")); + translateContent.setIconUrl("images/language.gif"); + translateContent.setEnableCondition(notDeleted()); + // contentActionRegistry.addAction(translateContent, registerInTypes); + return translateContent; + } + + protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadAction(final String textDescription, + final String iconUrl, final String toolTip, final String permitedExtensions, + final String... registerInTypes) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; + uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_BOTTOMBAR, + new Listener0() { + @Override + public void onEvent() { + if (permitedExtensions != null) { + // FIXME: can't be reset ... + // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); + } else { + // FIXME: can't be reset ... + // fileUploaderProvider.get().resetPermittedExtensions(); + } + fileUploaderProvider.get().show(); + } + }); + uploadFile.setTextDescription(textDescription); + uploadFile.setIconUrl(iconUrl); + uploadFile.setToolTip(toolTip); + contextActionRegistry.addAction(uploadFile, registerInTypes); + return uploadFile; + } + + protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadMediaAction(final String... registerInTypes) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n.t("Upload media"), + "images/nav/upload.png", i18n.t("Upload some media (images, videos...)"), + session.getGalleryPermittedExtensions()); + contextActionRegistry.addAction(uploadMedia, registerInTypes); + return uploadMedia; + } + + protected void downloadContent(final StateToken token) { + fileDownloadProvider.get().downloadFile(token); + } + + private ActionEnableCondition<StateToken> notDefAndNotDeleted() { + return new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final boolean isNotDefContentToken = !session.getCurrentState().getGroup().getDefaultContent().getStateToken().equals( + session.getCurrentStateToken()); + return isNotDefContentToken && notDeleted().mustBeEnabled(token); + } + }; + } + + private ActionEnableCondition<StateToken> notDeleted() { + return new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( + ContentStatus.inTheDustbin)); + return isNotDeleted; + } + }; + } + + private void register(final ActionToolbarMenuAndItemDescriptor<StateToken> action, final Position position, + final String... registerInTypes) { + if (position.equals(Position.ctx)) { + contextActionRegistry.addAction(action, registerInTypes); + } else if (position.equals(Position.cnt)) { + // contentActionRegistry.addAction(action, registerInTypes); + } + } + + private void setContentStatus(final ContentStatus status, final StateToken stateToken) { + final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { + @Override + public void onSuccess(final StateAbstractDTO state) { + if (session.inSameToken(stateToken)) { + session.setCurrentState(state); + publicLink.setState(state); + foldableContent.refreshState(); + } + contextNavigator.setItemStatus(stateToken, status); + } + }; + if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) + || status.equals(ContentStatus.inTheDustbin)) { + contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); + } else { + contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); + } + } + +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1014,7 +1014,7 @@ @Override public ActionContextTopToolbar create() { final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTEXT_TOPBAR, p(ActionManager.class), + OldAbstractFoldableContentActions.CONTEXT_TOPBAR, p(ActionManager.class), i(WorkspaceSkeleton.class)); final ActionContextTopToolbar toolbar = new ActionContextTopToolbar(panel); return toolbar; @@ -1025,7 +1025,7 @@ @Override public ActionContextBottomToolbar create() { final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTEXT_BOTTOMBAR, p(ActionManager.class), + OldAbstractFoldableContentActions.CONTEXT_BOTTOMBAR, p(ActionManager.class), i(WorkspaceSkeleton.class)); final ActionContextBottomToolbar toolbar = new ActionContextBottomToolbar(panel); return toolbar; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.workspace.client.ctxnav; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_FOLDER; +import static cc.kune.docs.client.DocumentClientTool.TYPE_FOLDER; import java.util.HashMap; @@ -27,7 +27,7 @@ import org.ourproject.kune.platf.client.actions.ActionRegistry; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.ui.KuneUiUtils; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cxt.ActionContextBottomToolbar; import org.ourproject.kune.workspace.client.title.RenameAction; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -160,8 +160,8 @@ topToolbar.disableMenusAndClearButtons(); bottomToolbar.disableMenusAndClearButtons(); final ActionItemCollection<StateToken> itemCollection = actionsByItem.get(stateToken); - topToolbar.addActions(itemCollection, AbstractFoldableContentActions.CONTEXT_TOPBAR); - bottomToolbar.addActions(itemCollection, AbstractFoldableContentActions.CONTEXT_BOTTOMBAR); + topToolbar.addActions(itemCollection, OldAbstractFoldableContentActions.CONTEXT_TOPBAR); + bottomToolbar.addActions(itemCollection, OldAbstractFoldableContentActions.CONTEXT_BOTTOMBAR); } @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.ActionManager; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.ui.Widget; @@ -35,13 +35,13 @@ final Provider<ActionManager> actionManagerProvider, final WorkspaceSkeleton ws) { super(actionManagerProvider); EntityWorkspace entityWorkspace = ws.getEntityWorkspace(); - if (position.equals(AbstractFoldableContentActions.CONTENT_TOPBAR)) { + if (position.equals(OldAbstractFoldableContentActions.CONTENT_TOPBAR)) { wsToolbar = entityWorkspace.getContentTopBar(); - } else if (position.equals(AbstractFoldableContentActions.CONTENT_BOTTOMBAR)) { + } else if (position.equals(OldAbstractFoldableContentActions.CONTENT_BOTTOMBAR)) { wsToolbar = entityWorkspace.getContentBottomBar(); - } else if (position.equals(AbstractFoldableContentActions.CONTEXT_TOPBAR)) { + } else if (position.equals(OldAbstractFoldableContentActions.CONTEXT_TOPBAR)) { wsToolbar = entityWorkspace.getContextTopBar(); - } else if (position.equals(AbstractFoldableContentActions.CONTEXT_BOTTOMBAR)) { + } else if (position.equals(OldAbstractFoldableContentActions.CONTEXT_BOTTOMBAR)) { wsToolbar = entityWorkspace.getContextBottomBar(); } Modified: trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -25,7 +25,6 @@ import org.junit.After; import org.junit.Before; -import org.ourproject.kune.docs.server.DocumentServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -34,6 +33,7 @@ import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.server.manager.LicenseManager; import cc.kune.core.server.manager.UserManager; +import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.I18nCountry; Modified: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.chat.server.ChatServerTool; -import org.ourproject.kune.docs.server.DocumentServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; @@ -37,6 +36,7 @@ import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.server.manager.I18nTranslationManager; import cc.kune.core.server.manager.LicenseManager; +import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -23,7 +23,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.ourproject.kune.chat.server.ChatServerModule; -import org.ourproject.kune.docs.server.DocumentServerModule; import org.ourproject.kune.wiki.server.WikiServerModule; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; @@ -35,6 +34,7 @@ import cc.kune.core.server.TestConstants; import cc.kune.core.server.init.FinderRegistry; import cc.kune.core.server.properties.PropertiesFileName; +import cc.kune.docs.server.DocumentServerModule; import cc.kune.wave.server.CustomSettingsBinder; import com.google.inject.AbstractModule; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -26,8 +26,6 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.wiki.server.WikiServerTool; import cc.kune.core.client.errors.ContentNotFoundException; @@ -40,6 +38,8 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.docs.client.DocumentClientTool; +import cc.kune.docs.server.DocumentServerTool; public class ContentServiceAddTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -29,8 +29,6 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.docs.server.DocumentServerTool; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.server.integration.IntegrationTestHelper; @@ -43,6 +41,8 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.docs.client.DocumentClientTool; +import cc.kune.docs.server.DocumentServerTool; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -23,10 +23,10 @@ import org.junit.Ignore; import org.junit.Test; -import org.ourproject.kune.docs.server.DocumentServerTool; import cc.kune.core.server.PersistencePreLoadedDataTest; import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; Copied: trunk/src/test/java/cc/kune/docs/DocumentToolTest.java (from rev 1295, trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java) =================================================================== --- trunk/src/test/java/cc/kune/docs/DocumentToolTest.java (rev 0) +++ trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -0,0 +1,38 @@ +/* + * + * Copyright (C) 2007-2011 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.docs; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import cc.kune.docs.client.DocumentClientTool; +import cc.kune.docs.server.DocumentServerTool; + +public class DocumentToolTest { + + @Test + public void clientAndServerSync() { + assertEquals(DocumentServerTool.NAME, DocumentClientTool.NAME); + assertEquals(DocumentServerTool.TYPE_ROOT, DocumentClientTool.TYPE_ROOT); + assertEquals(DocumentServerTool.TYPE_FOLDER, DocumentClientTool.TYPE_FOLDER); + assertEquals(DocumentServerTool.TYPE_DOCUMENT, DocumentClientTool.TYPE_DOCUMENT); + } +} Copied: trunk/src/test/java/cc/kune/docs/server (from rev 1295, trunk/src/test/java/org/ourproject/kune/docs/server) Modified: trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/docs/server/DocumentServerToolTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -17,16 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.docs.server; +package cc.kune.docs.server; -import static org.ourproject.kune.docs.server.DocumentServerTool.TYPE_DOCUMENT; -import static org.ourproject.kune.docs.server.DocumentServerTool.TYPE_FOLDER; -import static org.ourproject.kune.docs.server.DocumentServerTool.TYPE_ROOT; -import static org.ourproject.kune.docs.server.DocumentServerTool.TYPE_UPLOADEDFILE; +import static cc.kune.docs.server.DocumentServerTool.TYPE_DOCUMENT; +import static cc.kune.docs.server.DocumentServerTool.TYPE_FOLDER; +import static cc.kune.docs.server.DocumentServerTool.TYPE_ROOT; +import static cc.kune.docs.server.DocumentServerTool.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; +import cc.kune.docs.server.DocumentServerTool; + public class DocumentServerToolTest { // extends PersistenceTest { private DocumentServerTool serverTool; Deleted: trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.docs; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.docs.server.DocumentServerTool; - -public class DocumentToolTest { - - @Test - public void clientAndServerSync() { - assertEquals(DocumentServerTool.NAME, DocumentClientTool.NAME); - assertEquals(DocumentServerTool.TYPE_ROOT, DocumentClientTool.TYPE_ROOT); - assertEquals(DocumentServerTool.TYPE_FOLDER, DocumentClientTool.TYPE_FOLDER); - assertEquals(DocumentServerTool.TYPE_DOCUMENT, DocumentClientTool.TYPE_DOCUMENT); - } -} Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -25,12 +25,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter; import org.ourproject.kune.workspace.client.upload.FileUploaderView; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.docs.client.DocumentClientTool; public class FileUploaderPresenterTest { Modified: trunk/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 22:16:57 UTC (rev 1299) +++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-30 14:56:20 UTC (rev 1300) @@ -25,8 +25,6 @@ import org.ourproject.kune.blogs.server.BlogServerToolTest; import org.ourproject.kune.chat.ChatToolTest; import org.ourproject.kune.chat.server.managers.XmppManagerTest; -import org.ourproject.kune.docs.DocumentToolTest; -import org.ourproject.kune.docs.server.DocumentServerToolTest; import org.ourproject.kune.gallery.server.GalleryServerToolTest; import org.ourproject.kune.wiki.server.WikiServerToolTest; import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest; @@ -36,6 +34,8 @@ import cc.kune.core.server.rack.filters.rest.TestRESTMethodFinder; import cc.kune.core.server.rack.filters.rest.TestRESTServiceDefinition; +import cc.kune.docs.DocumentToolTest; +import cc.kune.docs.server.DocumentServerToolTest; import cc.kune.gspace.client.tags.TagsSummaryPresenterTest; import cc.kune.gspace.client.tool.ToolSelectorPresenterTest;

1 0

25 Mar '11

Author: vjrj_ Date: 2011-03-25 23:16:57 +0100 (Fri, 25 Mar 2011) New Revision: 1299 Added: trunk/src/test/java/cc/kune/core/server/integration/ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/integration/content/ trunk/src/test/java/cc/kune/core/server/integration/kuneservice/ trunk/src/test/java/cc/kune/core/server/integration/selenium/ trunk/src/test/java/cc/kune/core/server/integration/site/ trunk/src/test/java/cc/kune/core/server/integration/socialnet/ trunk/src/test/java/cc/kune/core/server/rack/ trunk/src/test/java/cc/kune/core/server/rack/filters/ trunk/src/test/java/cc/kune/core/server/rack/filters/rest/ trunk/src/test/java/cc/kune/core/server/testhelper/ trunk/src/test/java/cc/kune/core/server/testhelper/ctx/ Removed: trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/ trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/ trunk/src/test/java/org/ourproject/kune/platf/integration/site/ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/ Modified: trunk/src/test/java/cc/kune/core/server/TestHelper.java trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentCommentServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceIntegrationTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTMethodFinder.java trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTServiceDefinition.java trunk/src/test/java/cc/kune/core/server/testhelper/ctx/DomainContext.java trunk/src/test/java/cc/kune/core/server/testhelper/ctx/SocialNetworkOperator.java trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java trunk/src/test/java/testsuites/IntegrationTestSuite.java trunk/src/test/java/testsuites/OthersTestSuite.java Log: server refactorization Modified: trunk/src/test/java/cc/kune/core/server/TestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestHelper.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/TestHelper.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.configuration.ConfigurationException; -import org.ourproject.kune.platf.integration.HttpServletRequestMocked; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.authentication.AccountStoreHolder; @@ -32,6 +31,7 @@ import org.waveprotocol.wave.federation.noop.NoOpFederationModule; import cc.kune.core.server.init.FinderRegistry; +import cc.kune.core.server.integration.HttpServletRequestMocked; import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.wave.server.CustomSettingsBinder; Modified: trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -24,10 +24,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.testhelper.ctx.DomainContext; import cc.kune.core.server.TestDomainHelper; import cc.kune.core.server.access.AccessRightsServiceDefault; +import cc.kune.core.server.testhelper.ctx.DomainContext; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -25,13 +25,13 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.server.auth.Authenticated; import cc.kune.core.server.auth.AuthenticatedMethodInterceptor; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; public class AuthenticatedMethodInterceptorTest extends IntegrationTest { Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -25,14 +25,14 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.server.auth.ActionLevel; import cc.kune.core.server.auth.Authorizated; import cc.kune.core.server.auth.AuthorizatedMethodInterceptor; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; Copied: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializationTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -0,0 +1,125 @@ +/* + * + * Copyright (C) 2007-2011 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.server.integration; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.ourproject.kune.chat.server.ChatServerTool; +import org.ourproject.kune.docs.server.DocumentServerTool; + +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; + +import com.google.inject.Inject; +import com.google.inject.persist.Transactional; + +public class DatabaseInitializationTest { + @Inject + GroupManager groupManager; + @Inject + LicenseManager licenseManager; + @Inject + I18nTranslationManager transManager; + @Inject + I18nLanguageManager languageManager; + @Inject + I18nCountryManager countryManager; + @Inject + ContentManager contentManager; + @Inject + ContainerManager containerManager; + + private Group defaultGroup; + + /** + * If this test fails, see database configuration in INSTALL (the collation + * part) and http://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html + * + * Title must be created as something like `title` varchar(255) collate + * utf8_bin default NULL + * + */ + @Test + public void caseSensitive() { + final Content defaultContent = defaultGroup.getDefaultContent(); + assertTrue(contentManager.findIfExistsTitle(defaultContent.getContainer(), "Welcome to kune demo")); + assertTrue(!contentManager.findIfExistsTitle(defaultContent.getContainer(), "welcome to kune Demo")); + assertTrue(!contentManager.findIfExistsTitle(defaultContent.getContainer(), "Welcome to kune demo ")); + } + + @Transactional + @Before + public void init() { + new IntegrationTestHelper(this); + defaultGroup = groupManager.getSiteDefaultGroup(); + } + + @Test + public void testDefaultContentAndLicenses() { + assertNotNull(defaultGroup.getDefaultContent()); + assertTrue(licenseManager.getAll().size() > 0); + assertNotNull(defaultGroup.getDefaultLicense()); + } + + @Test + public void testDefaultDocumentContent() { + final Content content = defaultGroup.getDefaultContent(); + assertEquals(DocumentServerTool.TYPE_DOCUMENT, content.getTypeId()); + final Container rootDocFolder = content.getContainer(); + assertEquals(true, rootDocFolder.isRoot()); + } + + @Test + public void testI18n() { + assertNotNull(countryManager.find(Long.valueOf(75))); + assertNotNull(languageManager.findByCode("en")); + assertNotNull(languageManager.find(Long.valueOf(1819))); + } + + @Test + public void testToolConfiguration() { + assertNotNull(defaultGroup); + final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(DocumentServerTool.NAME); + assertNotNull(docToolConfig); + assertTrue(docToolConfig.isEnabled()); + final ToolConfiguration chatToolConfig = defaultGroup.getToolConfiguration(ChatServerTool.NAME); + assertNotNull(chatToolConfig); + assertTrue(chatToolConfig.isEnabled()); + final List<String> enabledTools = groupManager.findEnabledTools(defaultGroup.getId()); + assertNotNull(enabledTools); + assertTrue(enabledTools.size() > 0); + } + +} Copied: trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -0,0 +1,262 @@ +/* + * + * Copyright (C) 2007-2011 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.server.integration; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Map; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +public class HttpServletRequestMocked implements HttpServletRequest { + + public Object getAttribute(final String arg0) { + return null; + } + + @SuppressWarnings("rawtypes") + public Enumeration getAttributeNames() { + return null; + } + + public String getAuthType() { + return null; + } + + public String getCharacterEncoding() { + return null; + } + + public int getContentLength() { + return 0; + } + + public String getContentType() { + return null; + } + + public String getContextPath() { + return null; + } + + // @PMD:REVIEWED:ReturnEmptyArrayRatherThanNull: by vjrj on 21/05/09 15:17 + public Cookie[] getCookies() { + return null; + } + + public long getDateHeader(final String arg0) { + return 0; + } + + public String getHeader(final String arg0) { + return null; + } + + @SuppressWarnings("rawtypes") + public Enumeration getHeaderNames() { + return null; + } + + @SuppressWarnings("rawtypes") + public Enumeration getHeaders(final String arg0) { + return null; + } + + public ServletInputStream getInputStream() throws IOException { + return null; + } + + public int getIntHeader(final String arg0) { + return 0; + } + + public String getLocalAddr() { + return null; + } + + public Locale getLocale() { + return null; + } + + @SuppressWarnings("rawtypes") + public Enumeration getLocales() { + return null; + } + + public String getLocalName() { + return null; + } + + public int getLocalPort() { + return 0; + } + + public String getMethod() { + return null; + } + + public String getParameter(final String arg0) { + return null; + } + + @SuppressWarnings("rawtypes") + public Map getParameterMap() { + return null; + } + + @SuppressWarnings("rawtypes") + public Enumeration getParameterNames() { + return null; + } + + // @PMD:REVIEWED:ReturnEmptyArrayRatherThanNull: by vjrj on 21/05/09 15:17 + public String[] getParameterValues(final String arg0) { + return null; + } + + public String getPathInfo() { + return null; + } + + public String getPathTranslated() { + return null; + } + + public String getProtocol() { + return null; + } + + public String getQueryString() { + return null; + } + + public BufferedReader getReader() throws IOException { + return null; + } + + public String getRealPath(final String arg0) { + return null; + } + + public String getRemoteAddr() { + return null; + } + + public String getRemoteHost() { + return null; + } + + public int getRemotePort() { + return 0; + } + + public String getRemoteUser() { + return null; + } + + public RequestDispatcher getRequestDispatcher(final String arg0) { + return null; + } + + public String getRequestedSessionId() { + return null; + } + + public String getRequestURI() { + return null; + } + + public StringBuffer getRequestURL() { + return null; + } + + public String getScheme() { + return null; + } + + public String getServerName() { + return null; + } + + public int getServerPort() { + return 0; + } + + public String getServletPath() { + return null; + } + + public HttpSession getSession() { + return null; + } + + public HttpSession getSession(final boolean arg0) { + return null; + } + + public Principal getUserPrincipal() { + return null; + } + + public boolean isRequestedSessionIdFromCookie() { + return false; + } + + public boolean isRequestedSessionIdFromUrl() { + return false; + } + + public boolean isRequestedSessionIdFromURL() { + return false; + } + + public boolean isRequestedSessionIdValid() { + return false; + } + + public boolean isSecure() { + return false; + } + + public boolean isUserInRole(final String arg0) { + return false; + } + + public void removeAttribute(final String arg0) { + + } + + public void setAttribute(final String arg0, final Object arg1) { + + } + + public void setCharacterEncoding(final String arg0) throws UnsupportedEncodingException { + + } + +} Copied: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -0,0 +1,86 @@ +/* + * + * Copyright (C) 2007-2011 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.server.integration; + +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; + + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.properties.DatabaseProperties; + +import com.google.inject.Inject; + +public abstract class IntegrationTest { + + @Inject + DatabaseProperties properties; + @Inject + protected UserSession session; + protected String token; + @Inject + UserService userService; + + protected String doLogin() throws DefaultException, IOException { + waveLogin(); + return userService.login(getSiteAdminShortName(), properties.getAdminPassword(), token).getUserHash(); + } + + protected String doLoginWithDummyUser() throws DefaultException, IOException { + waveLogin(); + return userService.login("dummy", properties.getAdminPassword(), token).getUserHash(); + } + + protected void doLogout() throws DefaultException { + userService.logout(getHash()); + } + + protected String getDefLicense() { + return properties.getDefaultLicense(); + } + + protected String getDefSiteGroupName() { + return properties.getDefaultSiteShortName(); + } + + public String getHash() { + return session.getHash(); + } + + protected String getSiteAdminShortName() { + return properties.getAdminShortName(); + } + + protected void waveLogin() throws IOException { + token = "somesampletoken"; + // final ClientAuthenticator authenticator = new + // ClientAuthenticator("http://localhost:8080" + // + SessionManager.SIGN_IN_URL); + // final HttpCookie cookie = + // authenticator.authenticate("admin@localhost", + // "easyeasy".toCharArray()); + // token = cookie.getValue(); + assertNotNull(token); + } + +} Copied: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -0,0 +1,83 @@ +/* + * + * Copyright (C) 2007-2011 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.server.integration; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.configuration.ConfigurationException; +import org.ourproject.kune.chat.server.ChatServerModule; +import org.ourproject.kune.docs.server.DocumentServerModule; +import org.ourproject.kune.wiki.server.WikiServerModule; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.ServerModule; +import org.waveprotocol.box.server.persistence.PersistenceModule; +import org.waveprotocol.wave.federation.noop.NoOpFederationModule; + +import cc.kune.core.server.KunePersistenceService; +import cc.kune.core.server.PlatformServerModule; +import cc.kune.core.server.TestConstants; +import cc.kune.core.server.init.FinderRegistry; +import cc.kune.core.server.properties.PropertiesFileName; +import cc.kune.wave.server.CustomSettingsBinder; + +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Scopes; +import com.google.inject.persist.jpa.JpaPersistModule; +import com.google.inject.servlet.RequestScoped; +import com.google.inject.servlet.SessionScoped; + +public class IntegrationTestHelper { + + public static Injector createInjector() { + Injector injector; + try { + injector = Guice.createInjector(CustomSettingsBinder.bindSettings(TestConstants.WAVE_TEST_PROPFILE, + CoreSettings.class)); + final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); + final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); + final Injector childInjector = injector.createChildInjector(wavePersistModule, + FinderRegistry.init(new JpaPersistModule(TestConstants.PERSISTENCE_UNIT)), + new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule( + false), federationModule, new WikiServerModule(), new AbstractModule() { + @Override + protected void configure() { + bindScope(SessionScoped.class, Scopes.SINGLETON); + bindScope(RequestScoped.class, Scopes.SINGLETON); + bindConstant().annotatedWith(PropertiesFileName.class).to("kune.properties"); + bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + } + }); + return childInjector; + } catch (final ConfigurationException e) { + e.printStackTrace(); + } + return null; + } + + public IntegrationTestHelper(final Object... tests) { + final Injector injector = createInjector(); + injector.getInstance(KunePersistenceService.class).start(); + for (final Object test : tests) { + injector.injectMembers(test); + } + } +} Copied: trunk/src/test/java/cc/kune/core/server/integration/content (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/content) Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentCommentServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentCommentServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,16 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.dto.CommentDTO; import cc.kune.core.shared.dto.StateContainerDTO; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,11 +28,11 @@ import org.junit.Test; import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.wiki.server.WikiServerTool; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceIntegrationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceIntegrationTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; -import org.ourproject.kune.platf.integration.IntegrationTest; import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.integration.IntegrationTest; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContentDTO; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.server.TestDomainHelper; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.dto.StateContentDTO; public class ContentServiceSaveTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.content; +package cc.kune.core.server.integration.content; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,9 +31,9 @@ import org.junit.Test; import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.domain.TagCount; import cc.kune.core.shared.domain.utils.StateToken; Copied: trunk/src/test/java/cc/kune/core/server/integration/kuneservice (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice) Modified: trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,18 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.kuneservice; +package cc.kune.core.server.integration.kuneservice; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.GroupService; import cc.kune.core.server.UserSession; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; Copied: trunk/src/test/java/cc/kune/core/server/integration/selenium (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/selenium) Copied: trunk/src/test/java/cc/kune/core/server/integration/site (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/site) Modified: trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.site; +package cc.kune.core.server.integration.site; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,11 +27,11 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.rpcservices.SiteService; import cc.kune.core.server.UserSession; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.LicenseDTO; Modified: trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.site; +package cc.kune.core.server.integration.site; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,13 +27,13 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.server.mapper.Mapper; import cc.kune.core.server.properties.DatabaseProperties; Copied: trunk/src/test/java/cc/kune/core/server/integration/socialnet (from rev 1295, trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet) Modified: trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.socialnet; +package cc.kune.core.server.integration.socialnet; import static org.junit.Assert.assertEquals; @@ -25,10 +25,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.server.UserSession; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.domain.Group; Modified: trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,19 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.integration.socialnet; +package cc.kune.core.server.integration.socialnet; import static org.junit.Assert.assertNotNull; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTest; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.AlreadyUserMemberException; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.SocialNetworkService; import cc.kune.core.server.UserSession; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -26,11 +26,11 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.integration.IntegrationTestHelper; +import cc.kune.core.server.integration.content.ContentServiceIntegrationTest; import cc.kune.core.shared.dto.StateContainerDTO; import com.google.inject.Inject; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -30,9 +30,9 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.file.FileDownloadManager; import cc.kune.core.server.manager.file.FileUtils; import cc.kune.core.server.properties.KuneProperties; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -21,11 +21,11 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.integration.IntegrationTestHelper; +import cc.kune.core.server.integration.content.ContentServiceIntegrationTest; import cc.kune.core.server.manager.file.FileUploadManager; import com.google.inject.Inject; Modified: trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -23,9 +23,9 @@ import org.junit.After; import org.junit.Before; -import org.ourproject.kune.testhelper.ctx.DomainContext; import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.testhelper.ctx.DomainContext; import cc.kune.domain.Group; import cc.kune.domain.User; Copied: trunk/src/test/java/cc/kune/core/server/rack/filters/rest (from rev 1295, trunk/src/test/java/org/ourproject/kune/rack/filters/rest) Modified: trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTMethodFinder.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTMethodFinder.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTServiceDefinition.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/rack/filters/rest/TestRESTServiceDefinition.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import static org.junit.Assert.assertEquals; Copied: trunk/src/test/java/cc/kune/core/server/testhelper/ctx (from rev 1295, trunk/src/test/java/org/ourproject/kune/testhelper/ctx) Modified: trunk/src/test/java/cc/kune/core/server/testhelper/ctx/DomainContext.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/testhelper/ctx/DomainContext.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.testhelper.ctx; +package cc.kune.core.server.testhelper.ctx; import java.util.HashMap; import java.util.TimeZone; Modified: trunk/src/test/java/cc/kune/core/server/testhelper/ctx/SocialNetworkOperator.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java 2011-03-25 20:22:13 UTC (rev 1295) +++ trunk/src/test/java/cc/kune/core/server/testhelper/ctx/SocialNetworkOperator.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.testhelper.ctx; +package cc.kune.core.server.testhelper.ctx; import cc.kune.domain.SocialNetwork; Modified: trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.xmpp.ChatConnection; import cc.kune.core.server.xmpp.ChatException; import cc.kune.core.server.xmpp.Room; Deleted: trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -1,125 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.integration; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.chat.server.ChatServerTool; -import org.ourproject.kune.docs.server.DocumentServerTool; - -import cc.kune.core.server.content.ContainerManager; -import cc.kune.core.server.content.ContentManager; -import cc.kune.core.server.manager.GroupManager; -import cc.kune.core.server.manager.I18nCountryManager; -import cc.kune.core.server.manager.I18nLanguageManager; -import cc.kune.core.server.manager.I18nTranslationManager; -import cc.kune.core.server.manager.LicenseManager; -import cc.kune.domain.Container; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.ToolConfiguration; - -import com.google.inject.Inject; -import com.google.inject.persist.Transactional; - -public class DatabaseInitializationTest { - @Inject - GroupManager groupManager; - @Inject - LicenseManager licenseManager; - @Inject - I18nTranslationManager transManager; - @Inject - I18nLanguageManager languageManager; - @Inject - I18nCountryManager countryManager; - @Inject - ContentManager contentManager; - @Inject - ContainerManager containerManager; - - private Group defaultGroup; - - /** - * If this test fails, see database configuration in INSTALL (the collation - * part) and http://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html - * - * Title must be created as something like `title` varchar(255) collate - * utf8_bin default NULL - * - */ - @Test - public void caseSensitive() { - final Content defaultContent = defaultGroup.getDefaultContent(); - assertTrue(contentManager.findIfExistsTitle(defaultContent.getContainer(), "Welcome to kune demo")); - assertTrue(!contentManager.findIfExistsTitle(defaultContent.getContainer(), "welcome to kune Demo")); - assertTrue(!contentManager.findIfExistsTitle(defaultContent.getContainer(), "Welcome to kune demo ")); - } - - @Transactional - @Before - public void init() { - new IntegrationTestHelper(this); - defaultGroup = groupManager.getSiteDefaultGroup(); - } - - @Test - public void testDefaultContentAndLicenses() { - assertNotNull(defaultGroup.getDefaultContent()); - assertTrue(licenseManager.getAll().size() > 0); - assertNotNull(defaultGroup.getDefaultLicense()); - } - - @Test - public void testDefaultDocumentContent() { - final Content content = defaultGroup.getDefaultContent(); - assertEquals(DocumentServerTool.TYPE_DOCUMENT, content.getTypeId()); - final Container rootDocFolder = content.getContainer(); - assertEquals(true, rootDocFolder.isRoot()); - } - - @Test - public void testI18n() { - assertNotNull(countryManager.find(Long.valueOf(75))); - assertNotNull(languageManager.findByCode("en")); - assertNotNull(languageManager.find(Long.valueOf(1819))); - } - - @Test - public void testToolConfiguration() { - assertNotNull(defaultGroup); - final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(DocumentServerTool.NAME); - assertNotNull(docToolConfig); - assertTrue(docToolConfig.isEnabled()); - final ToolConfiguration chatToolConfig = defaultGroup.getToolConfiguration(ChatServerTool.NAME); - assertNotNull(chatToolConfig); - assertTrue(chatToolConfig.isEnabled()); - final List<String> enabledTools = groupManager.findEnabledTools(defaultGroup.getId()); - assertNotNull(enabledTools); - assertTrue(enabledTools.size() > 0); - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -1,262 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.integration; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -public class HttpServletRequestMocked implements HttpServletRequest { - - public Object getAttribute(final String arg0) { - return null; - } - - @SuppressWarnings("rawtypes") - public Enumeration getAttributeNames() { - return null; - } - - public String getAuthType() { - return null; - } - - public String getCharacterEncoding() { - return null; - } - - public int getContentLength() { - return 0; - } - - public String getContentType() { - return null; - } - - public String getContextPath() { - return null; - } - - // @PMD:REVIEWED:ReturnEmptyArrayRatherThanNull: by vjrj on 21/05/09 15:17 - public Cookie[] getCookies() { - return null; - } - - public long getDateHeader(final String arg0) { - return 0; - } - - public String getHeader(final String arg0) { - return null; - } - - @SuppressWarnings("rawtypes") - public Enumeration getHeaderNames() { - return null; - } - - @SuppressWarnings("rawtypes") - public Enumeration getHeaders(final String arg0) { - return null; - } - - public ServletInputStream getInputStream() throws IOException { - return null; - } - - public int getIntHeader(final String arg0) { - return 0; - } - - public String getLocalAddr() { - return null; - } - - public Locale getLocale() { - return null; - } - - @SuppressWarnings("rawtypes") - public Enumeration getLocales() { - return null; - } - - public String getLocalName() { - return null; - } - - public int getLocalPort() { - return 0; - } - - public String getMethod() { - return null; - } - - public String getParameter(final String arg0) { - return null; - } - - @SuppressWarnings("rawtypes") - public Map getParameterMap() { - return null; - } - - @SuppressWarnings("rawtypes") - public Enumeration getParameterNames() { - return null; - } - - // @PMD:REVIEWED:ReturnEmptyArrayRatherThanNull: by vjrj on 21/05/09 15:17 - public String[] getParameterValues(final String arg0) { - return null; - } - - public String getPathInfo() { - return null; - } - - public String getPathTranslated() { - return null; - } - - public String getProtocol() { - return null; - } - - public String getQueryString() { - return null; - } - - public BufferedReader getReader() throws IOException { - return null; - } - - public String getRealPath(final String arg0) { - return null; - } - - public String getRemoteAddr() { - return null; - } - - public String getRemoteHost() { - return null; - } - - public int getRemotePort() { - return 0; - } - - public String getRemoteUser() { - return null; - } - - public RequestDispatcher getRequestDispatcher(final String arg0) { - return null; - } - - public String getRequestedSessionId() { - return null; - } - - public String getRequestURI() { - return null; - } - - public StringBuffer getRequestURL() { - return null; - } - - public String getScheme() { - return null; - } - - public String getServerName() { - return null; - } - - public int getServerPort() { - return 0; - } - - public String getServletPath() { - return null; - } - - public HttpSession getSession() { - return null; - } - - public HttpSession getSession(final boolean arg0) { - return null; - } - - public Principal getUserPrincipal() { - return null; - } - - public boolean isRequestedSessionIdFromCookie() { - return false; - } - - public boolean isRequestedSessionIdFromUrl() { - return false; - } - - public boolean isRequestedSessionIdFromURL() { - return false; - } - - public boolean isRequestedSessionIdValid() { - return false; - } - - public boolean isSecure() { - return false; - } - - public boolean isUserInRole(final String arg0) { - return false; - } - - public void removeAttribute(final String arg0) { - - } - - public void setAttribute(final String arg0, final Object arg1) { - - } - - public void setCharacterEncoding(final String arg0) throws UnsupportedEncodingException { - - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -1,86 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.integration; - -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; - - -import cc.kune.core.client.errors.DefaultException; -import cc.kune.core.client.rpcservices.UserService; -import cc.kune.core.server.UserSession; -import cc.kune.core.server.properties.DatabaseProperties; - -import com.google.inject.Inject; - -public abstract class IntegrationTest { - - @Inject - DatabaseProperties properties; - @Inject - protected UserSession session; - protected String token; - @Inject - UserService userService; - - protected String doLogin() throws DefaultException, IOException { - waveLogin(); - return userService.login(getSiteAdminShortName(), properties.getAdminPassword(), token).getUserHash(); - } - - protected String doLoginWithDummyUser() throws DefaultException, IOException { - waveLogin(); - return userService.login("dummy", properties.getAdminPassword(), token).getUserHash(); - } - - protected void doLogout() throws DefaultException { - userService.logout(getHash()); - } - - protected String getDefLicense() { - return properties.getDefaultLicense(); - } - - protected String getDefSiteGroupName() { - return properties.getDefaultSiteShortName(); - } - - public String getHash() { - return session.getHash(); - } - - protected String getSiteAdminShortName() { - return properties.getAdminShortName(); - } - - protected void waveLogin() throws IOException { - token = "somesampletoken"; - // final ClientAuthenticator authenticator = new - // ClientAuthenticator("http://localhost:8080" - // + SessionManager.SIGN_IN_URL); - // final HttpCookie cookie = - // authenticator.authenticate("admin@localhost", - // "easyeasy".toCharArray()); - // token = cookie.getValue(); - assertNotNull(token); - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -1,83 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.integration; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.configuration.ConfigurationException; -import org.ourproject.kune.chat.server.ChatServerModule; -import org.ourproject.kune.docs.server.DocumentServerModule; -import org.ourproject.kune.wiki.server.WikiServerModule; -import org.waveprotocol.box.server.CoreSettings; -import org.waveprotocol.box.server.ServerModule; -import org.waveprotocol.box.server.persistence.PersistenceModule; -import org.waveprotocol.wave.federation.noop.NoOpFederationModule; - -import cc.kune.core.server.KunePersistenceService; -import cc.kune.core.server.PlatformServerModule; -import cc.kune.core.server.TestConstants; -import cc.kune.core.server.init.FinderRegistry; -import cc.kune.core.server.properties.PropertiesFileName; -import cc.kune.wave.server.CustomSettingsBinder; - -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Scopes; -import com.google.inject.persist.jpa.JpaPersistModule; -import com.google.inject.servlet.RequestScoped; -import com.google.inject.servlet.SessionScoped; - -public class IntegrationTestHelper { - - public static Injector createInjector() { - Injector injector; - try { - injector = Guice.createInjector(CustomSettingsBinder.bindSettings(TestConstants.WAVE_TEST_PROPFILE, - CoreSettings.class)); - final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); - final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); - final Injector childInjector = injector.createChildInjector(wavePersistModule, - FinderRegistry.init(new JpaPersistModule(TestConstants.PERSISTENCE_UNIT)), - new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule( - false), federationModule, new WikiServerModule(), new AbstractModule() { - @Override - protected void configure() { - bindScope(SessionScoped.class, Scopes.SINGLETON); - bindScope(RequestScoped.class, Scopes.SINGLETON); - bindConstant().annotatedWith(PropertiesFileName.class).to("kune.properties"); - bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); - } - }); - return childInjector; - } catch (final ConfigurationException e) { - e.printStackTrace(); - } - return null; - } - - public IntegrationTestHelper(final Object... tests) { - final Injector injector = createInjector(); - injector.getInstance(KunePersistenceService.class).start(); - for (final Object test : tests) { - injector.injectMembers(test); - } - } -} Modified: trunk/src/test/java/testsuites/IntegrationTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/IntegrationTestSuite.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/testsuites/IntegrationTestSuite.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -22,18 +22,19 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.ourproject.kune.platf.integration.DatabaseInitializationTest; -import org.ourproject.kune.platf.integration.content.ContentCommentServiceTest; -import org.ourproject.kune.platf.integration.content.ContentServiceAddTest; -import org.ourproject.kune.platf.integration.content.ContentServiceGetTest; -import org.ourproject.kune.platf.integration.content.ContentServiceSaveTest; -import org.ourproject.kune.platf.integration.content.ContentServiceVariousTest; -import org.ourproject.kune.platf.integration.kuneservice.GroupServiceTest; -import org.ourproject.kune.platf.integration.site.SiteServiceTest; -import org.ourproject.kune.platf.integration.site.UserServiceTest; -import org.ourproject.kune.platf.integration.socialnet.SocialNetworkMembersTest; -import org.ourproject.kune.platf.integration.socialnet.SocialNetworkServiceTest; +import cc.kune.core.server.integration.DatabaseInitializationTest; +import cc.kune.core.server.integration.content.ContentCommentServiceTest; +import cc.kune.core.server.integration.content.ContentServiceAddTest; +import cc.kune.core.server.integration.content.ContentServiceGetTest; +import cc.kune.core.server.integration.content.ContentServiceSaveTest; +import cc.kune.core.server.integration.content.ContentServiceVariousTest; +import cc.kune.core.server.integration.kuneservice.GroupServiceTest; +import cc.kune.core.server.integration.site.SiteServiceTest; +import cc.kune.core.server.integration.site.UserServiceTest; +import cc.kune.core.server.integration.socialnet.SocialNetworkMembersTest; +import cc.kune.core.server.integration.socialnet.SocialNetworkServiceTest; + /** * Rescan with : * Modified: trunk/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 21:43:36 UTC (rev 1298) +++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 22:16:57 UTC (rev 1299) @@ -28,14 +28,14 @@ import org.ourproject.kune.docs.DocumentToolTest; import org.ourproject.kune.docs.server.DocumentServerToolTest; import org.ourproject.kune.gallery.server.GalleryServerToolTest; -import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder; -import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition; import org.ourproject.kune.wiki.server.WikiServerToolTest; import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest; import org.ourproject.kune.workspace.client.socialnet.SNRolActionTest; import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; +import cc.kune.core.server.rack.filters.rest.TestRESTMethodFinder; +import cc.kune.core.server.rack.filters.rest.TestRESTServiceDefinition; import cc.kune.gspace.client.tags.TagsSummaryPresenterTest; import cc.kune.gspace.client.tool.ToolSelectorPresenterTest;

1 0

r1298 - kune-sandbox/src/cc/kune/sandbox/client
by Vicente J. Ruiz Jurado 25 Mar '11

25 Mar '11

Author: vjrj_ Date: 2011-03-25 22:43:36 +0100 (Fri, 25 Mar 2011) New Revision: 1298 Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java Log: sandbox minor change Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java =================================================================== --- kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-03-25 21:39:02 UTC (rev 1297) +++ kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-03-25 21:43:36 UTC (rev 1298) @@ -4,9 +4,10 @@ import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.PopupBottomPanel; import cc.kune.common.client.ui.PopupTopPanel; -import cc.kune.core.client.tool.ToolSelectorItemPanel; -import cc.kune.core.client.tool.ToolSelectorPanel; import cc.kune.core.client.ui.dialogs.BasicDialog; +import cc.kune.gspace.client.WsArmorImpl; +import cc.kune.gspace.client.tool.ToolSelectorItemPanel; +import cc.kune.gspace.client.tool.ToolSelectorPanel; import cc.kune.msgs.client.CloseCallback; import cc.kune.msgs.client.UserMessage; import cc.kune.msgs.client.UserMessagesPanel; @@ -35,7 +36,7 @@ public void onModuleLoad() { // testUserMessages(); // testDialogs(); - ToolSelectorPanel toolSelector = new ToolSelectorPanel(); + ToolSelectorPanel toolSelector = new ToolSelectorPanel(new WsArmorImpl()); ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); toolItem1.getLabel().setText("documents"); ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel();

1 0

r1297 - trunk/src/test/java/cc/kune/core/server/manager/file
by Vicente J. Ruiz Jurado 25 Mar '11

25 Mar '11

Author: vjrj_ Date: 2011-03-25 22:39:02 +0100 (Fri, 25 Mar 2011) New Revision: 1297 Modified: trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java Log: Some test fixed after refactorization Modified: trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 20:39:42 UTC (rev 1296) +++ trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 21:39:02 UTC (rev 1297) @@ -31,14 +31,13 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.core.server.manager.file.EntityLogoUploadManager; import cc.kune.core.shared.dto.StateContainerDTO; import com.google.inject.Inject; public class EntityLogoUploadManagerTest extends ContentServiceIntegrationTest { - private static final String TEST_FILE = "src/test/java/org/ourproject/kune/platf/server/manager/file/orig.png"; + private static final String TEST_FILE = "src/test/java/cc/kune/core/server/manager/file/orig.png"; @Inject EntityLogoUploadManager manager; @@ -50,7 +49,7 @@ @Test public void testCreateLogo() throws Exception { manager.createUploadedFile(super.getSiteDefaultContent().getStateToken(), "image/png", new File(TEST_FILE)); - StateContainerDTO defaultContent = super.getSiteDefaultContent(); + final StateContainerDTO defaultContent = super.getSiteDefaultContent(); assertTrue(defaultContent.getGroup().hasLogo()); } Modified: trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java 2011-03-25 20:39:42 UTC (rev 1296) +++ trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java 2011-03-25 21:39:02 UTC (rev 1297) @@ -32,8 +32,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import cc.kune.core.server.manager.file.ImageUtilsDefault; - /** * If you get a UnsatisfiedLinkError this is a problem with jmagick installation * (in debian, apt-get install libjmagick6-jni, and add @@ -46,14 +44,14 @@ */ public class ImageUtilsDefaultTest { - private static final String IMG_PATH = "src/test/java/org/ourproject/kune/platf/server/manager/file/"; - private static String[] images = { "orig.png", "orig.gif", "orig.jpg", "orig.tiff", "orig.pdf" }; private static String imageDest; + private static String[] images = { "orig.png", "orig.gif", "orig.jpg", "orig.tiff", "orig.pdf" }; + private static final String IMG_PATH = "src/test/java/cc/kune/core/server/manager/file/"; private static String pdf = "orig.pdf"; @AfterClass public static void after() { - File file = new File(imageDest); + final File file = new File(imageDest); file.delete(); } @@ -69,9 +67,9 @@ @Test public void generateIcon() throws MagickException, FileNotFoundException { - for (String image : images) { + for (final String image : images) { ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 16, 16); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + final Dimension dimension = ImageUtilsDefault.getDimension(imageDest); assertEquals(16, (int) dimension.getHeight()); assertEquals(16, (int) dimension.getWidth()); } @@ -79,9 +77,9 @@ @Test public void generateThumb() throws MagickException, FileNotFoundException { - for (String image : images) { + for (final String image : images) { ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 100, 85); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + final Dimension dimension = ImageUtilsDefault.getDimension(imageDest); assertEquals(85, (int) dimension.getHeight()); assertEquals(85, (int) dimension.getWidth()); } @@ -89,7 +87,7 @@ @Test public void testProportionalHigher() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(500, 1000, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(500, 1000, 100); assertEquals(100, proportionalDim.width); assertEquals(200, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -98,7 +96,7 @@ @Test public void testProportionalHigherLikeSamples() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1200, 1600, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1200, 1600, 100); assertEquals(100, proportionalDim.width); assertEquals(133, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -107,7 +105,7 @@ @Test public void testProportionalHigherSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 100, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 100, 100); assertEquals(20, proportionalDim.width); assertEquals(100, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -116,7 +114,7 @@ @Test public void testProportionalHigherSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 10, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 10, 100); assertEquals(20, proportionalDim.width); assertEquals(10, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -125,35 +123,35 @@ @Test public void testProportionalToBiggerNormal() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 300, false); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 300, false); assertEquals(300, proportionalDim.width); assertEquals(150, proportionalDim.height); } @Test public void testProportionalToBiggerSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 600, false); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 600, false); assertEquals(600, proportionalDim.width); assertEquals(300, proportionalDim.height); } @Test public void testProportionalToBiggerSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 700, false); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 700, false); assertEquals(600, proportionalDim.width); assertEquals(300, proportionalDim.height); } @Test public void testProportionalToBiggerWider() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(300, 600, 200, false); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(300, 600, 200, false); assertEquals(100, proportionalDim.width); assertEquals(200, proportionalDim.height); } @Test public void testProportionalWider() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1000, 500, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1000, 500, 100); assertEquals(200, proportionalDim.width); assertEquals(100, proportionalDim.height); assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -162,7 +160,7 @@ @Test public void testProportionalWiderSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(100, 20, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(100, 20, 100); assertEquals(100, proportionalDim.width); assertEquals(20, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -171,7 +169,7 @@ @Test public void testProportionalWiderSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(5, 10, 100); + final Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(5, 10, 100); assertEquals(5, proportionalDim.width); assertEquals(10, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -180,9 +178,9 @@ @Test public void testResize() throws MagickException, FileNotFoundException { - for (String image : images) { + for (final String image : images) { assertTrue(ImageUtilsDefault.scaleImage(IMG_PATH + image, imageDest, 100, 100)); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + final Dimension dimension = ImageUtilsDefault.getDimension(imageDest); assertEquals(100, (int) dimension.getHeight()); assertEquals(100, (int) dimension.getWidth()); } @@ -190,9 +188,9 @@ @Test public void testSize() throws MagickException { - for (String image : images) { + for (final String image : images) { if (!image.equals(pdf)) { - Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); + final Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); assertEquals(400, (int) dimension.getHeight()); assertEquals(300, (int) dimension.getWidth()); }

1 0

25 Mar '11

Author: vjrj_ Date: 2011-03-25 21:39:42 +0100 (Fri, 25 Mar 2011) New Revision: 1296 Removed: trunk/src/main/java/cc/kune/core/client/ui/footer/ trunk/src/main/java/cc/kune/gspace/client/entitytools/ trunk/src/main/java/cc/ourproject/kune/core/client/ trunk/src/main/java/org/ourproject/kune/chat/server/managers/ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ trunk/src/main/java/org/ourproject/kune/platf/client/utils/ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ trunk/src/main/java/org/ourproject/kune/rack/filters/ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/ Log: deleted empty packages

1 0

r1295 - trunk/src/main/java/cc/kune/pspace/client
by Vicente J. Ruiz Jurado 25 Mar '11

25 Mar '11

Author: vjrj_ Date: 2011-03-25 21:22:13 +0100 (Fri, 25 Mar 2011) New Revision: 1295 Added: trunk/src/main/java/cc/kune/pspace/client/PSpaceParts.java Log: server refactorization Added: trunk/src/main/java/cc/kune/pspace/client/PSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceParts.java (rev 0) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceParts.java 2011-03-25 20:22:13 UTC (rev 1295) @@ -0,0 +1,21 @@ +package cc.kune.pspace.client; + +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class PSpaceParts { + + @Inject + public PSpaceParts(final Session session, final Provider<PSpacePresenter> pspacePresenter) { + session.onInitDataReceived(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + pspacePresenter.get(); + } + }); + } +}

1 0

25 Mar '11

Author: vjrj_ Date: 2011-03-25 21:21:30 +0100 (Fri, 25 Mar 2011) New Revision: 1294 Added: trunk/src/main/java/cc/kune/core/server/ trunk/src/main/java/cc/kune/core/server/AbstractExtendedModule.java trunk/src/main/java/cc/kune/core/server/InitData.java trunk/src/main/java/cc/kune/core/server/KuneApplicationListener.java trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java trunk/src/main/java/cc/kune/core/server/KunePersistenceService.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/LoggerMethodInterceptor.java trunk/src/main/java/cc/kune/core/server/NotInObject.java trunk/src/main/java/cc/kune/core/server/OutermostCallInterceptor.java trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java trunk/src/main/java/cc/kune/core/server/ServerException.java trunk/src/main/java/cc/kune/core/server/UserSession.java trunk/src/main/java/cc/kune/core/server/access/ trunk/src/main/java/cc/kune/core/server/auth/ trunk/src/main/java/cc/kune/core/server/content/ trunk/src/main/java/cc/kune/core/server/i18n/ trunk/src/main/java/cc/kune/core/server/init/ trunk/src/main/java/cc/kune/core/server/manager/ trunk/src/main/java/cc/kune/core/server/manager/ExtMediaDescripManager.java trunk/src/main/java/cc/kune/core/server/manager/FileManager.java trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java trunk/src/main/java/cc/kune/core/server/manager/I18nCountryManager.java trunk/src/main/java/cc/kune/core/server/manager/I18nLanguageManager.java trunk/src/main/java/cc/kune/core/server/manager/I18nTranslationManager.java trunk/src/main/java/cc/kune/core/server/manager/LicenseManager.java trunk/src/main/java/cc/kune/core/server/manager/Manager.java trunk/src/main/java/cc/kune/core/server/manager/RateManager.java trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java trunk/src/main/java/cc/kune/core/server/manager/TagManager.java trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManager.java trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/ToolConfigurationManager.java trunk/src/main/java/cc/kune/core/server/manager/UserManager.java trunk/src/main/java/cc/kune/core/server/manager/file/ trunk/src/main/java/cc/kune/core/server/manager/impl/ trunk/src/main/java/cc/kune/core/server/mapper/ trunk/src/main/java/cc/kune/core/server/properties/ trunk/src/main/java/cc/kune/core/server/rack/ trunk/src/main/java/cc/kune/core/server/rack/ContainerListener.java trunk/src/main/java/cc/kune/core/server/rack/Rack.java trunk/src/main/java/cc/kune/core/server/rack/RackBuilder.java trunk/src/main/java/cc/kune/core/server/rack/RackHelper.java trunk/src/main/java/cc/kune/core/server/rack/RackModule.java trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java trunk/src/main/java/cc/kune/core/server/rack/dock/ trunk/src/main/java/cc/kune/core/server/rack/filters/ trunk/src/main/java/cc/kune/core/server/rack/filters/AbstractInjectedFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/ApplicationListener.java trunk/src/main/java/cc/kune/core/server/rack/filters/ForwardFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/ListenerFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/LogFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/RedirectFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/ trunk/src/main/java/cc/kune/core/server/rack/filters/servlet/ trunk/src/main/java/cc/kune/core/server/rest/ trunk/src/main/java/cc/kune/core/server/rpc/ trunk/src/main/java/cc/kune/core/server/state/ trunk/src/main/java/cc/kune/core/server/tool/ trunk/src/main/java/cc/kune/core/server/users/ trunk/src/main/java/cc/kune/core/server/utils/ trunk/src/main/java/cc/kune/core/server/xmpp/ trunk/src/main/java/cc/kune/core/server/xmpp/ChatConnection.java trunk/src/main/java/cc/kune/core/server/xmpp/ChatException.java trunk/src/main/java/cc/kune/core/server/xmpp/Room.java trunk/src/main/java/cc/kune/core/server/xmpp/RoomConfigurationDumper.java trunk/src/main/java/cc/kune/core/server/xmpp/RoomListener.java trunk/src/main/java/cc/kune/core/server/xmpp/XmppConnection.java trunk/src/main/java/cc/kune/core/server/xmpp/XmppManager.java trunk/src/main/java/cc/kune/core/server/xmpp/XmppManagerDefault.java trunk/src/main/java/cc/kune/core/server/xmpp/XmppRoom.java trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java trunk/src/test/java/cc/kune/core/server/ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java trunk/src/test/java/cc/kune/core/server/PersistenceTest.java trunk/src/test/java/cc/kune/core/server/TestConstants.java trunk/src/test/java/cc/kune/core/server/TestDomainHelper.java trunk/src/test/java/cc/kune/core/server/TestHelper.java trunk/src/test/java/cc/kune/core/server/access/ trunk/src/test/java/cc/kune/core/server/auth/ trunk/src/test/java/cc/kune/core/server/domain/ trunk/src/test/java/cc/kune/core/server/finders/ trunk/src/test/java/cc/kune/core/server/manager/ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/FileManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/I18nManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/LicenseManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/TagManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/TagUserContentTest.java trunk/src/test/java/cc/kune/core/server/manager/UserManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/ trunk/src/test/java/cc/kune/core/server/manager/impl/ trunk/src/test/java/cc/kune/core/server/mapper/ trunk/src/test/java/cc/kune/core/server/properties/ Removed: trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java.txt trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/ trunk/src/main/java/org/ourproject/kune/app/public/js/ trunk/src/main/java/org/ourproject/kune/app/server/ trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatConnection.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/Room.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomConfigurationDumper.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomListener.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java trunk/src/main/java/org/ourproject/kune/platf/server/ServerException.java trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java trunk/src/main/java/org/ourproject/kune/platf/server/access/ trunk/src/main/java/org/ourproject/kune/platf/server/auth/ trunk/src/main/java/org/ourproject/kune/platf/server/content/ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/ trunk/src/main/java/org/ourproject/kune/platf/server/init/ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/ trunk/src/main/java/org/ourproject/kune/platf/server/properties/ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ trunk/src/main/java/org/ourproject/kune/platf/server/state/ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ trunk/src/main/java/org/ourproject/kune/platf/server/users/ trunk/src/main/java/org/ourproject/kune/platf/server/utils/ trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java trunk/src/main/java/org/ourproject/kune/rack/Rack.java trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java trunk/src/main/java/org/ourproject/kune/rack/RackHelper.java trunk/src/main/java/org/ourproject/kune/rack/RackModule.java trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java trunk/src/main/java/org/ourproject/kune/rack/dock/ trunk/src/main/java/org/ourproject/kune/rack/filters/AbstractInjectedFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java trunk/src/main/java/org/ourproject/kune/rack/filters/ForwardFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ trunk/src/main/java/org/ourproject/kune/rack/filters/servlet/ trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/TestConstants.java trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java trunk/src/test/java/org/ourproject/kune/platf/server/access/ trunk/src/test/java/org/ourproject/kune/platf/server/auth/ trunk/src/test/java/org/ourproject/kune/platf/server/domain/ trunk/src/test/java/org/ourproject/kune/platf/server/finders/ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/FileManagerDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/ trunk/src/test/java/org/ourproject/kune/platf/server/properties/ Modified: trunk/.classpath trunk/TODO trunk/TROUBLESHOOT trunk/src/main/java/cc/kune/core/server/access/AccessRightsService.java trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java trunk/src/main/java/cc/kune/core/server/access/AccessService.java trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java trunk/src/main/java/cc/kune/core/server/access/FinderService.java trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java trunk/src/main/java/cc/kune/core/server/auth/ActionLevel.java trunk/src/main/java/cc/kune/core/server/auth/Authenticated.java trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java trunk/src/main/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptor.java trunk/src/main/java/cc/kune/core/server/auth/SessionService.java trunk/src/main/java/cc/kune/core/server/auth/SessionServiceDefault.java trunk/src/main/java/cc/kune/core/server/content/CommentManager.java trunk/src/main/java/cc/kune/core/server/content/CommentManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/ContentManager.java trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/ContentUtils.java trunk/src/main/java/cc/kune/core/server/content/CreationService.java trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/core/server/init/FinderRegistry.java trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManagerUtils.java trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java trunk/src/main/java/cc/kune/core/server/manager/file/FileManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/cc/kune/core/server/manager/file/FileUtils.java trunk/src/main/java/cc/kune/core/server/manager/file/ImageUtilsDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/ExtMediaDescripManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/I18nCountryManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/I18nLanguageManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/LicenseManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/RateManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/SearchResult.java trunk/src/main/java/cc/kune/core/server/manager/impl/ServerManagerException.java trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/TagManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/ToolConfigurationManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/mapper/DozerMapper.java trunk/src/main/java/cc/kune/core/server/mapper/GroupListModeConverter.java trunk/src/main/java/cc/kune/core/server/mapper/Mapper.java trunk/src/main/java/cc/kune/core/server/properties/ChatProperties.java trunk/src/main/java/cc/kune/core/server/properties/DatabaseProperties.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java trunk/src/main/java/cc/kune/core/server/properties/PropertiesFileName.java trunk/src/main/java/cc/kune/core/server/rack/dock/AbstractDock.java trunk/src/main/java/cc/kune/core/server/rack/dock/Dock.java trunk/src/main/java/cc/kune/core/server/rack/dock/RegexDock.java trunk/src/main/java/cc/kune/core/server/rack/dock/RegexMatcher.java trunk/src/main/java/cc/kune/core/server/rack/dock/RequestMatcher.java trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/DefaultRESTMethodFinder.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/JSONLibRESTSerializer.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/Parameters.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/ParametersAdapter.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethod.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethodFinder.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTSerializer.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceDefinition.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceFilter.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServicesModule.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/TransactionalServiceExecutor.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/XStreamRESTSerializer.java trunk/src/main/java/cc/kune/core/server/rack/filters/servlet/ServletServiceFilter.java trunk/src/main/java/cc/kune/core/server/rest/ContentJSONService.java trunk/src/main/java/cc/kune/core/server/rest/GroupJSONService.java trunk/src/main/java/cc/kune/core/server/rest/I18nTranslationJSONService.java trunk/src/main/java/cc/kune/core/server/rest/TestJSONService.java trunk/src/main/java/cc/kune/core/server/rest/UserJSONService.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java trunk/src/main/java/cc/kune/core/server/rpc/I18nRPC.java trunk/src/main/java/cc/kune/core/server/rpc/RPC.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/cc/kune/core/server/state/StateAbstract.java trunk/src/main/java/cc/kune/core/server/state/StateContainer.java trunk/src/main/java/cc/kune/core/server/state/StateContent.java trunk/src/main/java/cc/kune/core/server/state/StateNoContent.java trunk/src/main/java/cc/kune/core/server/state/StateService.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java trunk/src/main/java/cc/kune/core/server/tool/ServerToolTarget.java trunk/src/main/java/cc/kune/core/server/tool/ToolSimple.java trunk/src/main/java/cc/kune/core/server/users/Link.java trunk/src/main/java/cc/kune/core/server/users/UserInfo.java trunk/src/main/java/cc/kune/core/server/users/UserInfoService.java trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java trunk/src/main/java/cc/kune/core/server/utils/StringW.java trunk/src/main/java/cc/kune/core/server/utils/XmlW.java trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/main/resources/log4j.dev.properties trunk/src/main/resources/log4j.properties trunk/src/main/webapp/WEB-INF/web.xml trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java trunk/src/test/java/cc/kune/core/server/access/FinderTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/domain/GroupListTest.java trunk/src/test/java/cc/kune/core/server/finders/GroupFinderTest.java trunk/src/test/java/cc/kune/core/server/finders/LicenseFinderTest.java trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java trunk/src/test/java/cc/kune/core/server/finders/UserFinderTest.java trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileUtilsTest.java trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerMoreTest.java trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerTest.java trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java trunk/src/test/java/cc/kune/core/server/properties/KunePropertiesTest.java trunk/src/test/java/cc/kune/domain/finders/TagUserContentFinderTest.java trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java trunk/src/test/java/testsuites/ServerManagerTestSuite.java trunk/src/test/java/testsuites/ServerOtherTestSuite.java trunk/src/test/java/testsuites/ServerTestSuite.java Log: server refactorization Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/.classpath 2011-03-25 20:21:30 UTC (rev 1294) @@ -107,7 +107,6 @@ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry including="**/*.java" kind="src" path="target/generated-sources/apt"/> <classpathentry kind="lib" path="/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/gwt-user.jar"> <attributes> <attribute name="javadoc_location" value="file:/home/vjrj/bin/eclipse64-hel-new/plugins/com.google.gwt.eclipse.sdkbundle.2.1.1_2.1.1.v201012170127/gwt-2.1.1/doc/javadoc/"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/TODO 2011-03-25 20:21:30 UTC (rev 1294) @@ -48,7 +48,7 @@ ** TODO >> kune.properties from cmd line ** TODO HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... ** TODO Register of "reserved words" not permitted for groups/users names (in server and in client) -** TODO WIAB under proxies +** WIAB under proxies https://groups.google.com/group/wave-protocol/browse_thread/thread/202dee4b… ** TODO StateManager #signin while already signed in NPE ** TODO Testing Presenters via juckito: Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/TROUBLESHOOT 2011-03-25 20:21:30 UTC (rev 1294) @@ -13,6 +13,8 @@ Also for different logging levels you can play with -Dorg.eclipse.jetty.util.log.DEBUG=true (or similars) +See also log4j.properties in src/main/resources/ + == Client debug == You can debug the client with the eclipse launch configuration 'script/kune client -no-server.launch'. Copied: trunk/src/main/java/cc/kune/core/server/AbstractExtendedModule.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/AbstractExtendedModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/AbstractExtendedModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,112 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import static com.google.inject.name.Names.named; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + +import org.aopalliance.intercept.MethodInterceptor; + +import com.google.inject.AbstractModule; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.matcher.Matcher; + +/** + * An extension of AbstractModule that provides support for member injection of + * instances constructed at bind-time; in particular, itself and + * MethodInterceptors. + */ + +/* + * See: + * http://tembrel.blogspot.com/2007/09/injecting-method-interceptors-in-guice + * .html + */ + +public abstract class AbstractExtendedModule extends AbstractModule { + + /** + * Hack to ensure unique Keys for binding different instances of + * ExtendedModule. The prefix is chosen to reduce the chances of a conflict + * with some other use of + * + * @Named. A better solution would be to invent an Annotation for just this + * purpose. + */ + private static Annotation getUniqueAnnotation() { + return named("ExtendedModule-" + COUNT.incrementAndGet()); + } + + private final Set<Object> toBeInjected = new HashSet<Object>(); + + private boolean selfInjected = false; + + private static final AtomicInteger COUNT = new AtomicInteger(); + + /** + * Overridden version of bindInterceptor that, in addition to the standard + * behavior, arranges for field and method injection of each + * MethodInterceptor in {@code interceptors}. + */ + @Override + public void bindInterceptor(final Matcher<? super Class<?>> classMatcher, + final Matcher<? super Method> methodMatcher, final MethodInterceptor... interceptors) { + registerForInjection(interceptors); + super.bindInterceptor(classMatcher, methodMatcher, interceptors); + } + + /** + * Arranges for this module and each of the given objects (if any) to be + * field and method injected when the Injector is created. It is safe to + * call this method more than once, and it is safe to call it more than once + * on the same object(s). + */ + protected <T> void registerForInjection(final T... objects) { + ensureSelfInjection(); + if (objects != null) { + for (T object : objects) { + if (object != null) { + toBeInjected.add(object); + } + } + } + } + + private void ensureSelfInjection() { + if (!selfInjected) { + bind(AbstractExtendedModule.class).annotatedWith(getUniqueAnnotation()).toInstance(this); + selfInjected = true; + } + } + + @SuppressWarnings("unused") + @Inject + private void injectRegisteredObjects(final Injector injector) { + for (Object injectee : toBeInjected) { + injector.injectMembers(injectee); + } + } +} Copied: trunk/src/main/java/cc/kune/core/server/InitData.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,294 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import java.util.ArrayList; +import java.util.List; + + +import cc.kune.core.server.tool.ToolSimple; +import cc.kune.core.server.users.UserInfo; +import cc.kune.domain.ExtMediaDescrip; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.License; + +public class InitData { + + private String siteUrl; + private List<License> licenses; + private List<I18nLanguage> languages; + private List<I18nCountry> countries; + private String[] timezones; + private UserInfo userInfo; + private String chatHttpBase; + private String siteDomain; + private String chatDomain; + private String chatRoomHost; + private License defaultLicense; + private String currentCCversion; + private String defaultWsTheme; + private String[] wsThemes; + private String siteLogoUrl; + private String galleryPermittedExtensions; + private String maxFileSizeInMb; + private int imgResizewidth; + private int imgThumbsize; + private int imgCropsize; + private int imgIconsize; + private ArrayList<ToolSimple> userTools; + private ArrayList<ToolSimple> groupTools; + private List<ExtMediaDescrip> extMediaDescrips; + + private String flvEmbedObject; + + private String oggEmbedObject; + + private String mp3EmbedObject; + + private String aviEmbedObject; + + public String getAviEmbedObject() { + return aviEmbedObject; + } + + public String getChatDomain() { + return chatDomain; + } + + public String getChatHttpBase() { + return chatHttpBase; + } + + public String getChatRoomHost() { + return chatRoomHost; + } + + public List<I18nCountry> getCountries() { + return countries; + } + + public String getCurrentCCversion() { + return currentCCversion; + } + + public License getDefaultLicense() { + return defaultLicense; + } + + public String getDefaultWsTheme() { + return defaultWsTheme; + } + + public List<ExtMediaDescrip> getExtMediaDescrips() { + return extMediaDescrips; + } + + public String getFlvEmbedObject() { + return flvEmbedObject; + } + + public String getGalleryPermittedExtensions() { + return galleryPermittedExtensions; + } + + public ArrayList<ToolSimple> getGroupTools() { + return groupTools; + } + + public int getImgCropsize() { + return imgCropsize; + } + + public int getImgIconsize() { + return imgIconsize; + } + + public int getImgResizewidth() { + return imgResizewidth; + } + + public int getImgThumbsize() { + return imgThumbsize; + } + + public List<I18nLanguage> getLanguages() { + return languages; + } + + public List<License> getLicenses() { + return licenses; + } + + public String getMaxFileSizeInMb() { + return maxFileSizeInMb; + } + + public String getMp3EmbedObject() { + return mp3EmbedObject; + } + + public String getOggEmbedObject() { + return oggEmbedObject; + } + + @Deprecated + public String getSiteDomain() { + return siteDomain; + } + + public String getSiteLogoUrl() { + return siteLogoUrl; + } + + public String getSiteUrl() { + return siteUrl; + } + + public String[] getTimezones() { + return timezones; + } + + public UserInfo getUserInfo() { + return userInfo; + } + + public ArrayList<ToolSimple> getUserTools() { + return userTools; + } + + public String[] getWsThemes() { + return wsThemes; + } + + public void setAviEmbedObject(final String aviEmbedObject) { + this.aviEmbedObject = aviEmbedObject; + } + + public void setChatDomain(final String chatDomain) { + this.chatDomain = chatDomain; + } + + public void setChatHttpBase(final String chatHttpBase) { + this.chatHttpBase = chatHttpBase; + } + + public void setChatRoomHost(final String chatRoomHost) { + this.chatRoomHost = chatRoomHost; + } + + public void setCountries(final List<I18nCountry> countries) { + this.countries = countries; + } + + public void setCurrentCCversion(final String currentCCversion) { + this.currentCCversion = currentCCversion; + } + + public void setDefaultLicense(final License defaultLicense) { + this.defaultLicense = defaultLicense; + } + + public void setDefaultWsTheme(final String defaultWsTheme) { + this.defaultWsTheme = defaultWsTheme; + } + + public void setExtMediaDescrips(final List<ExtMediaDescrip> extMediaDescrips) { + this.extMediaDescrips = extMediaDescrips; + } + + public void setFlvEmbedObject(final String flvEmbedObject) { + this.flvEmbedObject = flvEmbedObject; + } + + public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { + this.galleryPermittedExtensions = galleryPermittedExtensions; + } + + public void setGroupTools(final ArrayList<ToolSimple> groupTools) { + this.groupTools = groupTools; + } + + public void setImgCropsize(final int imgCropsize) { + this.imgCropsize = imgCropsize; + } + + public void setImgIconsize(final int imgIconsize) { + this.imgIconsize = imgIconsize; + } + + public void setImgResizewidth(final int imgResizewidth) { + this.imgResizewidth = imgResizewidth; + } + + public void setImgThumbsize(final int imgThumbsize) { + this.imgThumbsize = imgThumbsize; + } + + public void setLanguages(final List<I18nLanguage> languages) { + this.languages = languages; + } + + public void setLicenses(final List<License> licenses) { + this.licenses = licenses; + } + + public void setMaxFileSizeInMb(final String maxFileSizeInMb) { + this.maxFileSizeInMb = maxFileSizeInMb; + } + + public void setMp3EmbedObject(final String mp3EmbedObject) { + this.mp3EmbedObject = mp3EmbedObject; + } + + public void setOggEmbedObject(final String oggEmbedObject) { + this.oggEmbedObject = oggEmbedObject; + } + + @Deprecated + public void setSiteDomain(final String siteDomain) { + this.siteDomain = siteDomain; + } + + public void setSiteLogoUrl(final String siteLogoUrl) { + this.siteLogoUrl = siteLogoUrl; + } + + public void setSiteUrl(final String siteUrl) { + this.siteUrl = siteUrl; + } + + public void setTimezones(final String[] timezones) { + this.timezones = timezones; + } + + public void setUserInfo(final UserInfo currentUserInfo) { + this.userInfo = currentUserInfo; + } + + public void setUserTools(final ArrayList<ToolSimple> userTools) { + this.userTools = userTools; + } + + public void setWsThemes(final String[] wsThemes) { + this.wsThemes = wsThemes; + } + +} Copied: trunk/src/main/java/cc/kune/core/server/KuneApplicationListener.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/app/server/KuneApplicationListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneApplicationListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/KuneApplicationListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,44 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +import cc.kune.core.server.rack.filters.ApplicationListener; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +class KuneApplicationListener implements ApplicationListener { + final Provider<UserSession> userSessionProvider; + + @Inject + public KuneApplicationListener(final Provider<UserSession> userSessionProvider) { + this.userSessionProvider = userSessionProvider; + } + + public void doAfter(final HttpServletRequest request, final HttpServletResponse httpServletResponse) { + } + + public void doBefore(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse) { + } +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,77 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.log4j.PropertyConfigurator; + +import cc.kune.core.server.rack.ContainerListener; + +import com.google.inject.Inject; + +public class KuneContainerListener implements ContainerListener { + private final Logger logger; // NOPMD by vjrj on 16/07/09 22:38 + private final KunePersistenceService persistenceService; + + @Inject + public KuneContainerListener(final KunePersistenceService persistenceService, final Logger logger) { + this.persistenceService = persistenceService; + this.logger = logger; + } + + private void configureLog4j() { + try { + final Properties properties = new Properties(); + final InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream( + "log4j.dev.properties"); + properties.load(input); + PropertyConfigurator.configure(properties); + } catch (final IOException e) { + e.printStackTrace(); + } + } + + public Logger getLogger() { + return logger; + } + + @Override + public void start() { + configureLog4j(); + logger.log(Level.INFO, "Starting Kune..."); + persistenceService.start(); + logger.log(Level.INFO, "Kune server started"); + } + + @Override + public void stop() { + logger.log(Level.INFO, "Stopping Kune..."); + logger.log(Level.INFO, "Kune server stopped"); + } +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/server/KunePersistenceService.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/KunePersistenceService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/KunePersistenceService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,45 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + + +import cc.kune.core.server.init.DatabaseInitializer; + +import com.google.inject.Inject; +import com.google.inject.Singleton; +import com.google.inject.persist.PersistService; + +@Singleton +public class KunePersistenceService { + @Inject + DatabaseInitializer databaseInitializer; + @Inject + PersistService persistenceService; + + public void start() { + try { + persistenceService.start(); + databaseInitializer.initConditional(); + } catch (final Exception e) { + throw new ServerException("Error starting persistence service", e); + } + } + +} Copied: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,154 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.ourproject.kune.blogs.server.BlogServerModule; +import org.ourproject.kune.chat.server.ChatServerModule; +import org.ourproject.kune.docs.server.DocumentServerModule; +import org.ourproject.kune.gallery.server.GalleryServerModule; +import org.ourproject.kune.wiki.server.WikiServerModule; + +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.init.FinderRegistry; +import cc.kune.core.server.manager.file.EntityLogoDownloadManager; +import cc.kune.core.server.manager.file.EntityLogoUploadManager; +import cc.kune.core.server.manager.file.FileDownloadManager; +import cc.kune.core.server.manager.file.FileUploadManager; +import cc.kune.core.server.properties.PropertiesFileName; +import cc.kune.core.server.rack.RackBuilder; +import cc.kune.core.server.rack.RackModule; +import cc.kune.core.server.rack.filters.ForwardFilter; +import cc.kune.core.server.rack.filters.ListenerFilter; +import cc.kune.core.server.rack.filters.LogFilter; +import cc.kune.core.server.rack.filters.RedirectFilter; +import cc.kune.core.server.rack.filters.rest.RESTServicesModule; +import cc.kune.core.server.rest.ContentJSONService; +import cc.kune.core.server.rest.GroupJSONService; +import cc.kune.core.server.rest.I18nTranslationJSONService; +import cc.kune.core.server.rest.TestJSONService; +import cc.kune.core.server.rest.UserJSONService; + +import com.google.inject.AbstractModule; +import com.google.inject.Module; +import com.google.inject.Scope; +import com.google.inject.matcher.Matchers; +import com.google.inject.persist.jpa.JpaPersistModule; +import com.google.inject.servlet.GuiceFilter; +import com.google.inject.servlet.ServletModule; +import com.google.inject.servlet.SessionScoped; + +public class KuneRackModule implements RackModule { + public static final Log LOG = LogFactory.getLog(KuneRackModule.class); + private final Module configModule; + + public KuneRackModule() { + this("development", "kune.properties", null); + } + + public KuneRackModule(final String jpaUnit, final String propertiesFileName, final Scope sessionScope) { + + configModule = new AbstractModule() { + @Override + public void configure() { + install(FinderRegistry.init(new JpaPersistModule(jpaUnit))); + bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); + bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); + if (sessionScope != null) { + bindScope(SessionScoped.class, sessionScope); + } + } + }; + } + + @Override + @SuppressWarnings("unchecked") + public void configure(final RackBuilder builder) { + installGuiceModules(builder); + + builder.add(KuneContainerListener.class); + + builder.exclude("/http-bind.*"); + builder.exclude("/public/.*"); + builder.exclude("/images/.*"); + builder.exclude("/stylesheets/.*"); + builder.exclude("/javascripts/.*"); + builder.exclude("/templates/.*"); + + /* Wave with context '/' */ + builder.exclude("/"); + builder.exclude("/attachment/.*"); + builder.exclude("/auth/signin"); + builder.exclude("/auth/signout"); + builder.exclude("/auth/register"); + builder.exclude("/fetch/.*"); + builder.exclude("/robot/dataapi"); + builder.exclude("/robot/dataapi/oauth/.*"); + builder.exclude("/robot/dataapi/rpc"); + builder.exclude("/robot/register/.*"); + builder.exclude("/robot/rpc"); + builder.exclude("/gadgets"); + builder.exclude("/gadgets/.*"); + builder.exclude("/socket.io/*"); + builder.exclude("/socket.io/.*]"); + builder.exclude("/socket"); + builder.exclude("/static/.*"); + builder.exclude("/webclient/.*"); + + builder.at(".*").install(new LogFilter()); + builder.at(".*").install(new GuiceFilter()); + + // NOTE: Commented this while testing Wave + // builder.at("^/$").install(new RedirectFilter("/ws/")); + builder.at("^/ws").install(new RedirectFilter("/ws/")); + + builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class), + new ForwardFilter("/ws/ws.html")); + + builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class, + UserService.class, SocialNetworkService.class, I18nService.class); + builder.installRESTServices("^/ws/json/", TestJSONService.class, GroupJSONService.class, UserJSONService.class, + I18nTranslationJSONService.class, ContentJSONService.class); + builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, + EntityLogoUploadManager.class, EntityLogoDownloadManager.class); + + builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}")); + } + + private void installGuiceModules(final RackBuilder builder) { + // https://code.google.com/p/google-guice/wiki/ServletModule + builder.use(new ServletModule()); + builder.use(new PlatformServerModule()); + builder.use(new DocumentServerModule()); + builder.use(new BlogServerModule()); + builder.use(new WikiServerModule()); + builder.use(new ChatServerModule()); + builder.use(new GalleryServerModule()); + builder.use(new RESTServicesModule()); + builder.use(configModule); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/LoggerMethodInterceptor.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/LoggerMethodInterceptor.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/LoggerMethodInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,124 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class LoggerMethodInterceptor implements MethodInterceptor { + + private static final Log LOG = LogFactory.getLog(LoggerMethodInterceptor.class); + private final boolean simplifyNames; + + public LoggerMethodInterceptor() { + this(true); + } + + public LoggerMethodInterceptor(final boolean simplifyNames) { + this.simplifyNames = simplifyNames; + } + + private void addMethodName(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append("."); + buffer.append(invocation.getMethod().getName()); + } + + private void addMethodParameters(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append("("); + final Object[] arguments = invocation.getArguments(); + for (final Object arg : arguments) { + buffer.append(getValue(arg)).append(", "); + } + buffer.append(")"); + } + + private void addTargetClassName(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append(getSimpleName(invocation.getThis().getClass())); + } + + private StringBuffer createBuffer(final MethodInvocation invocation) { + final StringBuffer buffer = new StringBuffer(); + addTargetClassName(invocation, buffer); + return buffer; + } + + private String getSimpleName(final Class<? extends Object> type) { + String simpleName = type.getSimpleName(); + if (simplifyNames == true) { + final int index = simpleName.indexOf('$'); + if (index > 0) { + simpleName = simpleName.substring(0, index); + } + } + return simpleName; + } + + private String getValue(final Object result) { + if (result == null) { + return "null"; + } else { + return result.toString(); + } + } + + @Override + public Object invoke(final MethodInvocation invocation) throws Throwable { + logInvocation(invocation); + try { + final Object result = invocation.proceed(); + logResult(invocation, result); + return result; + } catch (final Exception e) { + logException(invocation, e); + throw e; + } + } + + protected void log(final String output) { + LOG.debug(output); + } + + protected void logException(final MethodInvocation invocation, final Throwable e) { + final StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + buffer.append(" EXCEPTION => ").append(e.getClass()).append(": ").append( + e.getCause() != null ? e.getCause() : "").append(e.getMessage() != null ? e.getMessage() : ""); + log(buffer.toString()); + } + + protected void logInvocation(final MethodInvocation invocation) { + final StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + addMethodParameters(invocation, buffer); + log(buffer.toString()); + } + + protected void logResult(final MethodInvocation invocation, final Object result) { + final StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + if (invocation.getMethod().getReturnType() != null) { + buffer.append(" => "); + buffer.append(getValue(result)); + } + log(buffer.toString()); + } +} Copied: trunk/src/main/java/cc/kune/core/server/NotInObject.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/app/server/NotInObject.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/NotInObject.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/NotInObject.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,46 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + +import com.google.inject.matcher.AbstractMatcher; + +public class NotInObject extends AbstractMatcher<Method> { + + private final List<String> excluded; + + public NotInObject() { + super(); + // FIXME exclude password + excluded = Arrays.asList(new String[] { "finalize", "toString", "hashCode", "getClass", "wait", "equals" }); + } + + public boolean matches(final Method method) { + final String name = method.getName(); + + final boolean isGetter = name.startsWith("set"); + final boolean isExcluded = excluded.contains(name); + return !isGetter || !isExcluded; + } + +} Copied: trunk/src/main/java/cc/kune/core/server/OutermostCallInterceptor.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/OutermostCallInterceptor.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/OutermostCallInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,78 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + +import com.google.inject.Inject; +import com.google.inject.Injector; + +/* + * See: + * http://tembrel.blogspot.com/2007/09/matcher-and-methodinterceptor-for-dwr.h… + * + */ + +public final class OutermostCallInterceptor implements MethodInterceptor { + /** + * Decorates a MethodInterceptor so that only the outermost invocation using + * that interceptor will be intercepted and nested invocations willbe + * ignored. + */ + public static MethodInterceptor outermostCall(final MethodInterceptor interceptor) { + return new OutermostCallInterceptor(interceptor); + } + + private final MethodInterceptor interceptor; + + @SuppressWarnings("rawtypes") + private final ThreadLocal count = new ThreadLocal() { + @Override + protected Integer initialValue() { + return 0; + } + }; + + private OutermostCallInterceptor(final MethodInterceptor interceptor) { + this.interceptor = interceptor; + } + + @SuppressWarnings("unchecked") + public Object invoke(final MethodInvocation invocation) throws Throwable { + final int savedCount = (Integer) count.get(); + count.set(savedCount + 1); + try { + if ((Integer) count.get() > 1) { + return invocation.proceed(); + } else { + return interceptor.invoke(invocation); + } + } finally { + count.set(savedCount); + } + } + + /** Ensure underlying interceptor is injected. */ + @Inject + void injectInterceptor(final Injector injector) { + injector.injectMembers(interceptor); + } +} Copied: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,180 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import static cc.kune.core.server.OutermostCallInterceptor.outermostCall; + + +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.access.AccessRightsService; +import cc.kune.core.server.access.AccessRightsServiceDefault; +import cc.kune.core.server.access.AccessService; +import cc.kune.core.server.access.AccessServiceDefault; +import cc.kune.core.server.access.FinderService; +import cc.kune.core.server.access.FinderServiceDefault; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.AuthenticatedMethodInterceptor; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.auth.AuthorizatedMethodInterceptor; +import cc.kune.core.server.auth.SessionService; +import cc.kune.core.server.auth.SessionServiceDefault; +import cc.kune.core.server.content.CommentManager; +import cc.kune.core.server.content.CommentManagerDefault; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContainerManagerDefault; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentManagerDefault; +import cc.kune.core.server.content.CreationService; +import cc.kune.core.server.content.CreationServiceDefault; +import cc.kune.core.server.i18n.I18nTranslationServiceDefault; +import cc.kune.core.server.manager.ExtMediaDescripManager; +import cc.kune.core.server.manager.FileManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.manager.RateManager; +import cc.kune.core.server.manager.SocialNetworkManager; +import cc.kune.core.server.manager.TagManager; +import cc.kune.core.server.manager.TagUserContentManager; +import cc.kune.core.server.manager.TagUserContentManagerDefault; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.manager.file.EntityLogoDownloadManager; +import cc.kune.core.server.manager.file.EntityLogoUploadManager; +import cc.kune.core.server.manager.file.FileDownloadManager; +import cc.kune.core.server.manager.file.FileManagerDefault; +import cc.kune.core.server.manager.file.FileUploadManager; +import cc.kune.core.server.manager.impl.ExtMediaDescripManagerDefault; +import cc.kune.core.server.manager.impl.GroupManagerDefault; +import cc.kune.core.server.manager.impl.I18nCountryManagerDefault; +import cc.kune.core.server.manager.impl.I18nLanguageManagerDefault; +import cc.kune.core.server.manager.impl.I18nTranslationManagerDefault; +import cc.kune.core.server.manager.impl.LicenseManagerDefault; +import cc.kune.core.server.manager.impl.RateManagerDefault; +import cc.kune.core.server.manager.impl.SocialNetworkManagerDefault; +import cc.kune.core.server.manager.impl.TagManagerDefault; +import cc.kune.core.server.manager.impl.ToolConfigurationManagerDefault; +import cc.kune.core.server.manager.impl.UserManagerDefault; +import cc.kune.core.server.mapper.DozerMapper; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.server.properties.KunePropertiesDefault; +import cc.kune.core.server.rpc.ContentRPC; +import cc.kune.core.server.rpc.GroupRPC; +import cc.kune.core.server.rpc.I18nRPC; +import cc.kune.core.server.rpc.SiteRPC; +import cc.kune.core.server.rpc.SocialNetworkRPC; +import cc.kune.core.server.rpc.UserRPC; +import cc.kune.core.server.state.StateService; +import cc.kune.core.server.state.StateServiceDefault; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.users.UserInfoService; +import cc.kune.core.server.users.UserInfoServiceDefault; +import cc.kune.core.server.xmpp.XmppManager; +import cc.kune.core.server.xmpp.XmppManagerDefault; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Comment; +import cc.kune.domain.SocialNetwork; + +import com.google.inject.matcher.Matchers; + +public class PlatformServerModule extends AbstractExtendedModule { + private void bindFinders() { + // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Inje… + // (...) Just-in-time bindings created for child injectors will be + // created in an ancestor injector whenever possible (...) + // (This fails with finders, then we make explicit bindings) + + bind(SocialNetwork.class); + bind(Comment.class); + } + + private void bindManagers() { + bind(UserManager.class).to(UserManagerDefault.class); + bind(GroupManager.class).to(GroupManagerDefault.class); + bind(ContentManager.class).to(ContentManagerDefault.class); + bind(ToolConfigurationManager.class).to(ToolConfigurationManagerDefault.class); + bind(ContainerManager.class).to(ContainerManagerDefault.class); + bind(LicenseManager.class).to(LicenseManagerDefault.class); + bind(SocialNetworkManager.class).to(SocialNetworkManagerDefault.class); + bind(XmppManager.class).to(XmppManagerDefault.class); + bind(RateManager.class).to(RateManagerDefault.class); + bind(I18nCountryManager.class).to(I18nCountryManagerDefault.class); + bind(I18nLanguageManager.class).to(I18nLanguageManagerDefault.class); + bind(I18nTranslationManager.class).to(I18nTranslationManagerDefault.class); + bind(TagManager.class).to(TagManagerDefault.class); + bind(TagUserContentManager.class).to(TagUserContentManagerDefault.class); + bind(CommentManager.class).to(CommentManagerDefault.class); + bind(FileManager.class).to(FileManagerDefault.class); + bind(ExtMediaDescripManager.class).to(ExtMediaDescripManagerDefault.class); + } + + private void bindRPC() { + bind(SiteService.class).to(SiteRPC.class); + bind(GroupService.class).to(GroupRPC.class); + bind(ContentService.class).to(ContentRPC.class); + bind(UserService.class).to(UserRPC.class); + bind(SocialNetworkService.class).to(SocialNetworkRPC.class); + bind(I18nService.class).to(I18nRPC.class); + } + + private void bindServices() { + bind(UserInfoService.class).to(UserInfoServiceDefault.class); + bind(CreationService.class).to(CreationServiceDefault.class); + bind(AccessRightsService.class).to(AccessRightsServiceDefault.class); + bind(AccessService.class).to(AccessServiceDefault.class); + bind(FinderService.class).to(FinderServiceDefault.class); + bind(StateService.class).to(StateServiceDefault.class); + bind(I18nTranslationService.class).to(I18nTranslationServiceDefault.class); + bind(SessionService.class).to(SessionServiceDefault.class); + } + + @Override + protected void configure() { + // install(PersistService.usingJpa().across(UnitOfWork.TRANSACTION).buildModule()); + bind(KunePersistenceService.class); + + bindFinders(); + bindManagers(); + bindRPC(); + bindServices(); + bind(KuneProperties.class).to(KunePropertiesDefault.class); + bind(Mapper.class).to(DozerMapper.class); + bind(ServerToolRegistry.class); + // bind(FileUploadManager.class).in(ServletScopes.REQUEST); + bind(FileUploadManager.class); + bind(FileDownloadManager.class); + bind(EntityLogoUploadManager.class); + bind(EntityLogoDownloadManager.class); + + bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authenticated.class), + outermostCall(new AuthenticatedMethodInterceptor())); + bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authorizated.class), + outermostCall(new AuthorizatedMethodInterceptor())); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/ServerException.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/ServerException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/ServerException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/ServerException.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class ServerException extends RuntimeException { + + private static final long serialVersionUID = 2028618233098694418L; + + private static final Log LOG = LogFactory.getLog(ServerException.class); + + public ServerException() { + super(); + } + + public ServerException(final String text) { + super(text); + LOG.error(text); + } + + public ServerException(final String text, final Throwable cause) { + super(text, cause); + LOG.error(text, cause); + } + + public ServerException(final Throwable cause) { + super(cause); + LOG.error("ServerManagerException", cause); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/UserSession.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSession.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/UserSession.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,74 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + + +import cc.kune.core.server.manager.UserManager; +import cc.kune.domain.User; + +import com.google.inject.Inject; +import com.google.inject.servlet.SessionScoped; + +@SessionScoped +public class UserSession { + private String userHash; + private Long userId; + private final UserManager manager; + + @Inject + public UserSession(final UserManager manager) { + this.manager = manager; + } + + public String getHash() { + return userHash; + } + + public User getUser() { + return manager.find(userId); + } + + public boolean isUserLoggedIn() { + return userId != null; + } + + public boolean isUserNotLoggedIn() { + return !isUserLoggedIn(); + } + + public void login(final User user, final String newUserHash) { + setUser(user); + setHash(newUserHash); + } + + public void logout() { + userId = null; + userHash = null; + } + + private void setHash(final String hash) { + this.userHash = hash; + } + + private void setUser(final User user) { + userId = user.getId(); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/access (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/access) Modified: trunk/src/main/java/cc/kune/core/server/access/AccessRightsService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/AccessRightsService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; Modified: trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import java.util.ArrayList; import java.util.HashSet; Modified: trunk/src/main/java/cc/kune/core/server/access/AccessService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/AccessService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import cc.kune.core.client.errors.DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import cc.kune.core.client.errors.AccessViolationException; Modified: trunk/src/main/java/cc/kune/core/server/access/FinderService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/FinderService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import cc.kune.core.client.errors.DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,22 +17,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import javax.persistence.NoResultException; import javax.persistence.PersistenceException; -import org.ourproject.kune.platf.server.content.CommentManager; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.RateManager; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.GroupNotFoundException; import cc.kune.core.client.errors.NoDefaultContentException; import cc.kune.core.client.errors.ToolNotFoundException; +import cc.kune.core.server.content.CommentManager; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.RateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Comment; import cc.kune.domain.Container; Copied: trunk/src/main/java/cc/kune/core/server/auth (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/auth) Modified: trunk/src/main/java/cc/kune/core/server/auth/ActionLevel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/ActionLevel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/ActionLevel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; public enum ActionLevel { group, tool, container, content Modified: trunk/src/main/java/cc/kune/core/server/auth/Authenticated.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authenticated.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/Authenticated.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Modified: trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import javax.servlet.http.HttpServletRequest; @@ -25,10 +25,10 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.server.UserSession; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.UserSession; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Modified: trunk/src/main/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,19 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import javax.persistence.NoResultException; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.access.AccessService; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.access.AccessRightsService; +import cc.kune.core.server.access.AccessService; +import cc.kune.core.server.content.ContentUtils; +import cc.kune.core.server.manager.GroupManager; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/core/server/auth/SessionService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/SessionService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; public interface SessionService { Modified: trunk/src/main/java/cc/kune/core/server/auth/SessionServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/auth/SessionServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; Copied: trunk/src/main/java/cc/kune/core/server/content (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/content) Modified: trunk/src/main/java/cc/kune/core/server/content/CommentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/CommentManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,11 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; -import org.ourproject.kune.platf.server.manager.Manager; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.Manager; import cc.kune.domain.Comment; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/core/server/content/CommentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/CommentManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.manager.impl.DefaultManager; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.access.FinderService; +import cc.kune.core.server.manager.impl.DefaultManager; import cc.kune.domain.Comment; import cc.kune.domain.Content; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; -import org.ourproject.kune.platf.server.manager.Manager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.Manager; +import cc.kune.core.server.manager.impl.SearchResult; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import java.util.ArrayList; import java.util.List; @@ -28,14 +28,14 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.ourproject.kune.platf.server.manager.file.FileUtils; -import org.ourproject.kune.platf.server.manager.impl.DefaultManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.manager.impl.ServerManagerException; -import org.ourproject.kune.platf.server.utils.FilenameUtils; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.NameInUseException; +import cc.kune.core.server.manager.file.FileUtils; +import cc.kune.core.server.manager.impl.DefaultManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.manager.impl.ServerManagerException; +import cc.kune.core.server.utils.FilenameUtils; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import java.util.Date; -import org.ourproject.kune.platf.server.manager.Manager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.Manager; +import cc.kune.core.server.manager.impl.SearchResult; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import java.util.Date; import java.util.List; @@ -28,18 +28,18 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.manager.TagUserContentManager; -import org.ourproject.kune.platf.server.manager.file.FileUtils; -import org.ourproject.kune.platf.server.manager.impl.DefaultManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.manager.impl.ServerManagerException; -import org.ourproject.kune.platf.server.utils.FilenameUtils; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.client.errors.UserNotFoundException; +import cc.kune.core.server.access.FinderService; +import cc.kune.core.server.manager.TagUserContentManager; +import cc.kune.core.server.manager.file.FileUtils; +import cc.kune.core.server.manager.impl.DefaultManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.manager.impl.ServerManagerException; +import cc.kune.core.server.utils.FilenameUtils; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/content/ContentUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/ContentUtils.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import cc.kune.core.client.errors.ContentNotFoundException; Modified: trunk/src/main/java/cc/kune/core/server/content/CreationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/CreationService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,10 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.content; +package cc.kune.core.server.content; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Copied: trunk/src/main/java/cc/kune/core/server/i18n (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/i18n) Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.i18n; +package cc.kune.core.server.i18n; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.manager.I18nTranslationManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nTranslation; Copied: trunk/src/main/java/cc/kune/core/server/init (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/init) Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,20 +1,20 @@ -package org.ourproject.kune.platf.server.init; +package cc.kune.core.server.init; import java.util.TimeZone; import javax.persistence.NoResultException; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; import org.waveprotocol.box.server.authentication.PasswordDigest; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.properties.DatabaseProperties; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.GroupType; import cc.kune.domain.Content; Modified: trunk/src/main/java/cc/kune/core/server/init/FinderRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/FinderRegistry.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/init/FinderRegistry.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,4 +1,4 @@ -package org.ourproject.kune.platf.server.init; +package cc.kune.core.server.init; import cc.kune.domain.finders.ContainerFinder; import cc.kune.domain.finders.ContentFinder; Copied: trunk/src/main/java/cc/kune/core/server/manager/ExtMediaDescripManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/ExtMediaDescripManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/ExtMediaDescripManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.List; + +import cc.kune.domain.ExtMediaDescrip; + +public interface ExtMediaDescripManager extends Manager<ExtMediaDescrip, Long> { + List<ExtMediaDescrip> getAll(); +} Copied: trunk/src/main/java/cc/kune/core/server/manager/FileManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/FileManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/FileManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,54 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.io.File; +import java.io.IOException; + +public interface FileManager { + + /** + * Create a new file adding a numeric sequence if the file already exists + * + * @param dir + * the directory (use File.separator for dir delimiters) + * @param fileName + * (the new file name) + * @return if 'file.txt' exists it creates 'file 1.txt' and if 'file 1.txt' + * exists it creates 'file 2.txt' and so on + * @throws IOException + */ + File createFileWithSequentialName(String dir, String fileName) throws IOException; + + /** + * @param dir + * the directory (use File.separator for dir delimiters) + * @return true if and only if the directory was created, along with all + * necessary parent directories; false otherwise + */ + boolean mkdir(String dir); + + /** + * @param dir + * the directory (use File.separator for dir delimiters) + */ + boolean rmdir(String dir) throws IOException; + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,77 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.List; + + +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +public interface GroupManager extends Manager<Group, Long> { + + void changeDefLicense(User user, Group group, String licenseShortName); + + void changeWsTheme(User user, Group group, String theme) throws AccessViolationException; + + void clearGroupBackImage(Group group); + + Group createGroup(Group group, User user) throws GroupNameInUseException, UserMustBeLoggedException; + + Group createUserGroup(User user) throws GroupNameInUseException, EmailAddressInUseException; + + Group createUserGroup(User user, boolean wantPersonalHomepage) throws GroupNameInUseException, + EmailAddressInUseException; + + List<Group> findAdminInGroups(Long groupId); + + Group findByShortName(String groupName); + + List<Group> findCollabInGroups(Long groupId); + + List<String> findEnabledTools(Long id); + + /** + * IMPORTANT: returns null if userId is null + * + * @param userId + * @return + */ + Group getGroupOfUserWithId(Long userId); + + Group getSiteDefaultGroup(); + + SearchResult<Group> search(String search); + + SearchResult<Group> search(String search, Integer firstResult, Integer maxResults); + + void setDefaultContent(String groupShortName, Content content); + + void setGroupBackImage(Group group, Content content); + + void setToolEnabled(User userLogged, String groupShortName, String toolName, boolean enabled); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/I18nCountryManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/I18nCountryManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/I18nCountryManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.List; + +import cc.kune.domain.I18nCountry; + +public interface I18nCountryManager extends Manager<I18nCountry, Long> { + + List<I18nCountry> getAll(); + + I18nCountry findByCode(String country); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/I18nLanguageManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/I18nLanguageManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/I18nLanguageManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.List; + +import cc.kune.domain.I18nLanguage; + +public interface I18nLanguageManager extends Manager<I18nLanguage, Long> { + + I18nLanguage findByCode(String language); + + List<I18nLanguage> getAll(); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/I18nTranslationManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/I18nTranslationManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/I18nTranslationManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,52 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.HashMap; +import java.util.List; + + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.domain.I18nTranslation; + +public interface I18nTranslationManager extends Manager<I18nTranslation, Long> { + + HashMap<String, String> getLexicon(String language); + + List<I18nTranslation> getTranslatedLexicon(String language); + + SearchResult<I18nTranslation> getTranslatedLexicon(String language, Integer firstResult, Integer maxResults); + + String getTranslation(String language, String text); + + String getTranslation(String language, String text, Integer arg); + + String getTranslation(String language, String text, String arg); + + List<I18nTranslation> getUntranslatedLexicon(String language); + + SearchResult<I18nTranslation> getUntranslatedLexicon(String language, Integer firstResult, Integer maxResults); + + String setTranslation(String id, String translation) throws DefaultException; + + void setTranslation(String language, String text, String translation); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/LicenseManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/LicenseManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/LicenseManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,43 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.List; + +import cc.kune.domain.License; +import cc.kune.domain.finders.LicenseFinder; + +public interface LicenseManager { + + License findByShortName(String licenseDef); + + List<License> getAll(); + + List<License> getCC(); + + License getDefLicense(); + + List<License> getNotCC(); + + License persist(final License license); + + void setLicenseFinder(final LicenseFinder licenseFinder); + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/server/manager/Manager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/Manager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/Manager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,49 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import org.apache.lucene.search.BooleanClause; + +import cc.kune.core.server.manager.impl.SearchResult; + +public interface Manager<T, X> { + + void clear(); + + T find(X id); + + T merge(T entity); + + T persist(T entity); + + void reIndex(); + + void remove(T entity); + + SearchResult<T> search(final String query, final String[] fields, final BooleanClause.Occur[] flags, + final Integer firstResult, final Integer maxResults); + + SearchResult<T> search(final String[] queries, final String[] fields, final BooleanClause.Occur[] flags, + final Integer firstResult, final Integer maxResults); + + SearchResult<T> search(final String[] queries, final String[] fields, final Integer firstResult, + final Integer maxResults); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/RateManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/RateManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/RateManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,35 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + + +import cc.kune.domain.Content; +import cc.kune.domain.Rate; +import cc.kune.domain.User; + +public interface RateManager extends Manager<Rate, Long> { + + Rate find(User user, Content content); + + Double getRateAvg(Content content); + + Long getRateByUsers(Content content); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,61 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + + + +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; +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> { + + void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; + + void addGroupToAdmins(User userLogged, Group group, Group inGroup) throws DefaultException; + + void addGroupToCollabs(User userLogged, Group group, Group inGroup) throws DefaultException; + + void addGroupToViewers(User userLogged, Group group, Group inGroup) throws DefaultException; + + void deleteMember(User userLogged, Group group, Group inGroup) throws DefaultException, AccessViolationException; + + void denyJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; + + ParticipationData findParticipation(User user, Group group) throws DefaultException; + + SocialNetwork get(User userLogged, Group group) throws DefaultException; + + SocialNetworkData getSocialNetworkData(User userLogged, Group group); + + SocialNetworkRequestResult requestToJoin(User user, Group inGroup) throws DefaultException; + + void setAdminAsCollab(User userLogged, Group group, Group inGroup) throws DefaultException; + + void setCollabAsAdmin(User userLogged, Group group, Group inGroup) throws DefaultException; + + void unJoinGroup(Group groupToUnJoin, Group inGroup) throws DefaultException; + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/TagManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/TagManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/TagManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import cc.kune.domain.Tag; + +public interface TagManager extends Manager<Tag, Long> { + + Tag findByTagName(String tag); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,38 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.TagUserContent; +import cc.kune.domain.User; + +public interface TagUserContentManager extends Manager<TagUserContent, Long> { + + TagCloudResult getTagCloudResultByGroup(Group group); + + String getTagsAsString(User user, Content content); + + void remove(User user, Content content); + + void setTags(User user, Content content, String tags); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManagerDefault.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManagerDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/TagUserContentManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,127 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; + + +import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.server.manager.impl.DefaultManager; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.TagCount; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Tag; +import cc.kune.domain.TagUserContent; +import cc.kune.domain.User; +import cc.kune.domain.finders.TagUserContentFinder; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +@Singleton +public class TagUserContentManagerDefault extends DefaultManager<TagUserContent, Long> implements TagUserContentManager { + private final TagUserContentFinder finder; + private final Provider<EntityManager> provider; + private final TagManager tagManager; + + @Inject + public TagUserContentManagerDefault(final Provider<EntityManager> provider, final TagManager tagManager, + final TagUserContentFinder finder) { + super(provider, TagUserContent.class); + this.provider = provider; + this.tagManager = tagManager; + this.finder = finder; + } + + List<Tag> find(final User user, final Content content) { + return finder.findTags(user, content); + } + + private int getMaxCount(final Group group) { + return finder.getMaxGrouped(group).intValue(); + } + + private int getMinCount(final Group group) { + return finder.getMinGrouped(group).intValue(); + } + + private List<TagCount> getSummaryByGroup(final Group group) { + return finder.getTagsGroups(group); + } + + @Override + public TagCloudResult getTagCloudResultByGroup(final Group group) { + try { + return new TagCloudResult(getSummaryByGroup(group), getMaxCount(group), getMinCount(group)); + } catch (final NoResultException e) { + return new TagCloudResult(); + } + } + + @Override + public String getTagsAsString(final User user, final Content content) { + final StringBuffer tagConcatenated = new StringBuffer(); + if (user.getId() != null) { + // FIXME: User must be persisted (this fails on tests) + final List<Tag> tags = find(user, content); + for (final Tag tag : tags) { + tagConcatenated.append(" ").append(tag.getName()); + } + } + return tagConcatenated.toString().replaceFirst(" ", ""); + } + + @Override + public void remove(final User user, final Content content) { + for (final TagUserContent item : finder.find(user, content)) { + provider.get().remove(item); + } + } + + @Override + public void setTags(final User user, final Content content, final String tags) { + final ArrayList<String> tagsStripped = TextUtils.splitTags(tags); + final ArrayList<Tag> tagList = new ArrayList<Tag>(); + + for (final String tagString : tagsStripped) { + Tag tag; + try { + tag = tagManager.findByTagName(tagString); + } catch (final NoResultException e) { + tag = new Tag(tagString); + tagManager.persist(tag); + } + if (!tagList.contains(tag)) { + tagList.add(tag); + } + } + remove(user, content); + for (final Tag tag : tagList) { + final TagUserContent tagUserContent = new TagUserContent(tag, user, content); + persist(tagUserContent); + } + } +} Copied: trunk/src/main/java/cc/kune/core/server/manager/ToolConfigurationManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/ToolConfigurationManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/ToolConfigurationManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import cc.kune.domain.ToolConfiguration; + +public interface ToolConfigurationManager extends Manager<ToolConfiguration, Long> { + ToolConfiguration persist(ToolConfiguration config); +} Copied: trunk/src/main/java/cc/kune/core/server/manager/UserManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/UserManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/UserManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import org.waveprotocol.box.server.authentication.PasswordDigest; + +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.domain.User; +import cc.kune.domain.utils.UserBuddiesData; + +public interface UserManager { + /** + * CreateUser new method with language country and timezone params + * + * @param shortName + * @param longName + * @param email + * @param passwd + * @param timezone + * @param country + * @param language + * @param timezone + * @return User + * @throws I18nNotFoundException + */ + User createUser(String shortName, String longName, String email, String passwd, String language, String country, + String timezone) throws I18nNotFoundException; + + void createWaveAccount(String shortName, PasswordDigest passwdDigest); + + /** + * IMPORTANT: if userId == null, it returns User.UNKNOWN_USER + * + * @param userId + * @return + */ + User find(Long userId); + + User findByShortname(String shortName); + + UserBuddiesData getUserBuddies(String shortName); + + User login(String nickOrEmail, String passwd); + + void reIndex(); + + SearchResult<User> search(String search); + + SearchResult<User> search(String search, Integer firstResult, Integer maxResults); + +} Copied: trunk/src/main/java/cc/kune/core/server/manager/file (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/file) Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.IOException; @@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.client.services.FileConstants; +import cc.kune.core.server.manager.GroupManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.FileNotFoundException; @@ -29,12 +29,12 @@ import magick.MagickException; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.client.services.FileConstants; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.manager.GroupManager; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.FileNotFoundException; @@ -31,16 +31,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.services.FileConstants; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentUtils; +import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManagerUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileDownloadManagerUtils.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.BufferedInputStream; import java.io.FileInputStream; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.IOException; import java.io.Writer; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,13 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.IOException; -import org.ourproject.kune.platf.server.manager.FileManager; +import cc.kune.core.server.manager.FileManager; + import com.google.inject.Singleton; @Singleton Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.FileNotFoundException; @@ -26,18 +26,18 @@ import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessService; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.manager.FileManager; -import org.ourproject.kune.platf.server.properties.KuneProperties; -import org.ourproject.kune.platf.server.utils.StringW; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.access.AccessService; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentUtils; +import cc.kune.core.server.manager.FileManager; +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.server.utils.StringW; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.IOException; @@ -37,9 +37,9 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.client.services.FileConstants; +import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.utils.StateToken; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUtils.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.io.File; import java.io.FileInputStream; Modified: trunk/src/main/java/cc/kune/core/server/manager/file/ImageUtilsDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/file/ImageUtilsDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import java.awt.Dimension; import java.awt.Rectangle; Copied: trunk/src/main/java/cc/kune/core/server/manager/impl (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl) Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/DefaultManager.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/ExtMediaDescripManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/ExtMediaDescripManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; +import cc.kune.core.server.manager.ExtMediaDescripManager; import cc.kune.domain.ExtMediaDescrip; import cc.kune.domain.finders.ExtMediaDescripFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.Collection; import java.util.List; @@ -31,18 +31,18 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; import org.hibernate.exception.ConstraintViolationException; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; -import org.ourproject.kune.platf.server.properties.KuneProperties; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.properties.DatabaseProperties; +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/I18nCountryManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nCountryManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/I18nCountryManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nCountryManager; import cc.kune.domain.I18nCountry; import cc.kune.domain.finders.I18nCountryFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/I18nLanguageManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nLanguageManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/I18nLanguageManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.domain.I18nLanguage; import cc.kune.domain.finders.I18nLanguageFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/I18nTranslationManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.HashMap; import java.util.List; @@ -25,11 +25,11 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; import cc.kune.domain.I18nLanguage; import cc.kune.domain.I18nTranslation; import cc.kune.domain.finders.I18nTranslationFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/LicenseManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/LicenseManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.properties.DatabaseProperties; import cc.kune.domain.License; import cc.kune.domain.finders.LicenseFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/RateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/RateManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/RateManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import javax.persistence.EntityManager; import javax.persistence.NoResultException; -import org.ourproject.kune.platf.server.manager.RateManager; +import cc.kune.core.server.manager.RateManager; import cc.kune.domain.Content; import cc.kune.domain.Rate; import cc.kune.domain.User; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/SearchResult.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SearchResult.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/SearchResult.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/ServerManagerException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ServerManagerException.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/ServerManagerException.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,9 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; -import org.ourproject.kune.platf.server.ServerException; +import cc.kune.core.server.ServerException; public class ServerManagerException extends ServerException { Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,16 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.List; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.ServerException; -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 cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; @@ -34,6 +30,10 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.LastAdminInGroupException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.ServerException; +import cc.kune.core.server.access.AccessRightsService; +import cc.kune.core.server.manager.SocialNetworkManager; +import cc.kune.core.server.manager.UserManager; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.SocialNetworkVisibility; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/TagManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/TagManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/TagManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.TagManager; +import cc.kune.core.server.manager.TagManager; import cc.kune.domain.Tag; import cc.kune.domain.finders.TagFinder; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/ToolConfigurationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/ToolConfigurationManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; +import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.domain.ToolConfiguration; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import java.util.Collection; import java.util.HashSet; @@ -33,13 +33,6 @@ import org.apache.lucene.search.Query; import org.jivesoftware.smack.RosterEntry; import org.jivesoftware.smack.packet.RosterPacket.ItemType; -import org.ourproject.kune.chat.server.managers.ChatConnection; -import org.ourproject.kune.chat.server.managers.ChatException; -import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.properties.ChatProperties; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.authentication.PasswordDigest; import org.waveprotocol.box.server.persistence.AccountStore; @@ -48,6 +41,13 @@ import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.UserRegistrationException; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.properties.ChatProperties; +import cc.kune.core.server.xmpp.ChatConnection; +import cc.kune.core.server.xmpp.ChatException; +import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nCountry; import cc.kune.domain.I18nLanguage; Copied: trunk/src/main/java/cc/kune/core/server/mapper (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/mapper) Modified: trunk/src/main/java/cc/kune/core/server/mapper/DozerMapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/mapper/DozerMapper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.mapper; +package cc.kune.core.server.mapper; import java.util.ArrayList; import java.util.List; @@ -25,8 +25,8 @@ import net.sf.dozer.util.mapping.DozerBeanMapperSingletonWrapper; import net.sf.dozer.util.mapping.MapperIF; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.server.manager.impl.SearchResult; import cc.kune.core.shared.dto.SearchResultDTO; import com.google.inject.Singleton; Modified: trunk/src/main/java/cc/kune/core/server/mapper/GroupListModeConverter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/mapper/GroupListModeConverter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.mapper; +package cc.kune.core.server.mapper; import java.text.MessageFormat; import java.util.HashMap; Modified: trunk/src/main/java/cc/kune/core/server/mapper/Mapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/mapper/Mapper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.mapper; +package cc.kune.core.server.mapper; import java.util.List; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.server.manager.impl.SearchResult; import cc.kune.core.shared.dto.SearchResultDTO; public interface Mapper { Copied: trunk/src/main/java/cc/kune/core/server/properties (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/properties) Modified: trunk/src/main/java/cc/kune/core/server/properties/ChatProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/properties/ChatProperties.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/cc/kune/core/server/properties/DatabaseProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/DatabaseProperties.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/properties/DatabaseProperties.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; public interface KuneProperties { String SITE_URL = "kune.siteurl"; Modified: trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KunePropertiesDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; import java.io.IOException; import java.io.InputStream; import java.text.MessageFormat; import java.util.Properties; -import org.ourproject.kune.platf.server.ServerException; +import cc.kune.core.server.ServerException; + import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/cc/kune/core/server/properties/PropertiesFileName.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/PropertiesFileName.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/properties/PropertiesFileName.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Copied: trunk/src/main/java/cc/kune/core/server/rack/ContainerListener.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/ContainerListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/ContainerListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack; + +public interface ContainerListener { + void start(); + + void stop(); +} Copied: trunk/src/main/java/cc/kune/core/server/rack/Rack.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/Rack.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/Rack.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/Rack.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,99 @@ +/* + * + * Copyright (C) 2007-2011 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/>. + * + */ +/* + * Copyright (C) 2007-2011 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.server.rack; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import cc.kune.core.server.rack.dock.Dock; +import cc.kune.core.server.rack.dock.RequestMatcher; + +import com.google.inject.Module; + +public class Rack { + public static final Log LOG = LogFactory.getLog(Rack.class); + private final ArrayList<Dock> docks; + private final ArrayList<Module> modules; + private final ArrayList<RequestMatcher> excludes; + private final ArrayList<Class<? extends ContainerListener>> listeners; + + public Rack() { + this.docks = new ArrayList<Dock>(); + this.modules = new ArrayList<Module>(); + this.excludes = new ArrayList<RequestMatcher>(); + this.listeners = new ArrayList<Class<? extends ContainerListener>>(); + } + + public void add(final Class<? extends ContainerListener> listenerType) { + listeners.add(listenerType); + + } + + public void add(final Dock dock) { + LOG.debug("INSTALLING: " + dock.toString()); + docks.add(dock); + } + + public void add(final Module module) { + modules.add(module); + } + + public void addExclusion(RequestMatcher matcher) { + excludes.add(matcher); + } + + public List<Dock> getDocks() { + return docks; + } + + public List<RequestMatcher> getExcludes() { + return excludes; + } + + public List<Module> getGuiceModules() { + return modules; + } + + public List<Class<? extends ContainerListener>> getListeners() { + return listeners; + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/RackBuilder.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackBuilder.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/RackBuilder.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,121 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack; + +import javax.servlet.Filter; +import javax.servlet.http.HttpServlet; + + +import cc.kune.core.server.rack.dock.RegexDock; +import cc.kune.core.server.rack.dock.RegexMatcher; +import cc.kune.core.server.rack.filters.gwts.GWTServiceFilter; +import cc.kune.core.server.rack.filters.rest.RESTServiceFilter; +import cc.kune.core.server.rack.filters.servlet.ServletServiceFilter; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.inject.Module; + +public class RackBuilder { + + public static class RackDockBuilder { + private final String regex; + private final Rack rack; + + public RackDockBuilder(final Rack rack, final String regex) { + this.rack = rack; + this.regex = regex; + } + + public RackDockBuilder install(final Filter... filters) { + for (final Filter filter : filters) { + final RegexDock dock = new RegexDock(regex); + dock.setFilter(filter); + rack.add(dock); + } + return this; + } + + } + + private final Rack rack; + + public RackBuilder() { + this.rack = new Rack(); + } + + public RackBuilder add(final Class<? extends ContainerListener> listener) { + rack.add(listener); + return this; + } + + public RackDockBuilder at(final String regex) { + return new RackDockBuilder(rack, regex); + } + + public RackBuilder exclude(final String... excludes) { + for (final String exclude : excludes) { + rack.addExclusion(new RegexMatcher(exclude)); + } + return this; + } + + public Rack getRack() { + return rack; + } + + public RackBuilder installGWTServices(final String root, final Class<? extends RemoteService>... serviceClasses) { + + for (final Class<? extends RemoteService> serviceClass : serviceClasses) { + final String simpleName = serviceClass.getSimpleName(); + final RegexDock dock = new RegexDock(root + simpleName + "$"); + dock.setFilter(new GWTServiceFilter(serviceClass)); + rack.add(dock); + } + + return this; + } + + public void installRESTServices(final String root, final Class<?>... serviceClasses) { + for (final Class<?> serviceClass : serviceClasses) { + final String simpleName = serviceClass.getSimpleName(); + final String pattern = root + simpleName + "/(.*)$"; + final RegexDock dock = new RegexDock(pattern); + dock.setFilter(new RESTServiceFilter(pattern, serviceClass)); + rack.add(dock); + } + } + + public void installServlet(final String root, final Class<? extends HttpServlet>... servletClasses) { + for (final Class<? extends HttpServlet> servletClass : servletClasses) { + final String simpleName = servletClass.getSimpleName(); + final RegexDock dock = new RegexDock(root + simpleName + "$"); + dock.setFilter(new ServletServiceFilter(servletClass)); + rack.add(dock); + } + + } + + public RackBuilder use(final Module... list) { + for (final Module m : list) { + rack.add(m); + } + return this; + } +} Copied: trunk/src/main/java/cc/kune/core/server/rack/RackHelper.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/RackHelper.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackHelper.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/RackHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,57 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + +public final class RackHelper { + public static String buildForwardString(final ServletRequest request, final String forward) { + String parameters = RackHelper.extractParameters(request); + return new StringBuilder(forward).append(parameters).toString(); + } + + public static String extractParameters(final ServletRequest request) { + HttpServletRequest httpServletRequest = (HttpServletRequest) request; + String uri = httpServletRequest.getRequestURI(); + int index = uri.indexOf('?'); + if (index > 0) { + return uri.substring(index); + } else { + return ""; + } + } + + public static String getRelativeURL(final ServletRequest request) { + HttpServletRequest req = (HttpServletRequest) request; + String contextPath = req.getContextPath(); + String uri = req.getRequestURI(); + return uri.substring(contextPath.length()); + } + + public static String getURI(final ServletRequest request) { + HttpServletRequest httpServletRequest = (HttpServletRequest) request; + return httpServletRequest.getRequestURI(); + } + + private RackHelper() { + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/RackModule.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/RackModule.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/RackModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack; + +public interface RackModule { + void configure(RackBuilder builder); +} Copied: trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,184 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.waveprotocol.box.server.rpc.ServerRpcProvider; + +import cc.kune.core.server.ServerException; +import cc.kune.core.server.rack.dock.Dock; +import cc.kune.core.server.rack.dock.RequestMatcher; + +import com.google.inject.Injector; + +public class RackServletFilter implements Filter { + public static class DockChain implements FilterChain { + private final Iterator<Dock> iterator; + + public DockChain(final Iterator<Dock> iterator) { + this.iterator = iterator; + } + + @Override + public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException, + ServletException { + Dock dock = null; + boolean matched = false; + + final String relative = RackHelper.getRelativeURL(request); + while (!matched && iterator.hasNext()) { + dock = iterator.next(); + matched = dock.matches(relative); + } + if (matched) { + execute(dock.getFilter(), request, response); + } + } + + private void execute(final Filter filter, final ServletRequest request, final ServletResponse response) + throws IOException, ServletException { + // log.debug("RACK FILTER: " + filter.getClass().getSimpleName()); + filter.doFilter(request, response, this); + } + } + + public static final String INJECTOR_ATTRIBUTE = Injector.class.getName() + "Child"; + public static final String INJECTOR_PARENT_ATTRIBUTE = ServerRpcProvider.INJECTOR_ATTRIBUTE; + private static final Log LOG = LogFactory.getLog(RackServletFilter.class); + private static final String MODULE_PARAMETER = RackModule.class.getName(); + private List<Dock> docks; + + private List<RequestMatcher> excludes; + private Injector injector; + private Rack rack; + + @Override + public void destroy() { + for (final Dock dock : docks) { + dock.getFilter().destroy(); + } + } + + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + + final String relative = RackHelper.getRelativeURL(request); + for (final RequestMatcher matcher : excludes) { + if (matcher.matches(relative)) { + LOG.info("Excluded (from Guice): " + relative); + chain.doFilter(request, response); + return; + } + } + LOG.debug("REQUEST: " + relative); + final FilterChain newChain = new DockChain(docks.iterator()); + newChain.doFilter(request, response); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + stopContainerListeners(rack.getListeners(), injector); + } + + private RackModule getModule(final FilterConfig filterConfig) { + final String moduleName = getModuleName(filterConfig); + try { + final Class<?> clazz = Class.forName(moduleName); + final RackModule module = (RackModule) clazz.newInstance(); + return module; + } catch (final Exception e) { + throw new ServerException("couldn't instantiate the rack module", e); + } + } + + private String getModuleName(final FilterConfig filterConfig) { + final String moduleName = filterConfig.getInitParameter(MODULE_PARAMETER); + if (moduleName == null) { + throw new ServerException("Rack module name can't be null!"); + } + return moduleName; + } + + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + LOG.debug("INITIALIZING RackServletFilter..."); + final RackModule module = getModule(filterConfig); + final RackBuilder builder = new RackBuilder(); + module.configure(builder); + rack = builder.getRack(); + // final WaveStarter waveStarter = new WaveStarter(); + // final Injector waveChildInjector = waveStarter.runMain(); + injector = (Injector) filterConfig.getServletContext().getAttribute(INJECTOR_PARENT_ATTRIBUTE); + final Injector kuneChildInjector = installInjector(filterConfig, rack, injector); + startContainerListeners(rack.getListeners(), kuneChildInjector); + docks = rack.getDocks(); + excludes = rack.getExcludes(); + initFilters(filterConfig); + LOG.debug("INITIALIZATION DONE!"); + } + + private void initFilters(final FilterConfig filterConfig) throws ServletException { + for (final Dock dock : docks) { + dock.getFilter().init(filterConfig); + } + } + + private Injector installInjector(final FilterConfig filterConfig, final Rack rack, final Injector waveChildInjector) { + // final Injector injector = Guice.createInjector(); + final Injector childInjector = waveChildInjector.createChildInjector(rack.getGuiceModules()); + filterConfig.getServletContext().setAttribute(INJECTOR_ATTRIBUTE, childInjector); + return childInjector; + } + + private void startContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, + final Injector injector) { + LOG.debug("STARTING CONTAINER LISTENERS..."); + for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { + final ContainerListener listener = injector.getInstance(listenerClass); + listener.start(); + } + } + + // FIXME: Dani, never used this: + @SuppressWarnings("unused") + private void stopContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, + final Injector injector) { + LOG.debug("STOPING CONTAINER LISTENERS..."); + for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { + final ContainerListener listener = injector.getInstance(listenerClass); + listener.stop(); + } + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/dock (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/dock) Modified: trunk/src/main/java/cc/kune/core/server/rack/dock/AbstractDock.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/AbstractDock.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/dock/AbstractDock.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.dock; +package cc.kune.core.server.rack.dock; import javax.servlet.Filter; Modified: trunk/src/main/java/cc/kune/core/server/rack/dock/Dock.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/Dock.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/dock/Dock.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.dock; +package cc.kune.core.server.rack.dock; import javax.servlet.Filter; Modified: trunk/src/main/java/cc/kune/core/server/rack/dock/RegexDock.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/RegexDock.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/dock/RegexDock.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.dock; +package cc.kune.core.server.rack.dock; import java.util.regex.Pattern; Modified: trunk/src/main/java/cc/kune/core/server/rack/dock/RegexMatcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/RegexMatcher.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/dock/RegexMatcher.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.dock; +package cc.kune.core.server.rack.dock; import java.util.regex.Pattern; Modified: trunk/src/main/java/cc/kune/core/server/rack/dock/RequestMatcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/RequestMatcher.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/dock/RequestMatcher.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.dock; +package cc.kune.core.server.rack.dock; public interface RequestMatcher { boolean matches(String url); Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/AbstractInjectedFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/AbstractInjectedFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/AbstractInjectedFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/AbstractInjectedFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,53 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import javax.servlet.Filter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + + +import cc.kune.core.server.rack.RackServletFilter; + +import com.google.inject.Injector; + +public abstract class AbstractInjectedFilter implements Filter { + + protected ServletContext ctx; + + @Override + public abstract void destroy(); + + public <T> T getInstance(final Class<T> type) { + return getInjector().getInstance(type); + } + + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + this.ctx = filterConfig.getServletContext(); + getInjector().injectMembers(this); + } + + private Injector getInjector() { + return (Injector) ctx.getAttribute(RackServletFilter.INJECTOR_ATTRIBUTE); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/ApplicationListener.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/ApplicationListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/ApplicationListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,29 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public interface ApplicationListener { + void doBefore(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + + void doAfter(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/ForwardFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/ForwardFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/ForwardFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/ForwardFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,81 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import cc.kune.core.server.rack.RackHelper; + +public class ForwardFilter extends AbstractInjectedFilter { + // private static final Log log = LogFactory.getLog(ForwardFilter.class); + + private final String forward; + private final Pattern pattern; + + public ForwardFilter(final String forward) { + this(".*", forward); + } + + public ForwardFilter(final String pattern, final String forward) { + this.forward = forward; + this.pattern = Pattern.compile(pattern); + } + + @Override + public void destroy() { + } + + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + + String relativeURL = RackHelper.getRelativeURL(request); + Matcher matcher = pattern.matcher(relativeURL); + matcher.matches(); + + int groupCount = matcher.groupCount(); + // log.debug("GROUP COUNT: " + groupCount); + String replaced = forward; + for (int index = 0; index < groupCount; index++) { + String tag = "{" + index + "}"; + String group = matcher.group(index + 1); + // log.debug("REPLACING " + tag + " WITH + " + group); + replaced = replaced.replace(tag, group); + } + + String forwardString = RackHelper.buildForwardString(request, replaced); + forward(request, response, forwardString); + } + + private void forward(final ServletRequest request, final ServletResponse response, final String forwardString) + throws ServletException, IOException { + // log.debug("FORWADING TO: " + forwardString); + HttpServletRequest httpRequest = (HttpServletRequest) request; + httpRequest.getRequestDispatcher(forwardString).forward(request, response); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/ListenerFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/ListenerFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/ListenerFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class ListenerFilter extends AbstractInjectedFilter { + private final Class<? extends ApplicationListener> listenerClass; + + public ListenerFilter(final Class<? extends ApplicationListener> listenerClass) { + this.listenerClass = listenerClass; + } + + @Override + public void destroy() { + } + + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + ApplicationListener listener = super.getInstance(listenerClass); + listener.doBefore((HttpServletRequest) request, (HttpServletResponse) response); + chain.doFilter(request, response); + listener.doAfter((HttpServletRequest) request, (HttpServletResponse) response); + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/LogFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/LogFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/LogFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,54 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import cc.kune.core.server.rack.RackHelper; + +public class LogFilter implements Filter { + public static final Log LOG = LogFactory.getLog(LogFilter.class); + + public void destroy() { + } + + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + // final long start = System.currentTimeMillis(); + LOG.debug("REQUEST: " + RackHelper.getURI(request)); + chain.doFilter(request, response); + // final long finish = System.currentTimeMillis(); + // log.debug("TOTAL TIME: " + (finish - start) + " miliseconds"); + } + + public void init(final FilterConfig filterConfig) throws ServletException { + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/RedirectFilter.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/RedirectFilter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/RedirectFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,52 @@ +/* + * + * Copyright (C) 2007-2011 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.server.rack.filters; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + +public class RedirectFilter implements Filter { + private final String redirect; + + public RedirectFilter(String redirect) { + this.redirect = redirect; + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.sendRedirect(redirect); + } + + public void init(FilterConfig filterConfig) throws ServletException { + } + + public void destroy() { + } + +} Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/gwts) Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/DelegatedRemoteServlet.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.gwts; +package cc.kune.core.server.rack.filters.gwts; import javax.servlet.ServletContext; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/GWTServiceFilter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.gwts; +package cc.kune.core.server.rack.filters.gwts; import java.io.IOException; @@ -31,9 +31,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.rack.RackHelper; -import org.ourproject.kune.rack.filters.AbstractInjectedFilter; +import cc.kune.core.server.rack.RackHelper; +import cc.kune.core.server.rack.filters.AbstractInjectedFilter; + import com.google.gwt.user.client.rpc.RemoteService; public class GWTServiceFilter extends AbstractInjectedFilter { Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/rest (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/rest) Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/DefaultRESTMethodFinder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/DefaultRESTMethodFinder.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/DefaultRESTMethodFinder.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.lang.reflect.Method; import java.util.Arrays; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/JSONLibRESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/JSONLibRESTSerializer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/JSONLibRESTSerializer.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import net.sf.json.JSONSerializer; import net.sf.json.JsonConfig; import net.sf.json.util.CycleDetectionStrategy; -import org.ourproject.kune.platf.server.ServerException; +import cc.kune.core.server.ServerException; public class JSONLibRESTSerializer implements RESTSerializer { private final JsonConfig config; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/Parameters.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/Parameters.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/Parameters.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; public interface Parameters { String get(String name); Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/ParametersAdapter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ParametersAdapter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/ParametersAdapter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -21,7 +21,7 @@ /** * \*/ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import javax.servlet.ServletRequest; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/REST.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethod.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethod.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethod.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,11 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.lang.reflect.Method; -import org.ourproject.kune.platf.server.ServerException; +import cc.kune.core.server.ServerException; public class RESTMethod { public static final String FORMAT_JSON = "json"; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethodFinder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethodFinder.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTMethodFinder.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; public interface RESTMethodFinder { RESTMethod findMethod(String methodName, Parameters parameters, Class<?> serviceType); Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTSerializer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTSerializer.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; public interface RESTSerializer { String serialize(Object target, String format); Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceDefinition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceDefinition.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceDefinition.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.lang.reflect.Method; import java.util.ArrayList; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceFilter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServiceFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.io.IOException; import java.io.PrintWriter; @@ -31,9 +31,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.rack.RackHelper; -import org.ourproject.kune.rack.filters.AbstractInjectedFilter; +import cc.kune.core.server.rack.RackHelper; +import cc.kune.core.server.rack.filters.AbstractInjectedFilter; + import com.google.inject.Inject; public class RESTServiceFilter extends AbstractInjectedFilter { Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServicesModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServicesModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/RESTServicesModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import com.google.inject.AbstractModule; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/TransactionalServiceExecutor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/TransactionalServiceExecutor.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/TransactionalServiceExecutor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import com.google.inject.Inject; import com.google.inject.persist.Transactional; Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/XStreamRESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/XStreamRESTSerializer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/XStreamRESTSerializer.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.rack.filters.rest; +package cc.kune.core.server.rack.filters.rest; import java.util.HashMap; Copied: trunk/src/main/java/cc/kune/core/server/rack/filters/servlet (from rev 1292, trunk/src/main/java/org/ourproject/kune/rack/filters/servlet) Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/servlet/ServletServiceFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/servlet/ServletServiceFilter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/servlet/ServletServiceFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.rack.filters.servlet; +package cc.kune.core.server.rack.filters.servlet; import java.io.IOException; @@ -30,9 +30,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.rack.RackHelper; -import org.ourproject.kune.rack.filters.AbstractInjectedFilter; +import cc.kune.core.server.rack.RackHelper; +import cc.kune.core.server.rack.filters.AbstractInjectedFilter; + public class ServletServiceFilter extends AbstractInjectedFilter { Log log = LogFactory.getLog(ServletServiceFilter.class); private final Class<? extends HttpServlet> servletClass; Copied: trunk/src/main/java/cc/kune/core/server/rest (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/rest) Modified: trunk/src/main/java/cc/kune/core/server/rest/ContentJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rest/ContentJSONService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rest; +package cc.kune.core.server.rest; -import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/rest/GroupJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rest/GroupJSONService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rest; +package cc.kune.core.server.rest; -import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; import cc.kune.domain.Group; Modified: trunk/src/main/java/cc/kune/core/server/rest/I18nTranslationJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rest/I18nTranslationJSONService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,16 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rest; +package cc.kune.core.server.rest; import java.util.List; -import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.I18nTranslationDTO; import cc.kune.core.shared.dto.SearchResultDTO; import cc.kune.domain.I18nTranslation; Modified: trunk/src/main/java/cc/kune/core/server/rest/TestJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/TestJSONService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rest/TestJSONService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rest; +package cc.kune.core.server.rest; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.server.rack.filters.rest.REST; + import com.google.inject.Inject; public class TestJSONService { Modified: trunk/src/main/java/cc/kune/core/server/rest/UserJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rest/UserJSONService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rest; +package cc.kune.core.server.rest; -import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; import cc.kune.domain.User; Copied: trunk/src/main/java/cc/kune/core/server/rpc (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/rpc) Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,31 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; import java.util.Date; import javax.persistence.NoResultException; -import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.access.AccessService; -import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.CommentManager; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.content.CreationService; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.TagUserContentManager; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.platf.server.state.StateContainer; -import org.ourproject.kune.platf.server.state.StateContent; -import org.ourproject.kune.platf.server.state.StateService; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; @@ -49,6 +30,25 @@ import cc.kune.core.client.errors.NoDefaultContentException; import cc.kune.core.client.errors.ToolNotFoundException; import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.access.AccessRightsService; +import cc.kune.core.server.access.AccessService; +import cc.kune.core.server.access.FinderService; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.content.CommentManager; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentUtils; +import cc.kune.core.server.content.CreationService; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.TagUserContentManager; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.state.StateContainer; +import cc.kune.core.server.state.StateContent; +import cc.kune.core.server.state.StateService; +import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; Modified: trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,19 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.mapper.Mapper; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentUtils; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.mapper.Mapper; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; Modified: trunk/src/main/java/cc/kune/core/server/rpc/I18nRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/I18nRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,22 +17,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; import java.util.HashMap; import javax.persistence.NoResultException; import javax.servlet.http.HttpServletRequest; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import org.ourproject.kune.platf.server.mapper.Mapper; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.mapper.Mapper; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.domain.I18nLanguage; import cc.kune.domain.I18nTranslation; Modified: trunk/src/main/java/cc/kune/core/server/rpc/RPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/RPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/RPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; /** * marker interface (should not contain any method!) Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,25 +17,25 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; import java.util.TimeZone; -import org.ourproject.kune.platf.server.InitData; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.platf.server.properties.ChatProperties; -import org.ourproject.kune.platf.server.properties.KuneProperties; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.users.UserInfoService; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.server.InitData; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.manager.ExtMediaDescripManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.properties.ChatProperties; +import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.dto.InitDataDTO; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,18 +17,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.SocialNetworkManager; -import org.ourproject.kune.platf.server.mapper.Mapper; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.SocialNetworkManager; +import cc.kune.core.server.mapper.Mapper; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,22 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.rpc; +package cc.kune.core.server.rpc; import javax.servlet.http.HttpSession; import org.jivesoftware.smack.util.Base64; import org.json.JSONObject; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.auth.SessionService; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.platf.server.users.UserInfo; -import org.ourproject.kune.platf.server.users.UserInfoService; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.authentication.SessionManager; @@ -40,6 +30,16 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.UserAuthException; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.auth.SessionService; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.users.UserInfo; +import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.UserSNetVisibility; import cc.kune.core.shared.domain.utils.StateToken; Copied: trunk/src/main/java/cc/kune/core/server/state (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/state) Modified: trunk/src/main/java/cc/kune/core/server/state/StateAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateAbstract.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/state/StateContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateContainer.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; import cc.kune.core.shared.domain.TagCloudResult; Modified: trunk/src/main/java/cc/kune/core/server/state/StateContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateContent.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; import java.util.Date; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/state/StateNoContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateNoContent.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateNoContent.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; /** Modified: trunk/src/main/java/cc/kune/core/server/state/StateService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,14 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.state; +package cc.kune.core.server.state; -import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.SocialNetworkManager; -import org.ourproject.kune.platf.server.manager.TagUserContentManager; +import cc.kune.core.server.access.AccessRightsService; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.SocialNetworkManager; +import cc.kune.core.server.manager.TagUserContentManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; Copied: trunk/src/main/java/cc/kune/core/server/tool (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/tool) Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.tool; +package cc.kune.core.server.tool; import cc.kune.domain.Container; Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolRegistry.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.tool; +package cc.kune.core.server.tool; import java.util.ArrayList; import java.util.Collection; Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerToolTarget.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolTarget.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerToolTarget.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.tool; +package cc.kune.core.server.tool; public enum ServerToolTarget { forUsers, forGroups, forBoth Modified: trunk/src/main/java/cc/kune/core/server/tool/ToolSimple.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolSimple.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/tool/ToolSimple.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.server.tool; +package cc.kune.core.server.tool; public class ToolSimple { Copied: trunk/src/main/java/cc/kune/core/server/users (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/users) Modified: trunk/src/main/java/cc/kune/core/server/users/Link.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/Link.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/users/Link.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.users; +package cc.kune.core.server.users; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/users/UserInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/users/UserInfo.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.users; +package cc.kune.core.server.users; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/server/users/UserInfoService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/users/UserInfoService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.users; +package cc.kune.core.server.users; import cc.kune.core.client.errors.DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.users; +package cc.kune.core.server.users; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; Copied: trunk/src/main/java/cc/kune/core/server/utils (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/server/utils) Modified: trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/utils/FilenameUtils.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.utils; +package cc.kune.core.server.utils; import org.apache.commons.lang.StringUtils; Modified: trunk/src/main/java/cc/kune/core/server/utils/StringW.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/utils/StringW.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/utils/StringW.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ //package com.generationjava.lang; // copied in kune from: // http://svn.apache.org/repos/asf/jakarta/taglibs/proper/string/trunk/src/org… -package org.ourproject.kune.platf.server.utils; +package cc.kune.core.server.utils; import org.apache.commons.lang.StringUtils; Modified: trunk/src/main/java/cc/kune/core/server/utils/XmlW.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/utils/XmlW.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/server/utils/XmlW.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ //package com.generationjava.web; // Copied in kune from: // http://svn.apache.org/repos/asf/jakarta/taglibs/proper/string/trunk/src/org… -package org.ourproject.kune.platf.server.utils; +package cc.kune.core.server.utils; import org.apache.commons.lang.StringUtils; Copied: trunk/src/main/java/cc/kune/core/server/xmpp/ChatConnection.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatConnection.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/ChatConnection.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/ChatConnection.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,24 @@ +/* + * + * 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.core.server.xmpp; + +public interface ChatConnection { + +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/ChatException.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/ChatException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/ChatException.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,35 @@ +/* + * + * 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.core.server.xmpp; + +import org.jivesoftware.smack.XMPPException; + +public class ChatException extends RuntimeException { + + private static final long serialVersionUID = 3777046831841032482L; + + public ChatException() { + super(""); + } + + public ChatException(final XMPPException cause) { + super(cause); + } +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/Room.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/Room.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/Room.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/Room.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,24 @@ +/* + * + * 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.core.server.xmpp; + +public interface Room { + void setListener(RoomListener listener); +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/RoomConfigurationDumper.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomConfigurationDumper.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/RoomConfigurationDumper.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/RoomConfigurationDumper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,76 @@ +/* + * + * 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.core.server.xmpp; + +import java.util.Iterator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jivesoftware.smack.XMPPException; +import org.jivesoftware.smackx.Form; +import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.muc.MultiUserChat; + +class RoomConfigurationDumper { + + private static final Log LOG = LogFactory.getLog(RoomConfigurationDumper.class); + + public static void showConfiguration(final Form form) { + for (Iterator<FormField> fields = form.getFields(); fields.hasNext();) { + FormField formField = fields.next(); + log("Field label: " + formField.getLabel()); + log("Field variable: " + formField.getVariable()); + log("Field type: " + formField.getType()); + log("Field desc: " + formField.getDescription()); + log("Field options: " + log(formField.getOptions())); + log("Field values: " + log(formField.getValues())); + log("Field end -------------------"); + } + } + + private static String log(final Iterator<?> options) { + String s = ""; + while (options.hasNext()) { + s += "| " + options.next().toString(); + } + return s; + } + + private static void log(final String string) { + LOG.debug(string); + } + + void configure2(final MultiUserChat muc) throws XMPPException { + Form form = muc.getConfigurationForm().createAnswerForm(); + form.setAnswer("muc#roomconfig_passwordprotectedroom", false); + // form.setAnswer("muc#roomconfig_roomname", + // mucRoomDialog.getRoomName()); + + form.setAnswer("muc#roomconfig_persistentroom", true); + + // List owners = new ArrayList(); + // owners.add(SparkManager.getSessionManager().getBareAddress()); + // form.setAnswer("muc#roomconfig_roomowners", owners); + + // new DataFormDialog(groupChat, form); + muc.sendConfigurationForm(form); + + } +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/RoomListener.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/RoomListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/RoomListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,26 @@ +/* + * + * 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.core.server.xmpp; + +public interface RoomListener { + + void onMessage(String from, String to, String body); + +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/XmppConnection.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/XmppConnection.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/XmppConnection.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,41 @@ +/* + * + * 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.core.server.xmpp; + +import org.jivesoftware.smack.XMPPConnection; + +public class XmppConnection implements ChatConnection { + private final XMPPConnection conn; + private final String userName; + + public XmppConnection(final String userName, final XMPPConnection conn) { + this.userName = userName; + this.conn = conn; + } + + public XMPPConnection getConn() { + return conn; + } + + public String getUserName() { + return userName; + } + +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/XmppManager.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/XmppManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/XmppManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,44 @@ +/* + * + * 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.core.server.xmpp; + +import java.util.Collection; + +import org.jivesoftware.smack.RosterEntry; + +public interface XmppManager { + + Room createRoom(ChatConnection connection, String roomName, String ownerAlias); + + void destroyRoom(ChatConnection conn, String roomName); + + void disconnect(ChatConnection connection); + + Collection<RosterEntry> getRoster(ChatConnection connection); + + Room joinRoom(ChatConnection connection, String roomName, String alias); + + ChatConnection login(String userName, String password, String resource); + + void sendMessage(Room room, String message); + + void sendMessage(String userName, String message); + +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/XmppManagerDefault.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/XmppManagerDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/XmppManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,194 @@ +/* + * + * 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.core.server.xmpp; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jivesoftware.smack.Chat; +import org.jivesoftware.smack.ConnectionConfiguration; +import org.jivesoftware.smack.MessageListener; +import org.jivesoftware.smack.Roster; +import org.jivesoftware.smack.RosterEntry; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPException; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smackx.Form; +import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.muc.MultiUserChat; + +import cc.kune.core.server.properties.ChatProperties; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class XmppManagerDefault implements XmppManager { + public static final Log LOG = LogFactory.getLog(XmppManagerDefault.class); + + private final ChatProperties chatProperties; + + @Inject + public XmppManagerDefault(final ChatProperties chatProperties) { + this.chatProperties = chatProperties; + } + + public Room createRoom(final ChatConnection conn, final String roomName, final String alias) { + XmppConnection xConn = (XmppConnection) conn; + MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); + try { + muc.create(alias); + configure(muc); + XmppRoom room = new XmppRoom(muc, alias); + muc.addMessageListener(room); + return room; + } catch (XMPPException e) { + throw new ChatException(e); + } + } + + public void destroyRoom(final ChatConnection conn, final String roomName) { + XmppConnection xConn = (XmppConnection) conn; + MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); + try { + muc.destroy("Room removed by kune server", ""); + } catch (XMPPException e) { + throw new ChatException(e); + } + } + + public void disconnect(final ChatConnection connection) { + XmppConnection xConn = (XmppConnection) connection; + xConn.getConn().disconnect(); + + } + + public Collection<RosterEntry> getRoster(final ChatConnection conn) { + XmppConnection xConn = (XmppConnection) conn; + Roster roster = xConn.getConn().getRoster(); + return roster.getEntries(); + } + + public Room joinRoom(final ChatConnection connection, final String roomName, final String alias) { + XmppConnection xConn = (XmppConnection) connection; + MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); + try { + muc.join(alias); + // configure(muc); + XmppRoom room = new XmppRoom(muc, alias); + muc.addMessageListener(room); + return room; + } catch (XMPPException e) { + throw new ChatException(e); + } + } + + public ChatConnection login(final String userName, final String password, final String resource) { + ConnectionConfiguration config = new ConnectionConfiguration(getServerName(), 5222); + XMPPConnection conn = new XMPPConnection(config); + try { + conn.connect(); + conn.login(userName, password, resource, true); + return new XmppConnection(userName, conn); + } catch (XMPPException e) { + throw new ChatException(e); + } + } + + public void sendMessage(final Room room, final String body) { + XmppRoom xAccess = (XmppRoom) room; + MultiUserChat muc = xAccess.getMuc(); + Message message = muc.createMessage(); + message.setBody(body); + message.setFrom(muc.getNickname()); + try { + muc.sendMessage(body); + } catch (XMPPException e) { + throw new ChatException(e); + } + } + + public void sendMessage(final String userName, final String text) { + ChatConnection connection = login(chatProperties.getAdminJID(), chatProperties.getAdminPasswd(), + "kuneserveradmin" + System.currentTimeMillis()); + XMPPConnection xmppConn = ((XmppConnection) connection).getConn(); + + String userJid = userName + "@" + chatProperties.getDomain(); + Chat newChat = xmppConn.getChatManager().createChat(userJid, new MessageListener() { + public void processMessage(final Chat arg0, final Message arg1) { + LOG.info("Sended message: " + text); + } + }); + try { + final Message message = new Message(); + message.setFrom(chatProperties.getDomain()); + message.setTo(userJid); + message.setBody(text); + newChat.sendMessage(message); + } catch (Exception e) { + LOG.error("Error Delivering xmpp message to " + userName); + } + xmppConn.disconnect(); + } + + private void configure(final MultiUserChat muc) throws XMPPException { + Form form = muc.getConfigurationForm(); + Form answer = form.createAnswerForm(); + + for (Iterator<FormField> fields = form.getFields(); fields.hasNext();) { + FormField field = fields.next(); + String type = field.getType(); + if (isVisible(type) && isNotEmpty(field) && isNotList(type)) { + List<String> values = new ArrayList<String>(); + for (Iterator<String> it = field.getValues(); it.hasNext();) { + values.add(it.next()); + } + answer.setAnswer(field.getVariable(), values); + } + } + answer.setAnswer("muc#roomconfig_persistentroom", true); + muc.sendConfigurationForm(answer); + } + + private String getRoomName(final String room) { + return room + "@" + chatProperties.getRoomHost(); + } + + private String getServerName() { + return chatProperties.getDomain(); + } + + private boolean isNotEmpty(final FormField field) { + return field.getVariable() != null; + } + + private boolean isNotList(final String type) { + return !FormField.TYPE_JID_MULTI.equals(type) && !FormField.TYPE_LIST_MULTI.equals(type) + && !FormField.TYPE_LIST_SINGLE.equals(type) && !isVisible(type); + } + + private boolean isVisible(final String type) { + return !FormField.TYPE_HIDDEN.equals(type); + } +} Copied: trunk/src/main/java/cc/kune/core/server/xmpp/XmppRoom.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/xmpp/XmppRoom.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/xmpp/XmppRoom.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,59 @@ +/* + * + * 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.core.server.xmpp; + +import org.jivesoftware.smack.PacketListener; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Packet; +import org.jivesoftware.smackx.muc.MultiUserChat; + +public class XmppRoom implements Room, PacketListener { + private final String alias; + private RoomListener listener; + private final MultiUserChat muc; + + public XmppRoom(final MultiUserChat muc, final String alias) { + this.muc = muc; + this.alias = alias; + } + + public String getAlias() { + return alias; + } + + public void processPacket(final Packet packet) { + if (packet instanceof Message) { + processMessage((Message) packet); + } + } + + private void processMessage(final Message message) { + listener.onMessage(message.getFrom(), message.getTo(), message.getBody()); + } + + public void setListener(final RoomListener listener) { + this.listener = listener; + } + + public MultiUserChat getMuc() { + return muc; + } + +} Copied: trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java (from rev 1292, trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,42 @@ +/* + * + * Copyright (C) 2007-2011 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.shared; + +public final class SearcherConstants { + + public final static String START_PARAM = "start"; + public final static String LIMIT_PARAM = "limit"; + public final static String QUERY_PARAM = "query"; + public final static String MIMETYPE_PARAM = "mimetype"; + public final static String MIMETYPE2_PARAM = "mimetype2"; + public final static String GROUP_PARAM = "group"; + + public final static String GROUP_DATA_PROXY_URL = "/ws/json/GroupJSONService/search"; + public final static String USER_DATA_PROXY_URL = "/ws/json/UserJSONService/search"; + public final static String CONTENT_DATA_PROXY_URL = "/ws/json/ContentJSONService/search"; + public final static String I18N_JSON_SERVICE = "/ws/json/I18nTranslationJSONService/search"; + public final static String I18N_JSON_SERVICE_TRANSLATED = "/ws/json/I18nTranslationJSONService/searchtranslated"; + + public final static String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; + public final static String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; + + private SearcherConstants() { + } +} Property changes on: trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,7 +19,6 @@ */ package cc.kune.pspace.client; - import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; public class PSpaceGinModule extends AbstractPresenterModule { @@ -33,6 +32,7 @@ protected void configure() { bindPresenter(PSpacePresenter.class, PSpacePresenter.PSpaceView.class, PSpacePanel.class, PSpacePresenter.PSpaceProxy.class); + bind(PSpaceParts.class).asEagerSingleton(); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -30,6 +30,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HasText; @@ -75,6 +76,7 @@ layer.addClassName("k-box-5shadow"); layer.addClassName("k-5corners"); icon.setResource(res.browser32()); + Window.alert("kk"); wsArmor.getPublicSpace().add(widget); } Deleted: trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java.txt =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java.txt 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java.txt 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,509 +0,0 @@ -package cc.kune.wave.server; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.servlet.Servlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.nio.SelectChannelConnector; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.resource.ResourceCollection; -import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.WebSocket; -import org.eclipse.jetty.websocket.WebSocketServlet; -import org.ourproject.kune.rack.RackServletFilter; -import org.waveprotocol.box.common.comms.WaveClientRpc.ProtocolAuthenticate; -import org.waveprotocol.box.common.comms.WaveClientRpc.ProtocolAuthenticationResult; -import org.waveprotocol.box.server.CoreSettings; -import org.waveprotocol.box.server.authentication.SessionManager; -import org.waveprotocol.box.server.rpc.BaseUrlHelper; -import org.waveprotocol.box.server.rpc.MessageExpectingChannel; -import org.waveprotocol.box.server.rpc.ProtoCallback; -import org.waveprotocol.box.server.rpc.Rpc; -import org.waveprotocol.box.server.rpc.ServerRpcController; -import org.waveprotocol.box.server.rpc.SocketIOServerChannel; -import org.waveprotocol.box.server.rpc.WebSocketServerChannel; -import org.waveprotocol.box.server.util.NetUtils; -import org.waveprotocol.wave.model.util.Pair; -import org.waveprotocol.wave.model.wave.ParticipantId; -import org.waveprotocol.wave.util.logging.Log; - -import com.glines.socketio.server.SocketIOInbound; -import com.glines.socketio.server.SocketIOServlet; -import com.glines.socketio.server.transport.FlashSocketTransport; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.name.Named; -import com.google.protobuf.Descriptors; -import com.google.protobuf.Descriptors.MethodDescriptor; -import com.google.protobuf.Message; -import com.google.protobuf.RpcCallback; -import com.google.protobuf.Service; -import com.google.protobuf.UnknownFieldSet; - -/** - * ServerRpcProvider can provide instances of type Service over an incoming - * network socket and service incoming RPCs to these services and their methods. - * - * - */ -public class CustomServerRpcProvider { - abstract class Connection implements ProtoCallback { - private final Map<Long, ServerRpcController> activeRpcs = new ConcurrentHashMap<Long, ServerRpcController>(); - - // The logged in user. - // Note: Due to this bug: - // http://code.google.com/p/wave-protocol/issues/detail?id=119, - // the field may be null on first connect and then set later using an - // RPC. - private ParticipantId loggedInUser; - - /** - * @param loggedInUser - * The currently logged in user, or null if no user is logged - * in. - */ - public Connection(final ParticipantId loggedInUser) { - this.loggedInUser = loggedInUser; - } - - private ParticipantId authenticate(final String token) { - final HttpSession session = sessionManager.getSessionFromToken(token); - final ParticipantId user = sessionManager.getLoggedInUser(session); - return user; - } - - protected void expectMessages(final MessageExpectingChannel channel) { - synchronized (registeredServices) { - for (final RegisteredServiceMethod serviceMethod : registeredServices.values()) { - channel.expectMessage(serviceMethod.service.getRequestPrototype(serviceMethod.method)); - LOG.fine("Expecting: " + serviceMethod.method.getFullName()); - } - } - channel.expectMessage(Rpc.CancelRpc.getDefaultInstance()); - } - - @Override - public void message(final long sequenceNo, final Message message) { - if (message instanceof Rpc.CancelRpc) { - final ServerRpcController controller = activeRpcs.get(sequenceNo); - if (controller == null) { - throw new IllegalStateException("Trying to cancel an RPC that is not active!"); - } else { - LOG.info("Cancelling open RPC " + sequenceNo); - controller.cancel(); - } - } else if (message instanceof ProtocolAuthenticate) { - // Workaround for bug: - // http://codereview.waveprotocol.org/224001/ - - // When we get this message, either the connection will not be - // logged in - // (loggedInUser == null) or the connection will have been - // authenticated - // via cookies - // (in which case loggedInUser must match the authenticated - // user, and - // this message has no - // effect). - - final ProtocolAuthenticate authMessage = (ProtocolAuthenticate) message; - final ParticipantId authenticatedAs = authenticate(authMessage.getToken()); - - Preconditions.checkArgument(authenticatedAs != null, "Auth token invalid"); - Preconditions.checkState(loggedInUser == null || loggedInUser.equals(authenticatedAs), - "Session already authenticated as a different user"); - - loggedInUser = authenticatedAs; - LOG.info("Session authenticated as " + loggedInUser); - sendMessage(sequenceNo, ProtocolAuthenticationResult.getDefaultInstance()); - } else if (registeredServices.containsKey(message.getDescriptorForType())) { - if (activeRpcs.containsKey(sequenceNo)) { - throw new IllegalStateException("Can't invoke a new RPC with a sequence number already in use."); - } else { - final RegisteredServiceMethod serviceMethod = registeredServices.get(message.getDescriptorForType()); - - // Create the internal ServerRpcController used to invoke - // the call. - final ServerRpcController controller = new ServerRpcControllerImpl(message, serviceMethod.service, - serviceMethod.method, loggedInUser, new RpcCallback<Message>() { - @Override - synchronized public void run(final Message message) { - if (message instanceof Rpc.RpcFinished - || !serviceMethod.method.getOptions().getExtension(Rpc.isStreamingRpc)) { - // This RPC is over - remove it from the - // map. - final boolean failed = message instanceof Rpc.RpcFinished ? ((Rpc.RpcFinished) message).getFailed() - : false; - LOG.fine("RPC " + sequenceNo + " is now finished, failed = " + failed); - if (failed) { - LOG.info("error = " + ((Rpc.RpcFinished) message).getErrorText()); - } - activeRpcs.remove(sequenceNo); - } - sendMessage(sequenceNo, message); - } - }); - - // Kick off a new thread specific to this RPC. - activeRpcs.put(sequenceNo, controller); - threadPool.execute(controller); - } - } else { - // Sent a message type we understand, but don't expect - - // erronous case! - throw new IllegalStateException("Got expected but unknown message (" + message + ") for sequence: " - + sequenceNo); - } - } - - protected abstract void sendMessage(long sequenceNo, Message message); - - @Override - public void unknown(final long sequenceNo, final String messageType, final String message) { - throw new IllegalStateException("Got unknown message (type: " + messageType + ", " + message - + ") for sequence: " + sequenceNo); - } - - @Override - public void unknown(final long sequenceNo, final String messageType, final UnknownFieldSet message) { - throw new IllegalStateException("Got unknown message (type: " + messageType + ", " + message - + ") for sequence: " + sequenceNo); - } - } - - /** - * Internal, static container class for any specific registered service - * method. - */ - static class RegisteredServiceMethod { - final MethodDescriptor method; - final Service service; - - RegisteredServiceMethod(final Service service, final MethodDescriptor method) { - this.service = service; - this.method = method; - } - } - class SocketIOConnection extends Connection { - private final SocketIOServerChannel socketChannel; - - SocketIOConnection(final ParticipantId loggedInUser) { - super(loggedInUser); - socketChannel = new SocketIOServerChannel(this); - LOG.info("New websocket connection set up for user " + loggedInUser); - expectMessages(socketChannel); - } - - public SocketIOServerChannel getWebSocketServerChannel() { - return socketChannel; - } - - @Override - protected void sendMessage(final long sequenceNo, final Message message) { - socketChannel.sendMessage(sequenceNo, message); - } - } - public class WaveSocketIOServlet extends SocketIOServlet { - @Override - protected SocketIOInbound doSocketIOConnect(final HttpServletRequest request, final String[] protocols) { - final ParticipantId loggedInUser = sessionManager.getLoggedInUser(request.getSession(false)); - - final SocketIOConnection connection = new SocketIOConnection(loggedInUser); - return connection.getWebSocketServerChannel(); - } - } - public class WaveWebSocketServlet extends WebSocketServlet { - @Override - protected WebSocket doWebSocketConnect(final HttpServletRequest request, final String protocol) { - final ParticipantId loggedInUser = sessionManager.getLoggedInUser(request.getSession(false)); - - final WebSocketConnection connection = new WebSocketConnection(loggedInUser); - return connection.getWebSocketServerChannel(); - } - } - class WebSocketConnection extends Connection { - private final WebSocketServerChannel socketChannel; - - WebSocketConnection(final ParticipantId loggedInUser) { - super(loggedInUser); - socketChannel = new WebSocketServerChannel(this); - LOG.info("New websocket connection set up for user " + loggedInUser); - expectMessages(socketChannel); - } - - public WebSocketServerChannel getWebSocketServerChannel() { - return socketChannel; - } - - @Override - protected void sendMessage(final long sequenceNo, final Message message) { - socketChannel.sendMessage(sequenceNo, message); - } - } - private static final Log LOG = Log.get(CustomServerRpcProvider.class); - - private static InetSocketAddress[] parseAddressList(final List<String> addressList) { - if (addressList == null || addressList.size() == 0) { - return new InetSocketAddress[0]; - } else { - final Set<InetSocketAddress> addresses = Sets.newHashSet(); - for (final String str : addressList) { - if (str.length() == 0) { - LOG.warning("Encountered empty address in http addresses list."); - } else { - try { - final InetSocketAddress address = NetUtils.parseHttpAddress(str); - if (!addresses.contains(address)) { - addresses.add(address); - } else { - LOG.warning("Ignoring duplicate address in http addresses list: Duplicate entry '" + str - + "' resolved to " + address.getAddress().getHostAddress()); - } - } catch (final IOException e) { - LOG.severe("Unable to process address " + str, e); - } - } - } - return addresses.toArray(new InetSocketAddress[0]); - } - } - private final String baseUrl; - - private final Integer flashsocketPolicyPort; - - private final InetSocketAddress[] httpAddresses; - - private Server httpServer = null; - - private final Set<Connection> incomingConnections = Sets.newHashSet(); - - private final org.eclipse.jetty.server.SessionManager jettySessionManager; - - // Mapping from incoming protocol buffer type -> specific handler. - private final Map<Descriptors.Descriptor, RegisteredServiceMethod> registeredServices = Maps.newHashMap(); - - private final String resourceBase; - - /** - * Set of servlets - */ - List<Pair<String, ServletHolder>> servletRegistry = Lists.newArrayList(); - - private final SessionManager sessionManager; - - private final ExecutorService threadPool; - - /** - * Construct a new ServerRpcProvider, hosting on the specified WebSocket - * addresses. - * - * Also accepts an ExecutorService for spawning managing threads. - */ - public CustomServerRpcProvider(final InetSocketAddress[] httpAddresses, final Integer flashsocketPolicyPort, - final String baseUrl, final String resourceBase, final ExecutorService threadPool, - final SessionManager sessionManager, final org.eclipse.jetty.server.SessionManager jettySessionManager) { - this.httpAddresses = httpAddresses; - this.flashsocketPolicyPort = flashsocketPolicyPort; - this.baseUrl = BaseUrlHelper.removeLastSlash(baseUrl); - this.resourceBase = resourceBase; - this.threadPool = threadPool; - this.sessionManager = sessionManager; - this.jettySessionManager = jettySessionManager; - } - - /** - * Constructs a new ServerRpcProvider with a default ExecutorService. - */ - public CustomServerRpcProvider(final InetSocketAddress[] httpAddresses, final Integer flashsocketPolicyPort, - final String baseUrl, final String resourceBase, final SessionManager sessionManager, - final org.eclipse.jetty.server.SessionManager jettySessionManager) { - this(httpAddresses, flashsocketPolicyPort, baseUrl, resourceBase, Executors.newCachedThreadPool(), - sessionManager, jettySessionManager); - } - - @Inject - public CustomServerRpcProvider((a)Named(CoreSettings.HTTP_FRONTEND_ADDRESSES) final List<String> httpAddresses, - @Named(CoreSettings.FLASHSOCKET_POLICY_PORT) final Integer flashsocketPolicyPort, - @Named(CoreSettings.HTTP_BASE_URL) final String baseUrl, - @Named(CoreSettings.RESOURCE_BASE) final String resourceBase, final SessionManager sessionManager, - final org.eclipse.jetty.server.SessionManager jettySessionManager) { - this(parseAddressList(httpAddresses), flashsocketPolicyPort, baseUrl, resourceBase, sessionManager, - jettySessionManager); - } - - /** - * Add a servlet to the servlet registry. This servlet will be attached to - * the specified URL pattern when the server is started up. - * - * @param urlPattern - * URL pattern for paths. Eg, '/foo', '/foo/*' - * @param servlet - * The servlet object to bind to the specified paths - * @return the {@link ServletHolder} that holds the servlet. - */ - public ServletHolder addServlet(final String urlPattern, final Servlet servlet) { - final ServletHolder servletHolder = new ServletHolder(servlet); - servletRegistry.add(new Pair<String, ServletHolder>(urlPattern, servletHolder)); - return servletHolder; - } - - /** - * @return a list of {@link SelectChannelConnector} each bound to a - * host:port pair form the list addresses. - */ - private List<SelectChannelConnector> getSelectChannelConnectors(final InetSocketAddress[] httpAddresses) { - final List<SelectChannelConnector> list = Lists.newArrayList(); - for (final InetSocketAddress address : httpAddresses) { - final SelectChannelConnector connector = new SelectChannelConnector(); - connector.setHost(address.getAddress().getHostAddress()); - connector.setPort(address.getPort()); - list.add(connector); - } - - return list; - } - - /** - * Returns the socket the WebSocket server is listening on. - */ - public SocketAddress getWebSocketAddress() { - if (httpServer == null) { - return null; - } else { - final Connector c = httpServer.getConnectors()[0]; - return new InetSocketAddress(c.getHost(), c.getLocalPort()); - } - } - - /** - * Register all methods provided by the given service type. - */ - public void registerService(final Service service) { - synchronized (registeredServices) { - for (final MethodDescriptor methodDescriptor : service.getDescriptorForType().getMethods()) { - registeredServices.put(methodDescriptor.getInputType(), new RegisteredServiceMethod(service, - methodDescriptor)); - } - } - } - - public void startWebSocketServer(final Injector injector) { - httpServer = new Server(); - - final List<SelectChannelConnector> connectors = getSelectChannelConnectors(httpAddresses); - if (connectors.isEmpty()) { - LOG.severe("No valid http end point address provided!"); - } - for (final SelectChannelConnector connector : connectors) { - httpServer.addConnector(connector); - } - - final WebAppContext context = new WebAppContext(); - - // FIXME This was with previous ServletContextHandler: needed? - // final ServletContextHandler context = new - // ServletContextHandler(ServletContextHandler.SESSIONS); - - if (jettySessionManager != null) { - context.getSessionHandler().setSessionManager(jettySessionManager); - } - final ResourceCollection resources = new ResourceCollection(new String[] { "src/main/webapp", resourceBase, }); - context.setBaseResource(resources); - context.setContextPath(baseUrl); - - context.setParentLoaderPriority(true); - context.setDescriptor("WEB-INF/web.xml"); - - context.setAttribute(RackServletFilter.INJECTOR_PARENT_ATTRIBUTE, injector); - - // Servlet where the websocket connection is served from. - final ServletHolder wsholder = new ServletHolder(new WaveWebSocketServlet()); - context.addServlet(wsholder, "/socket"); - // TODO(zamfi): fix to let messages span frames. - wsholder.setInitParameter("bufferSize", "" + 1024 * 1024); // 1M buffer - - // Servlet where the websocket connection is served from. - final ServletHolder sioholder = new ServletHolder(new WaveSocketIOServlet()); - context.addServlet(sioholder, "/socket.io/*"); - // TODO(zamfi): fix to let messages span frames. - sioholder.setInitParameter("bufferSize", "" + 1024 * 1024); // 1M buffer - // Set flash policy server parameters - String flashPolicyServerHost = "localhost"; - final StringBuilder flashPolicyAllowedPorts = new StringBuilder(); - /* - * Loop through addresses, collect list of ports, and determine if we - * are to use "localhost" of the AnyHost wildcard. - */ - for (final InetSocketAddress addr : httpAddresses) { - if (flashPolicyAllowedPorts.length() > 0) { - flashPolicyAllowedPorts.append(","); - } - flashPolicyAllowedPorts.append(addr.getPort()); - if (!addr.getAddress().isLoopbackAddress()) { - // Until it's possible to pass a list of address, this is the - // only valid alternative. - flashPolicyServerHost = "0.0.0.0"; - } - } - sioholder.setInitParameter(FlashSocketTransport.FLASHPOLICY_SERVER_HOST_KEY, flashPolicyServerHost); - sioholder.setInitParameter(FlashSocketTransport.FLASHPOLICY_SERVER_PORT_KEY, "" + flashsocketPolicyPort); - // TODO: Change to use the public http address and all other bound - // addresses. - sioholder.setInitParameter(FlashSocketTransport.FLASHPOLICY_DOMAIN_KEY, "*"); - sioholder.setInitParameter(FlashSocketTransport.FLASHPOLICY_PORTS_KEY, flashPolicyAllowedPorts.toString()); - - // Serve the static content and GWT web client with the default servlet - // (acts like a standard file-based web server). - final ServletHolder defaultServlet = new ServletHolder(new DefaultServlet()); - context.addServlet(defaultServlet, "/static/*"); - context.addServlet(defaultServlet, "/webclient/*"); - context.addServlet(defaultServlet, "/ws/*"); - context.addServlet(defaultServlet, "/images/*"); - context.addServlet(defaultServlet, "/javascripts/*"); - context.addServlet(defaultServlet, "/stylesheets/*"); - context.addServlet(defaultServlet, "/templates/*"); - - for (final Pair<String, ServletHolder> servlet : servletRegistry) { - context.addServlet(servlet.getSecond(), servlet.getFirst()); - } - - httpServer.setHandler(context); - - try { - httpServer.start(); - } catch (final Exception e) { // yes, .start() throws "Exception" - LOG.severe("Fatal error starting http server.", e); - return; - } - LOG.fine("WebSocket server running. --------"); - } - - /** - * Stops this server. - */ - public void stopServer() throws IOException { - try { - httpServer.stop(); // yes, .stop() throws "Exception" - } catch (final Exception e) { - LOG.warning("Fatal error stopping http server.", e); - } - LOG.fine("server shutdown."); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,51 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module rename-to="wsold"> - <inherits name="com.google.gwt.i18n.I18N" /> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.resources.Resources" /> -  - <inherits name="com.google.gwt.user.Debug" /> -  - <set-property name="gwt.suppressNonStaticFinalFieldWarnings" - value="true" /> - <inherits name="com.calclab.suco.Suco" /> - <inherits name="org.ourproject.kune.platf.KunePlatform" /> - <inherits name="org.ourproject.kune.docs.KuneDocs" /> - <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> - <inherits name="org.ourproject.kune.wiki.KuneWiki" /> - <inherits name="org.ourproject.kune.chat.KuneChat" /> - <inherits name="org.ourproject.kune.gallery.KuneGallery" /> - <inherits name="org.xwiki.gwt.dom.DOM" /> - <inherits name="org.cobogw.gwt.user.User" /> -  - <inherits name="com.gwtext.GwtExt" /> - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> - <inherits name="com.gwtextux.GwtExtUx" /> - <inherits name="com.gwtextux.UploadDialog" /> - <inherits name="com.gwtextux.ToastWindow" /> - <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> - <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> - <script src="js/ext-ux-all-min.js" /> -  - <stylesheet src="css/all.css" /> - <inherits name="com.allen_sauer.gwt.log.gwt-log" /> - <extend-property name="log_level" values="DEBUG" /> - <set-property name="log_level" value="DEBUG" /> - <set-property name="log_DivLogger" value="DISABLED" /> - <set-property name="log_FirebugLogger" value="ENABLED" /> -  - <set-configuration-property name="log_pattern" - value="%d [%-5p] %m%n" /> -  -  - <set-property name="user.agent" value="gecko1_8" /> - - <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> -  - <entry-point class="org.ourproject.kune.app.client.OldKuneEntryPoint" /> -  - <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> -</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.blogs.server; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -20,13 +20,13 @@ package org.ourproject.kune.chat.server; import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatConnection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatConnection.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatConnection.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,24 +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.chat.server.managers; - -public interface ChatConnection { - -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,35 +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.chat.server.managers; - -import org.jivesoftware.smack.XMPPException; - -public class ChatException extends RuntimeException { - - private static final long serialVersionUID = 3777046831841032482L; - - public ChatException() { - super(""); - } - - public ChatException(final XMPPException cause) { - super(cause); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/Room.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/Room.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/Room.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,24 +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.chat.server.managers; - -public interface Room { - void setListener(RoomListener listener); -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomConfigurationDumper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomConfigurationDumper.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomConfigurationDumper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,76 +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.chat.server.managers; - -import java.util.Iterator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.muc.MultiUserChat; - -class RoomConfigurationDumper { - - private static final Log LOG = LogFactory.getLog(RoomConfigurationDumper.class); - - public static void showConfiguration(final Form form) { - for (Iterator<FormField> fields = form.getFields(); fields.hasNext();) { - FormField formField = fields.next(); - log("Field label: " + formField.getLabel()); - log("Field variable: " + formField.getVariable()); - log("Field type: " + formField.getType()); - log("Field desc: " + formField.getDescription()); - log("Field options: " + log(formField.getOptions())); - log("Field values: " + log(formField.getValues())); - log("Field end -------------------"); - } - } - - private static String log(final Iterator<?> options) { - String s = ""; - while (options.hasNext()) { - s += "| " + options.next().toString(); - } - return s; - } - - private static void log(final String string) { - LOG.debug(string); - } - - void configure2(final MultiUserChat muc) throws XMPPException { - Form form = muc.getConfigurationForm().createAnswerForm(); - form.setAnswer("muc#roomconfig_passwordprotectedroom", false); - // form.setAnswer("muc#roomconfig_roomname", - // mucRoomDialog.getRoomName()); - - form.setAnswer("muc#roomconfig_persistentroom", true); - - // List owners = new ArrayList(); - // owners.add(SparkManager.getSessionManager().getBareAddress()); - // form.setAnswer("muc#roomconfig_roomowners", owners); - - // new DataFormDialog(groupChat, form); - muc.sendConfigurationForm(form); - - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomListener.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/RoomListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,26 +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.chat.server.managers; - -public interface RoomListener { - - void onMessage(String from, String to, String body); - -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,41 +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.chat.server.managers; - -import org.jivesoftware.smack.XMPPConnection; - -public class XmppConnection implements ChatConnection { - private final XMPPConnection conn; - private final String userName; - - public XmppConnection(final String userName, final XMPPConnection conn) { - this.userName = userName; - this.conn = conn; - } - - public XMPPConnection getConn() { - return conn; - } - - public String getUserName() { - return userName; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,44 +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.chat.server.managers; - -import java.util.Collection; - -import org.jivesoftware.smack.RosterEntry; - -public interface XmppManager { - - Room createRoom(ChatConnection connection, String roomName, String ownerAlias); - - void destroyRoom(ChatConnection conn, String roomName); - - void disconnect(ChatConnection connection); - - Collection<RosterEntry> getRoster(ChatConnection connection); - - Room joinRoom(ChatConnection connection, String roomName, String alias); - - ChatConnection login(String userName, String password, String resource); - - void sendMessage(Room room, String message); - - void sendMessage(String userName, String message); - -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,193 +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.chat.server.managers; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jivesoftware.smack.Chat; -import org.jivesoftware.smack.ConnectionConfiguration; -import org.jivesoftware.smack.MessageListener; -import org.jivesoftware.smack.Roster; -import org.jivesoftware.smack.RosterEntry; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.muc.MultiUserChat; -import org.ourproject.kune.platf.server.properties.ChatProperties; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class XmppManagerDefault implements XmppManager { - public static final Log LOG = LogFactory.getLog(XmppManagerDefault.class); - - private final ChatProperties chatProperties; - - @Inject - public XmppManagerDefault(final ChatProperties chatProperties) { - this.chatProperties = chatProperties; - } - - public Room createRoom(final ChatConnection conn, final String roomName, final String alias) { - XmppConnection xConn = (XmppConnection) conn; - MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); - try { - muc.create(alias); - configure(muc); - XmppRoom room = new XmppRoom(muc, alias); - muc.addMessageListener(room); - return room; - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - public void destroyRoom(final ChatConnection conn, final String roomName) { - XmppConnection xConn = (XmppConnection) conn; - MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); - try { - muc.destroy("Room removed by kune server", ""); - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - public void disconnect(final ChatConnection connection) { - XmppConnection xConn = (XmppConnection) connection; - xConn.getConn().disconnect(); - - } - - public Collection<RosterEntry> getRoster(final ChatConnection conn) { - XmppConnection xConn = (XmppConnection) conn; - Roster roster = xConn.getConn().getRoster(); - return roster.getEntries(); - } - - public Room joinRoom(final ChatConnection connection, final String roomName, final String alias) { - XmppConnection xConn = (XmppConnection) connection; - MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); - try { - muc.join(alias); - // configure(muc); - XmppRoom room = new XmppRoom(muc, alias); - muc.addMessageListener(room); - return room; - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - public ChatConnection login(final String userName, final String password, final String resource) { - ConnectionConfiguration config = new ConnectionConfiguration(getServerName(), 5222); - XMPPConnection conn = new XMPPConnection(config); - try { - conn.connect(); - conn.login(userName, password, resource, true); - return new XmppConnection(userName, conn); - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - public void sendMessage(final Room room, final String body) { - XmppRoom xAccess = (XmppRoom) room; - MultiUserChat muc = xAccess.getMuc(); - Message message = muc.createMessage(); - message.setBody(body); - message.setFrom(muc.getNickname()); - try { - muc.sendMessage(body); - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - public void sendMessage(final String userName, final String text) { - ChatConnection connection = login(chatProperties.getAdminJID(), chatProperties.getAdminPasswd(), - "kuneserveradmin" + System.currentTimeMillis()); - XMPPConnection xmppConn = ((XmppConnection) connection).getConn(); - - String userJid = userName + "@" + chatProperties.getDomain(); - Chat newChat = xmppConn.getChatManager().createChat(userJid, new MessageListener() { - public void processMessage(final Chat arg0, final Message arg1) { - LOG.info("Sended message: " + text); - } - }); - try { - final Message message = new Message(); - message.setFrom(chatProperties.getDomain()); - message.setTo(userJid); - message.setBody(text); - newChat.sendMessage(message); - } catch (Exception e) { - LOG.error("Error Delivering xmpp message to " + userName); - } - xmppConn.disconnect(); - } - - private void configure(final MultiUserChat muc) throws XMPPException { - Form form = muc.getConfigurationForm(); - Form answer = form.createAnswerForm(); - - for (Iterator<FormField> fields = form.getFields(); fields.hasNext();) { - FormField field = fields.next(); - String type = field.getType(); - if (isVisible(type) && isNotEmpty(field) && isNotList(type)) { - List<String> values = new ArrayList<String>(); - for (Iterator<String> it = field.getValues(); it.hasNext();) { - values.add(it.next()); - } - answer.setAnswer(field.getVariable(), values); - } - } - answer.setAnswer("muc#roomconfig_persistentroom", true); - muc.sendConfigurationForm(answer); - } - - private String getRoomName(final String room) { - return room + "@" + chatProperties.getRoomHost(); - } - - private String getServerName() { - return chatProperties.getDomain(); - } - - private boolean isNotEmpty(final FormField field) { - return field.getVariable() != null; - } - - private boolean isNotList(final String type) { - return !FormField.TYPE_JID_MULTI.equals(type) && !FormField.TYPE_LIST_MULTI.equals(type) - && !FormField.TYPE_LIST_SINGLE.equals(type) && !isVisible(type); - } - - private boolean isVisible(final String type) { - return !FormField.TYPE_HIDDEN.equals(type); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,59 +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.chat.server.managers; - -import org.jivesoftware.smack.PacketListener; -import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.muc.MultiUserChat; - -public class XmppRoom implements Room, PacketListener { - private final String alias; - private RoomListener listener; - private final MultiUserChat muc; - - public XmppRoom(final MultiUserChat muc, final String alias) { - this.muc = muc; - this.alias = alias; - } - - public String getAlias() { - return alias; - } - - public void processPacket(final Packet packet) { - if (packet instanceof Message) { - processMessage((Message) packet); - } - } - - private void processMessage(final Message message) { - listener.onMessage(message.getFrom(), message.getTo(), message.getBody()); - } - - public void setListener(final RoomListener listener) { - this.listener = listener; - } - - public MultiUserChat getMuc() { - return muc; - } - -} Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -21,15 +21,15 @@ import java.util.Date; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,14 +19,14 @@ */ package org.ourproject.kune.gallery.server; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,42 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.client.services; - -public final class SearcherConstants { - - public final static String START_PARAM = "start"; - public final static String LIMIT_PARAM = "limit"; - public final static String QUERY_PARAM = "query"; - public final static String MIMETYPE_PARAM = "mimetype"; - public final static String MIMETYPE2_PARAM = "mimetype2"; - public final static String GROUP_PARAM = "group"; - - public final static String GROUP_DATA_PROXY_URL = "/ws/json/GroupJSONService/search"; - public final static String USER_DATA_PROXY_URL = "/ws/json/UserJSONService/search"; - public final static String CONTENT_DATA_PROXY_URL = "/ws/json/ContentJSONService/search"; - public final static String I18N_JSON_SERVICE = "/ws/json/I18nTranslationJSONService/search"; - public final static String I18N_JSON_SERVICE_TRANSLATED = "/ws/json/I18nTranslationJSONService/searchtranslated"; - - public final static String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; - public final static String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; - - private SearcherConstants() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,294 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import java.util.ArrayList; -import java.util.List; - -import org.ourproject.kune.platf.server.tool.ToolSimple; -import org.ourproject.kune.platf.server.users.UserInfo; - -import cc.kune.domain.ExtMediaDescrip; -import cc.kune.domain.I18nCountry; -import cc.kune.domain.I18nLanguage; -import cc.kune.domain.License; - -public class InitData { - - private String siteUrl; - private List<License> licenses; - private List<I18nLanguage> languages; - private List<I18nCountry> countries; - private String[] timezones; - private UserInfo userInfo; - private String chatHttpBase; - private String siteDomain; - private String chatDomain; - private String chatRoomHost; - private License defaultLicense; - private String currentCCversion; - private String defaultWsTheme; - private String[] wsThemes; - private String siteLogoUrl; - private String galleryPermittedExtensions; - private String maxFileSizeInMb; - private int imgResizewidth; - private int imgThumbsize; - private int imgCropsize; - private int imgIconsize; - private ArrayList<ToolSimple> userTools; - private ArrayList<ToolSimple> groupTools; - private List<ExtMediaDescrip> extMediaDescrips; - - private String flvEmbedObject; - - private String oggEmbedObject; - - private String mp3EmbedObject; - - private String aviEmbedObject; - - public String getAviEmbedObject() { - return aviEmbedObject; - } - - public String getChatDomain() { - return chatDomain; - } - - public String getChatHttpBase() { - return chatHttpBase; - } - - public String getChatRoomHost() { - return chatRoomHost; - } - - public List<I18nCountry> getCountries() { - return countries; - } - - public String getCurrentCCversion() { - return currentCCversion; - } - - public License getDefaultLicense() { - return defaultLicense; - } - - public String getDefaultWsTheme() { - return defaultWsTheme; - } - - public List<ExtMediaDescrip> getExtMediaDescrips() { - return extMediaDescrips; - } - - public String getFlvEmbedObject() { - return flvEmbedObject; - } - - public String getGalleryPermittedExtensions() { - return galleryPermittedExtensions; - } - - public ArrayList<ToolSimple> getGroupTools() { - return groupTools; - } - - public int getImgCropsize() { - return imgCropsize; - } - - public int getImgIconsize() { - return imgIconsize; - } - - public int getImgResizewidth() { - return imgResizewidth; - } - - public int getImgThumbsize() { - return imgThumbsize; - } - - public List<I18nLanguage> getLanguages() { - return languages; - } - - public List<License> getLicenses() { - return licenses; - } - - public String getMaxFileSizeInMb() { - return maxFileSizeInMb; - } - - public String getMp3EmbedObject() { - return mp3EmbedObject; - } - - public String getOggEmbedObject() { - return oggEmbedObject; - } - - @Deprecated - public String getSiteDomain() { - return siteDomain; - } - - public String getSiteLogoUrl() { - return siteLogoUrl; - } - - public String getSiteUrl() { - return siteUrl; - } - - public String[] getTimezones() { - return timezones; - } - - public UserInfo getUserInfo() { - return userInfo; - } - - public ArrayList<ToolSimple> getUserTools() { - return userTools; - } - - public String[] getWsThemes() { - return wsThemes; - } - - public void setAviEmbedObject(final String aviEmbedObject) { - this.aviEmbedObject = aviEmbedObject; - } - - public void setChatDomain(final String chatDomain) { - this.chatDomain = chatDomain; - } - - public void setChatHttpBase(final String chatHttpBase) { - this.chatHttpBase = chatHttpBase; - } - - public void setChatRoomHost(final String chatRoomHost) { - this.chatRoomHost = chatRoomHost; - } - - public void setCountries(final List<I18nCountry> countries) { - this.countries = countries; - } - - public void setCurrentCCversion(final String currentCCversion) { - this.currentCCversion = currentCCversion; - } - - public void setDefaultLicense(final License defaultLicense) { - this.defaultLicense = defaultLicense; - } - - public void setDefaultWsTheme(final String defaultWsTheme) { - this.defaultWsTheme = defaultWsTheme; - } - - public void setExtMediaDescrips(final List<ExtMediaDescrip> extMediaDescrips) { - this.extMediaDescrips = extMediaDescrips; - } - - public void setFlvEmbedObject(final String flvEmbedObject) { - this.flvEmbedObject = flvEmbedObject; - } - - public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { - this.galleryPermittedExtensions = galleryPermittedExtensions; - } - - public void setGroupTools(final ArrayList<ToolSimple> groupTools) { - this.groupTools = groupTools; - } - - public void setImgCropsize(final int imgCropsize) { - this.imgCropsize = imgCropsize; - } - - public void setImgIconsize(final int imgIconsize) { - this.imgIconsize = imgIconsize; - } - - public void setImgResizewidth(final int imgResizewidth) { - this.imgResizewidth = imgResizewidth; - } - - public void setImgThumbsize(final int imgThumbsize) { - this.imgThumbsize = imgThumbsize; - } - - public void setLanguages(final List<I18nLanguage> languages) { - this.languages = languages; - } - - public void setLicenses(final List<License> licenses) { - this.licenses = licenses; - } - - public void setMaxFileSizeInMb(final String maxFileSizeInMb) { - this.maxFileSizeInMb = maxFileSizeInMb; - } - - public void setMp3EmbedObject(final String mp3EmbedObject) { - this.mp3EmbedObject = mp3EmbedObject; - } - - public void setOggEmbedObject(final String oggEmbedObject) { - this.oggEmbedObject = oggEmbedObject; - } - - @Deprecated - public void setSiteDomain(final String siteDomain) { - this.siteDomain = siteDomain; - } - - public void setSiteLogoUrl(final String siteLogoUrl) { - this.siteLogoUrl = siteLogoUrl; - } - - public void setSiteUrl(final String siteUrl) { - this.siteUrl = siteUrl; - } - - public void setTimezones(final String[] timezones) { - this.timezones = timezones; - } - - public void setUserInfo(final UserInfo currentUserInfo) { - this.userInfo = currentUserInfo; - } - - public void setUserTools(final ArrayList<ToolSimple> userTools) { - this.userTools = userTools; - } - - public void setWsThemes(final String[] wsThemes) { - this.wsThemes = wsThemes; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,44 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import org.ourproject.kune.platf.server.init.DatabaseInitializer; - -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.google.inject.persist.PersistService; - -@Singleton -public class KunePersistenceService { - @Inject - DatabaseInitializer databaseInitializer; - @Inject - PersistService persistenceService; - - public void start() { - try { - persistenceService.start(); - databaseInitializer.initConditional(); - } catch (final Exception e) { - throw new ServerException("Error starting persistence service", e); - } - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,123 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class LoggerMethodInterceptor implements MethodInterceptor { - - private static final Log LOG = LogFactory.getLog(LoggerMethodInterceptor.class); - private final boolean simplifyNames; - - public LoggerMethodInterceptor() { - this(true); - } - - public LoggerMethodInterceptor(final boolean simplifyNames) { - this.simplifyNames = simplifyNames; - } - - public Object invoke(final MethodInvocation invocation) throws Throwable { - logInvocation(invocation); - try { - final Object result = invocation.proceed(); - logResult(invocation, result); - return result; - } catch (Exception e) { - logException(invocation, e); - throw e; - } - } - - protected void log(final String output) { - LOG.debug(output); - } - - protected void logException(final MethodInvocation invocation, final Throwable e) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - buffer.append(" EXCEPTION => "); - buffer.append(e.toString()); - log(buffer.toString()); - } - - protected void logInvocation(final MethodInvocation invocation) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - addMethodParameters(invocation, buffer); - log(buffer.toString()); - } - - protected void logResult(final MethodInvocation invocation, final Object result) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - if (invocation.getMethod().getReturnType() != null) { - buffer.append(" => "); - buffer.append(getValue(result)); - } - log(buffer.toString()); - } - - private void addMethodName(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append("."); - buffer.append(invocation.getMethod().getName()); - } - - private void addMethodParameters(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append("("); - Object[] arguments = invocation.getArguments(); - for (Object arg : arguments) { - buffer.append(getValue(arg)).append(", "); - } - buffer.append(")"); - } - - private void addTargetClassName(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append(getSimpleName(invocation.getThis().getClass())); - } - - private StringBuffer createBuffer(final MethodInvocation invocation) { - StringBuffer buffer = new StringBuffer(); - addTargetClassName(invocation, buffer); - return buffer; - } - - private String getSimpleName(final Class<? extends Object> type) { - String simpleName = type.getSimpleName(); - if (simplifyNames == true) { - int index = simpleName.indexOf('$'); - if (index > 0) { - simpleName = simpleName.substring(0, index); - } - } - return simpleName; - } - - private String getValue(final Object result) { - if (result == null) { - return "null"; - } else { - return result.toString(); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,78 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; - -import com.google.inject.Inject; -import com.google.inject.Injector; - -/* - * See: - * http://tembrel.blogspot.com/2007/09/matcher-and-methodinterceptor-for-dwr.h… - * - */ - -public final class OutermostCallInterceptor implements MethodInterceptor { - /** - * Decorates a MethodInterceptor so that only the outermost invocation using - * that interceptor will be intercepted and nested invocations willbe - * ignored. - */ - public static MethodInterceptor outermostCall(final MethodInterceptor interceptor) { - return new OutermostCallInterceptor(interceptor); - } - - private final MethodInterceptor interceptor; - - @SuppressWarnings("rawtypes") - private final ThreadLocal count = new ThreadLocal() { - @Override - protected Integer initialValue() { - return 0; - } - }; - - private OutermostCallInterceptor(final MethodInterceptor interceptor) { - this.interceptor = interceptor; - } - - @SuppressWarnings("unchecked") - public Object invoke(final MethodInvocation invocation) throws Throwable { - final int savedCount = (Integer) count.get(); - count.set(savedCount + 1); - try { - if ((Integer) count.get() > 1) { - return invocation.proceed(); - } else { - return interceptor.invoke(invocation); - } - } finally { - count.set(savedCount); - } - } - - /** Ensure underlying interceptor is injected. */ - @Inject - void injectInterceptor(final Injector injector) { - injector.injectMembers(interceptor); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,181 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import static org.ourproject.kune.platf.server.OutermostCallInterceptor.outermostCall; - -import org.ourproject.kune.app.server.AbstractExtendedModule; -import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.chat.server.managers.XmppManagerDefault; -import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.access.AccessRightsServiceDefault; -import org.ourproject.kune.platf.server.access.AccessService; -import org.ourproject.kune.platf.server.access.AccessServiceDefault; -import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.access.FinderServiceDefault; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptor; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptor; -import org.ourproject.kune.platf.server.auth.SessionService; -import org.ourproject.kune.platf.server.auth.SessionServiceDefault; -import org.ourproject.kune.platf.server.content.CommentManager; -import org.ourproject.kune.platf.server.content.CommentManagerDefault; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContainerManagerDefault; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentManagerDefault; -import org.ourproject.kune.platf.server.content.CreationService; -import org.ourproject.kune.platf.server.content.CreationServiceDefault; -import org.ourproject.kune.platf.server.i18n.I18nTranslationServiceDefault; -import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; -import org.ourproject.kune.platf.server.manager.FileManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.manager.RateManager; -import org.ourproject.kune.platf.server.manager.SocialNetworkManager; -import org.ourproject.kune.platf.server.manager.TagManager; -import org.ourproject.kune.platf.server.manager.TagUserContentManager; -import org.ourproject.kune.platf.server.manager.TagUserContentManagerDefault; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.manager.file.EntityLogoDownloadManager; -import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManager; -import org.ourproject.kune.platf.server.manager.file.FileDownloadManager; -import org.ourproject.kune.platf.server.manager.file.FileManagerDefault; -import org.ourproject.kune.platf.server.manager.file.FileUploadManager; -import org.ourproject.kune.platf.server.manager.impl.ExtMediaDescripManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.GroupManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.I18nCountryManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.I18nLanguageManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.I18nTranslationManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.LicenseManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.RateManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.TagManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.ToolConfigurationManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.UserManagerDefault; -import org.ourproject.kune.platf.server.mapper.DozerMapper; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.platf.server.properties.KuneProperties; -import org.ourproject.kune.platf.server.properties.KunePropertiesDefault; -import org.ourproject.kune.platf.server.rpc.ContentRPC; -import org.ourproject.kune.platf.server.rpc.GroupRPC; -import org.ourproject.kune.platf.server.rpc.I18nRPC; -import org.ourproject.kune.platf.server.rpc.SiteRPC; -import org.ourproject.kune.platf.server.rpc.SocialNetworkRPC; -import org.ourproject.kune.platf.server.rpc.UserRPC; -import org.ourproject.kune.platf.server.state.StateService; -import org.ourproject.kune.platf.server.state.StateServiceDefault; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.users.UserInfoService; -import org.ourproject.kune.platf.server.users.UserInfoServiceDefault; - -import cc.kune.core.client.rpcservices.ContentService; -import cc.kune.core.client.rpcservices.GroupService; -import cc.kune.core.client.rpcservices.I18nService; -import cc.kune.core.client.rpcservices.SiteService; -import cc.kune.core.client.rpcservices.SocialNetworkService; -import cc.kune.core.client.rpcservices.UserService; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.domain.Comment; -import cc.kune.domain.SocialNetwork; - -import com.google.inject.matcher.Matchers; - -public class PlatformServerModule extends AbstractExtendedModule { - private void bindFinders() { - // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Inje… - // (...) Just-in-time bindings created for child injectors will be - // created in an ancestor injector whenever possible (...) - // (This fails with finders, then we make explicit bindings) - - bind(SocialNetwork.class); - bind(Comment.class); - } - - private void bindManagers() { - bind(UserManager.class).to(UserManagerDefault.class); - bind(GroupManager.class).to(GroupManagerDefault.class); - bind(ContentManager.class).to(ContentManagerDefault.class); - bind(ToolConfigurationManager.class).to(ToolConfigurationManagerDefault.class); - bind(ContainerManager.class).to(ContainerManagerDefault.class); - bind(LicenseManager.class).to(LicenseManagerDefault.class); - bind(SocialNetworkManager.class).to(SocialNetworkManagerDefault.class); - bind(XmppManager.class).to(XmppManagerDefault.class); - bind(RateManager.class).to(RateManagerDefault.class); - bind(I18nCountryManager.class).to(I18nCountryManagerDefault.class); - bind(I18nLanguageManager.class).to(I18nLanguageManagerDefault.class); - bind(I18nTranslationManager.class).to(I18nTranslationManagerDefault.class); - bind(TagManager.class).to(TagManagerDefault.class); - bind(TagUserContentManager.class).to(TagUserContentManagerDefault.class); - bind(CommentManager.class).to(CommentManagerDefault.class); - bind(FileManager.class).to(FileManagerDefault.class); - bind(ExtMediaDescripManager.class).to(ExtMediaDescripManagerDefault.class); - } - - private void bindRPC() { - bind(SiteService.class).to(SiteRPC.class); - bind(GroupService.class).to(GroupRPC.class); - bind(ContentService.class).to(ContentRPC.class); - bind(UserService.class).to(UserRPC.class); - bind(SocialNetworkService.class).to(SocialNetworkRPC.class); - bind(I18nService.class).to(I18nRPC.class); - } - - private void bindServices() { - bind(UserInfoService.class).to(UserInfoServiceDefault.class); - bind(CreationService.class).to(CreationServiceDefault.class); - bind(AccessRightsService.class).to(AccessRightsServiceDefault.class); - bind(AccessService.class).to(AccessServiceDefault.class); - bind(FinderService.class).to(FinderServiceDefault.class); - bind(StateService.class).to(StateServiceDefault.class); - bind(I18nTranslationService.class).to(I18nTranslationServiceDefault.class); - bind(SessionService.class).to(SessionServiceDefault.class); - } - - @Override - protected void configure() { - // install(PersistService.usingJpa().across(UnitOfWork.TRANSACTION).buildModule()); - bind(KunePersistenceService.class); - - bindFinders(); - bindManagers(); - bindRPC(); - bindServices(); - bind(KuneProperties.class).to(KunePropertiesDefault.class); - bind(Mapper.class).to(DozerMapper.class); - bind(ServerToolRegistry.class); - // bind(FileUploadManager.class).in(ServletScopes.REQUEST); - bind(FileUploadManager.class); - bind(FileDownloadManager.class); - bind(EntityLogoUploadManager.class); - bind(EntityLogoDownloadManager.class); - - bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authenticated.class), - outermostCall(new AuthenticatedMethodInterceptor())); - bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authorizated.class), - outermostCall(new AuthorizatedMethodInterceptor())); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/ServerException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/ServerException.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/ServerException.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,50 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class ServerException extends RuntimeException { - - private static final long serialVersionUID = 2028618233098694418L; - - private static final Log LOG = LogFactory.getLog(ServerException.class); - - public ServerException() { - super(); - } - - public ServerException(final String text) { - super(text); - LOG.error(text); - } - - public ServerException(final String text, final Throwable cause) { - super(text, cause); - LOG.error(text, cause); - } - - public ServerException(final Throwable cause) { - super(cause); - LOG.error("ServerManagerException", cause); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,74 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import org.ourproject.kune.platf.server.manager.UserManager; - -import cc.kune.domain.User; - -import com.google.inject.Inject; -import com.google.inject.servlet.SessionScoped; - -@SessionScoped -public class UserSession { - private String userHash; - private Long userId; - private final UserManager manager; - - @Inject - public UserSession(final UserManager manager) { - this.manager = manager; - } - - public String getHash() { - return userHash; - } - - public User getUser() { - return manager.find(userId); - } - - public boolean isUserLoggedIn() { - return userId != null; - } - - public boolean isUserNotLoggedIn() { - return !isUserLoggedIn(); - } - - public void login(final User user, final String newUserHash) { - setUser(user); - setHash(newUserHash); - } - - public void logout() { - userId = null; - userHash = null; - } - - private void setHash(final String hash) { - this.userHash = hash; - } - - private void setUser(final User user) { - userId = user.getId(); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,28 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.List; - -import cc.kune.domain.ExtMediaDescrip; - -public interface ExtMediaDescripManager extends Manager<ExtMediaDescrip, Long> { - List<ExtMediaDescrip> getAll(); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,54 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.io.File; -import java.io.IOException; - -public interface FileManager { - - /** - * Create a new file adding a numeric sequence if the file already exists - * - * @param dir - * the directory (use File.separator for dir delimiters) - * @param fileName - * (the new file name) - * @return if 'file.txt' exists it creates 'file 1.txt' and if 'file 1.txt' - * exists it creates 'file 2.txt' and so on - * @throws IOException - */ - File createFileWithSequentialName(String dir, String fileName) throws IOException; - - /** - * @param dir - * the directory (use File.separator for dir delimiters) - * @return true if and only if the directory was created, along with all - * necessary parent directories; false otherwise - */ - boolean mkdir(String dir); - - /** - * @param dir - * the directory (use File.separator for dir delimiters) - */ - boolean rmdir(String dir) throws IOException; - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,77 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.List; - -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -import cc.kune.core.client.errors.AccessViolationException; -import cc.kune.core.client.errors.EmailAddressInUseException; -import cc.kune.core.client.errors.GroupNameInUseException; -import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.User; - -public interface GroupManager extends Manager<Group, Long> { - - void changeDefLicense(User user, Group group, String licenseShortName); - - void changeWsTheme(User user, Group group, String theme) throws AccessViolationException; - - void clearGroupBackImage(Group group); - - Group createGroup(Group group, User user) throws GroupNameInUseException, UserMustBeLoggedException; - - Group createUserGroup(User user) throws GroupNameInUseException, EmailAddressInUseException; - - Group createUserGroup(User user, boolean wantPersonalHomepage) throws GroupNameInUseException, - EmailAddressInUseException; - - List<Group> findAdminInGroups(Long groupId); - - Group findByShortName(String groupName); - - List<Group> findCollabInGroups(Long groupId); - - List<String> findEnabledTools(Long id); - - /** - * IMPORTANT: returns null if userId is null - * - * @param userId - * @return - */ - Group getGroupOfUserWithId(Long userId); - - Group getSiteDefaultGroup(); - - SearchResult<Group> search(String search); - - SearchResult<Group> search(String search, Integer firstResult, Integer maxResults); - - void setDefaultContent(String groupShortName, Content content); - - void setGroupBackImage(Group group, Content content); - - void setToolEnabled(User userLogged, String groupShortName, String toolName, boolean enabled); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.List; - -import cc.kune.domain.I18nCountry; - -public interface I18nCountryManager extends Manager<I18nCountry, Long> { - - List<I18nCountry> getAll(); - - I18nCountry findByCode(String country); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.List; - -import cc.kune.domain.I18nLanguage; - -public interface I18nLanguageManager extends Manager<I18nLanguage, Long> { - - I18nLanguage findByCode(String language); - - List<I18nLanguage> getAll(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.HashMap; -import java.util.List; - -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -import cc.kune.core.client.errors.DefaultException; -import cc.kune.domain.I18nTranslation; - -public interface I18nTranslationManager extends Manager<I18nTranslation, Long> { - - HashMap<String, String> getLexicon(String language); - - List<I18nTranslation> getTranslatedLexicon(String language); - - SearchResult<I18nTranslation> getTranslatedLexicon(String language, Integer firstResult, Integer maxResults); - - String getTranslation(String language, String text); - - String getTranslation(String language, String text, Integer arg); - - String getTranslation(String language, String text, String arg); - - List<I18nTranslation> getUntranslatedLexicon(String language); - - SearchResult<I18nTranslation> getUntranslatedLexicon(String language, Integer firstResult, Integer maxResults); - - String setTranslation(String id, String translation) throws DefaultException; - - void setTranslation(String language, String text, String translation); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,43 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.List; - -import cc.kune.domain.License; -import cc.kune.domain.finders.LicenseFinder; - -public interface LicenseManager { - - License findByShortName(String licenseDef); - - List<License> getAll(); - - List<License> getCC(); - - License getDefLicense(); - - List<License> getNotCC(); - - License persist(final License license); - - void setLicenseFinder(final LicenseFinder licenseFinder); - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,48 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import org.apache.lucene.search.BooleanClause; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -public interface Manager<T, X> { - - void clear(); - - T find(X id); - - T merge(T entity); - - T persist(T entity); - - void reIndex(); - - void remove(T entity); - - SearchResult<T> search(final String query, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults); - - SearchResult<T> search(final String[] queries, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults); - - SearchResult<T> search(final String[] queries, final String[] fields, final Integer firstResult, - final Integer maxResults); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,35 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - - -import cc.kune.domain.Content; -import cc.kune.domain.Rate; -import cc.kune.domain.User; - -public interface RateManager extends Manager<Rate, Long> { - - Rate find(User user, Content content); - - Double getRateAvg(Content content); - - Long getRateByUsers(Content content); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,61 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - - - -import cc.kune.core.client.errors.AccessViolationException; -import cc.kune.core.client.errors.DefaultException; -import cc.kune.core.shared.dto.SocialNetworkRequestResult; -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> { - - void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; - - void addGroupToAdmins(User userLogged, Group group, Group inGroup) throws DefaultException; - - void addGroupToCollabs(User userLogged, Group group, Group inGroup) throws DefaultException; - - void addGroupToViewers(User userLogged, Group group, Group inGroup) throws DefaultException; - - void deleteMember(User userLogged, Group group, Group inGroup) throws DefaultException, AccessViolationException; - - void denyJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; - - ParticipationData findParticipation(User user, Group group) throws DefaultException; - - SocialNetwork get(User userLogged, Group group) throws DefaultException; - - SocialNetworkData getSocialNetworkData(User userLogged, Group group); - - SocialNetworkRequestResult requestToJoin(User user, Group inGroup) throws DefaultException; - - void setAdminAsCollab(User userLogged, Group group, Group inGroup) throws DefaultException; - - void setCollabAsAdmin(User userLogged, Group group, Group inGroup) throws DefaultException; - - void unJoinGroup(Group groupToUnJoin, Group inGroup) throws DefaultException; - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,28 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import cc.kune.domain.Tag; - -public interface TagManager extends Manager<Tag, Long> { - - Tag findByTagName(String tag); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import cc.kune.core.shared.domain.TagCloudResult; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.TagUserContent; -import cc.kune.domain.User; - -public interface TagUserContentManager extends Manager<TagUserContent, Long> { - - TagCloudResult getTagCloudResultByGroup(Group group); - - String getTagsAsString(User user, Content content); - - void remove(User user, Content content); - - void setTags(User user, Content content, String tags); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,127 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; - -import org.ourproject.kune.platf.server.manager.impl.DefaultManager; - -import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.shared.domain.TagCloudResult; -import cc.kune.core.shared.domain.TagCount; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.Tag; -import cc.kune.domain.TagUserContent; -import cc.kune.domain.User; -import cc.kune.domain.finders.TagUserContentFinder; - -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; - -@Singleton -public class TagUserContentManagerDefault extends DefaultManager<TagUserContent, Long> implements TagUserContentManager { - private final TagUserContentFinder finder; - private final Provider<EntityManager> provider; - private final TagManager tagManager; - - @Inject - public TagUserContentManagerDefault(final Provider<EntityManager> provider, final TagManager tagManager, - final TagUserContentFinder finder) { - super(provider, TagUserContent.class); - this.provider = provider; - this.tagManager = tagManager; - this.finder = finder; - } - - List<Tag> find(final User user, final Content content) { - return finder.findTags(user, content); - } - - private int getMaxCount(final Group group) { - return finder.getMaxGrouped(group).intValue(); - } - - private int getMinCount(final Group group) { - return finder.getMinGrouped(group).intValue(); - } - - private List<TagCount> getSummaryByGroup(final Group group) { - return finder.getTagsGroups(group); - } - - @Override - public TagCloudResult getTagCloudResultByGroup(final Group group) { - try { - return new TagCloudResult(getSummaryByGroup(group), getMaxCount(group), getMinCount(group)); - } catch (final NoResultException e) { - return new TagCloudResult(); - } - } - - @Override - public String getTagsAsString(final User user, final Content content) { - final StringBuffer tagConcatenated = new StringBuffer(); - if (user.getId() != null) { - // FIXME: User must be persisted (this fails on tests) - final List<Tag> tags = find(user, content); - for (final Tag tag : tags) { - tagConcatenated.append(" ").append(tag.getName()); - } - } - return tagConcatenated.toString().replaceFirst(" ", ""); - } - - @Override - public void remove(final User user, final Content content) { - for (final TagUserContent item : finder.find(user, content)) { - provider.get().remove(item); - } - } - - @Override - public void setTags(final User user, final Content content, final String tags) { - final ArrayList<String> tagsStripped = TextUtils.splitTags(tags); - final ArrayList<Tag> tagList = new ArrayList<Tag>(); - - for (final String tagString : tagsStripped) { - Tag tag; - try { - tag = tagManager.findByTagName(tagString); - } catch (final NoResultException e) { - tag = new Tag(tagString); - tagManager.persist(tag); - } - if (!tagList.contains(tag)) { - tagList.add(tag); - } - } - remove(user, content); - for (final Tag tag : tagList) { - final TagUserContent tagUserContent = new TagUserContent(tag, user, content); - persist(tagUserContent); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import cc.kune.domain.ToolConfiguration; - -public interface ToolConfigurationManager extends Manager<ToolConfiguration, Long> { - ToolConfiguration persist(ToolConfiguration config); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,69 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.waveprotocol.box.server.authentication.PasswordDigest; - -import cc.kune.core.client.errors.I18nNotFoundException; -import cc.kune.domain.User; -import cc.kune.domain.utils.UserBuddiesData; - -public interface UserManager { - /** - * CreateUser new method with language country and timezone params - * - * @param shortName - * @param longName - * @param email - * @param passwd - * @param timezone - * @param country - * @param language - * @param timezone - * @return User - * @throws I18nNotFoundException - */ - User createUser(String shortName, String longName, String email, String passwd, String language, String country, - String timezone) throws I18nNotFoundException; - - void createWaveAccount(String shortName, PasswordDigest passwdDigest); - - /** - * IMPORTANT: if userId == null, it returns User.UNKNOWN_USER - * - * @param userId - * @return - */ - User find(Long userId); - - User findByShortname(String shortName); - - UserBuddiesData getUserBuddies(String shortName); - - User login(String nickOrEmail, String passwd); - - void reIndex(); - - SearchResult<User> search(String search); - - SearchResult<User> search(String search, Integer firstResult, Integer maxResults); - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack; - -public interface ContainerListener { - void start(); - - void stop(); -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/Rack.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/Rack.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/Rack.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,98 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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/>. - * - */ -/* - * Copyright (C) 2007-2011 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.rack; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.rack.dock.Dock; -import org.ourproject.kune.rack.dock.RequestMatcher; - -import com.google.inject.Module; - -public class Rack { - public static final Log LOG = LogFactory.getLog(Rack.class); - private final ArrayList<Dock> docks; - private final ArrayList<Module> modules; - private final ArrayList<RequestMatcher> excludes; - private final ArrayList<Class<? extends ContainerListener>> listeners; - - public Rack() { - this.docks = new ArrayList<Dock>(); - this.modules = new ArrayList<Module>(); - this.excludes = new ArrayList<RequestMatcher>(); - this.listeners = new ArrayList<Class<? extends ContainerListener>>(); - } - - public void add(final Class<? extends ContainerListener> listenerType) { - listeners.add(listenerType); - - } - - public void add(final Dock dock) { - LOG.debug("INSTALLING: " + dock.toString()); - docks.add(dock); - } - - public void add(final Module module) { - modules.add(module); - } - - public void addExclusion(RequestMatcher matcher) { - excludes.add(matcher); - } - - public List<Dock> getDocks() { - return docks; - } - - public List<RequestMatcher> getExcludes() { - return excludes; - } - - public List<Module> getGuiceModules() { - return modules; - } - - public List<Class<? extends ContainerListener>> getListeners() { - return listeners; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,120 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack; - -import javax.servlet.Filter; -import javax.servlet.http.HttpServlet; - -import org.ourproject.kune.rack.dock.RegexDock; -import org.ourproject.kune.rack.dock.RegexMatcher; -import org.ourproject.kune.rack.filters.gwts.GWTServiceFilter; -import org.ourproject.kune.rack.filters.rest.RESTServiceFilter; -import org.ourproject.kune.rack.filters.servlet.ServletServiceFilter; - -import com.google.gwt.user.client.rpc.RemoteService; -import com.google.inject.Module; - -public class RackBuilder { - - public static class RackDockBuilder { - private final String regex; - private final Rack rack; - - public RackDockBuilder(final Rack rack, final String regex) { - this.rack = rack; - this.regex = regex; - } - - public RackDockBuilder install(final Filter... filters) { - for (final Filter filter : filters) { - final RegexDock dock = new RegexDock(regex); - dock.setFilter(filter); - rack.add(dock); - } - return this; - } - - } - - private final Rack rack; - - public RackBuilder() { - this.rack = new Rack(); - } - - public RackBuilder add(final Class<? extends ContainerListener> listener) { - rack.add(listener); - return this; - } - - public RackDockBuilder at(final String regex) { - return new RackDockBuilder(rack, regex); - } - - public RackBuilder exclude(final String... excludes) { - for (final String exclude : excludes) { - rack.addExclusion(new RegexMatcher(exclude)); - } - return this; - } - - public Rack getRack() { - return rack; - } - - public RackBuilder installGWTServices(final String root, final Class<? extends RemoteService>... serviceClasses) { - - for (final Class<? extends RemoteService> serviceClass : serviceClasses) { - final String simpleName = serviceClass.getSimpleName(); - final RegexDock dock = new RegexDock(root + simpleName + "$"); - dock.setFilter(new GWTServiceFilter(serviceClass)); - rack.add(dock); - } - - return this; - } - - public void installRESTServices(final String root, final Class<?>... serviceClasses) { - for (final Class<?> serviceClass : serviceClasses) { - final String simpleName = serviceClass.getSimpleName(); - final String pattern = root + simpleName + "/(.*)$"; - final RegexDock dock = new RegexDock(pattern); - dock.setFilter(new RESTServiceFilter(pattern, serviceClass)); - rack.add(dock); - } - } - - public void installServlet(final String root, final Class<? extends HttpServlet>... servletClasses) { - for (final Class<? extends HttpServlet> servletClass : servletClasses) { - final String simpleName = servletClass.getSimpleName(); - final RegexDock dock = new RegexDock(root + simpleName + "$"); - dock.setFilter(new ServletServiceFilter(servletClass)); - rack.add(dock); - } - - } - - public RackBuilder use(final Module... list) { - for (final Module m : list) { - rack.add(m); - } - return this; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/RackHelper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackHelper.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/RackHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,57 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; - -public final class RackHelper { - public static String buildForwardString(final ServletRequest request, final String forward) { - String parameters = RackHelper.extractParameters(request); - return new StringBuilder(forward).append(parameters).toString(); - } - - public static String extractParameters(final ServletRequest request) { - HttpServletRequest httpServletRequest = (HttpServletRequest) request; - String uri = httpServletRequest.getRequestURI(); - int index = uri.indexOf('?'); - if (index > 0) { - return uri.substring(index); - } else { - return ""; - } - } - - public static String getRelativeURL(final ServletRequest request) { - HttpServletRequest req = (HttpServletRequest) request; - String contextPath = req.getContextPath(); - String uri = req.getRequestURI(); - return uri.substring(contextPath.length()); - } - - public static String getURI(final ServletRequest request) { - HttpServletRequest httpServletRequest = (HttpServletRequest) request; - return httpServletRequest.getRequestURI(); - } - - private RackHelper() { - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/RackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackModule.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/RackModule.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,25 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack; - -public interface RackModule { - void configure(RackBuilder builder); - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,176 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack; - -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.server.ServerException; -import org.ourproject.kune.rack.dock.Dock; -import org.ourproject.kune.rack.dock.RequestMatcher; -import org.waveprotocol.box.server.rpc.ServerRpcProvider; - -import com.google.inject.Injector; - -public class RackServletFilter implements Filter { - public static class DockChain implements FilterChain { - private final Iterator<Dock> iterator; - - public DockChain(final Iterator<Dock> iterator) { - this.iterator = iterator; - } - - @Override - public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException, - ServletException { - Dock dock = null; - boolean matched = false; - - final String relative = RackHelper.getRelativeURL(request); - while (!matched && iterator.hasNext()) { - dock = iterator.next(); - matched = dock.matches(relative); - } - if (matched) { - execute(dock.getFilter(), request, response); - } - } - - private void execute(final Filter filter, final ServletRequest request, final ServletResponse response) - throws IOException, ServletException { - // log.debug("RACK FILTER: " + filter.getClass().getSimpleName()); - filter.doFilter(request, response, this); - } - } - - public static final String INJECTOR_ATTRIBUTE = Injector.class.getName() + "Child"; - public static final String INJECTOR_PARENT_ATTRIBUTE = ServerRpcProvider.INJECTOR_ATTRIBUTE; - private static final Log LOG = LogFactory.getLog(RackServletFilter.class); - private static final String MODULE_PARAMETER = RackModule.class.getName(); - private List<Dock> docks; - - private List<RequestMatcher> excludes; - - @Override - public void destroy() { - for (final Dock dock : docks) { - dock.getFilter().destroy(); - } - } - - @Override - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - - final String relative = RackHelper.getRelativeURL(request); - for (final RequestMatcher matcher : excludes) { - if (matcher.matches(relative)) { - LOG.info("Excluded (from Guice): " + relative); - chain.doFilter(request, response); - return; - } - } - LOG.debug("REQUEST: " + relative); - final FilterChain newChain = new DockChain(docks.iterator()); - newChain.doFilter(request, response); - } - - private RackModule getModule(final FilterConfig filterConfig) { - final String moduleName = getModuleName(filterConfig); - try { - final Class<?> clazz = Class.forName(moduleName); - final RackModule module = (RackModule) clazz.newInstance(); - return module; - } catch (final Exception e) { - throw new ServerException("couldn't instantiate the rack module", e); - } - } - - private String getModuleName(final FilterConfig filterConfig) { - final String moduleName = filterConfig.getInitParameter(MODULE_PARAMETER); - if (moduleName == null) { - throw new ServerException("Rack module name can't be null!"); - } - return moduleName; - } - - @Override - public void init(final FilterConfig filterConfig) throws ServletException { - LOG.debug("INITIALIZING RackServletFilter..."); - final RackModule module = getModule(filterConfig); - final RackBuilder builder = new RackBuilder(); - module.configure(builder); - final Rack rack = builder.getRack(); - // final WaveStarter waveStarter = new WaveStarter(); - // final Injector waveChildInjector = waveStarter.runMain(); - final Injector waveChildInjector = (Injector) filterConfig.getServletContext().getAttribute( - INJECTOR_PARENT_ATTRIBUTE); - final Injector kuneChildInjector = installInjector(filterConfig, rack, waveChildInjector); - startContainerListeners(rack.getListeners(), kuneChildInjector); - docks = rack.getDocks(); - excludes = rack.getExcludes(); - initFilters(filterConfig); - LOG.debug("INITIALIZATION DONE!"); - } - - private void initFilters(final FilterConfig filterConfig) throws ServletException { - for (final Dock dock : docks) { - dock.getFilter().init(filterConfig); - } - } - - private Injector installInjector(final FilterConfig filterConfig, final Rack rack, final Injector waveChildInjector) { - // final Injector injector = Guice.createInjector(); - final Injector childInjector = waveChildInjector.createChildInjector(rack.getGuiceModules()); - filterConfig.getServletContext().setAttribute(INJECTOR_ATTRIBUTE, childInjector); - return childInjector; - } - - private void startContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, - final Injector injector) { - LOG.debug("STARTING CONTAINER LISTENERS..."); - for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { - final ContainerListener listener = injector.getInstance(listenerClass); - listener.start(); - } - } - - // FIXME: Dani, never used this: - @SuppressWarnings("unused") - private void stopContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, - final Injector injector) { - LOG.debug("STOPING CONTAINER LISTENERS..."); - for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { - final ContainerListener listener = injector.getInstance(listenerClass); - listener.stop(); - } - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/AbstractInjectedFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/AbstractInjectedFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/AbstractInjectedFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.ourproject.kune.rack.RackServletFilter; - -import com.google.inject.Injector; - -public abstract class AbstractInjectedFilter implements Filter { - - protected ServletContext ctx; - - @Override - public abstract void destroy(); - - public <T> T getInstance(final Class<T> type) { - return getInjector().getInstance(type); - } - - @Override - public void init(final FilterConfig filterConfig) throws ServletException { - this.ctx = filterConfig.getServletContext(); - getInjector().injectMembers(this); - } - - private Injector getInjector() { - return (Injector) ctx.getAttribute(RackServletFilter.INJECTOR_ATTRIBUTE); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,29 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public interface ApplicationListener { - void doBefore(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); - - void doAfter(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/ForwardFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/ForwardFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/ForwardFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,81 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.ourproject.kune.rack.RackHelper; - -public class ForwardFilter extends AbstractInjectedFilter { - // private static final Log log = LogFactory.getLog(ForwardFilter.class); - - private final String forward; - private final Pattern pattern; - - public ForwardFilter(final String forward) { - this(".*", forward); - } - - public ForwardFilter(final String pattern, final String forward) { - this.forward = forward; - this.pattern = Pattern.compile(pattern); - } - - @Override - public void destroy() { - } - - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - - String relativeURL = RackHelper.getRelativeURL(request); - Matcher matcher = pattern.matcher(relativeURL); - matcher.matches(); - - int groupCount = matcher.groupCount(); - // log.debug("GROUP COUNT: " + groupCount); - String replaced = forward; - for (int index = 0; index < groupCount; index++) { - String tag = "{" + index + "}"; - String group = matcher.group(index + 1); - // log.debug("REPLACING " + tag + " WITH + " + group); - replaced = replaced.replace(tag, group); - } - - String forwardString = RackHelper.buildForwardString(request, replaced); - forward(request, response, forwardString); - } - - private void forward(final ServletRequest request, final ServletResponse response, final String forwardString) - throws ServletException, IOException { - // log.debug("FORWADING TO: " + forwardString); - HttpServletRequest httpRequest = (HttpServletRequest) request; - httpRequest.getRequestDispatcher(forwardString).forward(request, response); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,50 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class ListenerFilter extends AbstractInjectedFilter { - private final Class<? extends ApplicationListener> listenerClass; - - public ListenerFilter(final Class<? extends ApplicationListener> listenerClass) { - this.listenerClass = listenerClass; - } - - @Override - public void destroy() { - } - - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - ApplicationListener listener = super.getInstance(listenerClass); - listener.doBefore((HttpServletRequest) request, (HttpServletResponse) response); - chain.doFilter(request, response); - listener.doAfter((HttpServletRequest) request, (HttpServletResponse) response); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,53 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.rack.RackHelper; - -public class LogFilter implements Filter { - public static final Log LOG = LogFactory.getLog(LogFilter.class); - - public void destroy() { - } - - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - // final long start = System.currentTimeMillis(); - LOG.debug("REQUEST: " + RackHelper.getURI(request)); - chain.doFilter(request, response); - // final long finish = System.currentTimeMillis(); - // log.debug("TOTAL TIME: " + (finish - start) + " miliseconds"); - } - - public void init(final FilterConfig filterConfig) throws ServletException { - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.rack.filters; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; - -public class RedirectFilter implements Filter { - private final String redirect; - - public RedirectFilter(String redirect) { - this.redirect = redirect; - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { - - HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.sendRedirect(redirect); - } - - public void init(FilterConfig filterConfig) throws ServletException { - } - - public void destroy() { - } - -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -21,15 +21,15 @@ import java.util.Date; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; -import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ServerToolRegistry; -import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerTool; +import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.workspace.client.editor.insertlocalimg; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.LinkDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.workspace.client.editor.insertlocallink; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.StateTokenUtils; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.workspace.client.editor.insertlocalmedia; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.LinkDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.i18n; import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; @@ -28,6 +27,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.services.SearcherConstants; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,10 +19,10 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.common.client.errors.UIException; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/resources/dozerBeanMapping.xml 2011-03-25 20:21:30 UTC (rev 1294) @@ -9,7 +9,7 @@ </configuration> <mapping> <class-a> cc.kune.core.shared.dto.InitDataDTO </class-a> - <class-b>org.ourproject.kune.platf.server.InitData</class-b> + <class-b>cc.kune.core.server.InitData</class-b> <field> <a>licenses</a> <b>licenses</b> @@ -47,7 +47,7 @@ <b-hint> cc.kune.domain.Group </b-hint> </field> <field - custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter"> + custom-converter="cc.kune.core.server.mapper.GroupListModeConverter"> <a>mode</a> <b>mode</b> </field> @@ -76,7 +76,7 @@ </mapping> <mapping> <class-a>cc.kune.core.shared.dto.StateContentDTO</class-a> - <class-b>org.ourproject.kune.platf.server.state.StateContent</class-b> + <class-b>cc.kune.core.server.state.StateContent</class-b> <field> <a>authors</a> <b>authors</b> @@ -86,11 +86,11 @@ </mapping> <mapping> <class-a>cc.kune.core.shared.dto.StateContainerDTO</class-a> - <class-b>org.ourproject.kune.platf.server.state.StateContainer</class-b> + <class-b>cc.kune.core.server.state.StateContainer</class-b> </mapping> <mapping> <class-a>cc.kune.core.shared.dto.StateAbstractDTO</class-a> - <class-b>org.ourproject.kune.platf.server.state.StateAbstract</class-b> + <class-b>cc.kune.core.server.state.StateAbstract</class-b> </mapping>   @@ -172,7 +172,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.UserInfoDTO </class-a> - <class-b> org.ourproject.kune.platf.server.users.UserInfo </class-b> + <class-b> cc.kune.core.server.users.UserInfo </class-b> <field> <a>user</a> <b>user</b> @@ -250,7 +250,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ToolSimpleDTO </class-a> - <class-b> org.ourproject.kune.platf.server.tool.ToolSimple </class-b> + <class-b> cc.kune.core.server.tool.ToolSimple </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.UserBuddiesDataDTO </class-a> Modified: trunk/src/main/resources/log4j.dev.properties =================================================================== --- trunk/src/main/resources/log4j.dev.properties 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/resources/log4j.dev.properties 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,5 +1,7 @@ log4j.rootLogger=ERROR, stdout log4j.logger.org.ourproject=DEBUG +log4j.logger.cc.kune=DEBUG; +log4j.logger.org.waveprotocol=INFO; log4j.appender.stdout=org.apache.log4j.ConsoleAppender #log4j.appender.stdout.layout=org.apache.log4j.TTCCLayout #log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/resources/log4j.properties 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,5 +1,7 @@ log4j.rootLogger=error, stdout log4j.logger.org.ourproject=DEBUG; +log4j.logger.cc.kune=DEBUG; +log4j.logger.org.waveprotocol=INFO; log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-03-25 20:21:30 UTC (rev 1294) @@ -141,12 +141,10 @@  <filter> <filter-name>rack</filter-name> - <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> + <filter-class>cc.kune.core.server.rack.RackServletFilter</filter-class> <init-param> - <param-name>org.ourproject.kune.rack.RackModule</param-name> - <param-value> - org.ourproject.kune.app.server.KuneRackModule - </param-value> + <param-name>cc.kune.core.server.rack.RackModule</param-name> + <param-value>cc.kune.core.server.KuneRackModule</param-value> </init-param> </filter> <filter-mapping> Copied: trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,122 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import static org.junit.Assert.assertEquals; + +import java.util.TimeZone; + +import org.junit.After; +import org.junit.Before; +import org.ourproject.kune.docs.server.DocumentServerTool; + +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.core.server.manager.UserManager; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.License; +import cc.kune.domain.User; +import cc.kune.domain.finders.GroupFinder; +import cc.kune.domain.finders.LicenseFinder; +import cc.kune.domain.finders.UserFinder; + +import com.google.inject.Inject; + +public abstract class PersistencePreLoadedDataTest extends PersistenceTest { + protected static final String USER_EMAIL = "useremail(a)example.com"; + protected static final String USER_LONG_NAME = "the user long name"; + protected static final String USER_PASSWORD = "userPassword"; + protected static final String USER_SHORT_NAME = "usershortname"; + + protected Container container; + @Inject + protected ContainerManager containerManager; + protected Content content; + @Inject + protected ContentManager contentManager; + @Inject + protected I18nCountryManager countryManager; + protected License defLicense; + protected I18nLanguage english; + protected I18nCountry gb; + @Inject + protected GroupFinder groupFinder; + @Inject + protected GroupManager groupManager; + @Inject + protected I18nLanguageManager languageManager; + + @Inject + protected LicenseFinder licenseFinder; + @Inject + protected LicenseManager licenseManager; + // @Inject + // protected PropertyGroupManager propGroupManager; + protected User user; + @Inject + protected UserFinder userFinder; + @Inject + protected UserManager userManager; + + public PersistencePreLoadedDataTest() { + } + + @After + public void close() { + if (getTransaction().isActive()) { + getTransaction().rollback(); + } + } + + @Before + public void preLoadData() throws Exception { + openTransaction(); + assertEquals(0, userFinder.getAll().size()); + assertEquals(0, groupFinder.getAll().size()); + assertEquals(0, licenseFinder.getAll().size()); + // final PropertyGroup groupProps = new PropertyGroup(Group.PROPS_ID); + // final PropertyGroup userProps = new PropertyGroup(User.PROPS_ID); + // propGroupManager.persist(userProps); + // propGroupManager.persist(groupProps); + english = new I18nLanguage(Long.valueOf(1819), "English", "English", "en"); + languageManager.persist(english); + gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); + countryManager.persist(gb); + user = userManager.createUser(USER_SHORT_NAME, USER_LONG_NAME, USER_EMAIL, USER_PASSWORD, "en", "GB", + TimeZone.getDefault().getID()); + defLicense = new License("by-sa-v3.0", "Creative Commons Attribution-ShareAlike", "", + "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); + licenseManager.persist(defLicense); + groupManager.createUserGroup(user, true); + content = new Content(); + content.setLanguage(english); + contentManager.persist(content); + container = new Container(); + container.setTypeId(DocumentServerTool.TYPE_FOLDER); + containerManager.persist(container); + } +} Copied: trunk/src/test/java/cc/kune/core/server/PersistenceTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistenceTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/PersistenceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,93 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; + +import org.junit.Before; + +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Provider; +import com.google.inject.persist.PersistService; +import com.google.inject.persist.Transactional; + +public abstract class PersistenceTest { + private final String persistenceUnit; + private final String propetiesFileName; + @Inject + Provider<EntityManager> provider; + + public PersistenceTest() { + // test: use memory + // test_db: use mysql + // Also configurable ein TestHelper + this(TestConstants.PERSISTENCE_UNIT, "kune.properties"); + } + + public PersistenceTest(final String persistenceUnit, final String propetiesFileName) { + this.persistenceUnit = persistenceUnit; + this.propetiesFileName = propetiesFileName; + } + + public void closeTransaction() { + getManager().getTransaction().commit(); + } + + protected EntityManager getManager() { + return provider.get(); + } + + public EntityTransaction getTransaction() { + return getManager().getTransaction(); + } + + public EntityManager openTransaction() { + final EntityManager manager = getManager(); + final EntityTransaction transaction = manager.getTransaction(); + transaction.begin(); + return manager; + } + + public void persist(final Object... entities) { + for (final Object entity : entities) { + getManager().persist(entity); + } + } + + @Transactional + @Before + public void prepare() { + final Injector injector = TestHelper.create(new PlatformServerModule(), persistenceUnit, propetiesFileName); + final PersistService persistence = injector.getInstance(PersistService.class); + // To Debug insert breakpoint here + persistence.start(); + injector.injectMembers(this); + } + + public void rollbackTransaction() { + final EntityTransaction transaction = getManager().getTransaction(); + if (transaction.isActive()) { + transaction.rollback(); + } + } + +} Copied: trunk/src/test/java/cc/kune/core/server/TestConstants.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/TestConstants.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestConstants.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/TestConstants.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,12 @@ +package cc.kune.core.server; + +public final class TestConstants { + // test: use memory + // test_db: use mysql + // public static final String PERSISTENCE_UNIT = "test_db"; + public static final String PERSISTENCE_UNIT = "test"; + public static final String WAVE_TEST_PROPFILE = "wave-server-testing.properties"; + + private TestConstants() { + } +} Property changes on: trunk/src/test/java/cc/kune/core/server/TestConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/test/java/cc/kune/core/server/TestDomainHelper.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestDomainHelper.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/TestDomainHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,259 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import java.util.TimeZone; + +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Revision; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; + +public abstract class TestDomainHelper { + + public static AccessLists createAccessLists(final Group groupAdmin, final Group groupEditor, final Group groupViewer) { + + final AccessLists lists = new AccessLists(); + if (groupAdmin != null) { + lists.addAdmin(groupAdmin); + } + if (groupEditor != null) { + lists.addEditor(groupEditor); + } + if (groupViewer != null) { + lists.addViewer(groupViewer); + } + return lists; + } + + public static String createBigText() { + final String text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Fusce leo felis, cursus eget, scelerisque adipiscing, fringilla vel, sem. Vestibulum semper tristique sem. Etiam quam neque, consectetuer at, fermentum id, vulputate non, leo. Ut condimentum, mauris et sollicitudin faucibus, lectus arcu facilisis mi, eu pretium arcu tortor quis sem. Pellentesque sit amet nulla ut tellus dapibus blandit. Donec eu dolor vitae mi scelerisque pretium. Donec sit amet nunc ut risus laoreet porta. Integer dictum mi at mauris. Vivamus vulputate, dolor quis pharetra interdum, augue nisi congue eros, a consectetuer libero mi ut quam. Fusce commodo sem blandit massa. Phasellus vehicula varius felis.\n" + + "\n" + + "Aenean tempus. Ut vel elit a nisl adipiscing commodo. Suspendisse nibh. Praesent pellentesque. Curabitur fringilla tempor justo. Suspendisse bibendum faucibus ipsum. Aenean porta elementum pede. Sed vel odio et metus egestas ultrices. Nulla facilisi. Sed blandit fermentum purus. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam adipiscing. Suspendisse dapibus, est porta vehicula auctor, diam orci scelerisque risus, eu condimentum enim pede ut turpis. Nullam turpis. Aliquam erat volutpat. Integer vitae magna. Mauris sit amet turpis.\n" + + "\n" + + "Suspendisse potenti. Proin ac felis nec justo bibendum tempus. Donec at nunc et leo aliquet vestibulum. Mauris a justo nec orci ultrices placerat. Etiam tempus commodo dolor. Proin at justo blandit mauris vestibulum hendrerit. Donec mollis pede nec orci. Donec mauris. Quisque adipiscing facilisis ante. Aliquam elit quam, vulputate sit amet, posuere a, suscipit nec, nunc. Etiam vehicula ullamcorper metus. Mauris nec diam a arcu porta lobortis.\n" + + "\n" + + "Cras dapibus justo sed lacus. Ut ultrices, massa malesuada vestibulum rhoncus, eros sem fringilla sem, vel ultricies eros arcu vel augue. Ut vehicula nibh at lacus. Integer interdum turpis vitae arcu tempus luctus. Praesent a ligula. Donec viverra vestibulum est. Donec ultricies blandit mi. Morbi eleifend, nisi quis tristique pretium, lacus enim luctus nisi, quis lacinia ligula quam a orci. Praesent vel lectus. Pellentesque molestie ante sed leo. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ultrices. Etiam augue. Morbi non purus. Nam libero ligula, lacinia at, rhoncus tincidunt, porttitor quis, leo.\n" + + "\n" + + "Nulla orci purus, laoreet vel, facilisis ac, rhoncus eu, dui. Phasellus sit amet urna quis dui tempor elementum. Curabitur at magna. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nullam in dui. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum lacinia lectus eleifend mauris. Proin pellentesque tellus sit amet eros. Nulla purus mi, aliquam ac, faucibus a, varius viverra, enim. Vestibulum porttitor, arcu in molestie tristique, tellus velit imperdiet risus, dignissim sollicitudin pede ante sed orci. Nunc in elit. Aliquam adipiscing turpis condimentum tortor. Quisque tellus dolor, tincidunt eu, vehicula rutrum, tristique a, ipsum. Fusce a nunc at ligula egestas sodales. Maecenas molestie, arcu ac ullamcorper ornare, sem nunc sollicitudin velit, id tempor est dui vel elit. Praesent quam quam, vehicula a, mollis et, tincidunt a, nisi. Aliquam justo nibh, faucibus porta, convallis eu, sagittis eget, leo. Praesent at nisi. Nullam scelerisque.\n" + + "\n" + + "Nunc felis. Vestibulum imperdiet sem. Proin posuere, mauris sit amet molestie pharetra, purus turpis vulputate purus, et blandit ante urna non est. Morbi ligula turpis, faucibus fermentum, auctor a, euismod sit amet, lectus. Cras lacinia, purus et rutrum suscipit, pede odio facilisis dolor, nonummy commodo nunc sapien eu lectus. Proin egestas. Nam sodales aliquam eros. Ut lorem est, porttitor vel, dapibus a, tristique nec, diam. Ut non nulla eu nisi rhoncus lacinia. Ut ornare, sem non molestie condimentum, nisi risus iaculis sem, ac aliquet dui sem vel augue. Nullam varius pellentesque sem. Nulla facilisi.\n" + + "\n" + + "Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fringilla erat at diam. Suspendisse tincidunt. Nullam pharetra, nibh eget varius tempus, arcu massa dignissim justo, et scelerisque nisi velit commodo orci. Morbi sed nisi eu mi ultrices interdum. Cras in urna a elit sollicitudin consequat. Maecenas vel diam vitae dolor aliquam faucibus. Maecenas mattis, sem a iaculis auctor, est felis sagittis sapien, ut imperdiet diam nisi a nisl. Vestibulum rutrum nisl eget ante. Nulla non urna. In tellus urna, dignissim a, auctor in, pharetra eget, massa. Nam a magna. Ut id elit sit amet risus auctor laoreet. Quisque et urna. Praesent vehicula, nibh ac euismod rhoncus, ligula diam pharetra eros, ac sollicitudin elit odio a nunc. Quisque augue. Nulla pellentesque rhoncus leo. Proin sagittis erat.\n" + + "\n" + + "Donec fringilla. Mauris ultricies gravida pede. Nullam non urna et quam dignissim egestas. Mauris in nulla. Duis ac ligula non nulla sodales hendrerit. Aliquam condimentum lectus ac turpis. Etiam venenatis lacus vel sem. Proin convallis scelerisque diam. Suspendisse sed lacus a felis pretium rhoncus. Mauris at tortor ac libero euismod porttitor. Maecenas euismod. Etiam id orci. Donec consectetuer gravida lacus. Vivamus bibendum nisi ut felis. Phasellus ac nisl. Praesent lorem sapien, ultricies eget, accumsan a, viverra ut, magna. Integer lobortis leo vitae nunc. Sed vulputate justo eu sem. Proin et augue.\n" + + "\n" + + "Suspendisse pellentesque suscipit lectus. Fusce ut odio a turpis eleifend viverra. Vestibulum nisl. Aliquam sed turpis at ante pulvinar cursus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec sodales odio sagittis lorem. Duis mattis gravida odio. Cras mattis iaculis risus. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed iaculis laoreet elit. Cras ut tortor. Suspendisse eget nisi. Suspendisse ligula tellus, scelerisque a, consectetuer quis, tristique vel, arcu. Morbi varius, ligula et hendrerit iaculis, lorem purus luctus ipsum, eu interdum urna lorem id pede. Mauris est. In posuere dolor ac ipsum. Curabitur dictum. Vestibulum imperdiet. Pellentesque imperdiet aliquet dolor. Sed vulputate, enim at pulvinar sodales, felis libero malesuada felis, in iaculis odio mauris id neque.\n" + + "\n" + + "Pellentesque adipiscing. Nam ac neque sagittis nunc posuere fermentum. Sed quis orci vel enim commodo scelerisque. Ut aliquam. Quisque vitae tortor. Morbi libero augue, interdum et, nonummy ac, mattis vel, nisl. Suspendisse elit. Curabitur suscipit leo dignissim tellus. Proin felis massa, ultricies nec, fermentum sit amet, sollicitudin dignissim, mi. Maecenas ipsum ligula, tincidunt vitae, varius a, consequat ac, ligula. Suspendisse et urna. Phasellus consequat luctus arcu. Morbi molestie. Vivamus ligula. Mauris mollis.\n" + + "\n" + + "In nonummy iaculis leo. Sed vitae metus. Morbi vel eros in dolor accumsan pellentesque. In ut velit. Duis in tortor non enim ultricies scelerisque. Pellentesque ultrices dui a magna. In cursus pede non lorem. Vivamus nisl. Morbi ut tortor eu justo cursus dictum. Integer condimentum. Vivamus nisl risus, euismod id, molestie ut, feugiat nec, magna. Vivamus viverra sodales purus. Ut nunc. Vivamus dignissim sollicitudin nunc. Nulla tempor, diam ut viverra tincidunt, nisl orci sollicitudin lectus, eu dignissim tellus justo eu erat. Phasellus lobortis risus id libero. Ut faucibus diam ac justo. Duis neque magna, auctor eu, suscipit sit amet, tempor faucibus, lacus. Nunc mauris velit, feugiat sit amet, venenatis id, euismod ac, risus. Sed nisl lorem, eleifend et, scelerisque vel, imperdiet vitae, quam.\n" + + "\n" + + "Integer egestas dolor a purus. Ut quam dolor, elementum at, tincidunt venenatis, dapibus sollicitudin, ligula. Morbi luctus diam eget neque. Duis iaculis. Aliquam vel tellus auctor ipsum elementum hendrerit. In euismod ante tincidunt risus. Maecenas ac lorem sed magna volutpat gravida. Aliquam et sapien sed pede tristique vehicula. Cras et tellus. Nunc massa sem, aliquet a, sollicitudin vitae, malesuada vel, dolor. Suspendisse dui. Mauris purus. Maecenas egestas orci ut quam. Sed semper. Nullam feugiat. Ut aliquet, tellus quis aliquam viverra, orci velit viverra odio, vel adipiscing odio ligula in lorem. Sed ac sem vitae nibh pretium dapibus. Donec ac diam. Integer ultrices massa ut diam. Duis pretium posuere arcu.\n" + + "\n" + + "Morbi lorem. Fusce luctus lorem in risus gravida gravida. Donec vulputate volutpat metus. Pellentesque ac massa vitae orci placerat pellentesque. In hac habitasse platea dictumst. Curabitur pretium, ipsum in consequat tempor, ligula est volutpat nibh, eget porta diam massa ac leo. Curabitur placerat massa vel nibh. Nam at quam. In sagittis augue ac leo. Fusce adipiscing, ligula in auctor molestie, libero felis mattis sem, sit amet faucibus mauris nunc ac metus. Vivamus neque ipsum, bibendum sit amet, fringilla sit amet, bibendum ut, massa. Maecenas bibendum. Vivamus nunc est, accumsan et, tempus vitae, sagittis in, erat. Fusce turpis nunc, pretium vitae, varius sit amet, dignissim et, tortor. Quisque egestas, libero in dapibus tincidunt, justo arcu feugiat massa, sed sollicitudin lectus tellus sit amet augue. Vestibulum tristique nibh eget lorem. Curabitur cursus purus tristique nulla.\n" + + "\n" + + "Etiam blandit, arcu eu aliquam ornare, velit libero faucibus felis, sit amet sollicitudin velit leo in elit. Sed turpis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec eu risus. Sed risus lorem, luctus mattis, scelerisque eget, tincidunt a, enim. Vivamus consequat mollis tellus. Cras urna lorem, facilisis eu, porttitor mollis, dignissim posuere, ligula. Ut nonummy sapien. Praesent cursus. Ut turpis. Nulla enim. Aliquam aliquet, enim a gravida aliquam, pede odio porttitor nisi, non vestibulum odio erat a tortor. Donec fringilla ligula id augue. Curabitur vel tellus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur ullamcorper est vitae quam.\n" + + "\n" + + "Sed posuere neque. Vivamus tortor. Ut at mauris. Nam felis tellus, nonummy eu, gravida id, bibendum id, magna. Pellentesque laoreet mi sed felis. Fusce at lectus quis erat auctor laoreet. In interdum velit ut pede. Ut malesuada tincidunt velit. Suspendisse eu felis in mauris scelerisque iaculis. Morbi ornare dapibus risus. Quisque rhoncus elementum ante. Cras euismod nisi et lectus. Donec ut velit. Etiam a mauris. Integer cursus iaculis tellus. Fusce facilisis, nunc at semper tincidunt, dui purus accumsan nisi, in auctor magna ligula vel pede. Suspendisse ut arcu molestie lorem posuere vestibulum. Quisque pulvinar rhoncus ligula.\n" + + "\n" + + "Morbi sed enim. Donec in erat. Curabitur suscipit euismod lectus. Etiam dui nisi, volutpat vitae, tincidunt eget, tristique eget, turpis. Vivamus feugiat, quam ut tincidunt placerat, risus magna iaculis quam, id semper nisi tortor quis nibh. Donec a nulla. Aliquam turpis felis, aliquam non, ultrices eget, lacinia vel, nibh. Quisque vel nisi et eros vulputate eleifend. Aliquam nisl. Proin semper turpis. Cras ipsum.\n" + + "\n" + + "Donec scelerisque nunc non nibh. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nullam nec elit congue ligula vulputate pellentesque. Nunc ipsum. In imperdiet blandit lectus. Nulla ornare elit. Nunc at nibh at nibh semper vulputate. Cras scelerisque hendrerit erat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum et mi. Etiam ut nisi et augue congue tempor. Curabitur nec libero non lacus congue suscipit. Nunc et metus a justo condimentum tincidunt.\n" + + "\n" + + "Phasellus ultrices placerat dui. Phasellus luctus, sem eu sagittis ultricies, massa dui eleifend libero, eu mollis urna dolor in neque. Duis pellentesque rutrum ipsum. Phasellus iaculis arcu et enim. Morbi neque. Sed felis velit, mattis sed, mollis quis, tempor sed, mi. Curabitur consequat, ipsum vel volutpat molestie, turpis dui suscipit urna, nec blandit libero pede quis leo. Sed ullamcorper luctus enim. Etiam rutrum imperdiet orci. Pellentesque pede. Nullam sollicitudin blandit quam. Pellentesque non nisi at justo venenatis pharetra. Praesent a dolor at lectus fringilla lobortis.\n" + + "\n" + + "Morbi eget dolor at mi tempus commodo. Ut accumsan convallis odio. Nam ac velit ac ligula consectetuer lacinia. Ut nibh tortor, auctor et, placerat et, rhoncus ac, ante. Nulla dignissim rhoncus quam. Vestibulum ac est. Integer pharetra, diam sed iaculis porta, turpis orci rhoncus risus, vel aliquet metus eros quis velit. Pellentesque cursus scelerisque ante. Suspendisse tempor, metus a vehicula laoreet, orci mauris tincidunt ante, vitae molestie lectus velit vel nulla. Suspendisse potenti. Morbi quis massa ac felis semper facilisis. Vivamus convallis, magna sed sollicitudin dapibus, tellus tortor congue erat, ac luctus risus mi sit amet lorem.\n" + + "\n" + + "In pellentesque libero ut lorem. Aliquam a libero eget nulla iaculis vehicula. Nullam turpis tellus, accumsan sit amet, bibendum ac, tincidunt in, libero. Mauris ac neque. Aliquam ultrices lorem id eros cursus pretium. Vivamus at elit ac felis tempor viverra. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam eget nunc. Morbi iaculis luctus massa. In turpis sapien, molestie pretium, vulputate in, facilisis sit amet, lacus. Proin tincidunt faucibus diam. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec nibh tellus, laoreet sit amet, fringilla vitae, ornare a, sapien. Praesent feugiat lobortis tellus. Nullam euismod euismod arcu. Proin a eros. Vivamus in orci. Proin nisi lacus, viverra ut, cursus lacinia, pharetra vitae, metus.\n" + + "\n" + + "Suspendisse porta risus eget lacus. Suspendisse posuere tortor non erat. Fusce fermentum. Vestibulum pulvinar, elit quis semper porta, nunc mauris dictum quam, eu adipiscing felis pede imperdiet tellus. Nulla sed eros. Sed vestibulum massa vitae purus. Aenean eu felis. Vivamus erat purus, pretium non, congue vulputate, lacinia vel, magna. Donec aliquet, lacus sit amet rhoncus lacinia, nisi tortor mollis felis, id mollis magna quam eu arcu. Morbi quis leo ac orci nonummy malesuada. Fusce iaculis tincidunt elit. Aenean vestibulum. Fusce ut diam eget lectus mattis dapibus. Nam suscipit, tellus vitae lacinia fermentum, nisi leo dignissim erat, a ultrices metus eros et enim. Curabitur congue hendrerit dui. Nulla a sem. Nam tincidunt faucibus leo.\n" + + "\n" + + "Aliquam quis ante. Sed sit amet eros nec mi aliquet mollis. Nunc libero quam, egestas et, cursus vel, congue id, metus. Etiam et lacus. Phasellus feugiat, mi vel ultrices feugiat, est risus sagittis pede, ut fringilla sem velit quis elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur et neque a diam sollicitudin egestas. Fusce fringilla egestas arcu. Integer congue risus quis libero. Suspendisse aliquam erat non leo. Ut tellus leo, accumsan quis, varius in, dapibus venenatis, dui. Cras mollis tincidunt nisl. Phasellus dignissim iaculis est. Morbi elit. Proin at nulla. Sed id arcu sit amet quam luctus volutpat.\n" + + "\n" + + "Vestibulum a lorem. Sed condimentum iaculis magna. Phasellus rhoncus. Vivamus malesuada, est et aliquam lobortis, dui massa vestibulum nunc, sed pellentesque mi velit ac orci. Nulla facilisi. Nunc a diam eu est iaculis lobortis. In velit sem, iaculis ut, ornare eu, eleifend at, arcu. Nulla quis metus vel neque rhoncus ultrices. Duis non ligula. Donec vitae augue et pede consectetuer egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum eu lectus eget sem sagittis congue. Donec posuere lacus et turpis. Etiam sed dolor. Nam purus turpis, vehicula eu, suscipit a, vehicula vel, justo. Nunc eros neque, dignissim vel, consectetuer eu, malesuada sed, odio. Quisque consectetuer, risus vitae vulputate viverra, velit metus accumsan velit, vitae commodo sem sapien vitae lacus. Curabitur suscipit sem ut nisl. Aliquam nec metus. Donec vel pede a velit vestibulum luctus.\n" + + "\n" + + "Morbi neque turpis, tincidunt quis, dapibus et, sollicitudin sit amet, turpis. Praesent pretium pretium neque. Donec venenatis consequat nibh. Quisque eu nisi. Quisque ultricies vulputate turpis. Praesent non lacus et augue tempor dignissim. Praesent interdum, ipsum at viverra imperdiet, odio pede tincidunt augue, sit amet auctor metus arcu eget dui. Sed pellentesque vulputate nibh. Morbi eu lacus. Cras nonummy velit in nisl.\n" + + "\n" + + "Nullam mollis, dui id imperdiet semper, felis neque lacinia odio, id congue nisi mi a arcu. Maecenas quam. Vestibulum in sapien quis sapien pretium sodales. Maecenas laoreet mauris et turpis hendrerit gravida. Integer tristique, neque in accumsan auctor, dui purus laoreet enim, id laoreet arcu est elementum justo. Quisque adipiscing, metus id consequat elementum, dui magna bibendum ligula, et lacinia risus augue vitae ante. Nullam eget lacus. Vivamus viverra. Donec dolor nunc, nonummy vitae, consectetuer ac, pulvinar sit amet, urna. Pellentesque eget arcu non nulla malesuada condimentum. Morbi sapien felis, rhoncus vel, lobortis at, scelerisque sed, quam. Suspendisse a leo non velit volutpat rhoncus. Duis tempus magna ac nisl. Fusce augue. Sed volutpat posuere erat. Cras accumsan egestas nulla. Etiam mi massa, ultrices quis, facilisis ut, venenatis nec, odio. Integer felis. Morbi ut arcu non magna rutrum eleifend.\n" + + "\n" + + "Morbi rhoncus lorem sit amet nibh. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec suscipit aliquet tortor. Mauris vel erat. Sed commodo, nisl sed convallis scelerisque, metus turpis commodo nisl, ultricies blandit pede erat nec orci. Morbi turpis mauris, laoreet quis, iaculis vitae, faucibus et, sem. Praesent condimentum lorem in lorem. Aenean elit ipsum, congue in, pellentesque in, congue vel, odio. Fusce neque neque, auctor a, lobortis nec, tincidunt a, tortor. Sed ipsum purus, condimentum nec, dictum sit amet, adipiscing ac, neque. Pellentesque ligula. Maecenas nec mi. Integer iaculis tincidunt elit. Donec commodo orci ut risus. Nunc nonummy suscipit justo. Pellentesque augue urna, blandit sit amet, dapibus quis, mollis ac, pede. Suspendisse ornare velit et metus. Duis leo libero, euismod sed, mollis at, fringilla id, risus. Cras a justo vitae ante adipiscing molestie. Nam viverra.\n" + + "\n" + + "Nam semper pede id purus. Fusce ut nibh in enim fringilla placerat. Etiam sodales urna et eros. Nulla facilisi. Sed eleifend justo vel nibh. Praesent vestibulum feugiat neque. Nunc pretium. Etiam fringilla lorem eget sapien. Morbi id nisi. Etiam vehicula. Donec nisi risus, malesuada at, consequat pellentesque, iaculis in, turpis. Etiam iaculis risus nec odio. Fusce a risus. Curabitur dui lacus, ultricies quis, pretium eget, venenatis eget, tortor. Sed et urna. Duis enim ipsum, consequat sed, aliquet in, semper ornare, nibh. Aliquam consequat erat eget leo. Nulla facilisi. Vestibulum convallis. Fusce suscipit varius est.\n" + + "\n" + + "Duis magna. Nunc adipiscing euismod orci. Integer egestas, nisl non suscipit viverra, sapien mauris tempus quam, ac hendrerit ligula nulla quis nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nunc eget pede ultrices elit aliquam tincidunt. Praesent nonummy. Maecenas faucibus accumsan nibh. Morbi dapibus erat. Duis feugiat, nibh nec iaculis consequat, nunc eros placerat libero, a commodo enim odio sit amet magna. Vivamus ultricies tempor lectus. Proin eros elit, aliquam ac, pharetra eget, congue nec, lorem. Suspendisse nisl lectus, gravida at, lacinia a, consequat sit amet, dolor.\n" + + "\n" + + "Sed vitae est eget eros vehicula cursus. Sed interdum orci sed orci. Ut tempus tincidunt magna. Aliquam erat volutpat. Suspendisse sed diam non mi eleifend euismod. Donec sem nunc, gravida sed, condimentum eget, tristique ac, odio. Maecenas mollis tellus eu risus. Donec tristique magna ut purus. Fusce et felis mattis turpis condimentum dignissim. Mauris sapien massa, lacinia tincidunt, vehicula in, scelerisque eget, nisl. Aliquam sed turpis interdum ligula molestie vestibulum. Nunc dolor. Sed sed tellus ac arcu egestas dapibus. Nunc magna. Curabitur non mauris. Integer quis ligula.\n" + + "\n" + + "Nulla facilisi. Vivamus at lectus in ligula fringilla posuere. Sed et metus. Curabitur sollicitudin. Praesent mi. Donec eros mi, auctor eget, accumsan vel, volutpat porta, metus. Nam molestie, nisi quis bibendum auctor, nisi risus suscipit sem, sed suscipit dolor nibh quis ante. Morbi at eros. Suspendisse rhoncus tellus at nulla. Mauris mollis orci sit amet turpis. Pellentesque tempor purus. Phasellus ultricies dictum massa. Proin nisl. Quisque eleifend dolor sit amet metus. Nulla pellentesque erat at leo dignissim suscipit. Fusce facilisis viverra quam. Duis viverra. Morbi vel eros. Curabitur nunc. Praesent id eros.\n" + + "\n" + + "Etiam at arcu ac pede lacinia pellentesque. Nullam urna magna, feugiat at, commodo nec, sollicitudin ut, diam. Nunc in urna. Phasellus congue ultricies ante. Etiam vel leo id eros tempor euismod. Vivamus sed justo. Mauris magna nulla, pretium sed, rhoncus elementum, varius in, enim. Proin sagittis nibh non mauris. Duis non pede non est interdum sagittis. Sed nulla.\n" + + "\n" + + "Integer id quam. Suspendisse ornare tortor sed ligula. Proin ac magna. Etiam dapibus ornare dui. Nullam ac felis quis lectus fermentum aliquet. Nulla sed augue et velit sollicitudin porta. Integer porttitor quam sit amet lacus. In dictum quam in nulla. Fusce euismod purus et justo. Nam sit amet mi quis orci rutrum rhoncus. Curabitur eleifend malesuada ligula. Nunc luctus auctor tellus. Phasellus pretium bibendum libero.\n" + + "\n" + + "Duis cursus, nibh quis tincidunt egestas, massa pede bibendum metus, a molestie sapien magna ac elit. Donec nunc nunc, vulputate et, sagittis in, bibendum vel, magna. Maecenas eleifend. Maecenas augue nunc, dignissim at, rhoncus at, pulvinar ut, eros. Aliquam dictum rutrum nisi. In hac habitasse platea dictumst. Aliquam justo mauris, vestibulum sed, cursus ut, suscipit ut, metus. Fusce vitae erat nec nisl posuere ultrices. Vestibulum non orci. Cras nunc lectus, aliquet a, pellentesque id, dapibus ut, felis. Sed lacinia tellus ac nunc. Vivamus massa diam, malesuada nec, convallis eget, lobortis id, nulla. Morbi bibendum, diam eu lacinia aliquet, enim risus suscipit sapien, at aliquet ligula lorem quis metus. Vestibulum euismod, lectus ac egestas facilisis, tortor dui pharetra diam, a aliquet enim ante quis neque. Praesent rhoncus ipsum non sem scelerisque vestibulum. Nullam posuere vestibulum tortor. Nulla facilisi. Aenean at urna sed odio posuere imperdiet. In semper suscipit nisl.\n" + + "\n" + + "Aliquam quam. Nullam euismod scelerisque arcu. Sed ultricies diam vitae neque. Nunc dictum. Curabitur eget tellus. Sed posuere venenatis nisl. Nulla condimentum, erat quis volutpat rutrum, pede sem mattis nisl, sit amet lacinia orci felis non nisi. Ut et turpis. Duis condimentum, eros ac rutrum pellentesque, enim tortor posuere felis, eget tempus sapien sapien id leo. Sed cursus, est sed tempus dapibus, turpis sapien tempor purus, eget rhoncus arcu diam non neque. Cras lorem. Donec posuere posuere orci. Sed nec metus id orci fringilla dictum. Curabitur ultrices viverra libero.\n" + + "\n" + + "Mauris tincidunt risus a libero. Suspendisse in nisl. Mauris id mauris. Mauris justo neque, varius tincidunt, hendrerit porttitor, ornare et, leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque adipiscing sapien ac sem. Fusce leo. Curabitur sit amet mauris. Suspendisse justo augue, vehicula sit amet, tincidunt id, semper vel, nisi. Curabitur tristique. Nulla facilisis. Fusce posuere, ante a vestibulum mattis, metus lectus pharetra tortor, rutrum egestas pede dui ut ligula. Aliquam lacus ligula, blandit id, aliquam at, elementum sed, felis. Nam laoreet. Vivamus a sapien. Cras quis neque. Sed est.\n" + + "\n" + + "Vestibulum id diam sit amet eros nonummy fringilla. Nullam cursus lobortis velit. In pharetra diam non augue. Duis convallis risus interdum mauris. Etiam rhoncus metus eget pede. Sed velit enim, rutrum in, tincidunt vel, pellentesque ac, elit. Vestibulum pretium mauris at magna. Suspendisse volutpat. Maecenas sit amet arcu. Fusce blandit. Mauris eget neque. Nunc semper nunc a libero. Donec enim dolor, vulputate ac, tempor sit amet, tincidunt eu, enim. Cras sagittis.\n" + + "\n" + + "Nullam commodo libero ut nunc tincidunt aliquet. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Etiam id tortor quis ipsum pretium blandit. Ut hendrerit orci ac arcu. In id leo. Suspendisse sit amet leo ut ipsum tristique venenatis. Sed in justo. Quisque feugiat. Morbi gravida arcu a orci. Maecenas in justo. Donec sodales, tortor id luctus interdum, ante lorem pretium ante, ac porttitor odio pede vitae purus. Sed iaculis pellentesque purus. Curabitur sit amet libero. Nam a metus ut tortor commodo rhoncus. Nulla suscipit. Mauris ac nibh. Suspendisse ante. Sed nonummy pede at eros. Aenean augue dui, nonummy id, ullamcorper non, dignissim non, diam. Pellentesque diam nisi, pulvinar et, mollis vel, egestas non, nibh.\n" + + "\n" + + "Phasellus tincidunt. Aliquam molestie. In tristique viverra magna. Integer consequat tempus urna. Aenean turpis orci, aliquet sit amet, mattis vitae, hendrerit eu, justo. Duis pharetra ultricies enim. Nulla facilisi. Nullam sodales, justo vel consectetuer tempor, risus est accumsan orci, non feugiat est dolor ut risus. In pharetra nunc nec urna. Donec diam sem, gravida et, pulvinar id, elementum eu, enim. Morbi porttitor. Integer quis nibh. Nulla ac nulla. Morbi massa orci, tincidunt in, porttitor a, rutrum id, magna. Phasellus vel quam. Curabitur pharetra rutrum quam. Praesent vestibulum, orci in pulvinar congue, diam justo iaculis eros, imperdiet tincidunt lorem urna quis eros. Praesent in eros at velit porttitor pretium.\n" + + "\n" + + "Fusce consectetuer mattis est. Sed non nulla. Ut auctor nisl. Pellentesque ac massa sit amet augue volutpat molestie. Aliquam in purus. Etiam vitae libero. Nunc sapien lacus, mollis ac, auctor eu, fermentum eu, ligula. Suspendisse potenti. Duis molestie pulvinar elit. Vestibulum tellus libero, ultrices vitae, blandit eget, porttitor ac, odio.\n" + + "\n" + + "Vivamus malesuada sapien sed ipsum. Aenean quis nisl quis orci suscipit placerat. Pellentesque porttitor commodo nulla. Proin quis libero. Donec congue porttitor sapien. Phasellus sed est vel ligula vulputate facilisis. Mauris sit amet diam. In quis neque id orci tempus vehicula. Suspendisse egestas feugiat neque. Ut metus leo, placerat eget, pellentesque sed, porta at, nisi. Suspendisse potenti. Phasellus ultricies justo sit amet sem. Aenean porttitor enim nec nibh. Integer sed orci.\n" + + "\n" + + "Sed dignissim, nisi eu convallis luctus, enim justo posuere mauris, quis cursus leo tortor vitae metus. Nullam nec enim a nisl aliquet aliquam. Morbi nunc nisl, sodales et, condimentum in, sagittis vel, pede. Vivamus a sem. Praesent imperdiet luctus elit. Nulla facilisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed ac mauris non sapien pretium consequat. Fusce ut purus. Praesent sem. Proin placerat posuere lorem. Donec vel libero. Morbi tincidunt sapien at nisl. Sed porta felis eu pede. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam scelerisque. Aenean sit amet metus. Morbi accumsan diam et neque mattis vestibulum. Suspendisse sollicitudin odio et odio. Pellentesque auctor ante non elit.\n" + + "\n" + + "Morbi eget quam eu orci lobortis blandit. Duis consequat nisi ut magna. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam posuere, diam at pretium auctor, tortor orci mattis mi, quis bibendum leo diam sed tellus. Vestibulum rutrum nunc. Donec sapien mauris, vehicula ac, commodo ac, hendrerit ut, risus. Quisque non magna at sapien vulputate nonummy. Proin pede enim, tempus sit amet, porttitor commodo, adipiscing non, est. Nulla facilisi. Aenean condimentum ante vitae pede. Donec id tortor quis tellus dictum dictum. Sed pretium ipsum nec pede. Nunc porttitor. In auctor quam at justo. Nunc ligula arcu, bibendum ac, volutpat sed, hendrerit eu, augue. Integer molestie pede eget ipsum.\n" + + "\n" + + "Nulla faucibus urna quis purus. Sed lacinia. Phasellus sollicitudin augue quis eros. Aenean vel mauris non ipsum molestie scelerisque. Cras pharetra, ligula vel adipiscing fringilla, nunc odio nonummy sapien, nec imperdiet sem pede nec mi. Ut vehicula enim a nunc. Donec suscipit. Curabitur dapibus nisi. Aenean nunc sapien, tristique dapibus, placerat sed, venenatis sed, enim. Etiam bibendum laoreet ligula. Aliquam mauris tortor, feugiat non, consectetuer sit amet, accumsan nec, quam. Nunc quis dui. Nulla facilisi. Cras at nisl. Fusce orci. In turpis. Aliquam nisi est, pellentesque nec, rutrum vitae, commodo at, nisi.\n" + + "\n" + + "Pellentesque ligula massa, faucibus at, porta ac, cursus vitae, turpis. Nam nibh nisi, viverra sit amet, porttitor vel, molestie quis, arcu. Nullam consectetuer egestas lacus. Suspendisse potenti. Nam scelerisque eleifend nunc. Suspendisse potenti. Maecenas turpis. Nam eleifend semper augue. Praesent ante nisl, sagittis sed, rhoncus eget, scelerisque eu, felis. Nullam non urna. Vestibulum eget ante. Sed id quam. Morbi ut lacus venenatis dolor lacinia commodo. Sed tincidunt libero at elit. Vivamus vitae tortor. Suspendisse eget nisl.\n" + + "\n" + + "Suspendisse dignissim luctus nisi. Pellentesque varius. Sed gravida aliquet lorem. Phasellus ligula mi, rhoncus id, cursus et, consequat quis, ante. Etiam placerat posuere enim. Donec sed tortor eget pede gravida tristique. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas libero. Nunc a metus nec urna mollis dignissim. Cras sodales sapien ac leo. Mauris suscipit. Mauris at nisl sit amet turpis porta semper. Nullam non elit. Fusce pharetra vestibulum odio. Sed a eros id neque accumsan congue. Fusce turpis mi, volutpat a, convallis non, auctor luctus, tortor. Sed blandit, dui at egestas lobortis, ante sapien dictum quam, vel semper arcu nisi id est.\n" + + "\n" + + "Suspendisse posuere. Etiam gravida scelerisque enim. Praesent placerat. Nam ligula nunc, faucibus quis, porttitor in, molestie id, velit. Cras sed purus. Nullam in erat. Suspendisse nonummy aliquam mi. Etiam eu lorem. Fusce rhoncus mi ac lectus. Proin sed augue. Donec eu libero. Vestibulum iaculis ultrices diam. Nam tincidunt tincidunt risus. Suspendisse non ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam congue erat ac nunc. Nulla interdum nisi vestibulum quam. Curabitur turpis. Praesent varius, nunc ac lacinia egestas, ante elit dictum pede, eu consequat risus ligula id lacus. Donec vel arcu ac augue feugiat posuere.\n" + + "\n" + + "Etiam tincidunt pulvinar ipsum. In sit amet nunc volutpat lorem luctus feugiat. Proin augue purus, dictum eu, posuere non, vestibulum vitae, libero. Vivamus fermentum. Sed lorem. Aliquam egestas dapibus eros. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum nec turpis non lacus feugiat auctor. Sed rhoncus libero eu eros pretium dictum. Duis sed quam. Etiam nec nulla. Morbi elit metus, pulvinar quis, condimentum tristique, egestas eu, lorem. Nam turpis. Sed tincidunt, justo varius nonummy vestibulum, ante odio ultricies diam, sed ullamcorper pede turpis eu elit. Integer sit amet arcu. Sed lorem. Quisque vehicula erat vitae sem. Nunc consectetuer tellus sed neque. Nullam fringilla.\n" + + "\n" + + "Etiam tempus bibendum sem. Morbi nunc orci, molestie at, pretium non, blandit vitae, justo. Suspendisse potenti. Nulla mollis, metus id interdum malesuada, dolor nulla iaculis ligula, nec lacinia nibh odio volutpat arcu. In hac habitasse platea dictumst. Nullam lorem turpis, mollis a, placerat sit amet, lobortis varius, lectus. Nunc viverra vulputate arcu. Donec nec urna. Vestibulum dapibus, metus ut molestie mollis, elit diam tempor est, eu dictum lectus est in velit. Vivamus faucibus, elit id pellentesque malesuada, purus libero porttitor turpis, vel gravida nunc ligula tempor mauris. Vestibulum suscipit lobortis libero. Vestibulum interdum, sem eget eleifend adipiscing, libero lectus aliquam odio, sed bibendum ante dui ut mi. Pellentesque scelerisque, lorem sed pulvinar eleifend, augue velit lacinia dui, nec semper nibh erat sit amet eros. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent fermentum arcu eget leo. Curabitur in felis. Curabitur sit amet massa in est cursus ultricies. Sed neque dolor, mollis vel, pulvinar ac, fermentum eget, mi.\n" + + "\n" + + "Nulla facilisi. Maecenas eros arcu, gravida vitae, commodo ac, commodo vel, mi. Suspendisse non metus. Aenean aliquet condimentum dui. Donec augue turpis, adipiscing sed, ultricies in, condimentum nec, metus. Nam sit amet pede. Morbi fringilla. Sed sollicitudin massa nec nisi. Nam ut libero. Morbi malesuada, lacus at bibendum luctus, ante diam tincidunt erat, id consectetuer eros felis ut nisi. Suspendisse ullamcorper rutrum tellus. Aenean in metus sit amet magna tempus pellentesque.\n" + + "\n" + + "Nullam venenatis tellus id pede. Nunc ac nulla a turpis bibendum laoreet. Quisque eget diam eget arcu scelerisque ultricies. Nullam faucibus accumsan ipsum. Quisque diam nisi, euismod nec, cursus at, lobortis sit amet, nunc. Quisque fermentum sapien eget nibh. Curabitur scelerisque. In hac habitasse platea dictumst. Aliquam diam dui, pharetra quis, ultrices ac, rutrum ut, mi. Praesent egestas. Cras convallis sem ac mauris. Curabitur ultrices odio pretium mi. Nam mi metus, adipiscing id, laoreet id, mattis nec, tortor. Ut sed turpis varius purus vehicula rutrum. Duis suscipit erat eget lectus. Donec feugiat varius risus. Donec facilisis dolor ut justo.\n" + + "\n" + + "Curabitur lectus nibh, congue ac, laoreet sed, vulputate ac, ipsum. Donec convallis nisl placerat augue. Proin nec felis in arcu tincidunt facilisis. Duis congue tincidunt sapien. Vivamus lobortis purus eget risus. Aenean aliquet, ipsum quis bibendum eleifend, justo dolor pellentesque justo, in elementum orci enim congue nisi. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed sem enim, lobortis nec, interdum vitae, sollicitudin non, dolor. Sed commodo euismod orci. Maecenas vel arcu et nunc dignissim volutpat. Morbi molestie aliquam mi. Sed id neque rutrum nunc sagittis ultricies. Mauris diam magna, ullamcorper nec, tincidunt id, laoreet nec, dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aliquam feugiat nisl non arcu. Nulla facilisi. In hac habitasse platea dictumst. Quisque metus.\n" + + "\n" + + "Suspendisse potenti. Cras malesuada pulvinar est. Ut nisi. Curabitur hendrerit, mauris vel laoreet dictum, quam dolor elementum orci, venenatis gravida sem erat malesuada ante. Aliquam condimentum. Suspendisse orci quam, varius in, egestas ut, mollis quis, arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus sed mauris at massa interdum vulputate. Morbi rutrum ligula. Vivamus nec libero. Curabitur lacinia, lorem eget feugiat pretium, purus urna consequat leo, non bibendum dolor augue vitae quam. Proin mi nunc, feugiat nec, convallis ac, feugiat ac, mi. Praesent pulvinar. Cras cursus nisi id nulla. Integer vel magna. Cras felis. Nam id tellus ac velit interdum convallis. Cras dignissim tortor sed mi.\n" + + "\n" + + "Nunc vestibulum, tortor eu commodo facilisis, leo mi vehicula sapien, eget hendrerit ipsum odio vitae sem. Aliquam consequat augue eu ligula. Vivamus et neque. Sed sed arcu at justo placerat placerat. Donec posuere. Phasellus lacus ligula, pulvinar at, porta et, tincidunt quis, quam. Curabitur pede mauris, interdum laoreet, feugiat condimentum, mollis ut, lectus. Curabitur laoreet, quam a malesuada suscipit, tellus lorem aliquet diam, a feugiat lorem neque hendrerit risus. Etiam viverra orci vitae mauris. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque tellus augue, aliquam non, porttitor non, ornare eu, mi. Nullam blandit sagittis ante. Aliquam tincidunt, lorem ac imperdiet sodales, elit felis cursus dolor, vel interdum leo purus at tellus. Nunc viverra, dui non sagittis dapibus, justo eros accumsan massa, eu hendrerit lorem nulla ac magna. In hac habitasse platea dictumst.\n" + + "\n" + + "Ut velit risus, malesuada eget, vestibulum nec, ornare ac, ipsum. Morbi volutpat aliquet turpis. Nam enim. Nulla semper est vitae neque. Phasellus non dui. In hac habitasse platea dictumst. Morbi auctor porttitor est. Nullam non nulla quis elit eleifend porttitor. Aliquam erat volutpat. Duis erat. Cras lobortis nisl in elit. Vivamus leo. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean ac neque. Nam sem nulla, ornare quis, dictum eget, fermentum quis, lorem. In blandit lacus. Aenean in enim.\n" + + "\n" + + "Donec sit amet orci id quam rhoncus egestas. Integer metus. Vestibulum risus lorem, posuere ac, aliquam in, mollis at, lorem. Integer metus. Aliquam blandit scelerisque orci. Nulla eu ligula. Nulla nec nisi et libero cursus bibendum. Suspendisse potenti. Maecenas in massa eget tortor consectetuer scelerisque. Morbi tincidunt velit. Nam lectus purus, malesuada ac, gravida nec, sodales sed, sem. Vestibulum feugiat. Cras viverra vestibulum massa. Mauris scelerisque. Fusce ut ante ut ante molestie molestie. Praesent non arcu. Fusce auctor blandit ipsum. Nullam est.\n" + + "\n" + + "In pulvinar arcu quis ligula. Duis volutpat metus at lorem. Aenean eu urna vitae velit tempus sollicitudin. Duis erat lectus, dignissim sit amet, fermentum at, mattis at, nisi. Nunc vel libero. Nulla eget risus et dui facilisis sagittis. Donec vel est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Sed adipiscing massa nec dolor. Morbi a ligula a ante vulputate tempor. Nullam lorem lacus, sodales gravida, scelerisque in, laoreet eu, nulla. Nam in tortor non nunc consectetuer porta. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Morbi ut diam. Proin nonummy. Pellentesque erat justo, egestas ac, sagittis id, suscipit vitae, diam. Aenean tincidunt urna sit amet urna. Donec turpis. Mauris cursus dolor a massa.\n" + + "\n" + + "Phasellus sem arcu, semper vel, eleifend eu, viverra eu, nulla. Fusce felis elit, semper cursus, ornare et, eleifend vel, pede. In est tellus, vulputate sit amet, tristique sed, imperdiet vel, lacus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Etiam justo. Proin volutpat. Nullam vitae dui nec urna convallis euismod. Nulla facilisi. Phasellus porttitor. Aenean scelerisque dolor sed justo. In vel nisi gravida mi mollis tempus. Curabitur ante lorem, fringilla eu, laoreet vitae, ultricies id, nisi. Sed id ante. Morbi tristique, est id porta tempus, turpis ipsum porta elit, at gravida leo odio in ante. Fusce euismod.\n" + + "\n" + + "Maecenas urna quam, fringilla eu, porta eu, semper quis, dui. Nunc congue est eu ante. Donec suscipit viverra leo. Nullam tempus porttitor est. Cras eu elit eget erat consectetuer convallis. Nam tellus ligula, eleifend ultrices, consequat et, malesuada non, velit. Quisque vitae enim in elit accumsan ullamcorper. Pellentesque eget enim. Sed nonummy, orci pretium malesuada adipiscing, dolor velit bibendum pede, non tincidunt diam sapien ac nunc. Maecenas porta leo at augue.\n" + + "\n" + + "Aliquam erat volutpat. Curabitur eu arcu faucibus tellus hendrerit bibendum. Praesent orci pede, lacinia vitae, tristique vitae, suscipit non, turpis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse tincidunt laoreet sapien. Vestibulum varius neque in odio. Donec sem ipsum, egestas id, molestie sit amet, luctus eu, est. Integer leo eros, laoreet non, lacinia in, cursus nec, mi. Donec ornare velit non massa. Curabitur turpis ligula, pharetra lacinia, euismod eu, tincidunt ut, velit. Cras nec ipsum eget augue sagittis vestibulum. Cras mattis dapibus tortor. Pellentesque sit amet arcu eu quam pretium malesuada. Phasellus turpis nisi, mattis ac, gravida et, aliquam eget, tellus. Aenean quis justo eget erat congue tincidunt.\n" + + "\n" + + "Aenean non tortor ut sem facilisis blandit. Sed ante lectus, bibendum id, fermentum ac, vestibulum et, ipsum. Sed tincidunt. Ut tincidunt. In sit amet odio. Sed massa. Nullam auctor. Nam lacinia sem eu lorem. Nunc neque tortor, euismod ut, dictum vel, commodo vehicula, lorem. Nullam metus urna, interdum non, semper eget, sodales in, eros. Sed eget magna vel dui tincidunt iaculis. Nam faucibus justo eget nunc. Suspendisse potenti. Proin fermentum erat in orci. Suspendisse semper lorem. Fusce rhoncus nulla a sapien. Mauris turpis turpis, bibendum euismod, porttitor pretium, semper id, ante. Ut eget est vel elit tempus auctor. Morbi interdum quam. In hac habitasse platea dictumst.\n" + + "\n" + + "Praesent vel ante ac mi consectetuer accumsan. Quisque quis ipsum. Suspendisse vitae magna vitae metus congue tempus. Aenean sagittis, ante nec vehicula molestie, ligula nisl tristique justo, quis suscipit nulla urna in sapien. Pellentesque eget felis pellentesque orci dignissim interdum. Sed metus lorem, egestas quis, iaculis at, venenatis eleifend, dui. Praesent elementum porttitor lacus. Sed suscipit dui vel dolor. Sed sit amet nunc et nunc rutrum eleifend. Curabitur et ligula. Phasellus consectetuer mi ut pede. In a libero in urna blandit varius. Sed pellentesque ligula aliquet risus. Ut laoreet, eros volutpat rhoncus congue, erat felis porttitor augue, vel laoreet eros est vitae pede. Suspendisse sit amet elit. Quisque quis dui. Vivamus massa. Suspendisse quis felis. Aliquam diam enim, volutpat in, commodo pellentesque, consectetuer ut, nibh.\n" + + "\n" + + "Donec mattis. Quisque purus purus, mattis sit amet, sollicitudin at, faucibus quis, diam. Sed ut urna a arcu posuere porta. Duis feugiat massa ut pede. In hac habitasse platea dictumst. Donec lectus nisl, elementum vel, pulvinar a, bibendum at, lorem. Vestibulum non lacus. Praesent arcu. Maecenas justo. Proin vel ipsum. Etiam egestas arcu vitae nibh. Aenean vel lacus id lacus tempus hendrerit. Ut lobortis ornare nibh.\n" + + "\n" + + "Donec nonummy, massa a accumsan tristique, purus diam iaculis nibh, ut dictum lorem metus sit amet nibh. Aliquam id eros et diam congue condimentum. Vestibulum porttitor massa a purus dignissim fringilla. Curabitur lectus. Phasellus auctor tortor vitae orci. Duis ante est, hendrerit ut, commodo sit amet, scelerisque eget, arcu. Cras luctus, risus eu volutpat sagittis, sem nulla accumsan libero, nec volutpat eros dui sit amet ante. Nunc convallis purus sed nisl. Nulla rutrum. Etiam viverra, orci at facilisis pretium, odio libero sollicitudin eros, ac pharetra est diam eu orci. Cras dolor risus, porttitor eu, convallis sit amet, tincidunt a, nulla. Nunc porttitor luctus diam. Mauris erat magna, pharetra ac, pretium consequat, viverra ut, nisl. Donec blandit mollis metus. Praesent dui pede, ultricies non, pellentesque et, molestie eu, nulla.\n" + + "\n" + + "Vivamus eleifend, leo sit amet tristique elementum, urna urna sollicitudin dolor, eu egestas est enim et tellus. Maecenas congue feugiat dolor. Nullam semper. Aliquam ipsum justo, fringilla et, consequat in, malesuada id, arcu. Ut orci. Aliquam sagittis consequat urna. Nam elementum diam quis lacus. Morbi elementum adipiscing orci. Mauris eros neque, vehicula quis, egestas sit amet, imperdiet id, mi. Cras convallis nisi vitae nulla. Vestibulum at purus.\n" + + "\n" + + "Etiam quis nisi vel sapien commodo ultrices. Etiam lacus. Etiam venenatis elit nec purus. Fusce id est. Vivamus justo tellus, facilisis quis, bibendum non, lacinia eget, ante. Mauris aliquet. Suspendisse iaculis placerat purus. Aliquam erat volutpat. Quisque vel sem. Donec pulvinar, lorem id malesuada blandit, nibh diam lobortis mi, in elementum velit mi a felis. In egestas. Suspendisse pede.\n" + + "\n" + + "Curabitur eu urna eget pede placerat adipiscing. Sed adipiscing bibendum tortor. Integer justo. Fusce risus enim, hendrerit ac, pellentesque sed, egestas sed, orci. Nunc orci erat, rutrum eu, euismod quis, condimentum eget, metus. Cras tincidunt. Phasellus scelerisque. Nunc sed nulla. Aliquam et sapien ac purus faucibus tincidunt. Ut id ligula egestas enim gravida vulputate. Maecenas consequat. Etiam varius sapien id pede. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Integer cursus libero eget pede. In faucibus ultricies felis. Praesent nulla. Donec tortor.\n" + + "\n" + + "Nulla quam felis, semper pellentesque, imperdiet a, egestas ut, purus. Fusce vitae elit quis dolor hendrerit gravida. Donec vestibulum. Aenean fermentum semper libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla facilisi. Donec eleifend leo at sem. Vivamus consectetuer, magna et iaculis elementum, erat sapien viverra lacus, consectetuer consectetuer justo leo id nulla. Phasellus id nisl. Aliquam molestie pede sit amet nisl. Duis iaculis vehicula tellus.\n" + + "\n" + + "Donec quis ipsum eget lacus vehicula fringilla. Vivamus dui est, interdum sed, scelerisque at, rhoncus at, massa. Proin placerat sodales elit. Mauris sagittis urna et enim. Vestibulum aliquet convallis nisi. Donec auctor ullamcorper lectus. Nullam vitae purus facilisis justo condimentum malesuada. Donec dui lectus, iaculis quis, lobortis aliquam, auctor nec, lectus. Aenean vel mi. Pellentesque et arcu faucibus orci convallis ullamcorper. In consequat. Praesent lobortis faucibus leo. Duis ut justo. Morbi viverra aliquam dui. Fusce laoreet dolor porta quam. Duis molestie porttitor dui. Quisque libero sem, tempor vitae, rhoncus sed, suscipit non, ante.\n" + + "\n" + + "In accumsan. Ut metus turpis, tincidunt in, rutrum quis, ultrices feugiat, tellus. Vivamus pellentesque urna sit amet elit. Mauris iaculis dui nec massa. Duis ac sem. Suspendisse sed lorem. Etiam eget sapien. Duis adipiscing porttitor neque. Nullam nisl elit, imperdiet et, pretium et, pretium ac, velit. Aenean eu lectus. Nam suscipit blandit purus. Vestibulum vel pede sodales nisi pulvinar porta. Integer ut urna ac arcu imperdiet tempus. Etiam rutrum, quam id euismod mattis, ligula tortor imperdiet orci, nec fringilla tortor libero eu est. Nulla pretium ligula. Sed eu nisi. Proin neque lorem, suscipit euismod, vestibulum eu, pretium volutpat, elit. Aenean mauris lacus, dictum nec, vulputate et, aliquam et, mi. Praesent aliquam purus ac neque.\n" + + "\n" + + "Maecenas mollis risus eget turpis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur lacus urna, auctor in, commodo ut, blandit vitae, tellus. Nunc vitae elit. Mauris elementum arcu. Nulla facilisi. Nunc diam tellus, porttitor non, dictum id, fermentum eget, nulla. Nulla facilisis enim nec felis. Phasellus interdum, erat a fermentum mattis, urna nisl iaculis ipsum, sit amet venenatis ante massa sit amet enim. Quisque facilisis nibh. Donec sit amet mauris et nisi eleifend egestas. Suspendisse pellentesque malesuada dui. Ut vestibulum, tortor sit amet pellentesque venenatis, sem turpis scelerisque massa, ut facilisis est ipsum ut arcu. Suspendisse feugiat, enim sit amet vehicula varius, tortor justo dapibus odio, et semper magna turpis ac ligula.\n" + + "\n" + + "Pellentesque non diam. Donec vel neque vel turpis vulputate ornare. Sed porttitor mi id augue. Etiam sapien mi, lobortis sed, dapibus nec, congue at, augue. Vestibulum condimentum, leo in cursus porta, quam nisl eleifend lectus, quis mattis sapien nisl sed lacus. Morbi pellentesque viverra massa. Aenean volutpat nibh lobortis tortor. Aliquam id diam. Nulla facilisi. Etiam ipsum elit, vestibulum vitae, accumsan vitae, aliquam sit amet, odio. Donec condimentum. Phasellus sodales, nunc et ullamcorper laoreet, turpis arcu egestas pede, id pharetra ante tortor vel est. Maecenas sem. Nulla lorem massa, mollis id, malesuada eu, faucibus a, est.\n" + + "\n" + + "Curabitur molestie, nunc at aliquet tempor, risus metus adipiscing felis, vitae euismod justo felis id eros. Aenean tincidunt nunc sed eros. Nulla ac tellus. Aliquam erat volutpat. Nulla vitae felis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In consectetuer posuere purus. Phasellus interdum. Ut laoreet semper nunc. Duis blandit quam a velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Curabitur aliquam dolor et tortor. Pellentesque vulputate. Pellentesque diam purus, facilisis nec, fermentum a, consequat quis, ipsum. Ut euismod dui ut massa. Proin nonummy nisi ut pede. Pellentesque sollicitudin lectus a purus.\n" + + "\n" + + "Cras vulputate. Praesent tempus fringilla diam. Suspendisse at elit. Cras ut nulla eget mi dapibus pretium. Etiam hendrerit tortor sed lectus. Cras mauris. Nam ligula. Mauris semper, arcu ut facilisis molestie, lorem sapien iaculis quam, at dignissim sapien mauris id pede. In metus ante, porttitor id, fringilla a, adipiscing eget, nisi. Ut ornare sapien nec velit. Aenean tortor metus, pellentesque vitae, iaculis eget, imperdiet nec, turpis. Vestibulum sit amet erat ac urna auctor imperdiet. Nulla facilisi. Quisque facilisis pede vel mi consequat dignissim. Vivamus sapien.\n"; + return text; + } + + public static Content createDescriptor(final long id, final String title, final String content) { + final Content descriptor = new Content(); + descriptor.setId(id); + final Revision rev = new Revision(descriptor); + descriptor.addRevision(rev); + rev.setTitle(title); + rev.setBody(content); + return descriptor; + } + + public static Container createFolderWithId(final long id) { + final Container container = new Container(); + container.setId(id); + return container; + } + + public static Container createFolderWithIdAndGroupAndTool(final int i, final String groupShortName, + final String toolName) { + final Container container = createFolderWithIdAndToolName(i, toolName); + final Group owner = new Group(); + owner.setShortName(groupShortName); + container.setOwner(owner); + return container; + + } + + public static Container createFolderWithIdAndToolName(final int i, final String toolName) { + final Container container = createFolderWithId(i); + container.setToolName(toolName); + return container; + } + + public static Group createGroup(final int number) { + final Group group = new Group("ysei" + number, "Yellow Submarine Environmental Initiative" + number); + group.setId(Long.valueOf(number)); + return group; + } + + public static SocialNetwork createSocialNetwork(final Group groupInAdmins, final Group groupInCollab, + final Group groupInViewer, final Group groupInPendings) { + + final SocialNetwork socialNetwork = new SocialNetwork(); + socialNetwork.addAdmin(groupInAdmins); + socialNetwork.addCollaborator(groupInCollab); + socialNetwork.addViewer(groupInViewer); + socialNetwork.addPendingCollaborator(groupInPendings); + return socialNetwork; + } + + public static User createUser(final int number) { + final String shortName = "shortname" + number; + final String longName = "name" + number; + final User user = new User(shortName, longName, "email@domain" + number, ("password" + number), + "diggest".getBytes(), "salt".getBytes(), null, null, TimeZone.getDefault()); + final Group userGroup = new Group(shortName, longName); + userGroup.setAdmissionType(AdmissionType.Closed); + userGroup.setSocialNetwork(createSocialNetwork(userGroup, userGroup, userGroup, null)); + user.setUserGroup(userGroup); + return user; + } +} Copied: trunk/src/test/java/cc/kune/core/server/TestHelper.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestHelper.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/TestHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,88 @@ +/* + * + * Copyright (C) 2007-2011 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.server; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.configuration.ConfigurationException; +import org.ourproject.kune.platf.integration.HttpServletRequestMocked; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.ServerModule; +import org.waveprotocol.box.server.authentication.AccountStoreHolder; +import org.waveprotocol.box.server.persistence.AccountStore; +import org.waveprotocol.box.server.persistence.PersistenceException; +import org.waveprotocol.box.server.persistence.PersistenceModule; +import org.waveprotocol.wave.federation.noop.NoOpFederationModule; + +import cc.kune.core.server.init.FinderRegistry; +import cc.kune.core.server.properties.PropertiesFileName; +import cc.kune.wave.server.CustomSettingsBinder; + +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.Scopes; +import com.google.inject.name.Names; +import com.google.inject.persist.jpa.JpaPersistModule; +import com.google.inject.servlet.RequestScoped; +import com.google.inject.servlet.SessionScoped; + +public abstract class TestHelper { + public static Injector create(final Module module, final String persistenceUnit, final String propetiesFileName) { + try { + final Injector injector = Guice.createInjector(CustomSettingsBinder.bindSettings( + TestConstants.WAVE_TEST_PROPFILE, CoreSettings.class)); + final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); + final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); + final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule(false), + federationModule, FinderRegistry.init(new JpaPersistModule(persistenceUnit)), module, new Module() { + @Override + public void configure(final Binder binder) { + binder.bindScope(SessionScoped.class, Scopes.SINGLETON); + binder.bindScope(RequestScoped.class, Scopes.SINGLETON); + binder.bindConstant().annotatedWith(PropertiesFileName.class).to(propetiesFileName); + binder.bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + } + }); + final AccountStore accountStore = childInjector.getInstance(AccountStore.class); + accountStore.initializeAccountStore(); + AccountStoreHolder.resetForTesting(); + AccountStoreHolder.init(accountStore, + childInjector.getInstance(Key.get(String.class, Names.named(CoreSettings.WAVE_SERVER_DOMAIN)))); + return childInjector; + } catch (final ConfigurationException e) { + e.printStackTrace(); + } catch (final PersistenceException e) { + e.printStackTrace(); + } + return null; + } + + public static void inject(final Object target) { + // test: use memory + // test_db: use mysql + // Also configurable ein PersistenceTest + TestHelper.create(new PlatformServerModule(), TestConstants.PERSISTENCE_UNIT, "kune.properties").injectMembers( + target); + } + +} Copied: trunk/src/test/java/cc/kune/core/server/access (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/access) Modified: trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,16 +17,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.testhelper.ctx.DomainContext; +import cc.kune.core.server.TestDomainHelper; +import cc.kune.core.server.access.AccessRightsServiceDefault; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; Modified: trunk/src/test/java/cc/kune/core/server/access/FinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/access/FinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.access; +package cc.kune.core.server.access; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; @@ -25,14 +25,15 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.server.TestDomainHelper; -import org.ourproject.kune.platf.server.content.CommentManager; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.RateManager; import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.server.TestDomainHelper; +import cc.kune.core.server.access.FinderServiceDefault; +import cc.kune.core.server.content.CommentManager; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.RateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; import cc.kune.domain.Content; Copied: trunk/src/test/java/cc/kune/core/server/auth (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/auth) Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import java.lang.reflect.AccessibleObject; @@ -30,6 +30,8 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.auth.Authenticated; +import cc.kune.core.server.auth.AuthenticatedMethodInterceptor; public class AuthenticatedMethodInterceptorTest extends IntegrationTest { Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.auth; +package cc.kune.core.server.auth; import java.lang.reflect.AccessibleObject; @@ -30,6 +30,9 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.server.auth.ActionLevel; +import cc.kune.core.server.auth.Authorizated; +import cc.kune.core.server.auth.AuthorizatedMethodInterceptor; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; Copied: trunk/src/test/java/cc/kune/core/server/domain (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/domain) Modified: trunk/src/test/java/cc/kune/core/server/domain/GroupListTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/domain/GroupListTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.domain; +package cc.kune.core.server.domain; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; Copied: trunk/src/test/java/cc/kune/core/server/finders (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/finders) Modified: trunk/src/test/java/cc/kune/core/server/finders/GroupFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/finders/GroupFinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.finders; +package cc.kune.core.server.finders; import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.PersistenceTest; +import cc.kune.core.server.PersistenceTest; import cc.kune.domain.Group; import cc.kune.domain.finders.GroupFinder; Modified: trunk/src/test/java/cc/kune/core/server/finders/LicenseFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/LicenseFinderTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/finders/LicenseFinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.finders; +package cc.kune.core.server.finders; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,9 +27,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.properties.DatabaseProperties; import cc.kune.domain.License; import cc.kune.domain.finders.LicenseFinder; Modified: trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.finders; +package cc.kune.core.server.finders; import static org.junit.Assert.assertEquals; @@ -27,9 +27,9 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.TestDomainHelper; +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.TestDomainHelper; import cc.kune.domain.Content; import cc.kune.domain.Rate; import cc.kune.domain.User; Modified: trunk/src/test/java/cc/kune/core/server/finders/UserFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/UserFinderTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/finders/UserFinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.finders; +package cc.kune.core.server.finders; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.PersistencePreLoadedDataTest; import cc.kune.domain.User; import cc.kune.domain.finders.UserFinder; Copied: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,121 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; + +import org.junit.Ignore; +import org.junit.Test; +import org.ourproject.kune.docs.server.DocumentServerTool; + +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Content; + +public class ContentManagerTest extends PersistencePreLoadedDataTest { + + private static final String BODY = "body"; + private static final String MIMETYPE = "image"; + private static final String TITLE = "title"; + + private void createContent() { + final Content cnt = contentManager.createContent(TITLE, BODY, user, container, + DocumentServerTool.TYPE_UPLOADEDFILE); + persist(cnt); + } + + private void createContentWithMimeAndCheck(final String mimetype) { + final Content cnt = contentManager.createContent(TITLE, BODY, user, container, + DocumentServerTool.TYPE_UPLOADEDFILE); + cnt.setMimeType(new BasicMimeType(mimetype)); + persist(cnt); + final Content newCnt = contentManager.find(cnt.getId()); + assertEquals(mimetype, newCnt.getMimeType().toString()); + } + + @Ignore + @Test + public void testBasicBodySearch() { + createContent(); + final SearchResult<Content> search = contentManager.search(BODY); + contentManager.reIndex(); + assertEquals(1, search.getSize()); + } + + @Test + public void testBasicMimePersist() { + final String mimetype = "application/pdf"; + createContentWithMimeAndCheck(mimetype); + } + + @Test + public void testBasicMimePersistWithoutSubtype() { + final String mimetype = "application"; + createContentWithMimeAndCheck(mimetype); + } + + @Test + public void testBasicMimeSearchWithQueriesAndFields() { + createContentWithMimeAndCheck(MIMETYPE + "/png"); + contentManager.reIndex(); + final SearchResult<Content> search = contentManager.search(new String[] { MIMETYPE }, + new String[] { "mimeType.mimetype" }, 0, 10); + assertEquals(1, search.getSize()); + } + + @Test + public void testBasicSearchWithQueriesAndFields() { + createContentWithMimeAndCheck(MIMETYPE); + final SearchResult<Content> search = contentManager.search(new String[] { BODY }, + new String[] { "lastRevision.body" }, 0, 10); + contentManager.reIndex(); + assertEquals(1, search.getSize()); + } + + @Test + public void testBasicTitleSearch() { + createContent(); + final SearchResult<Content> search = contentManager.search(TITLE); + contentManager.reIndex(); + assertEquals(1, search.getSize()); + } + + @Ignore + @Test + public void testtMimeSearch() { + createContentWithMimeAndCheck(MIMETYPE + "/png"); + contentManager.reIndex(); + final SearchResult<Content> search = contentManager.searchMime(BODY, 0, 10, "asb", MIMETYPE); + assertEquals(1, search.getSize()); + } + + /** + * This normally fails with mysql (not configured for utf-8), see the + * INSTALL mysql section + */ + @Test + public void testUTF8Persist() { + final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container, + DocumentServerTool.TYPE_DOCUMENT); + final Content newCnt = contentManager.find(cnt.getId()); + assertEquals("汉语/漢語", newCnt.getTitle()); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/FileManagerDefaultTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/FileManagerDefaultTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/FileManagerDefaultTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/FileManagerDefaultTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import org.junit.Before; + +import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.manager.FileManager; + +import com.google.inject.Inject; + +public class FileManagerDefaultTest extends PersistenceTest { + + @Inject + FileManager fileManager; + + @Before + public void start() { + + } + +} Copied: trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,201 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.TimeZone; + +import org.apache.lucene.queryParser.ParseException; +import org.hibernate.validator.InvalidStateException; +import org.junit.Test; + +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.client.errors.UserRegistrationException; +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Group; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; + +public class GroupManagerTest extends PersistencePreLoadedDataTest { + + @Test + public void createdGroupShoudHaveValidSocialNetwork() throws Exception { + final Group group = new Group("short", "longName", defLicense, GroupType.PROJECT); + groupManager.createGroup(group, user); + final SocialNetwork socialNetwork = group.getSocialNetwork(); + final AccessLists lists = socialNetwork.getAccessLists(); + assertTrue(lists.getAdmins().includes(user.getUserGroup())); + assertTrue(lists.getEditors().isEmpty()); + assertTrue(lists.getViewers().isEmpty()); + closeTransaction(); + } + + @Test + public void createGroup() throws Exception { + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + final Group otherGroup = groupManager.findByShortName("ysei"); + + assertEquals(group.getLongName(), otherGroup.getLongName()); + assertEquals(group.getShortName(), otherGroup.getShortName()); + closeTransaction(); + } + + @Test + public void createGroupAndSearch() throws Exception, ParseException { + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + groupManager.reIndex(); + final SearchResult<Group> result = groupManager.search("ysei"); + assertEquals(1, result.getSize()); + assertEquals("ysei", result.getList().get(0).getShortName()); + rollbackTransaction(); + } + + @Test(expected = GroupNameInUseException.class) + public void createGroupWithExistingLongName() throws Exception { + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + + final Group group2 = new Group("ysei2", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + group2.setDefaultLicense(defLicense); + groupManager.createGroup(group2, user); + + rollbackTransaction(); + } + + @Test(expected = GroupNameInUseException.class) + public void createGroupWithExistingShortName() throws Exception { + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + + final Group group2 = new Group("ysei", "Yellow Submarine Environmental Initiative 2", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group2, user); + + rollbackTransaction(); + } + + private void createTestGroup(final int number) throws Exception { + final Group g = new Group("ysei" + number, "Yellow Submarine Environmental Initiative " + number, defLicense, + GroupType.PROJECT); + groupManager.createGroup(g, user); + } + + @Test(expected = EmailAddressInUseException.class) + public void createUserExistingEmail() throws I18nNotFoundException, GroupNameInUseException, + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test2", "test 2 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); + } + + @Test(expected = GroupNameInUseException.class) + public void createUserExistingLongName() throws I18nNotFoundException, GroupNameInUseException, + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test2", "test 1 name", "test2(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); + } + + @Test(expected = GroupNameInUseException.class) + public void createUserExistingShortName() throws I18nNotFoundException, GroupNameInUseException, + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test", "test 2 name", "test2(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); + } + + @Test(expected = EmailAddressInUseException.class) + public void createUserWithExistingEmail() throws Exception { + final User user2 = userManager.createUser("username2", "the user name 2", USER_EMAIL, "userPassword", "en", + "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); + } + + @Test(expected = GroupNameInUseException.class) + public void createUserWithExistingLongName() throws Exception { + final User user2 = userManager.createUser("username2", USER_LONG_NAME, "email2(a)example.com", "userPassword", + "en", "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); + } + + @Test(expected = GroupNameInUseException.class) + public void createUserWithExistingShortName() throws Exception { + final User user2 = userManager.createUser(USER_SHORT_NAME, "the user name 2", "email2(a)example.com", + "userPassword", "en", "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); + } + + @Test(expected = UserRegistrationException.class) + public void createUserWithIncorrectShortName() throws Exception { + final User user2 = userManager.createUser("u s", "the user name 2", "email2(a)example.com", "userPassword", "en", + "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); + } + + @Test(expected = InvalidStateException.class) + public void createUserWithVeryShortName() throws Exception { + final User user2 = userManager.createUser("us", "the user name 2", "email2(a)example.com", "userPassword", "en", + "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); + } + + @Test + public void groupSearchPagination() throws Exception, ParseException { + for (int i = 1; i < 10; i++) { + createTestGroup(i); + } + groupManager.reIndex(); + final SearchResult<Group> result = groupManager.search("Yellow", 0, 5); + assertEquals(9, result.getSize()); + assertEquals(5, result.getList().size()); + final SearchResult<Group> result2 = groupManager.search("Yellow", 5, 5); + assertEquals(9, result2.getSize()); + assertEquals(4, result2.getList().size()); + rollbackTransaction(); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/I18nManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/I18nManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/I18nManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,179 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; + +import org.apache.commons.lang.StringEscapeUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.I18nTranslation; + +import com.google.inject.Inject; + +public class I18nManagerTest extends PersistenceTest { + @Inject + I18nTranslationManager translationManager; + @Inject + I18nCountryManager countryManager; + @Inject + I18nLanguageManager languageManager; + @Inject + I18nTranslationService translationService; + + @Test + public void byDefaultUseEnglish() { + HashMap<String, String> map = translationManager.getLexicon("en"); + HashMap<String, String> map2 = translationManager.getLexicon("af"); + assertEquals(map.size(), map2.size()); + } + + @After + public void close() { + if (getTransaction().isActive()) { + getTransaction().rollback(); + } + } + + @Test + public void getNonExistentTranslationInAnyLangReturnsKey() { + HashMap<String, String> map = translationManager.getLexicon("en"); + HashMap<String, String> map2 = translationManager.getLexicon("aa"); + int initialSize = map.size(); + int initialSize2 = map2.size(); + + String translation = translationManager.getTranslation("es", "Foo foo foo"); + String translation2 = translationManager.getTranslation("aa", "Foo foo foo"); + + assertEquals(I18nTranslation.UNTRANSLATED_VALUE, translation); + assertEquals(I18nTranslation.UNTRANSLATED_VALUE, translation2); + + map = translationManager.getLexicon("en"); + map2 = translationManager.getLexicon("aa"); + int newSize = map.size(); + int newSize2 = map2.size(); + + assertEquals(initialSize + 1, newSize); + assertEquals(initialSize2 + 1, newSize2); + } + + @Test + public void getNonExistentTranslationReturnsDefaultLanguage() { + String translation = translationManager.getTranslation("af", "January [month]"); + assertEquals("January", translation); + } + + @Test + public void getTranslation() { + String translation = translationManager.getTranslation("af", "Sunday [weekday]"); + assertEquals("Sondag", translation); + } + + @Test + public void getTranslationUTF8() { + String translation = translationManager.getTranslation("el", "January [month]"); + assertEquals("Ιανουάριος", translation); + } + + @Test + public void getTranslationWithIntArg() { + String translation = translationManager.getTranslation("en", "[%d] users", 20); + assertEquals("20 users", translation); + } + + @Test + public void getTranslationWithIntArgFromService() { + String translation = translationService.t("[%d] users", 20); + assertEquals("20 users", translation); + } + + @Test + public void getTranslationWithIntArgFromWithNtService() { + String translation = translationService.tWithNT("[%d] users", "foo foo", 20); + assertEquals("20 users", translation); + } + + @Test + public void getTranslationWithStringArg() { + String translation = translationManager.getTranslation("en", "[%s] users", "Twenty"); + assertEquals("Twenty users", translation); + } + + @Test + public void getTranslationWithStringArgFromService() { + String translation = translationService.t("[%s] users", "Twenty"); + assertEquals("Twenty users", translation); + } + + @Test + public void getTranslationWithStringArgWithNtFromService() { + String translation = translationService.tWithNT("[%s] users", "foo foo", "Twenty"); + assertEquals("Twenty users", translation); + } + + @Before + public void insertData() { + openTransaction(); + I18nLanguage english = new I18nLanguage(Long.valueOf(1819), "English", "English", "en"); + I18nLanguage spanish = new I18nLanguage(Long.valueOf(5889), "Spanish", "Español", "es"); + I18nLanguage afrikaans = new I18nLanguage(Long.valueOf(114), "Afrikaans", "Afrikaans", "af"); + I18nLanguage greek = new I18nLanguage(Long.valueOf(1793), "Greek", "Ελληνικά", "el"); + languageManager.persist(english); + languageManager.persist(spanish); + languageManager.persist(afrikaans); + languageManager.persist(greek); + translationManager.persist(new I18nTranslation("Sunday [weekday]", english, "Sunday")); + translationManager.persist(new I18nTranslation("January [month]", english, "January")); + translationManager.persist(new I18nTranslation("Sunday [weekday]", afrikaans, "Sondag")); + translationManager.persist(new I18nTranslation("January [month]", greek, "Ιανουάριος")); + translationManager.persist(new I18nTranslation(StringEscapeUtils.escapeHtml("[%s] users"), english, + StringEscapeUtils.escapeHtml("[%s] users"))); + translationManager.persist(new I18nTranslation(StringEscapeUtils.escapeHtml("[%d] users"), english, + StringEscapeUtils.escapeHtml("[%d] users"))); + I18nCountry gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", + "western", ","); + countryManager.persist(gb); + } + + @Test + public void setTranslation() { + translationManager.setTranslation("en", "Foo foo foo", "Foo foo foo translation"); + String translation = translationManager.getTranslation("en", "Foo foo foo"); + assertEquals("Foo foo foo translation", translation); + } + + @Test + public void testGetLexicon() { + HashMap<String, String> map = translationManager.getLexicon("af"); + assertTrue(map.size() > 0); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/LicenseManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/LicenseManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/LicenseManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,64 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.manager.LicenseManager; +import cc.kune.domain.License; +import cc.kune.domain.finders.LicenseFinder; + +import com.google.inject.Inject; + +public class LicenseManagerTest extends PersistenceTest { + private License license; + @Inject + LicenseFinder licenseFinder; + @Inject + LicenseManager licenseManager; + + @After + public void close() { + if (getTransaction().isActive()) { + getTransaction().rollback(); + } + } + + @Before + public void insertData() { + openTransaction(); + assertEquals(0, licenseFinder.getAll().size()); + license = new License("by", "Creative Commons Attribution", "", "http://creativecommons.org/licenses/by/3.0/", + true, false, false, "", ""); + licenseManager.persist(license); + } + + @Test + public void testLicenseCreation() { + assertNotNull(license.getId()); + assertEquals(1, licenseFinder.getAll().size()); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/TagManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/TagManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/TagManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,64 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertNotNull; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.server.PersistenceTest; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.TagManager; +import cc.kune.domain.Tag; +import cc.kune.domain.finders.TagFinder; + +import com.google.inject.Inject; + +public class TagManagerTest extends PersistenceTest { + @Inject + ContentManager contentManager; + private Tag tag; + @Inject + TagFinder tagFinder; + @Inject + TagManager tagManager; + + @After + public void close() { + if (getTransaction().isActive()) { + getTransaction().rollback(); + } + } + + @Before + public void insertData() { + openTransaction(); + tag = new Tag("foo1"); + tagManager.persist(tag); + } + + @Test + public void testTagCreation() { + assertNotNull(tag.getId()); + assertNotNull(tagFinder.findByTagName("foo1")); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/TagUserContentTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/TagUserContentTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/TagUserContentTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,118 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.manager.TagManager; +import cc.kune.core.server.manager.TagUserContentManagerDefault; +import cc.kune.domain.Tag; +import cc.kune.domain.TagUserContent; +import cc.kune.domain.finders.TagUserContentFinder; + +import com.google.inject.Inject; + +public class TagUserContentTest extends PersistencePreLoadedDataTest { + private static final String DUMMY_TAG = "dummy"; + @Inject + TagUserContentFinder finder; + @Inject + TagUserContentManagerDefault manager; + + private Tag tag; + @Inject + TagManager tagManager; + + @Before + public void before() { + tag = new Tag(DUMMY_TAG); + tagManager.persist(tag); + } + + private void createSomeTagUserContent() { + List<Tag> tags = manager.find(user, content); + assertEquals(0, tags.size()); + createTagUserContent(); + tags = manager.find(user, content); + assertEquals(1, tags.size()); + } + + private TagUserContent createTagUserContent() { + final TagUserContent tagUC = new TagUserContent(tag, user, content); + manager.persist(tagUC); + return tagUC; + } + + @Test + public void getTagsAsString() { + manager.setTags(user, content, DUMMY_TAG); + final String tagS = manager.getTagsAsString(user, content); + assertEquals(DUMMY_TAG, tagS); + } + + @Test + public void getTagsGrouped() { + finder.getTagsGroups(user.getUserGroup()); + } + + @Test + public void insertSomeUserContent() { + createSomeTagUserContent(); + } + + @Test + public void removeSomeUserContent() { + createSomeTagUserContent(); + manager.remove(user, content); + final List<Tag> tags = manager.find(user, content); + assertEquals(0, tags.size()); + } + + @Test + public void setTags() { + List<Tag> tags = manager.find(user, content); + assertEquals(0, tags.size()); + manager.setTags(user, content, DUMMY_TAG + " " + DUMMY_TAG); + tags = manager.find(user, content); + assertEquals(1, tags.size()); + } + + @Test + public void setTagsRemoveBefore() { + manager.setTags(user, content, "foo"); + manager.setTags(user, content, DUMMY_TAG); + final List<Tag> tags = manager.find(user, content); + assertEquals(1, tags.size()); + assertEquals(DUMMY_TAG, tags.get(0).getName()); + } + + @Test + public void testInsertData() { + final TagUserContent tagUC = createTagUserContent(); + assertNotNull(tagUC.getId()); + } +} Copied: trunk/src/test/java/cc/kune/core/server/manager/UserManagerTest.java (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/UserManagerTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/manager/UserManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -0,0 +1,146 @@ +/* + * + * Copyright (C) 2007-2011 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.server.manager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import java.util.TimeZone; + +import javax.persistence.PersistenceException; + +import org.apache.lucene.queryParser.ParseException; +import org.hibernate.validator.InvalidStateException; +import org.junit.Test; + +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.manager.impl.SearchResult; +import cc.kune.core.shared.domain.UserSNetVisibility; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class UserManagerTest extends PersistencePreLoadedDataTest { + @Inject + Group groupFinder; + + @Test + public void emailCorrect() { + user = new User("test1", "test1 name", "test(a)example.com", "some passwd", "somediggest".getBytes(), + "some salt".getBytes(), english, gb, getTimeZone()); + persist(user); + } + + @Test(expected = PersistenceException.class) + public void emailEmpty() { + user = new User("test1", "test1 name", null, "some passwd", "somediggest".getBytes(), "some salt".getBytes(), + english, gb, getTimeZone()); + persist(user); + } + + @Test(expected = InvalidStateException.class) + public void emailIncorrect() { + user = new User("test1", "test1 name", "falseEmail@", "some passwd", "somediggest".getBytes(), + "some salt".getBytes(), english, gb, getTimeZone()); + persist(user); + } + + private TimeZone getTimeZone() { + return TimeZone.getDefault(); + } + + @Test + public void loginIncorrect() { + final User result = userManager.login("test", "test"); + assertNull(result); + } + + @Test + public void loginWithEmailCorrect() { + final User result = userManager.login(USER_EMAIL, USER_PASSWORD); + assertNotNull(result.getId()); + } + + @Test + public void loginWithNickCorrect() { + final User result = userManager.login(USER_SHORT_NAME, USER_PASSWORD); + assertNotNull(result.getId()); + } + + @Test(expected = InvalidStateException.class) + public void passwdLengthIncorrect() { + user = new User("test1", "test1 name", "test(a)example.com", "pass", "diggest".getBytes(), "salt".getBytes(), + english, gb, getTimeZone()); + persist(user); + } + + /** + * This was not working: + * http://opensource.atlassian.com/projects/hibernate/browse/EJB-382 + */ + @Test(expected = GroupNameInUseException.class) + public void testUserExist() throws I18nNotFoundException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + persist(user1); + final User user2 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + persist(user2); + } + + @Test(expected = InvalidStateException.class) + public void userNameLengthIncorrect() { + user = new User("test1", "te", "test(a)example.com", "some passwd", "diggest".getBytes(), "salt".getBytes(), + english, gb, getTimeZone()); + persist(user); + } + + @Test + public void userSearch() throws Exception, ParseException { + userManager.reIndex(); + final SearchResult<User> result = userManager.search(USER_SHORT_NAME); + assertEquals(1, result.getSize()); + assertEquals(USER_SHORT_NAME, result.getList().get(0).getShortName()); + rollbackTransaction(); + } + + @Test(expected = InvalidStateException.class) + public void userShortNameIncorrect() { + user = new User("test1A", "test1 name", "test(a)example.com", "some passwd", "diggest".getBytes(), + "salt".getBytes(), english, gb, getTimeZone()); + persist(user); + } + + @Test + public void visibilityPersist() { + user = new User("test1", "test1 name", "test(a)example.com", "some passwd", "somediggest".getBytes(), + "some salt".getBytes(), english, gb, getTimeZone()); + for (final UserSNetVisibility visibility : UserSNetVisibility.values()) { + user.setSNetVisibility(visibility); + persist(user); + assertEquals(user.getSNetVisibility(), visibility); + } + } + +} Copied: trunk/src/test/java/cc/kune/core/server/manager/file (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/file) Modified: trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import static org.junit.Assert.assertTrue; @@ -31,6 +31,7 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.manager.file.EntityLogoUploadManager; import cc.kune.core.shared.dto.StateContainerDTO; import com.google.inject.Inject; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import static org.junit.Assert.assertEquals; @@ -31,9 +31,11 @@ import org.junit.Test; import org.mockito.Mockito; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.server.manager.file.FileDownloadManager; +import cc.kune.core.server.manager.file.FileUtils; +import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,9 +28,11 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.server.TestHelper; -import org.ourproject.kune.platf.server.manager.FileManager; +import cc.kune.core.server.TestHelper; +import cc.kune.core.server.manager.FileManager; +import cc.kune.core.server.manager.file.FileUtils; + import com.google.inject.Inject; public class FileManagerTest { Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import org.junit.Before; import org.junit.Test; @@ -26,6 +26,7 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.server.manager.file.FileUploadManager; import com.google.inject.Inject; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUtilsTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileUtilsTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import static org.junit.Assert.assertEquals; import org.junit.Test; +import cc.kune.core.server.manager.file.FileUtils; + public class FileUtilsTest { private static final String SIMPLE_FILE_NAME = "simple file name"; Modified: trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefaultTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/file/ImageUtilsDefaultTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.file; +package cc.kune.core.server.manager.file; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,6 +32,8 @@ import org.junit.BeforeClass; import org.junit.Test; +import cc.kune.core.server.manager.file.ImageUtilsDefault; + /** * If you get a UnsatisfiedLinkError this is a problem with jmagick installation * (in debian, apt-get install libjmagick6-jni, and add Copied: trunk/src/test/java/cc/kune/core/server/manager/impl (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl) Modified: trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/AbstractSocialNetworkManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/impl/AbstractSocialNetworkManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,15 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Before; -import org.ourproject.kune.platf.server.PersistenceTest; import org.ourproject.kune.testhelper.ctx.DomainContext; +import cc.kune.core.server.PersistenceTest; import cc.kune.domain.Group; import cc.kune.domain.User; Modified: trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerMoreTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerMoreTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerMoreTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,6 +28,7 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; import cc.kune.core.client.errors.LastAdminInGroupException; +import cc.kune.core.server.manager.impl.SocialNetworkManagerDefault; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; Modified: trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/manager/impl/SocialNetworkManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.manager.impl; +package cc.kune.core.server.manager.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -27,6 +27,7 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; +import cc.kune.core.server.manager.impl.SocialNetworkManagerDefault; import cc.kune.core.shared.domain.GroupListMode; import com.google.inject.Inject; Copied: trunk/src/test/java/cc/kune/core/server/mapper (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/mapper) Modified: trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.mapper; +package cc.kune.core.server.mapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,11 +29,12 @@ import org.junit.Before; import org.junit.Test; -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.state.StateContent; +import cc.kune.core.server.TestDomainHelper; +import cc.kune.core.server.TestHelper; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.state.StateContent; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserSNetVisibility; Copied: trunk/src/test/java/cc/kune/core/server/properties (from rev 1292, trunk/src/test/java/org/ourproject/kune/platf/server/properties) Modified: trunk/src/test/java/cc/kune/core/server/properties/KunePropertiesTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/properties/KunePropertiesTest.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/cc/kune/core/server/properties/KunePropertiesTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -17,12 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.server.properties; +package cc.kune.core.server.properties; import static org.junit.Assert.assertEquals; import org.junit.Test; +import cc.kune.core.server.properties.KunePropertiesDefault; + public class KunePropertiesTest { @Test Modified: trunk/src/test/java/cc/kune/domain/finders/TagUserContentFinderTest.java =================================================================== --- trunk/src/test/java/cc/kune/domain/finders/TagUserContentFinderTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/cc/kune/domain/finders/TagUserContentFinderTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -22,8 +22,9 @@ import javax.persistence.NoResultException; import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; +import cc.kune.core.server.PersistencePreLoadedDataTest; + import com.google.inject.Inject; public class TagUserContentFinderTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -29,6 +29,12 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.server.xmpp.ChatConnection; +import cc.kune.core.server.xmpp.ChatException; +import cc.kune.core.server.xmpp.Room; +import cc.kune.core.server.xmpp.RoomListener; +import cc.kune.core.server.xmpp.XmppManager; + import com.google.inject.Inject; public class XmppManagerTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -29,14 +29,14 @@ import org.junit.Test; import org.ourproject.kune.chat.server.ChatServerTool; import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.I18nCountryManager; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.manager.I18nTranslationManager; +import cc.kune.core.server.manager.LicenseManager; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -23,11 +23,11 @@ import java.io.IOException; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.properties.DatabaseProperties; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -24,17 +24,17 @@ import org.apache.commons.configuration.ConfigurationException; import org.ourproject.kune.chat.server.ChatServerModule; import org.ourproject.kune.docs.server.DocumentServerModule; -import org.ourproject.kune.platf.server.KunePersistenceService; -import org.ourproject.kune.platf.server.PlatformServerModule; -import org.ourproject.kune.platf.server.TestConstants; -import org.ourproject.kune.platf.server.init.FinderRegistry; -import org.ourproject.kune.platf.server.properties.PropertiesFileName; import org.ourproject.kune.wiki.server.WikiServerModule; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.persistence.PersistenceModule; import org.waveprotocol.wave.federation.noop.NoOpFederationModule; +import cc.kune.core.server.KunePersistenceService; +import cc.kune.core.server.PlatformServerModule; +import cc.kune.core.server.TestConstants; +import cc.kune.core.server.init.FinderRegistry; +import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.wave.server.CustomSettingsBinder; import com.google.inject.AbstractModule; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.TestDomainHelper; +import cc.kune.core.server.TestDomainHelper; import cc.kune.core.shared.dto.StateContentDTO; public class ContentServiceSaveTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -25,10 +25,10 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.UserSession; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.server.UserSession; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -29,10 +29,10 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.domain.Group; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -29,16 +29,16 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.mapper.Mapper; -import org.ourproject.kune.platf.server.properties.DatabaseProperties; -import org.ourproject.kune.platf.server.users.UserInfo; -import org.ourproject.kune.platf.server.users.UserInfoService; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.properties.DatabaseProperties; +import cc.kune.core.server.users.UserInfo; +import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.domain.UserSNetVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.I18nCountryDTO; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -27,10 +27,10 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.SocialNetworkManager; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -25,11 +25,11 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.UserSession; import cc.kune.core.client.errors.AlreadyUserMemberException; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.server.UserSession; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,122 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import static org.junit.Assert.assertEquals; - -import java.util.TimeZone; - -import org.junit.After; -import org.junit.Before; -import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.manager.I18nCountryManager; -import org.ourproject.kune.platf.server.manager.I18nLanguageManager; -import org.ourproject.kune.platf.server.manager.LicenseManager; -import org.ourproject.kune.platf.server.manager.UserManager; - -import cc.kune.domain.Container; -import cc.kune.domain.Content; -import cc.kune.domain.I18nCountry; -import cc.kune.domain.I18nLanguage; -import cc.kune.domain.License; -import cc.kune.domain.User; -import cc.kune.domain.finders.GroupFinder; -import cc.kune.domain.finders.LicenseFinder; -import cc.kune.domain.finders.UserFinder; - -import com.google.inject.Inject; - -public abstract class PersistencePreLoadedDataTest extends PersistenceTest { - protected static final String USER_EMAIL = "useremail(a)example.com"; - protected static final String USER_LONG_NAME = "the user long name"; - protected static final String USER_PASSWORD = "userPassword"; - protected static final String USER_SHORT_NAME = "usershortname"; - - protected Container container; - @Inject - protected ContainerManager containerManager; - protected Content content; - @Inject - protected ContentManager contentManager; - @Inject - protected I18nCountryManager countryManager; - protected License defLicense; - protected I18nLanguage english; - protected I18nCountry gb; - @Inject - protected GroupFinder groupFinder; - @Inject - protected GroupManager groupManager; - @Inject - protected I18nLanguageManager languageManager; - - @Inject - protected LicenseFinder licenseFinder; - @Inject - protected LicenseManager licenseManager; - // @Inject - // protected PropertyGroupManager propGroupManager; - protected User user; - @Inject - protected UserFinder userFinder; - @Inject - protected UserManager userManager; - - public PersistencePreLoadedDataTest() { - } - - @After - public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } - } - - @Before - public void preLoadData() throws Exception { - openTransaction(); - assertEquals(0, userFinder.getAll().size()); - assertEquals(0, groupFinder.getAll().size()); - assertEquals(0, licenseFinder.getAll().size()); - // final PropertyGroup groupProps = new PropertyGroup(Group.PROPS_ID); - // final PropertyGroup userProps = new PropertyGroup(User.PROPS_ID); - // propGroupManager.persist(userProps); - // propGroupManager.persist(groupProps); - english = new I18nLanguage(Long.valueOf(1819), "English", "English", "en"); - languageManager.persist(english); - gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); - countryManager.persist(gb); - user = userManager.createUser(USER_SHORT_NAME, USER_LONG_NAME, USER_EMAIL, USER_PASSWORD, "en", "GB", - TimeZone.getDefault().getID()); - defLicense = new License("by-sa-v3.0", "Creative Commons Attribution-ShareAlike", "", - "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); - licenseManager.persist(defLicense); - groupManager.createUserGroup(user, true); - content = new Content(); - content.setLanguage(english); - contentManager.persist(content); - container = new Container(); - container.setTypeId(DocumentServerTool.TYPE_FOLDER); - containerManager.persist(container); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,93 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; - -import org.junit.Before; - -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Provider; -import com.google.inject.persist.PersistService; -import com.google.inject.persist.Transactional; - -public abstract class PersistenceTest { - private final String persistenceUnit; - private final String propetiesFileName; - @Inject - Provider<EntityManager> provider; - - public PersistenceTest() { - // test: use memory - // test_db: use mysql - // Also configurable ein TestHelper - this(TestConstants.PERSISTENCE_UNIT, "kune.properties"); - } - - public PersistenceTest(final String persistenceUnit, final String propetiesFileName) { - this.persistenceUnit = persistenceUnit; - this.propetiesFileName = propetiesFileName; - } - - public void closeTransaction() { - getManager().getTransaction().commit(); - } - - protected EntityManager getManager() { - return provider.get(); - } - - public EntityTransaction getTransaction() { - return getManager().getTransaction(); - } - - public EntityManager openTransaction() { - final EntityManager manager = getManager(); - final EntityTransaction transaction = manager.getTransaction(); - transaction.begin(); - return manager; - } - - public void persist(final Object... entities) { - for (final Object entity : entities) { - getManager().persist(entity); - } - } - - @Transactional - @Before - public void prepare() { - final Injector injector = TestHelper.create(new PlatformServerModule(), persistenceUnit, propetiesFileName); - final PersistService persistence = injector.getInstance(PersistService.class); - // To Debug insert breakpoint here - persistence.start(); - injector.injectMembers(this); - } - - public void rollbackTransaction() { - final EntityTransaction transaction = getManager().getTransaction(); - if (transaction.isActive()) { - transaction.rollback(); - } - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/TestConstants.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestConstants.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestConstants.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,12 +0,0 @@ -package org.ourproject.kune.platf.server; - -public final class TestConstants { - // test: use memory - // test_db: use mysql - // public static final String PERSISTENCE_UNIT = "test_db"; - public static final String PERSISTENCE_UNIT = "test"; - public static final String WAVE_TEST_PROPFILE = "wave-server-testing.properties"; - - private TestConstants() { - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,259 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import java.util.TimeZone; - -import cc.kune.core.shared.domain.AdmissionType; -import cc.kune.domain.AccessLists; -import cc.kune.domain.Container; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.Revision; -import cc.kune.domain.SocialNetwork; -import cc.kune.domain.User; - -public abstract class TestDomainHelper { - - public static AccessLists createAccessLists(final Group groupAdmin, final Group groupEditor, final Group groupViewer) { - - final AccessLists lists = new AccessLists(); - if (groupAdmin != null) { - lists.addAdmin(groupAdmin); - } - if (groupEditor != null) { - lists.addEditor(groupEditor); - } - if (groupViewer != null) { - lists.addViewer(groupViewer); - } - return lists; - } - - public static String createBigText() { - final String text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Fusce leo felis, cursus eget, scelerisque adipiscing, fringilla vel, sem. Vestibulum semper tristique sem. Etiam quam neque, consectetuer at, fermentum id, vulputate non, leo. Ut condimentum, mauris et sollicitudin faucibus, lectus arcu facilisis mi, eu pretium arcu tortor quis sem. Pellentesque sit amet nulla ut tellus dapibus blandit. Donec eu dolor vitae mi scelerisque pretium. Donec sit amet nunc ut risus laoreet porta. Integer dictum mi at mauris. Vivamus vulputate, dolor quis pharetra interdum, augue nisi congue eros, a consectetuer libero mi ut quam. Fusce commodo sem blandit massa. Phasellus vehicula varius felis.\n" - + "\n" - + "Aenean tempus. Ut vel elit a nisl adipiscing commodo. Suspendisse nibh. Praesent pellentesque. Curabitur fringilla tempor justo. Suspendisse bibendum faucibus ipsum. Aenean porta elementum pede. Sed vel odio et metus egestas ultrices. Nulla facilisi. Sed blandit fermentum purus. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam adipiscing. Suspendisse dapibus, est porta vehicula auctor, diam orci scelerisque risus, eu condimentum enim pede ut turpis. Nullam turpis. Aliquam erat volutpat. Integer vitae magna. Mauris sit amet turpis.\n" - + "\n" - + "Suspendisse potenti. Proin ac felis nec justo bibendum tempus. Donec at nunc et leo aliquet vestibulum. Mauris a justo nec orci ultrices placerat. Etiam tempus commodo dolor. Proin at justo blandit mauris vestibulum hendrerit. Donec mollis pede nec orci. Donec mauris. Quisque adipiscing facilisis ante. Aliquam elit quam, vulputate sit amet, posuere a, suscipit nec, nunc. Etiam vehicula ullamcorper metus. Mauris nec diam a arcu porta lobortis.\n" - + "\n" - + "Cras dapibus justo sed lacus. Ut ultrices, massa malesuada vestibulum rhoncus, eros sem fringilla sem, vel ultricies eros arcu vel augue. Ut vehicula nibh at lacus. Integer interdum turpis vitae arcu tempus luctus. Praesent a ligula. Donec viverra vestibulum est. Donec ultricies blandit mi. Morbi eleifend, nisi quis tristique pretium, lacus enim luctus nisi, quis lacinia ligula quam a orci. Praesent vel lectus. Pellentesque molestie ante sed leo. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ultrices. Etiam augue. Morbi non purus. Nam libero ligula, lacinia at, rhoncus tincidunt, porttitor quis, leo.\n" - + "\n" - + "Nulla orci purus, laoreet vel, facilisis ac, rhoncus eu, dui. Phasellus sit amet urna quis dui tempor elementum. Curabitur at magna. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nullam in dui. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum lacinia lectus eleifend mauris. Proin pellentesque tellus sit amet eros. Nulla purus mi, aliquam ac, faucibus a, varius viverra, enim. Vestibulum porttitor, arcu in molestie tristique, tellus velit imperdiet risus, dignissim sollicitudin pede ante sed orci. Nunc in elit. Aliquam adipiscing turpis condimentum tortor. Quisque tellus dolor, tincidunt eu, vehicula rutrum, tristique a, ipsum. Fusce a nunc at ligula egestas sodales. Maecenas molestie, arcu ac ullamcorper ornare, sem nunc sollicitudin velit, id tempor est dui vel elit. Praesent quam quam, vehicula a, mollis et, tincidunt a, nisi. Aliquam justo nibh, faucibus porta, convallis eu, sagittis eget, leo. Praesent at nisi. Nullam scelerisque.\n" - + "\n" - + "Nunc felis. Vestibulum imperdiet sem. Proin posuere, mauris sit amet molestie pharetra, purus turpis vulputate purus, et blandit ante urna non est. Morbi ligula turpis, faucibus fermentum, auctor a, euismod sit amet, lectus. Cras lacinia, purus et rutrum suscipit, pede odio facilisis dolor, nonummy commodo nunc sapien eu lectus. Proin egestas. Nam sodales aliquam eros. Ut lorem est, porttitor vel, dapibus a, tristique nec, diam. Ut non nulla eu nisi rhoncus lacinia. Ut ornare, sem non molestie condimentum, nisi risus iaculis sem, ac aliquet dui sem vel augue. Nullam varius pellentesque sem. Nulla facilisi.\n" - + "\n" - + "Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fringilla erat at diam. Suspendisse tincidunt. Nullam pharetra, nibh eget varius tempus, arcu massa dignissim justo, et scelerisque nisi velit commodo orci. Morbi sed nisi eu mi ultrices interdum. Cras in urna a elit sollicitudin consequat. Maecenas vel diam vitae dolor aliquam faucibus. Maecenas mattis, sem a iaculis auctor, est felis sagittis sapien, ut imperdiet diam nisi a nisl. Vestibulum rutrum nisl eget ante. Nulla non urna. In tellus urna, dignissim a, auctor in, pharetra eget, massa. Nam a magna. Ut id elit sit amet risus auctor laoreet. Quisque et urna. Praesent vehicula, nibh ac euismod rhoncus, ligula diam pharetra eros, ac sollicitudin elit odio a nunc. Quisque augue. Nulla pellentesque rhoncus leo. Proin sagittis erat.\n" - + "\n" - + "Donec fringilla. Mauris ultricies gravida pede. Nullam non urna et quam dignissim egestas. Mauris in nulla. Duis ac ligula non nulla sodales hendrerit. Aliquam condimentum lectus ac turpis. Etiam venenatis lacus vel sem. Proin convallis scelerisque diam. Suspendisse sed lacus a felis pretium rhoncus. Mauris at tortor ac libero euismod porttitor. Maecenas euismod. Etiam id orci. Donec consectetuer gravida lacus. Vivamus bibendum nisi ut felis. Phasellus ac nisl. Praesent lorem sapien, ultricies eget, accumsan a, viverra ut, magna. Integer lobortis leo vitae nunc. Sed vulputate justo eu sem. Proin et augue.\n" - + "\n" - + "Suspendisse pellentesque suscipit lectus. Fusce ut odio a turpis eleifend viverra. Vestibulum nisl. Aliquam sed turpis at ante pulvinar cursus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec sodales odio sagittis lorem. Duis mattis gravida odio. Cras mattis iaculis risus. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed iaculis laoreet elit. Cras ut tortor. Suspendisse eget nisi. Suspendisse ligula tellus, scelerisque a, consectetuer quis, tristique vel, arcu. Morbi varius, ligula et hendrerit iaculis, lorem purus luctus ipsum, eu interdum urna lorem id pede. Mauris est. In posuere dolor ac ipsum. Curabitur dictum. Vestibulum imperdiet. Pellentesque imperdiet aliquet dolor. Sed vulputate, enim at pulvinar sodales, felis libero malesuada felis, in iaculis odio mauris id neque.\n" - + "\n" - + "Pellentesque adipiscing. Nam ac neque sagittis nunc posuere fermentum. Sed quis orci vel enim commodo scelerisque. Ut aliquam. Quisque vitae tortor. Morbi libero augue, interdum et, nonummy ac, mattis vel, nisl. Suspendisse elit. Curabitur suscipit leo dignissim tellus. Proin felis massa, ultricies nec, fermentum sit amet, sollicitudin dignissim, mi. Maecenas ipsum ligula, tincidunt vitae, varius a, consequat ac, ligula. Suspendisse et urna. Phasellus consequat luctus arcu. Morbi molestie. Vivamus ligula. Mauris mollis.\n" - + "\n" - + "In nonummy iaculis leo. Sed vitae metus. Morbi vel eros in dolor accumsan pellentesque. In ut velit. Duis in tortor non enim ultricies scelerisque. Pellentesque ultrices dui a magna. In cursus pede non lorem. Vivamus nisl. Morbi ut tortor eu justo cursus dictum. Integer condimentum. Vivamus nisl risus, euismod id, molestie ut, feugiat nec, magna. Vivamus viverra sodales purus. Ut nunc. Vivamus dignissim sollicitudin nunc. Nulla tempor, diam ut viverra tincidunt, nisl orci sollicitudin lectus, eu dignissim tellus justo eu erat. Phasellus lobortis risus id libero. Ut faucibus diam ac justo. Duis neque magna, auctor eu, suscipit sit amet, tempor faucibus, lacus. Nunc mauris velit, feugiat sit amet, venenatis id, euismod ac, risus. Sed nisl lorem, eleifend et, scelerisque vel, imperdiet vitae, quam.\n" - + "\n" - + "Integer egestas dolor a purus. Ut quam dolor, elementum at, tincidunt venenatis, dapibus sollicitudin, ligula. Morbi luctus diam eget neque. Duis iaculis. Aliquam vel tellus auctor ipsum elementum hendrerit. In euismod ante tincidunt risus. Maecenas ac lorem sed magna volutpat gravida. Aliquam et sapien sed pede tristique vehicula. Cras et tellus. Nunc massa sem, aliquet a, sollicitudin vitae, malesuada vel, dolor. Suspendisse dui. Mauris purus. Maecenas egestas orci ut quam. Sed semper. Nullam feugiat. Ut aliquet, tellus quis aliquam viverra, orci velit viverra odio, vel adipiscing odio ligula in lorem. Sed ac sem vitae nibh pretium dapibus. Donec ac diam. Integer ultrices massa ut diam. Duis pretium posuere arcu.\n" - + "\n" - + "Morbi lorem. Fusce luctus lorem in risus gravida gravida. Donec vulputate volutpat metus. Pellentesque ac massa vitae orci placerat pellentesque. In hac habitasse platea dictumst. Curabitur pretium, ipsum in consequat tempor, ligula est volutpat nibh, eget porta diam massa ac leo. Curabitur placerat massa vel nibh. Nam at quam. In sagittis augue ac leo. Fusce adipiscing, ligula in auctor molestie, libero felis mattis sem, sit amet faucibus mauris nunc ac metus. Vivamus neque ipsum, bibendum sit amet, fringilla sit amet, bibendum ut, massa. Maecenas bibendum. Vivamus nunc est, accumsan et, tempus vitae, sagittis in, erat. Fusce turpis nunc, pretium vitae, varius sit amet, dignissim et, tortor. Quisque egestas, libero in dapibus tincidunt, justo arcu feugiat massa, sed sollicitudin lectus tellus sit amet augue. Vestibulum tristique nibh eget lorem. Curabitur cursus purus tristique nulla.\n" - + "\n" - + "Etiam blandit, arcu eu aliquam ornare, velit libero faucibus felis, sit amet sollicitudin velit leo in elit. Sed turpis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec eu risus. Sed risus lorem, luctus mattis, scelerisque eget, tincidunt a, enim. Vivamus consequat mollis tellus. Cras urna lorem, facilisis eu, porttitor mollis, dignissim posuere, ligula. Ut nonummy sapien. Praesent cursus. Ut turpis. Nulla enim. Aliquam aliquet, enim a gravida aliquam, pede odio porttitor nisi, non vestibulum odio erat a tortor. Donec fringilla ligula id augue. Curabitur vel tellus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur ullamcorper est vitae quam.\n" - + "\n" - + "Sed posuere neque. Vivamus tortor. Ut at mauris. Nam felis tellus, nonummy eu, gravida id, bibendum id, magna. Pellentesque laoreet mi sed felis. Fusce at lectus quis erat auctor laoreet. In interdum velit ut pede. Ut malesuada tincidunt velit. Suspendisse eu felis in mauris scelerisque iaculis. Morbi ornare dapibus risus. Quisque rhoncus elementum ante. Cras euismod nisi et lectus. Donec ut velit. Etiam a mauris. Integer cursus iaculis tellus. Fusce facilisis, nunc at semper tincidunt, dui purus accumsan nisi, in auctor magna ligula vel pede. Suspendisse ut arcu molestie lorem posuere vestibulum. Quisque pulvinar rhoncus ligula.\n" - + "\n" - + "Morbi sed enim. Donec in erat. Curabitur suscipit euismod lectus. Etiam dui nisi, volutpat vitae, tincidunt eget, tristique eget, turpis. Vivamus feugiat, quam ut tincidunt placerat, risus magna iaculis quam, id semper nisi tortor quis nibh. Donec a nulla. Aliquam turpis felis, aliquam non, ultrices eget, lacinia vel, nibh. Quisque vel nisi et eros vulputate eleifend. Aliquam nisl. Proin semper turpis. Cras ipsum.\n" - + "\n" - + "Donec scelerisque nunc non nibh. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nullam nec elit congue ligula vulputate pellentesque. Nunc ipsum. In imperdiet blandit lectus. Nulla ornare elit. Nunc at nibh at nibh semper vulputate. Cras scelerisque hendrerit erat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum et mi. Etiam ut nisi et augue congue tempor. Curabitur nec libero non lacus congue suscipit. Nunc et metus a justo condimentum tincidunt.\n" - + "\n" - + "Phasellus ultrices placerat dui. Phasellus luctus, sem eu sagittis ultricies, massa dui eleifend libero, eu mollis urna dolor in neque. Duis pellentesque rutrum ipsum. Phasellus iaculis arcu et enim. Morbi neque. Sed felis velit, mattis sed, mollis quis, tempor sed, mi. Curabitur consequat, ipsum vel volutpat molestie, turpis dui suscipit urna, nec blandit libero pede quis leo. Sed ullamcorper luctus enim. Etiam rutrum imperdiet orci. Pellentesque pede. Nullam sollicitudin blandit quam. Pellentesque non nisi at justo venenatis pharetra. Praesent a dolor at lectus fringilla lobortis.\n" - + "\n" - + "Morbi eget dolor at mi tempus commodo. Ut accumsan convallis odio. Nam ac velit ac ligula consectetuer lacinia. Ut nibh tortor, auctor et, placerat et, rhoncus ac, ante. Nulla dignissim rhoncus quam. Vestibulum ac est. Integer pharetra, diam sed iaculis porta, turpis orci rhoncus risus, vel aliquet metus eros quis velit. Pellentesque cursus scelerisque ante. Suspendisse tempor, metus a vehicula laoreet, orci mauris tincidunt ante, vitae molestie lectus velit vel nulla. Suspendisse potenti. Morbi quis massa ac felis semper facilisis. Vivamus convallis, magna sed sollicitudin dapibus, tellus tortor congue erat, ac luctus risus mi sit amet lorem.\n" - + "\n" - + "In pellentesque libero ut lorem. Aliquam a libero eget nulla iaculis vehicula. Nullam turpis tellus, accumsan sit amet, bibendum ac, tincidunt in, libero. Mauris ac neque. Aliquam ultrices lorem id eros cursus pretium. Vivamus at elit ac felis tempor viverra. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam eget nunc. Morbi iaculis luctus massa. In turpis sapien, molestie pretium, vulputate in, facilisis sit amet, lacus. Proin tincidunt faucibus diam. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec nibh tellus, laoreet sit amet, fringilla vitae, ornare a, sapien. Praesent feugiat lobortis tellus. Nullam euismod euismod arcu. Proin a eros. Vivamus in orci. Proin nisi lacus, viverra ut, cursus lacinia, pharetra vitae, metus.\n" - + "\n" - + "Suspendisse porta risus eget lacus. Suspendisse posuere tortor non erat. Fusce fermentum. Vestibulum pulvinar, elit quis semper porta, nunc mauris dictum quam, eu adipiscing felis pede imperdiet tellus. Nulla sed eros. Sed vestibulum massa vitae purus. Aenean eu felis. Vivamus erat purus, pretium non, congue vulputate, lacinia vel, magna. Donec aliquet, lacus sit amet rhoncus lacinia, nisi tortor mollis felis, id mollis magna quam eu arcu. Morbi quis leo ac orci nonummy malesuada. Fusce iaculis tincidunt elit. Aenean vestibulum. Fusce ut diam eget lectus mattis dapibus. Nam suscipit, tellus vitae lacinia fermentum, nisi leo dignissim erat, a ultrices metus eros et enim. Curabitur congue hendrerit dui. Nulla a sem. Nam tincidunt faucibus leo.\n" - + "\n" - + "Aliquam quis ante. Sed sit amet eros nec mi aliquet mollis. Nunc libero quam, egestas et, cursus vel, congue id, metus. Etiam et lacus. Phasellus feugiat, mi vel ultrices feugiat, est risus sagittis pede, ut fringilla sem velit quis elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur et neque a diam sollicitudin egestas. Fusce fringilla egestas arcu. Integer congue risus quis libero. Suspendisse aliquam erat non leo. Ut tellus leo, accumsan quis, varius in, dapibus venenatis, dui. Cras mollis tincidunt nisl. Phasellus dignissim iaculis est. Morbi elit. Proin at nulla. Sed id arcu sit amet quam luctus volutpat.\n" - + "\n" - + "Vestibulum a lorem. Sed condimentum iaculis magna. Phasellus rhoncus. Vivamus malesuada, est et aliquam lobortis, dui massa vestibulum nunc, sed pellentesque mi velit ac orci. Nulla facilisi. Nunc a diam eu est iaculis lobortis. In velit sem, iaculis ut, ornare eu, eleifend at, arcu. Nulla quis metus vel neque rhoncus ultrices. Duis non ligula. Donec vitae augue et pede consectetuer egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum eu lectus eget sem sagittis congue. Donec posuere lacus et turpis. Etiam sed dolor. Nam purus turpis, vehicula eu, suscipit a, vehicula vel, justo. Nunc eros neque, dignissim vel, consectetuer eu, malesuada sed, odio. Quisque consectetuer, risus vitae vulputate viverra, velit metus accumsan velit, vitae commodo sem sapien vitae lacus. Curabitur suscipit sem ut nisl. Aliquam nec metus. Donec vel pede a velit vestibulum luctus.\n" - + "\n" - + "Morbi neque turpis, tincidunt quis, dapibus et, sollicitudin sit amet, turpis. Praesent pretium pretium neque. Donec venenatis consequat nibh. Quisque eu nisi. Quisque ultricies vulputate turpis. Praesent non lacus et augue tempor dignissim. Praesent interdum, ipsum at viverra imperdiet, odio pede tincidunt augue, sit amet auctor metus arcu eget dui. Sed pellentesque vulputate nibh. Morbi eu lacus. Cras nonummy velit in nisl.\n" - + "\n" - + "Nullam mollis, dui id imperdiet semper, felis neque lacinia odio, id congue nisi mi a arcu. Maecenas quam. Vestibulum in sapien quis sapien pretium sodales. Maecenas laoreet mauris et turpis hendrerit gravida. Integer tristique, neque in accumsan auctor, dui purus laoreet enim, id laoreet arcu est elementum justo. Quisque adipiscing, metus id consequat elementum, dui magna bibendum ligula, et lacinia risus augue vitae ante. Nullam eget lacus. Vivamus viverra. Donec dolor nunc, nonummy vitae, consectetuer ac, pulvinar sit amet, urna. Pellentesque eget arcu non nulla malesuada condimentum. Morbi sapien felis, rhoncus vel, lobortis at, scelerisque sed, quam. Suspendisse a leo non velit volutpat rhoncus. Duis tempus magna ac nisl. Fusce augue. Sed volutpat posuere erat. Cras accumsan egestas nulla. Etiam mi massa, ultrices quis, facilisis ut, venenatis nec, odio. Integer felis. Morbi ut arcu non magna rutrum eleifend.\n" - + "\n" - + "Morbi rhoncus lorem sit amet nibh. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec suscipit aliquet tortor. Mauris vel erat. Sed commodo, nisl sed convallis scelerisque, metus turpis commodo nisl, ultricies blandit pede erat nec orci. Morbi turpis mauris, laoreet quis, iaculis vitae, faucibus et, sem. Praesent condimentum lorem in lorem. Aenean elit ipsum, congue in, pellentesque in, congue vel, odio. Fusce neque neque, auctor a, lobortis nec, tincidunt a, tortor. Sed ipsum purus, condimentum nec, dictum sit amet, adipiscing ac, neque. Pellentesque ligula. Maecenas nec mi. Integer iaculis tincidunt elit. Donec commodo orci ut risus. Nunc nonummy suscipit justo. Pellentesque augue urna, blandit sit amet, dapibus quis, mollis ac, pede. Suspendisse ornare velit et metus. Duis leo libero, euismod sed, mollis at, fringilla id, risus. Cras a justo vitae ante adipiscing molestie. Nam viverra.\n" - + "\n" - + "Nam semper pede id purus. Fusce ut nibh in enim fringilla placerat. Etiam sodales urna et eros. Nulla facilisi. Sed eleifend justo vel nibh. Praesent vestibulum feugiat neque. Nunc pretium. Etiam fringilla lorem eget sapien. Morbi id nisi. Etiam vehicula. Donec nisi risus, malesuada at, consequat pellentesque, iaculis in, turpis. Etiam iaculis risus nec odio. Fusce a risus. Curabitur dui lacus, ultricies quis, pretium eget, venenatis eget, tortor. Sed et urna. Duis enim ipsum, consequat sed, aliquet in, semper ornare, nibh. Aliquam consequat erat eget leo. Nulla facilisi. Vestibulum convallis. Fusce suscipit varius est.\n" - + "\n" - + "Duis magna. Nunc adipiscing euismod orci. Integer egestas, nisl non suscipit viverra, sapien mauris tempus quam, ac hendrerit ligula nulla quis nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nunc eget pede ultrices elit aliquam tincidunt. Praesent nonummy. Maecenas faucibus accumsan nibh. Morbi dapibus erat. Duis feugiat, nibh nec iaculis consequat, nunc eros placerat libero, a commodo enim odio sit amet magna. Vivamus ultricies tempor lectus. Proin eros elit, aliquam ac, pharetra eget, congue nec, lorem. Suspendisse nisl lectus, gravida at, lacinia a, consequat sit amet, dolor.\n" - + "\n" - + "Sed vitae est eget eros vehicula cursus. Sed interdum orci sed orci. Ut tempus tincidunt magna. Aliquam erat volutpat. Suspendisse sed diam non mi eleifend euismod. Donec sem nunc, gravida sed, condimentum eget, tristique ac, odio. Maecenas mollis tellus eu risus. Donec tristique magna ut purus. Fusce et felis mattis turpis condimentum dignissim. Mauris sapien massa, lacinia tincidunt, vehicula in, scelerisque eget, nisl. Aliquam sed turpis interdum ligula molestie vestibulum. Nunc dolor. Sed sed tellus ac arcu egestas dapibus. Nunc magna. Curabitur non mauris. Integer quis ligula.\n" - + "\n" - + "Nulla facilisi. Vivamus at lectus in ligula fringilla posuere. Sed et metus. Curabitur sollicitudin. Praesent mi. Donec eros mi, auctor eget, accumsan vel, volutpat porta, metus. Nam molestie, nisi quis bibendum auctor, nisi risus suscipit sem, sed suscipit dolor nibh quis ante. Morbi at eros. Suspendisse rhoncus tellus at nulla. Mauris mollis orci sit amet turpis. Pellentesque tempor purus. Phasellus ultricies dictum massa. Proin nisl. Quisque eleifend dolor sit amet metus. Nulla pellentesque erat at leo dignissim suscipit. Fusce facilisis viverra quam. Duis viverra. Morbi vel eros. Curabitur nunc. Praesent id eros.\n" - + "\n" - + "Etiam at arcu ac pede lacinia pellentesque. Nullam urna magna, feugiat at, commodo nec, sollicitudin ut, diam. Nunc in urna. Phasellus congue ultricies ante. Etiam vel leo id eros tempor euismod. Vivamus sed justo. Mauris magna nulla, pretium sed, rhoncus elementum, varius in, enim. Proin sagittis nibh non mauris. Duis non pede non est interdum sagittis. Sed nulla.\n" - + "\n" - + "Integer id quam. Suspendisse ornare tortor sed ligula. Proin ac magna. Etiam dapibus ornare dui. Nullam ac felis quis lectus fermentum aliquet. Nulla sed augue et velit sollicitudin porta. Integer porttitor quam sit amet lacus. In dictum quam in nulla. Fusce euismod purus et justo. Nam sit amet mi quis orci rutrum rhoncus. Curabitur eleifend malesuada ligula. Nunc luctus auctor tellus. Phasellus pretium bibendum libero.\n" - + "\n" - + "Duis cursus, nibh quis tincidunt egestas, massa pede bibendum metus, a molestie sapien magna ac elit. Donec nunc nunc, vulputate et, sagittis in, bibendum vel, magna. Maecenas eleifend. Maecenas augue nunc, dignissim at, rhoncus at, pulvinar ut, eros. Aliquam dictum rutrum nisi. In hac habitasse platea dictumst. Aliquam justo mauris, vestibulum sed, cursus ut, suscipit ut, metus. Fusce vitae erat nec nisl posuere ultrices. Vestibulum non orci. Cras nunc lectus, aliquet a, pellentesque id, dapibus ut, felis. Sed lacinia tellus ac nunc. Vivamus massa diam, malesuada nec, convallis eget, lobortis id, nulla. Morbi bibendum, diam eu lacinia aliquet, enim risus suscipit sapien, at aliquet ligula lorem quis metus. Vestibulum euismod, lectus ac egestas facilisis, tortor dui pharetra diam, a aliquet enim ante quis neque. Praesent rhoncus ipsum non sem scelerisque vestibulum. Nullam posuere vestibulum tortor. Nulla facilisi. Aenean at urna sed odio posuere imperdiet. In semper suscipit nisl.\n" - + "\n" - + "Aliquam quam. Nullam euismod scelerisque arcu. Sed ultricies diam vitae neque. Nunc dictum. Curabitur eget tellus. Sed posuere venenatis nisl. Nulla condimentum, erat quis volutpat rutrum, pede sem mattis nisl, sit amet lacinia orci felis non nisi. Ut et turpis. Duis condimentum, eros ac rutrum pellentesque, enim tortor posuere felis, eget tempus sapien sapien id leo. Sed cursus, est sed tempus dapibus, turpis sapien tempor purus, eget rhoncus arcu diam non neque. Cras lorem. Donec posuere posuere orci. Sed nec metus id orci fringilla dictum. Curabitur ultrices viverra libero.\n" - + "\n" - + "Mauris tincidunt risus a libero. Suspendisse in nisl. Mauris id mauris. Mauris justo neque, varius tincidunt, hendrerit porttitor, ornare et, leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque adipiscing sapien ac sem. Fusce leo. Curabitur sit amet mauris. Suspendisse justo augue, vehicula sit amet, tincidunt id, semper vel, nisi. Curabitur tristique. Nulla facilisis. Fusce posuere, ante a vestibulum mattis, metus lectus pharetra tortor, rutrum egestas pede dui ut ligula. Aliquam lacus ligula, blandit id, aliquam at, elementum sed, felis. Nam laoreet. Vivamus a sapien. Cras quis neque. Sed est.\n" - + "\n" - + "Vestibulum id diam sit amet eros nonummy fringilla. Nullam cursus lobortis velit. In pharetra diam non augue. Duis convallis risus interdum mauris. Etiam rhoncus metus eget pede. Sed velit enim, rutrum in, tincidunt vel, pellentesque ac, elit. Vestibulum pretium mauris at magna. Suspendisse volutpat. Maecenas sit amet arcu. Fusce blandit. Mauris eget neque. Nunc semper nunc a libero. Donec enim dolor, vulputate ac, tempor sit amet, tincidunt eu, enim. Cras sagittis.\n" - + "\n" - + "Nullam commodo libero ut nunc tincidunt aliquet. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Etiam id tortor quis ipsum pretium blandit. Ut hendrerit orci ac arcu. In id leo. Suspendisse sit amet leo ut ipsum tristique venenatis. Sed in justo. Quisque feugiat. Morbi gravida arcu a orci. Maecenas in justo. Donec sodales, tortor id luctus interdum, ante lorem pretium ante, ac porttitor odio pede vitae purus. Sed iaculis pellentesque purus. Curabitur sit amet libero. Nam a metus ut tortor commodo rhoncus. Nulla suscipit. Mauris ac nibh. Suspendisse ante. Sed nonummy pede at eros. Aenean augue dui, nonummy id, ullamcorper non, dignissim non, diam. Pellentesque diam nisi, pulvinar et, mollis vel, egestas non, nibh.\n" - + "\n" - + "Phasellus tincidunt. Aliquam molestie. In tristique viverra magna. Integer consequat tempus urna. Aenean turpis orci, aliquet sit amet, mattis vitae, hendrerit eu, justo. Duis pharetra ultricies enim. Nulla facilisi. Nullam sodales, justo vel consectetuer tempor, risus est accumsan orci, non feugiat est dolor ut risus. In pharetra nunc nec urna. Donec diam sem, gravida et, pulvinar id, elementum eu, enim. Morbi porttitor. Integer quis nibh. Nulla ac nulla. Morbi massa orci, tincidunt in, porttitor a, rutrum id, magna. Phasellus vel quam. Curabitur pharetra rutrum quam. Praesent vestibulum, orci in pulvinar congue, diam justo iaculis eros, imperdiet tincidunt lorem urna quis eros. Praesent in eros at velit porttitor pretium.\n" - + "\n" - + "Fusce consectetuer mattis est. Sed non nulla. Ut auctor nisl. Pellentesque ac massa sit amet augue volutpat molestie. Aliquam in purus. Etiam vitae libero. Nunc sapien lacus, mollis ac, auctor eu, fermentum eu, ligula. Suspendisse potenti. Duis molestie pulvinar elit. Vestibulum tellus libero, ultrices vitae, blandit eget, porttitor ac, odio.\n" - + "\n" - + "Vivamus malesuada sapien sed ipsum. Aenean quis nisl quis orci suscipit placerat. Pellentesque porttitor commodo nulla. Proin quis libero. Donec congue porttitor sapien. Phasellus sed est vel ligula vulputate facilisis. Mauris sit amet diam. In quis neque id orci tempus vehicula. Suspendisse egestas feugiat neque. Ut metus leo, placerat eget, pellentesque sed, porta at, nisi. Suspendisse potenti. Phasellus ultricies justo sit amet sem. Aenean porttitor enim nec nibh. Integer sed orci.\n" - + "\n" - + "Sed dignissim, nisi eu convallis luctus, enim justo posuere mauris, quis cursus leo tortor vitae metus. Nullam nec enim a nisl aliquet aliquam. Morbi nunc nisl, sodales et, condimentum in, sagittis vel, pede. Vivamus a sem. Praesent imperdiet luctus elit. Nulla facilisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed ac mauris non sapien pretium consequat. Fusce ut purus. Praesent sem. Proin placerat posuere lorem. Donec vel libero. Morbi tincidunt sapien at nisl. Sed porta felis eu pede. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam scelerisque. Aenean sit amet metus. Morbi accumsan diam et neque mattis vestibulum. Suspendisse sollicitudin odio et odio. Pellentesque auctor ante non elit.\n" - + "\n" - + "Morbi eget quam eu orci lobortis blandit. Duis consequat nisi ut magna. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam posuere, diam at pretium auctor, tortor orci mattis mi, quis bibendum leo diam sed tellus. Vestibulum rutrum nunc. Donec sapien mauris, vehicula ac, commodo ac, hendrerit ut, risus. Quisque non magna at sapien vulputate nonummy. Proin pede enim, tempus sit amet, porttitor commodo, adipiscing non, est. Nulla facilisi. Aenean condimentum ante vitae pede. Donec id tortor quis tellus dictum dictum. Sed pretium ipsum nec pede. Nunc porttitor. In auctor quam at justo. Nunc ligula arcu, bibendum ac, volutpat sed, hendrerit eu, augue. Integer molestie pede eget ipsum.\n" - + "\n" - + "Nulla faucibus urna quis purus. Sed lacinia. Phasellus sollicitudin augue quis eros. Aenean vel mauris non ipsum molestie scelerisque. Cras pharetra, ligula vel adipiscing fringilla, nunc odio nonummy sapien, nec imperdiet sem pede nec mi. Ut vehicula enim a nunc. Donec suscipit. Curabitur dapibus nisi. Aenean nunc sapien, tristique dapibus, placerat sed, venenatis sed, enim. Etiam bibendum laoreet ligula. Aliquam mauris tortor, feugiat non, consectetuer sit amet, accumsan nec, quam. Nunc quis dui. Nulla facilisi. Cras at nisl. Fusce orci. In turpis. Aliquam nisi est, pellentesque nec, rutrum vitae, commodo at, nisi.\n" - + "\n" - + "Pellentesque ligula massa, faucibus at, porta ac, cursus vitae, turpis. Nam nibh nisi, viverra sit amet, porttitor vel, molestie quis, arcu. Nullam consectetuer egestas lacus. Suspendisse potenti. Nam scelerisque eleifend nunc. Suspendisse potenti. Maecenas turpis. Nam eleifend semper augue. Praesent ante nisl, sagittis sed, rhoncus eget, scelerisque eu, felis. Nullam non urna. Vestibulum eget ante. Sed id quam. Morbi ut lacus venenatis dolor lacinia commodo. Sed tincidunt libero at elit. Vivamus vitae tortor. Suspendisse eget nisl.\n" - + "\n" - + "Suspendisse dignissim luctus nisi. Pellentesque varius. Sed gravida aliquet lorem. Phasellus ligula mi, rhoncus id, cursus et, consequat quis, ante. Etiam placerat posuere enim. Donec sed tortor eget pede gravida tristique. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas libero. Nunc a metus nec urna mollis dignissim. Cras sodales sapien ac leo. Mauris suscipit. Mauris at nisl sit amet turpis porta semper. Nullam non elit. Fusce pharetra vestibulum odio. Sed a eros id neque accumsan congue. Fusce turpis mi, volutpat a, convallis non, auctor luctus, tortor. Sed blandit, dui at egestas lobortis, ante sapien dictum quam, vel semper arcu nisi id est.\n" - + "\n" - + "Suspendisse posuere. Etiam gravida scelerisque enim. Praesent placerat. Nam ligula nunc, faucibus quis, porttitor in, molestie id, velit. Cras sed purus. Nullam in erat. Suspendisse nonummy aliquam mi. Etiam eu lorem. Fusce rhoncus mi ac lectus. Proin sed augue. Donec eu libero. Vestibulum iaculis ultrices diam. Nam tincidunt tincidunt risus. Suspendisse non ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam congue erat ac nunc. Nulla interdum nisi vestibulum quam. Curabitur turpis. Praesent varius, nunc ac lacinia egestas, ante elit dictum pede, eu consequat risus ligula id lacus. Donec vel arcu ac augue feugiat posuere.\n" - + "\n" - + "Etiam tincidunt pulvinar ipsum. In sit amet nunc volutpat lorem luctus feugiat. Proin augue purus, dictum eu, posuere non, vestibulum vitae, libero. Vivamus fermentum. Sed lorem. Aliquam egestas dapibus eros. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum nec turpis non lacus feugiat auctor. Sed rhoncus libero eu eros pretium dictum. Duis sed quam. Etiam nec nulla. Morbi elit metus, pulvinar quis, condimentum tristique, egestas eu, lorem. Nam turpis. Sed tincidunt, justo varius nonummy vestibulum, ante odio ultricies diam, sed ullamcorper pede turpis eu elit. Integer sit amet arcu. Sed lorem. Quisque vehicula erat vitae sem. Nunc consectetuer tellus sed neque. Nullam fringilla.\n" - + "\n" - + "Etiam tempus bibendum sem. Morbi nunc orci, molestie at, pretium non, blandit vitae, justo. Suspendisse potenti. Nulla mollis, metus id interdum malesuada, dolor nulla iaculis ligula, nec lacinia nibh odio volutpat arcu. In hac habitasse platea dictumst. Nullam lorem turpis, mollis a, placerat sit amet, lobortis varius, lectus. Nunc viverra vulputate arcu. Donec nec urna. Vestibulum dapibus, metus ut molestie mollis, elit diam tempor est, eu dictum lectus est in velit. Vivamus faucibus, elit id pellentesque malesuada, purus libero porttitor turpis, vel gravida nunc ligula tempor mauris. Vestibulum suscipit lobortis libero. Vestibulum interdum, sem eget eleifend adipiscing, libero lectus aliquam odio, sed bibendum ante dui ut mi. Pellentesque scelerisque, lorem sed pulvinar eleifend, augue velit lacinia dui, nec semper nibh erat sit amet eros. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent fermentum arcu eget leo. Curabitur in felis. Curabitur sit amet massa in est cursus ultricies. Sed neque dolor, mollis vel, pulvinar ac, fermentum eget, mi.\n" - + "\n" - + "Nulla facilisi. Maecenas eros arcu, gravida vitae, commodo ac, commodo vel, mi. Suspendisse non metus. Aenean aliquet condimentum dui. Donec augue turpis, adipiscing sed, ultricies in, condimentum nec, metus. Nam sit amet pede. Morbi fringilla. Sed sollicitudin massa nec nisi. Nam ut libero. Morbi malesuada, lacus at bibendum luctus, ante diam tincidunt erat, id consectetuer eros felis ut nisi. Suspendisse ullamcorper rutrum tellus. Aenean in metus sit amet magna tempus pellentesque.\n" - + "\n" - + "Nullam venenatis tellus id pede. Nunc ac nulla a turpis bibendum laoreet. Quisque eget diam eget arcu scelerisque ultricies. Nullam faucibus accumsan ipsum. Quisque diam nisi, euismod nec, cursus at, lobortis sit amet, nunc. Quisque fermentum sapien eget nibh. Curabitur scelerisque. In hac habitasse platea dictumst. Aliquam diam dui, pharetra quis, ultrices ac, rutrum ut, mi. Praesent egestas. Cras convallis sem ac mauris. Curabitur ultrices odio pretium mi. Nam mi metus, adipiscing id, laoreet id, mattis nec, tortor. Ut sed turpis varius purus vehicula rutrum. Duis suscipit erat eget lectus. Donec feugiat varius risus. Donec facilisis dolor ut justo.\n" - + "\n" - + "Curabitur lectus nibh, congue ac, laoreet sed, vulputate ac, ipsum. Donec convallis nisl placerat augue. Proin nec felis in arcu tincidunt facilisis. Duis congue tincidunt sapien. Vivamus lobortis purus eget risus. Aenean aliquet, ipsum quis bibendum eleifend, justo dolor pellentesque justo, in elementum orci enim congue nisi. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed sem enim, lobortis nec, interdum vitae, sollicitudin non, dolor. Sed commodo euismod orci. Maecenas vel arcu et nunc dignissim volutpat. Morbi molestie aliquam mi. Sed id neque rutrum nunc sagittis ultricies. Mauris diam magna, ullamcorper nec, tincidunt id, laoreet nec, dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aliquam feugiat nisl non arcu. Nulla facilisi. In hac habitasse platea dictumst. Quisque metus.\n" - + "\n" - + "Suspendisse potenti. Cras malesuada pulvinar est. Ut nisi. Curabitur hendrerit, mauris vel laoreet dictum, quam dolor elementum orci, venenatis gravida sem erat malesuada ante. Aliquam condimentum. Suspendisse orci quam, varius in, egestas ut, mollis quis, arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus sed mauris at massa interdum vulputate. Morbi rutrum ligula. Vivamus nec libero. Curabitur lacinia, lorem eget feugiat pretium, purus urna consequat leo, non bibendum dolor augue vitae quam. Proin mi nunc, feugiat nec, convallis ac, feugiat ac, mi. Praesent pulvinar. Cras cursus nisi id nulla. Integer vel magna. Cras felis. Nam id tellus ac velit interdum convallis. Cras dignissim tortor sed mi.\n" - + "\n" - + "Nunc vestibulum, tortor eu commodo facilisis, leo mi vehicula sapien, eget hendrerit ipsum odio vitae sem. Aliquam consequat augue eu ligula. Vivamus et neque. Sed sed arcu at justo placerat placerat. Donec posuere. Phasellus lacus ligula, pulvinar at, porta et, tincidunt quis, quam. Curabitur pede mauris, interdum laoreet, feugiat condimentum, mollis ut, lectus. Curabitur laoreet, quam a malesuada suscipit, tellus lorem aliquet diam, a feugiat lorem neque hendrerit risus. Etiam viverra orci vitae mauris. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque tellus augue, aliquam non, porttitor non, ornare eu, mi. Nullam blandit sagittis ante. Aliquam tincidunt, lorem ac imperdiet sodales, elit felis cursus dolor, vel interdum leo purus at tellus. Nunc viverra, dui non sagittis dapibus, justo eros accumsan massa, eu hendrerit lorem nulla ac magna. In hac habitasse platea dictumst.\n" - + "\n" - + "Ut velit risus, malesuada eget, vestibulum nec, ornare ac, ipsum. Morbi volutpat aliquet turpis. Nam enim. Nulla semper est vitae neque. Phasellus non dui. In hac habitasse platea dictumst. Morbi auctor porttitor est. Nullam non nulla quis elit eleifend porttitor. Aliquam erat volutpat. Duis erat. Cras lobortis nisl in elit. Vivamus leo. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean ac neque. Nam sem nulla, ornare quis, dictum eget, fermentum quis, lorem. In blandit lacus. Aenean in enim.\n" - + "\n" - + "Donec sit amet orci id quam rhoncus egestas. Integer metus. Vestibulum risus lorem, posuere ac, aliquam in, mollis at, lorem. Integer metus. Aliquam blandit scelerisque orci. Nulla eu ligula. Nulla nec nisi et libero cursus bibendum. Suspendisse potenti. Maecenas in massa eget tortor consectetuer scelerisque. Morbi tincidunt velit. Nam lectus purus, malesuada ac, gravida nec, sodales sed, sem. Vestibulum feugiat. Cras viverra vestibulum massa. Mauris scelerisque. Fusce ut ante ut ante molestie molestie. Praesent non arcu. Fusce auctor blandit ipsum. Nullam est.\n" - + "\n" - + "In pulvinar arcu quis ligula. Duis volutpat metus at lorem. Aenean eu urna vitae velit tempus sollicitudin. Duis erat lectus, dignissim sit amet, fermentum at, mattis at, nisi. Nunc vel libero. Nulla eget risus et dui facilisis sagittis. Donec vel est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Sed adipiscing massa nec dolor. Morbi a ligula a ante vulputate tempor. Nullam lorem lacus, sodales gravida, scelerisque in, laoreet eu, nulla. Nam in tortor non nunc consectetuer porta. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Morbi ut diam. Proin nonummy. Pellentesque erat justo, egestas ac, sagittis id, suscipit vitae, diam. Aenean tincidunt urna sit amet urna. Donec turpis. Mauris cursus dolor a massa.\n" - + "\n" - + "Phasellus sem arcu, semper vel, eleifend eu, viverra eu, nulla. Fusce felis elit, semper cursus, ornare et, eleifend vel, pede. In est tellus, vulputate sit amet, tristique sed, imperdiet vel, lacus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Etiam justo. Proin volutpat. Nullam vitae dui nec urna convallis euismod. Nulla facilisi. Phasellus porttitor. Aenean scelerisque dolor sed justo. In vel nisi gravida mi mollis tempus. Curabitur ante lorem, fringilla eu, laoreet vitae, ultricies id, nisi. Sed id ante. Morbi tristique, est id porta tempus, turpis ipsum porta elit, at gravida leo odio in ante. Fusce euismod.\n" - + "\n" - + "Maecenas urna quam, fringilla eu, porta eu, semper quis, dui. Nunc congue est eu ante. Donec suscipit viverra leo. Nullam tempus porttitor est. Cras eu elit eget erat consectetuer convallis. Nam tellus ligula, eleifend ultrices, consequat et, malesuada non, velit. Quisque vitae enim in elit accumsan ullamcorper. Pellentesque eget enim. Sed nonummy, orci pretium malesuada adipiscing, dolor velit bibendum pede, non tincidunt diam sapien ac nunc. Maecenas porta leo at augue.\n" - + "\n" - + "Aliquam erat volutpat. Curabitur eu arcu faucibus tellus hendrerit bibendum. Praesent orci pede, lacinia vitae, tristique vitae, suscipit non, turpis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse tincidunt laoreet sapien. Vestibulum varius neque in odio. Donec sem ipsum, egestas id, molestie sit amet, luctus eu, est. Integer leo eros, laoreet non, lacinia in, cursus nec, mi. Donec ornare velit non massa. Curabitur turpis ligula, pharetra lacinia, euismod eu, tincidunt ut, velit. Cras nec ipsum eget augue sagittis vestibulum. Cras mattis dapibus tortor. Pellentesque sit amet arcu eu quam pretium malesuada. Phasellus turpis nisi, mattis ac, gravida et, aliquam eget, tellus. Aenean quis justo eget erat congue tincidunt.\n" - + "\n" - + "Aenean non tortor ut sem facilisis blandit. Sed ante lectus, bibendum id, fermentum ac, vestibulum et, ipsum. Sed tincidunt. Ut tincidunt. In sit amet odio. Sed massa. Nullam auctor. Nam lacinia sem eu lorem. Nunc neque tortor, euismod ut, dictum vel, commodo vehicula, lorem. Nullam metus urna, interdum non, semper eget, sodales in, eros. Sed eget magna vel dui tincidunt iaculis. Nam faucibus justo eget nunc. Suspendisse potenti. Proin fermentum erat in orci. Suspendisse semper lorem. Fusce rhoncus nulla a sapien. Mauris turpis turpis, bibendum euismod, porttitor pretium, semper id, ante. Ut eget est vel elit tempus auctor. Morbi interdum quam. In hac habitasse platea dictumst.\n" - + "\n" - + "Praesent vel ante ac mi consectetuer accumsan. Quisque quis ipsum. Suspendisse vitae magna vitae metus congue tempus. Aenean sagittis, ante nec vehicula molestie, ligula nisl tristique justo, quis suscipit nulla urna in sapien. Pellentesque eget felis pellentesque orci dignissim interdum. Sed metus lorem, egestas quis, iaculis at, venenatis eleifend, dui. Praesent elementum porttitor lacus. Sed suscipit dui vel dolor. Sed sit amet nunc et nunc rutrum eleifend. Curabitur et ligula. Phasellus consectetuer mi ut pede. In a libero in urna blandit varius. Sed pellentesque ligula aliquet risus. Ut laoreet, eros volutpat rhoncus congue, erat felis porttitor augue, vel laoreet eros est vitae pede. Suspendisse sit amet elit. Quisque quis dui. Vivamus massa. Suspendisse quis felis. Aliquam diam enim, volutpat in, commodo pellentesque, consectetuer ut, nibh.\n" - + "\n" - + "Donec mattis. Quisque purus purus, mattis sit amet, sollicitudin at, faucibus quis, diam. Sed ut urna a arcu posuere porta. Duis feugiat massa ut pede. In hac habitasse platea dictumst. Donec lectus nisl, elementum vel, pulvinar a, bibendum at, lorem. Vestibulum non lacus. Praesent arcu. Maecenas justo. Proin vel ipsum. Etiam egestas arcu vitae nibh. Aenean vel lacus id lacus tempus hendrerit. Ut lobortis ornare nibh.\n" - + "\n" - + "Donec nonummy, massa a accumsan tristique, purus diam iaculis nibh, ut dictum lorem metus sit amet nibh. Aliquam id eros et diam congue condimentum. Vestibulum porttitor massa a purus dignissim fringilla. Curabitur lectus. Phasellus auctor tortor vitae orci. Duis ante est, hendrerit ut, commodo sit amet, scelerisque eget, arcu. Cras luctus, risus eu volutpat sagittis, sem nulla accumsan libero, nec volutpat eros dui sit amet ante. Nunc convallis purus sed nisl. Nulla rutrum. Etiam viverra, orci at facilisis pretium, odio libero sollicitudin eros, ac pharetra est diam eu orci. Cras dolor risus, porttitor eu, convallis sit amet, tincidunt a, nulla. Nunc porttitor luctus diam. Mauris erat magna, pharetra ac, pretium consequat, viverra ut, nisl. Donec blandit mollis metus. Praesent dui pede, ultricies non, pellentesque et, molestie eu, nulla.\n" - + "\n" - + "Vivamus eleifend, leo sit amet tristique elementum, urna urna sollicitudin dolor, eu egestas est enim et tellus. Maecenas congue feugiat dolor. Nullam semper. Aliquam ipsum justo, fringilla et, consequat in, malesuada id, arcu. Ut orci. Aliquam sagittis consequat urna. Nam elementum diam quis lacus. Morbi elementum adipiscing orci. Mauris eros neque, vehicula quis, egestas sit amet, imperdiet id, mi. Cras convallis nisi vitae nulla. Vestibulum at purus.\n" - + "\n" - + "Etiam quis nisi vel sapien commodo ultrices. Etiam lacus. Etiam venenatis elit nec purus. Fusce id est. Vivamus justo tellus, facilisis quis, bibendum non, lacinia eget, ante. Mauris aliquet. Suspendisse iaculis placerat purus. Aliquam erat volutpat. Quisque vel sem. Donec pulvinar, lorem id malesuada blandit, nibh diam lobortis mi, in elementum velit mi a felis. In egestas. Suspendisse pede.\n" - + "\n" - + "Curabitur eu urna eget pede placerat adipiscing. Sed adipiscing bibendum tortor. Integer justo. Fusce risus enim, hendrerit ac, pellentesque sed, egestas sed, orci. Nunc orci erat, rutrum eu, euismod quis, condimentum eget, metus. Cras tincidunt. Phasellus scelerisque. Nunc sed nulla. Aliquam et sapien ac purus faucibus tincidunt. Ut id ligula egestas enim gravida vulputate. Maecenas consequat. Etiam varius sapien id pede. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Integer cursus libero eget pede. In faucibus ultricies felis. Praesent nulla. Donec tortor.\n" - + "\n" - + "Nulla quam felis, semper pellentesque, imperdiet a, egestas ut, purus. Fusce vitae elit quis dolor hendrerit gravida. Donec vestibulum. Aenean fermentum semper libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla facilisi. Donec eleifend leo at sem. Vivamus consectetuer, magna et iaculis elementum, erat sapien viverra lacus, consectetuer consectetuer justo leo id nulla. Phasellus id nisl. Aliquam molestie pede sit amet nisl. Duis iaculis vehicula tellus.\n" - + "\n" - + "Donec quis ipsum eget lacus vehicula fringilla. Vivamus dui est, interdum sed, scelerisque at, rhoncus at, massa. Proin placerat sodales elit. Mauris sagittis urna et enim. Vestibulum aliquet convallis nisi. Donec auctor ullamcorper lectus. Nullam vitae purus facilisis justo condimentum malesuada. Donec dui lectus, iaculis quis, lobortis aliquam, auctor nec, lectus. Aenean vel mi. Pellentesque et arcu faucibus orci convallis ullamcorper. In consequat. Praesent lobortis faucibus leo. Duis ut justo. Morbi viverra aliquam dui. Fusce laoreet dolor porta quam. Duis molestie porttitor dui. Quisque libero sem, tempor vitae, rhoncus sed, suscipit non, ante.\n" - + "\n" - + "In accumsan. Ut metus turpis, tincidunt in, rutrum quis, ultrices feugiat, tellus. Vivamus pellentesque urna sit amet elit. Mauris iaculis dui nec massa. Duis ac sem. Suspendisse sed lorem. Etiam eget sapien. Duis adipiscing porttitor neque. Nullam nisl elit, imperdiet et, pretium et, pretium ac, velit. Aenean eu lectus. Nam suscipit blandit purus. Vestibulum vel pede sodales nisi pulvinar porta. Integer ut urna ac arcu imperdiet tempus. Etiam rutrum, quam id euismod mattis, ligula tortor imperdiet orci, nec fringilla tortor libero eu est. Nulla pretium ligula. Sed eu nisi. Proin neque lorem, suscipit euismod, vestibulum eu, pretium volutpat, elit. Aenean mauris lacus, dictum nec, vulputate et, aliquam et, mi. Praesent aliquam purus ac neque.\n" - + "\n" - + "Maecenas mollis risus eget turpis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur lacus urna, auctor in, commodo ut, blandit vitae, tellus. Nunc vitae elit. Mauris elementum arcu. Nulla facilisi. Nunc diam tellus, porttitor non, dictum id, fermentum eget, nulla. Nulla facilisis enim nec felis. Phasellus interdum, erat a fermentum mattis, urna nisl iaculis ipsum, sit amet venenatis ante massa sit amet enim. Quisque facilisis nibh. Donec sit amet mauris et nisi eleifend egestas. Suspendisse pellentesque malesuada dui. Ut vestibulum, tortor sit amet pellentesque venenatis, sem turpis scelerisque massa, ut facilisis est ipsum ut arcu. Suspendisse feugiat, enim sit amet vehicula varius, tortor justo dapibus odio, et semper magna turpis ac ligula.\n" - + "\n" - + "Pellentesque non diam. Donec vel neque vel turpis vulputate ornare. Sed porttitor mi id augue. Etiam sapien mi, lobortis sed, dapibus nec, congue at, augue. Vestibulum condimentum, leo in cursus porta, quam nisl eleifend lectus, quis mattis sapien nisl sed lacus. Morbi pellentesque viverra massa. Aenean volutpat nibh lobortis tortor. Aliquam id diam. Nulla facilisi. Etiam ipsum elit, vestibulum vitae, accumsan vitae, aliquam sit amet, odio. Donec condimentum. Phasellus sodales, nunc et ullamcorper laoreet, turpis arcu egestas pede, id pharetra ante tortor vel est. Maecenas sem. Nulla lorem massa, mollis id, malesuada eu, faucibus a, est.\n" - + "\n" - + "Curabitur molestie, nunc at aliquet tempor, risus metus adipiscing felis, vitae euismod justo felis id eros. Aenean tincidunt nunc sed eros. Nulla ac tellus. Aliquam erat volutpat. Nulla vitae felis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In consectetuer posuere purus. Phasellus interdum. Ut laoreet semper nunc. Duis blandit quam a velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Curabitur aliquam dolor et tortor. Pellentesque vulputate. Pellentesque diam purus, facilisis nec, fermentum a, consequat quis, ipsum. Ut euismod dui ut massa. Proin nonummy nisi ut pede. Pellentesque sollicitudin lectus a purus.\n" - + "\n" - + "Cras vulputate. Praesent tempus fringilla diam. Suspendisse at elit. Cras ut nulla eget mi dapibus pretium. Etiam hendrerit tortor sed lectus. Cras mauris. Nam ligula. Mauris semper, arcu ut facilisis molestie, lorem sapien iaculis quam, at dignissim sapien mauris id pede. In metus ante, porttitor id, fringilla a, adipiscing eget, nisi. Ut ornare sapien nec velit. Aenean tortor metus, pellentesque vitae, iaculis eget, imperdiet nec, turpis. Vestibulum sit amet erat ac urna auctor imperdiet. Nulla facilisi. Quisque facilisis pede vel mi consequat dignissim. Vivamus sapien.\n"; - return text; - } - - public static Content createDescriptor(final long id, final String title, final String content) { - final Content descriptor = new Content(); - descriptor.setId(id); - final Revision rev = new Revision(descriptor); - descriptor.addRevision(rev); - rev.setTitle(title); - rev.setBody(content); - return descriptor; - } - - public static Container createFolderWithId(final long id) { - final Container container = new Container(); - container.setId(id); - return container; - } - - public static Container createFolderWithIdAndGroupAndTool(final int i, final String groupShortName, - final String toolName) { - final Container container = createFolderWithIdAndToolName(i, toolName); - final Group owner = new Group(); - owner.setShortName(groupShortName); - container.setOwner(owner); - return container; - - } - - public static Container createFolderWithIdAndToolName(final int i, final String toolName) { - final Container container = createFolderWithId(i); - container.setToolName(toolName); - return container; - } - - public static Group createGroup(final int number) { - final Group group = new Group("ysei" + number, "Yellow Submarine Environmental Initiative" + number); - group.setId(Long.valueOf(number)); - return group; - } - - public static SocialNetwork createSocialNetwork(final Group groupInAdmins, final Group groupInCollab, - final Group groupInViewer, final Group groupInPendings) { - - final SocialNetwork socialNetwork = new SocialNetwork(); - socialNetwork.addAdmin(groupInAdmins); - socialNetwork.addCollaborator(groupInCollab); - socialNetwork.addViewer(groupInViewer); - socialNetwork.addPendingCollaborator(groupInPendings); - return socialNetwork; - } - - public static User createUser(final int number) { - final String shortName = "shortname" + number; - final String longName = "name" + number; - final User user = new User(shortName, longName, "email@domain" + number, ("password" + number), - "diggest".getBytes(), "salt".getBytes(), null, null, TimeZone.getDefault()); - final Group userGroup = new Group(shortName, longName); - userGroup.setAdmissionType(AdmissionType.Closed); - userGroup.setSocialNetwork(createSocialNetwork(userGroup, userGroup, userGroup, null)); - user.setUserGroup(userGroup); - return user; - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,88 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.configuration.ConfigurationException; -import org.ourproject.kune.platf.integration.HttpServletRequestMocked; -import org.ourproject.kune.platf.server.init.FinderRegistry; -import org.ourproject.kune.platf.server.properties.PropertiesFileName; -import org.waveprotocol.box.server.CoreSettings; -import org.waveprotocol.box.server.ServerModule; -import org.waveprotocol.box.server.authentication.AccountStoreHolder; -import org.waveprotocol.box.server.persistence.AccountStore; -import org.waveprotocol.box.server.persistence.PersistenceException; -import org.waveprotocol.box.server.persistence.PersistenceModule; -import org.waveprotocol.wave.federation.noop.NoOpFederationModule; - -import cc.kune.wave.server.CustomSettingsBinder; - -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.Scopes; -import com.google.inject.name.Names; -import com.google.inject.persist.jpa.JpaPersistModule; -import com.google.inject.servlet.RequestScoped; -import com.google.inject.servlet.SessionScoped; - -public abstract class TestHelper { - public static Injector create(final Module module, final String persistenceUnit, final String propetiesFileName) { - try { - final Injector injector = Guice.createInjector(CustomSettingsBinder.bindSettings( - TestConstants.WAVE_TEST_PROPFILE, CoreSettings.class)); - final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); - final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); - final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule(false), - federationModule, FinderRegistry.init(new JpaPersistModule(persistenceUnit)), module, new Module() { - @Override - public void configure(final Binder binder) { - binder.bindScope(SessionScoped.class, Scopes.SINGLETON); - binder.bindScope(RequestScoped.class, Scopes.SINGLETON); - binder.bindConstant().annotatedWith(PropertiesFileName.class).to(propetiesFileName); - binder.bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); - } - }); - final AccountStore accountStore = childInjector.getInstance(AccountStore.class); - accountStore.initializeAccountStore(); - AccountStoreHolder.resetForTesting(); - AccountStoreHolder.init(accountStore, - childInjector.getInstance(Key.get(String.class, Names.named(CoreSettings.WAVE_SERVER_DOMAIN)))); - return childInjector; - } catch (final ConfigurationException e) { - e.printStackTrace(); - } catch (final PersistenceException e) { - e.printStackTrace(); - } - return null; - } - - public static void inject(final Object target) { - // test: use memory - // test_db: use mysql - // Also configurable ein PersistenceTest - TestHelper.create(new PlatformServerModule(), TestConstants.PERSISTENCE_UNIT, "kune.properties").injectMembers( - target); - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,121 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; - -import org.junit.Ignore; -import org.junit.Test; -import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -import cc.kune.domain.BasicMimeType; -import cc.kune.domain.Content; - -public class ContentManagerTest extends PersistencePreLoadedDataTest { - - private static final String BODY = "body"; - private static final String MIMETYPE = "image"; - private static final String TITLE = "title"; - - private void createContent() { - final Content cnt = contentManager.createContent(TITLE, BODY, user, container, - DocumentServerTool.TYPE_UPLOADEDFILE); - persist(cnt); - } - - private void createContentWithMimeAndCheck(final String mimetype) { - final Content cnt = contentManager.createContent(TITLE, BODY, user, container, - DocumentServerTool.TYPE_UPLOADEDFILE); - cnt.setMimeType(new BasicMimeType(mimetype)); - persist(cnt); - final Content newCnt = contentManager.find(cnt.getId()); - assertEquals(mimetype, newCnt.getMimeType().toString()); - } - - @Ignore - @Test - public void testBasicBodySearch() { - createContent(); - final SearchResult<Content> search = contentManager.search(BODY); - contentManager.reIndex(); - assertEquals(1, search.getSize()); - } - - @Test - public void testBasicMimePersist() { - final String mimetype = "application/pdf"; - createContentWithMimeAndCheck(mimetype); - } - - @Test - public void testBasicMimePersistWithoutSubtype() { - final String mimetype = "application"; - createContentWithMimeAndCheck(mimetype); - } - - @Test - public void testBasicMimeSearchWithQueriesAndFields() { - createContentWithMimeAndCheck(MIMETYPE + "/png"); - contentManager.reIndex(); - final SearchResult<Content> search = contentManager.search(new String[] { MIMETYPE }, - new String[] { "mimeType.mimetype" }, 0, 10); - assertEquals(1, search.getSize()); - } - - @Test - public void testBasicSearchWithQueriesAndFields() { - createContentWithMimeAndCheck(MIMETYPE); - final SearchResult<Content> search = contentManager.search(new String[] { BODY }, - new String[] { "lastRevision.body" }, 0, 10); - contentManager.reIndex(); - assertEquals(1, search.getSize()); - } - - @Test - public void testBasicTitleSearch() { - createContent(); - final SearchResult<Content> search = contentManager.search(TITLE); - contentManager.reIndex(); - assertEquals(1, search.getSize()); - } - - @Ignore - @Test - public void testtMimeSearch() { - createContentWithMimeAndCheck(MIMETYPE + "/png"); - contentManager.reIndex(); - final SearchResult<Content> search = contentManager.searchMime(BODY, 0, 10, "asb", MIMETYPE); - assertEquals(1, search.getSize()); - } - - /** - * This normally fails with mysql (not configured for utf-8), see the - * INSTALL mysql section - */ - @Test - public void testUTF8Persist() { - final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container, - DocumentServerTool.TYPE_DOCUMENT); - final Content newCnt = contentManager.find(cnt.getId()); - assertEquals("汉语/漢語", newCnt.getTitle()); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/FileManagerDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/FileManagerDefaultTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/FileManagerDefaultTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import org.junit.Before; -import org.ourproject.kune.platf.server.PersistenceTest; - -import com.google.inject.Inject; - -public class FileManagerDefaultTest extends PersistenceTest { - - @Inject - FileManager fileManager; - - @Before - public void start() { - - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,201 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.TimeZone; - -import org.apache.lucene.queryParser.ParseException; -import org.hibernate.validator.InvalidStateException; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -import cc.kune.core.client.errors.EmailAddressInUseException; -import cc.kune.core.client.errors.GroupNameInUseException; -import cc.kune.core.client.errors.I18nNotFoundException; -import cc.kune.core.client.errors.UserRegistrationException; -import cc.kune.core.shared.dto.GroupType; -import cc.kune.domain.AccessLists; -import cc.kune.domain.Group; -import cc.kune.domain.SocialNetwork; -import cc.kune.domain.User; - -public class GroupManagerTest extends PersistencePreLoadedDataTest { - - @Test - public void createdGroupShoudHaveValidSocialNetwork() throws Exception { - final Group group = new Group("short", "longName", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); - final SocialNetwork socialNetwork = group.getSocialNetwork(); - final AccessLists lists = socialNetwork.getAccessLists(); - assertTrue(lists.getAdmins().includes(user.getUserGroup())); - assertTrue(lists.getEditors().isEmpty()); - assertTrue(lists.getViewers().isEmpty()); - closeTransaction(); - } - - @Test - public void createGroup() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - final Group otherGroup = groupManager.findByShortName("ysei"); - - assertEquals(group.getLongName(), otherGroup.getLongName()); - assertEquals(group.getShortName(), otherGroup.getShortName()); - closeTransaction(); - } - - @Test - public void createGroupAndSearch() throws Exception, ParseException { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - groupManager.reIndex(); - final SearchResult<Group> result = groupManager.search("ysei"); - assertEquals(1, result.getSize()); - assertEquals("ysei", result.getList().get(0).getShortName()); - rollbackTransaction(); - } - - @Test(expected = GroupNameInUseException.class) - public void createGroupWithExistingLongName() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - - final Group group2 = new Group("ysei2", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - group2.setDefaultLicense(defLicense); - groupManager.createGroup(group2, user); - - rollbackTransaction(); - } - - @Test(expected = GroupNameInUseException.class) - public void createGroupWithExistingShortName() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - - final Group group2 = new Group("ysei", "Yellow Submarine Environmental Initiative 2", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group2, user); - - rollbackTransaction(); - } - - private void createTestGroup(final int number) throws Exception { - final Group g = new Group("ysei" + number, "Yellow Submarine Environmental Initiative " + number, defLicense, - GroupType.PROJECT); - groupManager.createGroup(g, user); - } - - @Test(expected = EmailAddressInUseException.class) - public void createUserExistingEmail() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test2", "test 2 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); - } - - @Test(expected = GroupNameInUseException.class) - public void createUserExistingLongName() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test2", "test 1 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); - } - - @Test(expected = GroupNameInUseException.class) - public void createUserExistingShortName() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test", "test 2 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); - } - - @Test(expected = EmailAddressInUseException.class) - public void createUserWithExistingEmail() throws Exception { - final User user2 = userManager.createUser("username2", "the user name 2", USER_EMAIL, "userPassword", "en", - "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); - } - - @Test(expected = GroupNameInUseException.class) - public void createUserWithExistingLongName() throws Exception { - final User user2 = userManager.createUser("username2", USER_LONG_NAME, "email2(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); - } - - @Test(expected = GroupNameInUseException.class) - public void createUserWithExistingShortName() throws Exception { - final User user2 = userManager.createUser(USER_SHORT_NAME, "the user name 2", "email2(a)example.com", - "userPassword", "en", "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); - } - - @Test(expected = UserRegistrationException.class) - public void createUserWithIncorrectShortName() throws Exception { - final User user2 = userManager.createUser("u s", "the user name 2", "email2(a)example.com", "userPassword", "en", - "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); - } - - @Test(expected = InvalidStateException.class) - public void createUserWithVeryShortName() throws Exception { - final User user2 = userManager.createUser("us", "the user name 2", "email2(a)example.com", "userPassword", "en", - "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); - } - - @Test - public void groupSearchPagination() throws Exception, ParseException { - for (int i = 1; i < 10; i++) { - createTestGroup(i); - } - groupManager.reIndex(); - final SearchResult<Group> result = groupManager.search("Yellow", 0, 5); - assertEquals(9, result.getSize()); - assertEquals(5, result.getList().size()); - final SearchResult<Group> result2 = groupManager.search("Yellow", 5, 5); - assertEquals(9, result2.getSize()); - assertEquals(4, result2.getList().size()); - rollbackTransaction(); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,176 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.HashMap; - -import org.apache.commons.lang.StringEscapeUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistenceTest; - -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.domain.I18nCountry; -import cc.kune.domain.I18nLanguage; -import cc.kune.domain.I18nTranslation; - -import com.google.inject.Inject; - -public class I18nManagerTest extends PersistenceTest { - @Inject - I18nTranslationManager translationManager; - @Inject - I18nCountryManager countryManager; - @Inject - I18nLanguageManager languageManager; - @Inject - I18nTranslationService translationService; - - @Test - public void byDefaultUseEnglish() { - HashMap<String, String> map = translationManager.getLexicon("en"); - HashMap<String, String> map2 = translationManager.getLexicon("af"); - assertEquals(map.size(), map2.size()); - } - - @After - public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } - } - - @Test - public void getNonExistentTranslationInAnyLangReturnsKey() { - HashMap<String, String> map = translationManager.getLexicon("en"); - HashMap<String, String> map2 = translationManager.getLexicon("aa"); - int initialSize = map.size(); - int initialSize2 = map2.size(); - - String translation = translationManager.getTranslation("es", "Foo foo foo"); - String translation2 = translationManager.getTranslation("aa", "Foo foo foo"); - - assertEquals(I18nTranslation.UNTRANSLATED_VALUE, translation); - assertEquals(I18nTranslation.UNTRANSLATED_VALUE, translation2); - - map = translationManager.getLexicon("en"); - map2 = translationManager.getLexicon("aa"); - int newSize = map.size(); - int newSize2 = map2.size(); - - assertEquals(initialSize + 1, newSize); - assertEquals(initialSize2 + 1, newSize2); - } - - @Test - public void getNonExistentTranslationReturnsDefaultLanguage() { - String translation = translationManager.getTranslation("af", "January [month]"); - assertEquals("January", translation); - } - - @Test - public void getTranslation() { - String translation = translationManager.getTranslation("af", "Sunday [weekday]"); - assertEquals("Sondag", translation); - } - - @Test - public void getTranslationUTF8() { - String translation = translationManager.getTranslation("el", "January [month]"); - assertEquals("Ιανουάριος", translation); - } - - @Test - public void getTranslationWithIntArg() { - String translation = translationManager.getTranslation("en", "[%d] users", 20); - assertEquals("20 users", translation); - } - - @Test - public void getTranslationWithIntArgFromService() { - String translation = translationService.t("[%d] users", 20); - assertEquals("20 users", translation); - } - - @Test - public void getTranslationWithIntArgFromWithNtService() { - String translation = translationService.tWithNT("[%d] users", "foo foo", 20); - assertEquals("20 users", translation); - } - - @Test - public void getTranslationWithStringArg() { - String translation = translationManager.getTranslation("en", "[%s] users", "Twenty"); - assertEquals("Twenty users", translation); - } - - @Test - public void getTranslationWithStringArgFromService() { - String translation = translationService.t("[%s] users", "Twenty"); - assertEquals("Twenty users", translation); - } - - @Test - public void getTranslationWithStringArgWithNtFromService() { - String translation = translationService.tWithNT("[%s] users", "foo foo", "Twenty"); - assertEquals("Twenty users", translation); - } - - @Before - public void insertData() { - openTransaction(); - I18nLanguage english = new I18nLanguage(Long.valueOf(1819), "English", "English", "en"); - I18nLanguage spanish = new I18nLanguage(Long.valueOf(5889), "Spanish", "Español", "es"); - I18nLanguage afrikaans = new I18nLanguage(Long.valueOf(114), "Afrikaans", "Afrikaans", "af"); - I18nLanguage greek = new I18nLanguage(Long.valueOf(1793), "Greek", "Ελληνικά", "el"); - languageManager.persist(english); - languageManager.persist(spanish); - languageManager.persist(afrikaans); - languageManager.persist(greek); - translationManager.persist(new I18nTranslation("Sunday [weekday]", english, "Sunday")); - translationManager.persist(new I18nTranslation("January [month]", english, "January")); - translationManager.persist(new I18nTranslation("Sunday [weekday]", afrikaans, "Sondag")); - translationManager.persist(new I18nTranslation("January [month]", greek, "Ιανουάριος")); - translationManager.persist(new I18nTranslation(StringEscapeUtils.escapeHtml("[%s] users"), english, - StringEscapeUtils.escapeHtml("[%s] users"))); - translationManager.persist(new I18nTranslation(StringEscapeUtils.escapeHtml("[%d] users"), english, - StringEscapeUtils.escapeHtml("[%d] users"))); - I18nCountry gb = new I18nCountry(Long.valueOf(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", - "western", ","); - countryManager.persist(gb); - } - - @Test - public void setTranslation() { - translationManager.setTranslation("en", "Foo foo foo", "Foo foo foo translation"); - String translation = translationManager.getTranslation("en", "Foo foo foo"); - assertEquals("Foo foo foo translation", translation); - } - - @Test - public void testGetLexicon() { - HashMap<String, String> map = translationManager.getLexicon("af"); - assertTrue(map.size() > 0); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,63 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistenceTest; - -import cc.kune.domain.License; -import cc.kune.domain.finders.LicenseFinder; - -import com.google.inject.Inject; - -public class LicenseManagerTest extends PersistenceTest { - private License license; - @Inject - LicenseFinder licenseFinder; - @Inject - LicenseManager licenseManager; - - @After - public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } - } - - @Before - public void insertData() { - openTransaction(); - assertEquals(0, licenseFinder.getAll().size()); - license = new License("by", "Creative Commons Attribution", "", "http://creativecommons.org/licenses/by/3.0/", - true, false, false, "", ""); - licenseManager.persist(license); - } - - @Test - public void testLicenseCreation() { - assertNotNull(license.getId()); - assertEquals(1, licenseFinder.getAll().size()); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,63 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertNotNull; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.content.ContentManager; - -import cc.kune.domain.Tag; -import cc.kune.domain.finders.TagFinder; - -import com.google.inject.Inject; - -public class TagManagerTest extends PersistenceTest { - @Inject - ContentManager contentManager; - private Tag tag; - @Inject - TagFinder tagFinder; - @Inject - TagManager tagManager; - - @After - public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } - } - - @Before - public void insertData() { - openTransaction(); - tag = new Tag("foo1"); - tagManager.persist(tag); - } - - @Test - public void testTagCreation() { - assertNotNull(tag.getId()); - assertNotNull(tagFinder.findByTagName("foo1")); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,116 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; - -import cc.kune.domain.Tag; -import cc.kune.domain.TagUserContent; -import cc.kune.domain.finders.TagUserContentFinder; - -import com.google.inject.Inject; - -public class TagUserContentTest extends PersistencePreLoadedDataTest { - private static final String DUMMY_TAG = "dummy"; - @Inject - TagUserContentFinder finder; - @Inject - TagUserContentManagerDefault manager; - - private Tag tag; - @Inject - TagManager tagManager; - - @Before - public void before() { - tag = new Tag(DUMMY_TAG); - tagManager.persist(tag); - } - - private void createSomeTagUserContent() { - List<Tag> tags = manager.find(user, content); - assertEquals(0, tags.size()); - createTagUserContent(); - tags = manager.find(user, content); - assertEquals(1, tags.size()); - } - - private TagUserContent createTagUserContent() { - final TagUserContent tagUC = new TagUserContent(tag, user, content); - manager.persist(tagUC); - return tagUC; - } - - @Test - public void getTagsAsString() { - manager.setTags(user, content, DUMMY_TAG); - final String tagS = manager.getTagsAsString(user, content); - assertEquals(DUMMY_TAG, tagS); - } - - @Test - public void getTagsGrouped() { - finder.getTagsGroups(user.getUserGroup()); - } - - @Test - public void insertSomeUserContent() { - createSomeTagUserContent(); - } - - @Test - public void removeSomeUserContent() { - createSomeTagUserContent(); - manager.remove(user, content); - final List<Tag> tags = manager.find(user, content); - assertEquals(0, tags.size()); - } - - @Test - public void setTags() { - List<Tag> tags = manager.find(user, content); - assertEquals(0, tags.size()); - manager.setTags(user, content, DUMMY_TAG + " " + DUMMY_TAG); - tags = manager.find(user, content); - assertEquals(1, tags.size()); - } - - @Test - public void setTagsRemoveBefore() { - manager.setTags(user, content, "foo"); - manager.setTags(user, content, DUMMY_TAG); - final List<Tag> tags = manager.find(user, content); - assertEquals(1, tags.size()); - assertEquals(DUMMY_TAG, tags.get(0).getName()); - } - - @Test - public void testInsertData() { - final TagUserContent tagUC = createTagUserContent(); - assertNotNull(tagUC.getId()); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -1,146 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.manager; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.util.TimeZone; - -import javax.persistence.PersistenceException; - -import org.apache.lucene.queryParser.ParseException; -import org.hibernate.validator.InvalidStateException; -import org.junit.Test; -import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.manager.impl.SearchResult; - -import cc.kune.core.client.errors.GroupNameInUseException; -import cc.kune.core.client.errors.I18nNotFoundException; -import cc.kune.core.shared.domain.UserSNetVisibility; -import cc.kune.domain.Group; -import cc.kune.domain.User; - -import com.google.inject.Inject; - -public class UserManagerTest extends PersistencePreLoadedDataTest { - @Inject - Group groupFinder; - - @Test - public void emailCorrect() { - user = new User("test1", "test1 name", "test(a)example.com", "some passwd", "somediggest".getBytes(), - "some salt".getBytes(), english, gb, getTimeZone()); - persist(user); - } - - @Test(expected = PersistenceException.class) - public void emailEmpty() { - user = new User("test1", "test1 name", null, "some passwd", "somediggest".getBytes(), "some salt".getBytes(), - english, gb, getTimeZone()); - persist(user); - } - - @Test(expected = InvalidStateException.class) - public void emailIncorrect() { - user = new User("test1", "test1 name", "falseEmail@", "some passwd", "somediggest".getBytes(), - "some salt".getBytes(), english, gb, getTimeZone()); - persist(user); - } - - private TimeZone getTimeZone() { - return TimeZone.getDefault(); - } - - @Test - public void loginIncorrect() { - final User result = userManager.login("test", "test"); - assertNull(result); - } - - @Test - public void loginWithEmailCorrect() { - final User result = userManager.login(USER_EMAIL, USER_PASSWORD); - assertNotNull(result.getId()); - } - - @Test - public void loginWithNickCorrect() { - final User result = userManager.login(USER_SHORT_NAME, USER_PASSWORD); - assertNotNull(result.getId()); - } - - @Test(expected = InvalidStateException.class) - public void passwdLengthIncorrect() { - user = new User("test1", "test1 name", "test(a)example.com", "pass", "diggest".getBytes(), "salt".getBytes(), - english, gb, getTimeZone()); - persist(user); - } - - /** - * This was not working: - * http://opensource.atlassian.com/projects/hibernate/browse/EJB-382 - */ - @Test(expected = GroupNameInUseException.class) - public void testUserExist() throws I18nNotFoundException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - persist(user1); - final User user2 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - persist(user2); - } - - @Test(expected = InvalidStateException.class) - public void userNameLengthIncorrect() { - user = new User("test1", "te", "test(a)example.com", "some passwd", "diggest".getBytes(), "salt".getBytes(), - english, gb, getTimeZone()); - persist(user); - } - - @Test - public void userSearch() throws Exception, ParseException { - userManager.reIndex(); - final SearchResult<User> result = userManager.search(USER_SHORT_NAME); - assertEquals(1, result.getSize()); - assertEquals(USER_SHORT_NAME, result.getList().get(0).getShortName()); - rollbackTransaction(); - } - - @Test(expected = InvalidStateException.class) - public void userShortNameIncorrect() { - user = new User("test1A", "test1 name", "test(a)example.com", "some passwd", "diggest".getBytes(), - "salt".getBytes(), english, gb, getTimeZone()); - persist(user); - } - - @Test - public void visibilityPersist() { - user = new User("test1", "test1 name", "test(a)example.com", "some passwd", "somediggest".getBytes(), - "some salt".getBytes(), english, gb, getTimeZone()); - for (final UserSNetVisibility visibility : UserSNetVisibility.values()) { - user.setSNetVisibility(visibility); - persist(user); - assertEquals(user.getSNetVisibility(), visibility); - } - } - -} Modified: trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -29,6 +29,12 @@ import org.junit.Before; import org.junit.Test; +import cc.kune.core.server.rack.filters.rest.DefaultRESTMethodFinder; +import cc.kune.core.server.rack.filters.rest.Parameters; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.server.rack.filters.rest.RESTMethod; +import cc.kune.core.server.rack.filters.rest.RESTMethodFinder; + public class TestRESTMethodFinder { private RESTMethodFinder finder; private MyTestService service; Modified: trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -24,6 +24,9 @@ import org.junit.Before; import org.junit.Test; +import cc.kune.core.server.rack.filters.rest.REST; +import cc.kune.core.server.rack.filters.rest.RESTServiceDefinition; + public class TestRESTServiceDefinition { private RESTServiceDefinition definition; Modified: trunk/src/test/java/testsuites/ServerManagerTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/ServerManagerTestSuite.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/testsuites/ServerManagerTestSuite.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -22,22 +22,23 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.ourproject.kune.platf.server.manager.ContentManagerTest; -import org.ourproject.kune.platf.server.manager.GroupManagerTest; -import org.ourproject.kune.platf.server.manager.I18nManagerTest; -import org.ourproject.kune.platf.server.manager.LicenseManagerTest; -import org.ourproject.kune.platf.server.manager.TagManagerTest; -import org.ourproject.kune.platf.server.manager.TagUserContentTest; -import org.ourproject.kune.platf.server.manager.UserManagerTest; -import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManagerTest; -import org.ourproject.kune.platf.server.manager.file.FileDownloadManagerTest; -import org.ourproject.kune.platf.server.manager.file.FileManagerTest; -import org.ourproject.kune.platf.server.manager.file.FileUploadManagerTest; -import org.ourproject.kune.platf.server.manager.file.FileUtilsTest; -import org.ourproject.kune.platf.server.manager.file.ImageUtilsDefaultTest; -import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerMoreTest; -import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerTest; +import cc.kune.core.server.manager.ContentManagerTest; +import cc.kune.core.server.manager.GroupManagerTest; +import cc.kune.core.server.manager.I18nManagerTest; +import cc.kune.core.server.manager.LicenseManagerTest; +import cc.kune.core.server.manager.TagManagerTest; +import cc.kune.core.server.manager.TagUserContentTest; +import cc.kune.core.server.manager.UserManagerTest; +import cc.kune.core.server.manager.file.EntityLogoUploadManagerTest; +import cc.kune.core.server.manager.file.FileDownloadManagerTest; +import cc.kune.core.server.manager.file.FileManagerTest; +import cc.kune.core.server.manager.file.FileUploadManagerTest; +import cc.kune.core.server.manager.file.FileUtilsTest; +import cc.kune.core.server.manager.file.ImageUtilsDefaultTest; +import cc.kune.core.server.manager.impl.SocialNetworkManagerMoreTest; +import cc.kune.core.server.manager.impl.SocialNetworkManagerTest; + /** * Rescan with : * Modified: trunk/src/test/java/testsuites/ServerOtherTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/ServerOtherTestSuite.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/testsuites/ServerOtherTestSuite.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -22,18 +22,19 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.ourproject.kune.platf.server.access.AccessRightsServiceTest; -import org.ourproject.kune.platf.server.access.FinderTest; -import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest; -import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest; -import org.ourproject.kune.platf.server.domain.GroupListTest; -import org.ourproject.kune.platf.server.finders.GroupFinderTest; -import org.ourproject.kune.platf.server.finders.LicenseFinderTest; -import org.ourproject.kune.platf.server.finders.RateFinderTest; -import org.ourproject.kune.platf.server.finders.UserFinderTest; -import org.ourproject.kune.platf.server.mapper.MapperTest; -import org.ourproject.kune.platf.server.properties.KunePropertiesTest; +import cc.kune.core.server.access.AccessRightsServiceTest; +import cc.kune.core.server.access.FinderTest; +import cc.kune.core.server.auth.AuthenticatedMethodInterceptorTest; +import cc.kune.core.server.auth.AuthorizatedMethodInterceptorTest; +import cc.kune.core.server.domain.GroupListTest; +import cc.kune.core.server.finders.GroupFinderTest; +import cc.kune.core.server.finders.LicenseFinderTest; +import cc.kune.core.server.finders.RateFinderTest; +import cc.kune.core.server.finders.UserFinderTest; +import cc.kune.core.server.mapper.MapperTest; +import cc.kune.core.server.properties.KunePropertiesTest; + /** * Rescan with : * Modified: trunk/src/test/java/testsuites/ServerTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/ServerTestSuite.java 2011-03-25 12:43:38 UTC (rev 1293) +++ trunk/src/test/java/testsuites/ServerTestSuite.java 2011-03-25 20:21:30 UTC (rev 1294) @@ -22,18 +22,19 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.ourproject.kune.platf.server.access.AccessRightsServiceTest; -import org.ourproject.kune.platf.server.access.FinderTest; -import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest; -import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest; -import org.ourproject.kune.platf.server.domain.GroupListTest; -import org.ourproject.kune.platf.server.finders.GroupFinderTest; -import org.ourproject.kune.platf.server.finders.LicenseFinderTest; -import org.ourproject.kune.platf.server.finders.RateFinderTest; -import org.ourproject.kune.platf.server.finders.UserFinderTest; -import org.ourproject.kune.platf.server.mapper.MapperTest; -import org.ourproject.kune.platf.server.properties.KunePropertiesTest; +import cc.kune.core.server.access.AccessRightsServiceTest; +import cc.kune.core.server.access.FinderTest; +import cc.kune.core.server.auth.AuthenticatedMethodInterceptorTest; +import cc.kune.core.server.auth.AuthorizatedMethodInterceptorTest; +import cc.kune.core.server.domain.GroupListTest; +import cc.kune.core.server.finders.GroupFinderTest; +import cc.kune.core.server.finders.LicenseFinderTest; +import cc.kune.core.server.finders.RateFinderTest; +import cc.kune.core.server.finders.UserFinderTest; +import cc.kune.core.server.mapper.MapperTest; +import cc.kune.core.server.properties.KunePropertiesTest; + /** * Rescan with : *

1 0

r1293 - in trunk/src: main/java/cc/kune/client main/java/cc/kune/core/client main/java/cc/kune/core/client/cnt main/java/cc/kune/core/client/services main/java/cc/kune/core/client/ui main/java/cc/kune/core/client/ui/footer main/java/cc/kune/core/client/ui/utils main/java/cc/kune/gspace main/java/cc/kune/gspace/client main/java/cc/kune/gspace/client/tags main/java/cc/kune/gspace/client/tool main/java/cc/kune/gspace/client/ui main/java/cc/kune/gspace/client/ui/footer main/java/cc/kune/gspace/cl
by Vicente J. Ruiz Jurado 25 Mar '11

25 Mar '11

Author: vjrj_ Date: 2011-03-25 13:43:38 +0100 (Fri, 25 Mar 2011) New Revision: 1293 Added: trunk/src/main/java/cc/kune/core/client/cnt/ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java trunk/src/main/java/cc/kune/core/client/ui/utils/ trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java trunk/src/main/java/cc/kune/gspace/client/tags/ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ trunk/src/main/java/cc/kune/gspace/client/ui/ trunk/src/main/java/cc/kune/gspace/client/ui/footer/ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/ trunk/src/test/java/cc/kune/gspace/ trunk/src/test/java/cc/kune/gspace/client/ trunk/src/test/java/cc/kune/gspace/client/tags/ trunk/src/test/java/cc/kune/gspace/client/tool/ Removed: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java trunk/src/main/java/cc/kune/core/client/tags/ trunk/src/main/java/cc/kune/core/client/tool/ trunk/src/main/java/cc/kune/core/client/ui/footer/license/ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ trunk/src/test/java/cc/kune/core/client/tags/ trunk/src/test/java/cc/kune/core/client/tool/ Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml trunk/src/main/java/cc/kune/gspace/client/WsArmor.java trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java trunk/src/test/java/testsuites/OthersTestSuite.java Log: Tools refactoring Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -79,5 +79,6 @@ ginjector.getSpacesTabPresenter(); ginjector.getChatClient(); ginjector.getCoreParts(); + ginjector.getPSpacePresenter(); } } Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -44,11 +44,12 @@ import cc.kune.core.client.sn.UserSNPresenter; import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import cc.kune.pspace.client.PSpaceGinModule; import cc.kune.pspace.client.PSpacePresenter; import cc.kune.wave.client.WaveGinModule; @@ -109,8 +110,6 @@ AsyncProvider<PSpacePresenter> getPSpacePresenter(); - AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); - AsyncProvider<RegisterPresenter> getRegisterPresenter(); AsyncProvider<SignInPresenter> getSignInPresenter(); @@ -127,6 +126,10 @@ StateManager getStateManager(); + AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); + + AsyncProvider<ToolSelectorPresenter> getToolSelectorPresenter(); + AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -89,10 +89,6 @@ import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.StateManagerDefault; -import cc.kune.core.client.tags.TagsSummaryPanel; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePanel; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.client.ws.entheader.EntityHeader; @@ -101,6 +97,13 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; import cc.kune.gspace.client.WsArmorImpl; +import cc.kune.gspace.client.tags.TagsSummaryPanel; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelectorPanel; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePanel; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; @@ -117,7 +120,7 @@ /* * (non-Javadoc) - * + * * @see com.google.gwt.inject.client.AbstractGinModule#configure() */ @Override @@ -161,6 +164,9 @@ UserConfirmPresenter.UserConfirmProxy.class); bindPresenter(TagsSummaryPresenter.class, TagsSummaryPresenter.TagsSummaryView.class, TagsSummaryPanel.class, TagsSummaryPresenter.TagsSummaryProxy.class); + bindPresenter(ToolSelectorPresenter.class, ToolSelectorPresenter.ToolSelectorView.class, + ToolSelectorPanel.class, ToolSelectorPresenter.ToolSelectorProxy.class); + bind(ToolSelector.class).to(ToolSelectorPresenter.class).in(Singleton.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -8,8 +8,9 @@ import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; import cc.kune.core.client.sn.actions.registry.UserSNConfActions; import cc.kune.core.client.state.Session; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import com.google.inject.Inject; import com.google.inject.Provider; @@ -21,7 +22,8 @@ final Provider<UserSNPresenter> buddiesAndParticipationPresenter, final Provider<GroupSNConfActions> groupMembersConfActions, final Provider<UserSNConfActions> userSNConfActions, final Provider<SiteUserOptionsPresenter> userOptions, - final Provider<EntityLicensePresenter> licenseFooter, final Provider<TagsSummaryPresenter> tagsPresenter) { + final Provider<EntityLicensePresenter> licenseFooter, final Provider<TagsSummaryPresenter> tagsPresenter, + final Provider<ToolSelector> toolSelector) { session.onInitDataReceived(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -32,6 +34,7 @@ userOptions.get(); licenseFooter.get(); tagsPresenter.get(); + toolSelector.get(); } }); } Copied: trunk/src/main/java/cc/kune/core/client/cnt (from rev 1279, trunk/src/main/java/org/ourproject/kune/workspace/client/cnt) Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentPanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,23 +17,24 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.gspace.client.WsArmor; +import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; public abstract class AbstractContentPanel { - private final WorkspaceSkeleton ws; private Widget widget; + private final ForIsWidget ws; - public AbstractContentPanel(final WorkspaceSkeleton ws) { - this.ws = ws; + public AbstractContentPanel(final WsArmor ws) { + this.ws = ws.getDocContainer(); } public void attach() { if (widget != null && !widget.isAttached()) { - ws.getEntityWorkspace().setContent(widget); + ws.add(widget); } } @@ -43,7 +44,7 @@ } } - public void setWidget(Widget widget) { + public void setWidget(final Widget widget) { this.widget = widget; } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; public abstract class AbstractContentPresenter { Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,12 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import cc.kune.common.client.actions.ui.IsActionExtensible; -import cc.kune.core.shared.domain.utils.StateToken; +public interface ActionContentToolbar extends IsActionExtensible { -public interface ActionContentToolbar extends ActionToolbar<StateToken> { + void attach(); + void detach(); + } Added: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,52 @@ +/* + * + * Copyright (C) 2007-2011 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.cnt; + +import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.inject.Inject; + +public class ActionContentToolbarImpl extends ActionFlowPanel implements ActionContentToolbar { + + private final ForIsWidget wsToolbar; + + @Inject + public ActionContentToolbarImpl(final GuiProvider guiProvider, final WsArmor wsArmor) { + super(guiProvider); + this.wsToolbar = wsArmor.getDocSubheader(); + } + + @Override + public void attach() { + if (!this.isAttached()) { + wsToolbar.add(this); + } + } + + @Override + public void detach() { + if (this.isAttached()) { + this.removeFromParent(); + } + } +} Deleted: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,33 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.workspace.client.cnt; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; - -import cc.kune.core.shared.domain.utils.StateToken; - -public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar { - - public ActionContentToolbarPresenter(ActionToolbarView<StateToken> toolbar) { - super(toolbar); - } - -} Modified: trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,11 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionRegistry; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; -import cc.kune.core.shared.domain.utils.StateToken; - -public class ContentActionRegistry extends ActionRegistry<StateToken> { +@SuppressWarnings("serial") +public class ContentActionRegistry extends GuiActionDescCollection { } Deleted: trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,78 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.workspace.client.cnt; - -import java.util.HashMap; - -import cc.kune.core.shared.dto.BasicMimeTypeDTO; - -public class ContentIconsRegistry { - private final HashMap<String, String> contentTypesIcons; - - public ContentIconsRegistry() { - contentTypesIcons = new HashMap<String, String>(); - } - - public String getContentTypeIcon(final String typeId) { - final String icon = contentTypesIcons.get(typeId); - return icon == null ? "" : icon; - } - - /** - * If there is a specific icon for a type/subtype pair or a generic type - * icon in defect - * - * @param typeId - * the kune typeId (see *ClientTool) - * @param mimeType - * @return - */ - public String getContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType) { - String icon = getContentTypeIcon(concatenate(typeId, mimeType)); - if (icon.equals("")) { - if (mimeType == null) { - return getContentTypeIcon(typeId); - } - } else { - return icon; - } - final String subtype = mimeType.getSubtype(); - if (subtype != null && subtype.length() > 0) { - icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); - } - return icon.equals("") ? getContentTypeIcon(typeId) : icon; - } - - public void registerContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType, final String iconUrl) { - registerContentTypeIcon(concatenate(typeId, mimeType), iconUrl); - } - - public void registerContentTypeIcon(final String contentTypeId, final String iconUrl) { - contentTypesIcons.put(contentTypeId, iconUrl); - } - - private String concatenate(final String typeId, final BasicMimeTypeDTO mimeType) { - if (mimeType != null) { - return typeId + "|" + mimeType; - } else { - return typeId; - } - } -} Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContent.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; public interface FoldableContent { Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,18 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.IconLabel; -import org.ourproject.kune.platf.client.ui.KuneUiUtils; -import org.ourproject.kune.platf.client.ui.RoundedPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.common.client.ui.IconLabel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -39,19 +37,30 @@ private static final String DEF_CONTENT_MARGINS_STYLE = "kune-Margin-7-trbl"; private final I18nTranslationService i18n; - private final RoundedPanel messagePanel; private final IconLabel messageLabel; + private final FlowPanel messagePanel; - public FoldableContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n) { + public FoldableContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { super(ws); this.i18n = i18n; - messageLabel = new IconLabel(Images.App.getInstance().info(), ""); + messageLabel = new IconLabel(""); + messageLabel.setLeftIconResource(res.info()); messageLabel.addStyleName("k-preview-msg-lab"); - messagePanel = new RoundedPanel(messageLabel, RoundedPanel.ALL, 2); - messagePanel.setCornerStyleName("k-preview-msg"); + messagePanel = new FlowPanel(); + messagePanel.add(messageLabel); + messagePanel.addStyleName("k-preview-msg"); messagePanel.addStyleName("kune-Margin-7-b"); } + private VerticalPanel createMessageVp(final boolean showMsg) { + final VerticalPanel vp = new VerticalPanel(); + if (showMsg) { + setDefPreviewMsg(); + vp.add(messagePanel); + } + return vp; + } + @Override public void setContent(final String content, final boolean showPreviewMsg) { final VerticalPanel vp = createMessageVp(showPreviewMsg); @@ -60,11 +69,42 @@ setWidgetAsContent(vp, true); } + private void setContent(final Widget widget) { + setWidget(widget); + attach(); + } + + private void setDefPreviewMsg() { + messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file")); + } + + private void setDefStyle(final Widget widget) { + widget.setStyleName("kune-Content-Main"); + widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); + } + @Override public void setInfo(final String info) { setLabel(info); } + // public void setWave(final String waveId, final Listener0 onLoaded) { + // final WaveWidget waveWidget = new + // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); + // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); + // waveWidget.setHeight("100%"); + // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { + // public void onWaveLoad(final WaveLoadEvent event) { + // Log.info("Wave '" + event.getWaveId() + "' loaded!"); + // onLoaded.onEvent(); + // } + // }); + // waveWidget.loadWave(waveId); + // setWidgetAsContent(waveWidget, false); + // waveWidget.setToolbarVisible(true); + // waveWidget.setEditMode(false); + // } + @Override public void setInfoMessage(final String text) { final VerticalPanel vp = createMessageVp(true); @@ -85,6 +125,10 @@ setWidgetAsContent(vp, true); } + private void setNoPreviewLabelMsg() { + messageLabel.setText(i18n.t("Preview not available")); + } + @Override public void setRawContent(final String content) { final HTML html = new HTML(content); @@ -92,23 +136,6 @@ setContent(html); } - // public void setWave(final String waveId, final Listener0 onLoaded) { - // final WaveWidget waveWidget = new - // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); - // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); - // waveWidget.setHeight("100%"); - // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { - // public void onWaveLoad(final WaveLoadEvent event) { - // Log.info("Wave '" + event.getWaveId() + "' loaded!"); - // onLoaded.onEvent(); - // } - // }); - // waveWidget.loadWave(waveId); - // setWidgetAsContent(waveWidget, false); - // waveWidget.setToolbarVisible(true); - // waveWidget.setEditMode(false); - // } - @Override public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { if (setDefMargins) { @@ -122,8 +149,8 @@ final VerticalPanel vp = createMessageVp(showPreviewMsg); final Image imgOrig = new Image(imageUrl); final Image imgResized = new Image(imageResizedUrl); - KuneUiUtils.setQuickTip(imgOrig, i18n.t("Click to zoom out")); - KuneUiUtils.setQuickTip(imgResized, i18n.t("Click to zoom in")); + imgOrig.setTitle(i18n.t("Click to zoom out")); + imgResized.setTitle(i18n.t("Click to zoom in")); setDefStyle(imgOrig); setDefStyle(imgResized); imgOrig.addStyleName("kune-pointer"); @@ -146,31 +173,4 @@ setWidgetAsContent(vp, true); Image.prefetch(imageUrl); } - - private VerticalPanel createMessageVp(final boolean showMsg) { - final VerticalPanel vp = new VerticalPanel(); - if (showMsg) { - setDefPreviewMsg(); - vp.add(messagePanel); - } - return vp; - } - - private void setContent(final Widget widget) { - setWidget(widget); - attach(); - } - - private void setDefPreviewMsg() { - messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file")); - } - - private void setDefStyle(final Widget widget) { - widget.setStyleName("kune-Content-Main"); - widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); - } - - private void setNoPreviewLabelMsg() { - messageLabel.setText(i18n.t("Preview not available")); - } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,18 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; - +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -36,23 +34,22 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public abstract class FoldableContentPresenter extends AbstractContentPresenter implements FoldableContent { - private final String toolName; - private final ActionRegistry<StateToken> actionRegistry; - protected final Session session; - private final ActionContentToolbar toolbar; + private final GuiActionDescCollection actionRegistry; private final Provider<FileDownloadUtils> downloadProvider; private final I18nTranslationService i18n; private final Provider<MediaUtils> mediaUtils; + protected final Session session; + private final ActionContentToolbar toolbar; + private final String toolName; private String uploadType; private String waveType; public FoldableContentPresenter(final String toolName, final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, final Provider<MediaUtils> mediaUtils) { this.toolName = toolName; @@ -62,14 +59,19 @@ this.downloadProvider = downloadProvider; this.i18n = i18n; this.mediaUtils = mediaUtils; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + stateManager.onStateChanged(true, new StateChangedHandler() { @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); } }); } + private String getContentBody(final StateContentDTO state) { + final String contentBody = state.getContent(); + return contentBody; + } + public String getToolName() { return toolName; } @@ -87,14 +89,6 @@ setState(session.getContentState()); } - public void setUploadType(final String uploadType) { - this.uploadType = uploadType; - } - - public void setWaveType(final String waveType) { - this.waveType = waveType; - } - protected void setContent(final StateContentDTO state) { final String typeId = state.getTypeId(); if (typeId.equals(getUploadType())) { @@ -107,6 +101,19 @@ view.attach(); } + private void setNormalContent(final StateContentDTO state) { + final String contentBody = getContentBody(state); + if (contentBody == null || contentBody.length() == 0) { + if (state.getContentRights().isEditable()) { + view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); + } else { + view.setInfoMessage(i18n.t("There is no text in this page")); + } + } else { + view.setRawContent(contentBody); + } + } + protected void setState(final StateAbstractDTO state) { toolbar.detach(); if (state instanceof StateContainerDTO) { @@ -123,43 +130,18 @@ } protected void setState(final StateContainerDTO state) { - final ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContainerRights()); - setToolbar(collection); + setToolbar(actionRegistry); attach(); } protected void setState(final StateContentDTO state) { - final ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContentRights()); - setToolbar(collection); + setToolbar(actionRegistry); + attach(); } - private ActionItemCollection<StateToken> getActionCollection(final StateContainerDTO state, - final AccessRights rights) { - return actionRegistry.getCurrentActions(state.getStateToken(), state.getTypeId(), session.isLogged(), rights, - true); - } - - private String getContentBody(final StateContentDTO state) { - final String contentBody = state.getContent(); - return contentBody; - } - - private void setNormalContent(final StateContentDTO state) { - final String contentBody = getContentBody(state); - if (contentBody == null || contentBody.length() == 0) { - if (state.getContentRights().isEditable()) { - view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); - } else { - view.setInfoMessage(i18n.t("There is no text in this page")); - } - } else { - view.setRawContent(contentBody); - } - } - - private void setToolbar(final ActionItemCollection<StateToken> collection) { - toolbar.disableMenusAndClearButtons(); - toolbar.addActions(collection, AbstractFoldableContentActions.CONTENT_TOPBAR); + private void setToolbar(final GuiActionDescCollection collection) { + // toolbar.disableMenusAndClearButtons(); + toolbar.addActions(collection); toolbar.attach(); } @@ -192,4 +174,12 @@ view.setNoPreview(); } } + + public void setUploadType(final String uploadType) { + this.uploadType = uploadType; + } + + public void setWaveType(final String waveType) { + this.waveType = waveType; + } } Copied: trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java (from rev 1279, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,64 @@ +/* + * + * Copyright (C) 2007-2011 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.services; + + +import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.shared.domain.utils.StateToken; + +public class MediaUtils { + + public static final String DOC_URL_TAG = "###DOC_URL###"; + + private final Session session; + + private final FileDownloadUtils downloadUtils; + + public MediaUtils(final Session session, final FileDownloadUtils downloadUtils) { + this.session = session; + this.downloadUtils = downloadUtils; + } + + public String getAviEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getFlvEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getMp3Embed(final StateToken token) { + return setCenterPosition(session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getOggEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + private String setCenterPosition(final String elementCode) { + return ContentPosition.setCenterPosition(elementCode); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java (from rev 1279, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,79 @@ +/* + * + * Copyright (C) 2007-2011 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.ui.utils; + +import org.cobogw.gwt.user.client.CSS; + +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HTML; +import com.google.inject.Inject; + +public class ContentPosition { + + public static final String CENTER = "center"; + public static final String LEFT = "left"; + public static final String RIGHT = "right"; + private static I18nTranslationService i18n; + private static Object[][] positionObjs; + public static final String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; + + public synchronized static Object[][] getPositions() { + if (positionObjs == null) { + final String[][] values = positions; + positionObjs = new Object[values.length][1]; + int i = 0; + for (final String[] position : values) { + final Object[] obj = new Object[] { position[0], i18n.t(position[0]) }; + positionObjs[i++] = obj; + } + } + return positionObjs; + } + + public static String setCenterPosition(final String elementCode) { + return setPosition(elementCode, false, CENTER); + } + + public static Element setPosition(final Element element, final boolean wraptext, final String position) { + if (!wraptext || position.equals(ContentPosition.CENTER)) { + final com.google.gwt.user.client.Element divEl = DOM.createDiv(); + CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); + divEl.setInnerHTML(element.getString()); + return divEl; + } else { + CSS.setProperty(element, CSS.A.FLOAT, position); + return element; + } + } + + public static String setPosition(final String elementCode, final boolean wraptext, final String position) { + final HTML html = new HTML(elementCode); + html.removeStyleName("gwt-HTML"); + return setPosition(html.getElement(), wraptext, position).getString(); + } + + @Inject + public ContentPosition(final I18nTranslationService i18n) { + ContentPosition.i18n = i18n; + } +} Modified: trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,13 +1,8 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> <inherits name="com.google.gwt.user.User" /> -  <public path="public" /> - <source path="client" /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <inherits name="cc.kune.pspace.PSpace" /> -  -  -  - </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,6 +20,7 @@ package cc.kune.gspace.client; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.gwt.user.client.ui.SimplePanel; public interface WsArmor { @@ -41,6 +42,8 @@ ForIsWidget getEntityToolsSouth(); + SimplePanel getPublicSpace(); + ForIsWidget getSitebar(); ForIsWidget getUserSpace(); Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -34,7 +34,7 @@ resources.style().ensureInjected(); final RootLayoutPanel rootPanel = RootLayoutPanel.get(); - final WsArmorImpl armor = new WsArmorImpl(null); + final WsArmorImpl armor = new WsArmorImpl(); final InlineLabel icons = new InlineLabel("Icons"); final InlineLabel login = new InlineLabel("Login"); final InlineLabel logo = new InlineLabel("Logo"); Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,8 +19,6 @@ */ package cc.kune.gspace.client; -import cc.kune.pspace.client.PSpacePresenter; - import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -34,7 +32,6 @@ import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; public class WsArmorImpl extends Composite implements WsArmor { @@ -80,13 +77,11 @@ @UiField FlowPanel userSpace; - @Inject - public WsArmorImpl(final PSpacePresenter pspace) { + public WsArmorImpl() { initWidget(uiBinder.createAndBindUi(this)); groupSpace.setWidgetMinSize(splitEast, 150); tabs.setStyleName("k-spaces"); homeSpace.add(RootPanel.get("k-home-wrapper")); - publicSpace.add(pspace.getWidget()); } @Override @@ -135,10 +130,16 @@ } @Override + public SimplePanel getPublicSpace() { + return publicSpace; + } + + @Override public ForIsWidget getSitebar() { return sitebar; } + @Override public ForIsWidget getUserSpace() { return userSpace; } Copied: trunk/src/main/java/cc/kune/gspace/client/tags (from rev 1281, trunk/src/main/java/cc/kune/core/client/tags) Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummary.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import cc.kune.core.shared.domain.TagCloudResult; Deleted: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPanel.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,84 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.tags; - -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryView; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.WsArmor; - -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; - -public class TagsSummaryPanel extends ViewImpl implements TagsSummaryView { - - private final FlowPanel flowPanel; - private final I18nTranslationService i18n; - - @Inject - public TagsSummaryPanel(final I18nTranslationService i18n, final WsArmor ws) { - this.i18n = i18n; - FlowPanel mainPanel = new FlowPanel(); - flowPanel = new FlowPanel(); - flowPanel.setWidth("100%"); - Label header = new Label(i18n.t("Tags")); - header.setTitle(i18n.t("Keywords or terms associated with this group")); - // super.setBorderStylePrimaryName("k-dropdownouter-tags"); - flowPanel.addStyleName("kune-Margin-Small-trbl"); - flowPanel.addStyleName("k-tsp-cloud"); - header.addStyleName("k-sn-maintitle"); - mainPanel.addStyleName("k-sn-mainpanel"); - mainPanel.add(header); - mainPanel.add(flowPanel); - ws.getEntityToolsSouth().add(mainPanel); - } - - public void addTag(final String name, final Long count, final String style, ClickHandler clickHandler) { - final Label label = new Label(name); - // i18n pluralization - if (count > 1) { - label.setTitle(i18n.t("There are [%d] items with this tag", count)); - } else { - label.setTitle(i18n.t("There are [%d] item with this tag", count)); - } - label.addClickHandler(clickHandler); - label.addStyleName("k-tsp-tag"); - label.addStyleName(style); - flowPanel.add(label); - } - - @Override - public void clear() { - flowPanel.clear(); - } - - @Override - public void setVisible(boolean visible) { - flowPanel.setVisible(visible); - } - - @Override - public Widget asWidget() { - return flowPanel; - } -} Copied: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java (from rev 1282, trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,85 @@ +/* + * + * Copyright (C) 2007-2011 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.gspace.client.tags; + +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView; + +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class TagsSummaryPanel extends ViewImpl implements TagsSummaryView { + + private final FlowPanel flowPanel; + private final I18nTranslationService i18n; + private FlowPanel mainPanel; + + @Inject + public TagsSummaryPanel(final I18nTranslationService i18n, final WsArmor ws) { + this.i18n = i18n; + mainPanel = new FlowPanel(); + flowPanel = new FlowPanel(); + flowPanel.setWidth("100%"); + Label header = new Label(i18n.t("Tags")); + header.setTitle(i18n.t("Keywords or terms associated with this group")); + // super.setBorderStylePrimaryName("k-dropdownouter-tags"); + flowPanel.addStyleName("kune-Margin-Small-trbl"); + flowPanel.addStyleName("k-tsp-cloud"); + header.addStyleName("k-sn-maintitle"); + mainPanel.addStyleName("k-sn-mainpanel"); + mainPanel.add(header); + mainPanel.add(flowPanel); + ws.getEntityToolsSouth().add(mainPanel); + } + + public void addTag(final String name, final Long count, final String style, ClickHandler clickHandler) { + final Label label = new Label(name); + // i18n pluralization + if (count > 1) { + label.setTitle(i18n.t("There are [%d] items with this tag", count)); + } else { + label.setTitle(i18n.t("There are [%d] item with this tag", count)); + } + label.addClickHandler(clickHandler); + label.addStyleName("k-tsp-tag"); + label.addStyleName(style); + flowPanel.add(label); + } + + @Override + public void clear() { + flowPanel.clear(); + } + + @Override + public void setVisible(boolean visible) { + mainPanel.setVisible(visible); + } + + @Override + public Widget asWidget() { + return mainPanel; + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPresenter.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyUser; Copied: trunk/src/main/java/cc/kune/gspace/client/tool (from rev 1291, trunk/src/main/java/cc/kune/core/client/tool) Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/AbstractClientTool.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; public abstract class AbstractClientTool { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/FoldableAbstractClientTool.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolResources.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,4 +1,4 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelector.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; public interface ToolSelector { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItem.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,9 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; public interface ToolSelectorItem { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPanel.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,6 +1,6 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-25 12:43:38 UTC (rev 1293) @@ -33,7 +33,7 @@ top: -6px; } </ui:style> - <ui:with field='res' type='cc.kune.core.client.tool.ToolResources' /> + <ui:with field='res' type='cc.kune.gspace.client.tool.ToolResources' /> <g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> <g:Image ui:field="iconLeft" styleName="{style.iconLeft}" /> Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPresenter.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorPanel.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,13 +1,15 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorView; +import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorView; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; public class ToolSelectorPanel extends ViewImpl implements ToolSelectorView { @@ -20,8 +22,9 @@ @UiField FlowPanel flow; - public ToolSelectorPanel() { - uiBinder.createAndBindUi(this); + @Inject + public ToolSelectorPanel(final WsArmor wsArmor) { + wsArmor.getEntityToolsSouth().add(uiBinder.createAndBindUi(this)); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorPresenter.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import java.util.HashMap; import java.util.List; @@ -31,7 +31,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.ToolChangedEvent; import cc.kune.core.client.state.ToolChangedEvent.ToolChangedHandler; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -101,6 +101,13 @@ getView().addItem(item.getView()); } + private void checkTool(final ToolSelectorItem tool) { + if (tool == null) { + throw new UIException("Trying to activate an unregistered tool in client"); + } + + } + void onGroupChanged(final String newGroupName) { for (final String name : tools.keySet()) { tools.get(name).setGroupShortName(newGroupName); @@ -110,10 +117,14 @@ void onToolChanged(final String oldTool, final String newTool) { Log.debug("Registered tools: " + tools.keySet().toString()); if (!oldTool.equals("")) { - tools.get(oldTool).setSelected(false); + final ToolSelectorItem tool = tools.get(oldTool); + checkTool(tool); + tool.setSelected(false); } if (!newTool.equals("")) { - tools.get(newTool).setSelected(true); + final ToolSelectorItem tool = tools.get(newTool); + checkTool(tool); + tool.setSelected(true); } } Copied: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license (from rev 1279, trunk/src/main/java/cc/kune/core/client/ui/footer/license) Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,16 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.footer.license; +package cc.kune.gspace.client.ui.footer.license; import org.adamtacy.client.ui.effects.examples.Fade; import org.adamtacy.client.ui.effects.examples.Show; import cc.kune.common.client.ui.KuneWindowUtils; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.dom.client.MouseOutEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.footer.license; +package cc.kune.gspace.client.ui.footer.license; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.core.client.resources.CoreResources; +import cc.kune.gspace.client.WsArmor; import cc.kune.pspace.client.PSpacePresenter.PSpaceView; import com.google.gwt.core.client.GWT; @@ -64,7 +65,7 @@ private final Widget widget; @Inject - public PSpacePanel(final GuiProvider guiProvider, final CoreResources res) { + public PSpacePanel(final GuiProvider guiProvider, final CoreResources res, final WsArmor wsArmor) { widget = uiBinder.createAndBindUi(this); actionPanel = new ActionFlowPanel(guiProvider); actionPanelContainer.add(actionPanel); @@ -74,6 +75,7 @@ layer.addClassName("k-box-5shadow"); layer.addClassName("k-5corners"); icon.setResource(res.browser32()); + wsArmor.getPublicSpace().add(widget); } @Override Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.blogs.client.cnt.BlogViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.blogs.client; - -import org.ourproject.kune.blogs.client.cnt.BlogFolderContent; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPanel; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentView; -import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPanel; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogViewerView; -import org.ourproject.kune.blogs.client.ctx.BlogContext; -import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class BlogClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<BlogClientTool>(BlogClientTool.class) { - @Override - public BlogClientTool create() { - i(BlogClientActions.class); - return new BlogClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogClientActions>(BlogClientActions.class) { - @Override - public BlogClientActions create() { - return new BlogClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(BlogViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogContext>(BlogContext.class) { - @Override - public BlogContext create() { - final BlogContextPresenter presenter = new BlogContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<BlogViewer>(BlogViewer.class) { - @Override - public BlogViewer create() { - final BlogViewerPresenter presenter = new BlogViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogViewerView view = new BlogViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<BlogFolderContent>(BlogFolderContent.class) { - @Override - public BlogFolderContent create() { - final BlogFolderContentPresenter presenter = new BlogFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogFolderContentView view = new BlogFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class BlogClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "blogs"; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class BlogFolderContentPanel extends FoldableContentPanel implements BlogFolderContentView { - public BlogFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public BlogFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,27 +20,26 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class BlogFolderContentPresenter extends FoldableContentPresenter implements BlogFolderContent { - private BlogFolderContentView view; private final I18nTranslationService i18n; + private BlogFolderContentView view; public BlogFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface BlogFolderContentView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface BlogViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,16 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class BlogViewerPanel extends FoldableContentPanel implements BlogViewerView { - public BlogViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public BlogViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class BlogViewerPresenter extends FoldableContentPresenter implements BlogViewer { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface BlogViewerView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,19 +19,15 @@ \*/ package org.ourproject.kune.chat.client; -import org.ourproject.kune.blogs.client.BlogClientTool; import org.ourproject.kune.chat.client.ctx.room.AddRoom; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.gallery.client.GalleryClientTool; import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.ContentStatus; @@ -113,16 +109,23 @@ addRoom.setToolTip(i18n.t("Create a new chat room")); addRoom.setMustBeAuthenticated(true); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_DOCUMENT); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, WikiClientTool.TYPE_WIKIPAGE); - contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_POST); - contentActionRegistry.addAction(chatAbout, WikiClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, GalleryClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_UPLOADEDFILE); - - contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, ChatClientTool.TYPE_ROOM); - contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); + // contentActionRegistry.addAction(chatAbout, + // DocumentClientTool.TYPE_DOCUMENT); + // contentActionRegistry.addAction(chatAbout, + // DocumentClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // WikiClientTool.TYPE_WIKIPAGE); + // contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_POST); + // contentActionRegistry.addAction(chatAbout, + // WikiClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // GalleryClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // BlogClientTool.TYPE_UPLOADEDFILE); + // + // contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, + // ChatClientTool.TYPE_ROOM); + // contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); } private ActionEnableCondition<StateToken> notDeleted() { Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,105 +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.chat.client; - -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; - -public class ChatClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - // - // register(ToolGroup.class, new - // Factory<ChatClientActions>(ChatClientActions.class) { - // @Override - // public ChatClientActions create() { - // return new ChatClientActions(i(I18nUITranslationService.class), - // i(Session.class), - // i(ContentActionRegistry.class), i(ContextActionRegistry.class), - // p(ChatEngine.class), - // p(AddRoom.class), p(SchedulerManager.class)); - // } - // }); - // - // register(ToolGroup.class, new - // Factory<ChatClientTool>(ChatClientTool.class) { - // @Override - // public ChatClientTool create() { - // return new ChatClientTool(i(I18nUITranslationService.class), - // i(WorkspaceSkeleton.class), - // i(ToolSelector.class), i(WsThemeManager.class), - // i(ContentCapabilitiesRegistry.class)); - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatContext>(ChatContext.class) - // { - // @Override - // public ChatContext create() { - // final ChatContextPresenter presenter = new - // ChatContextPresenter(i(StateManager.class), - // p(ContextNavigator.class)); - // return presenter; - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatEngine>(ChatEngine.class) { - // @Override - // public ChatEngine create() { - // final ChatEngineDefault chatEngineDefault = new - // ChatEngineDefault(i(I18nUITranslationService.class), - // i(WorkspaceSkeleton.class), i(AppStarter.class), i(Session.class), - // p(EmiteUIDialog.class), - // p(FileDownloadUtils.class), i(GlobalShortcutRegister.class)); - // return chatEngineDefault; - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatRoom>(ChatRoom.class) { - // @Override - // public ChatRoom create() { - // final ChatRoomPresenter presenter = new - // ChatRoomPresenter(i(StateManager.class), i(Session.class), - // i(I18nUITranslationService.class), i(ActionContentToolbar.class), - // i(ContentActionRegistry.class), p(FileDownloadUtils.class), - // p(MediaUtils.class)); - // final ChatRoomPanel panel = new - // ChatRoomPanel(i(WorkspaceSkeleton.class), - // i(I18nTranslationService.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - // - // register(Singleton.class, new Factory<AddRoom>(AddRoom.class) { - // @Override - // public AddRoom create() { - // final AddRoomPresenter presenter = new - // AddRoomPresenter(i(Session.class), p(ContentServiceAsync.class), - // i(StateManager.class)); - // final AddRoomPanel panel = new AddRoomPanel(presenter, - // i(I18nTranslationService.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - } -} Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -24,8 +24,8 @@ import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tool.ToolSelector; public class ChatClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "chats"; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.chat.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class ChatRoomPanel extends FoldableContentPanel implements ChatRoomView { - public ChatRoomPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public ChatRoomPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,29 +20,28 @@ package org.ourproject.kune.chat.client.cnt; import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class ChatRoomPresenter extends FoldableContentPresenter implements ChatRoom { - private ChatRoomView view; private final I18nUITranslationService i18n; + private ChatRoomView view; public ChatRoomPresenter(final StateManager stateManager, final Session session, final I18nUITranslationService i18n, final ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(ChatClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); this.i18n = i18n; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.chat.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface ChatRoomView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.docs.client.cnt.DocumentViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +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.docs.client; - -import org.ourproject.kune.docs.client.cnt.DocFolderContent; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPanel; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPresenter; -import org.ourproject.kune.docs.client.cnt.DocFolderContentView; -import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPanel; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPresenter; -import org.ourproject.kune.docs.client.cnt.DocumentViewerView; -import org.ourproject.kune.docs.client.ctx.DocumentContext; -import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class DocumentClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { - @Override - public DocumentClientTool create() { - i(DocumentClientActions.class); - return new DocumentClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { - @Override - public DocumentClientActions create() { - return new DocumentClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(DocumentViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { - @Override - public DocumentContext create() { - final DocumentContextPresenter presenter = new DocumentContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<DocumentViewer>(DocumentViewer.class) { - @Override - public DocumentViewer create() { - final DocumentViewerPresenter presenter = new DocumentViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final DocumentViewerView view = new DocumentViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<DocFolderContent>(DocFolderContent.class) { - @Override - public DocFolderContent create() { - final DocFolderContentPresenter presenter = new DocFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - p(FileDownloadUtils.class), i(I18nTranslationService.class), p(MediaUtils.class)); - final DocFolderContentView view = new DocFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class DocumentClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "docs"; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,15 +19,18 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class DocFolderContentPanel extends FoldableContentPanel implements DocFolderContentView { - public DocFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public DocFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); setInfo(""); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,23 +20,22 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class DocFolderContentPresenter extends FoldableContentPresenter implements DocFolderContent { public DocFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, final Provider<MediaUtils> mediaUtils) { super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface DocFolderContentView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface DocumentViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,17 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class DocumentViewerPanel extends FoldableContentPanel implements DocumentViewerView { - public DocumentViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + + @Inject + public DocumentViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class DocumentViewerPresenter extends FoldableContentPresenter implements DocumentViewer { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface DocumentViewerView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,6 @@ import org.ourproject.kune.gallery.client.cnt.GalleryViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -36,6 +35,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,125 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.gallery.client; - -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContent; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentView; -import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerView; -import org.ourproject.kune.gallery.client.ctx.GalleryContext; -import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class GalleryClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<GalleryClientTool>(GalleryClientTool.class) { - @Override - public GalleryClientTool create() { - i(GalleryClientActions.class); - return new GalleryClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryClientActions>(GalleryClientActions.class) { - @Override - public GalleryClientActions create() { - return new GalleryClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(GalleryViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryContext>(GalleryContext.class) { - @Override - public GalleryContext create() { - final GalleryContextPresenter presenter = new GalleryContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<GalleryViewer>(GalleryViewer.class) { - @Override - public GalleryViewer create() { - final GalleryViewerPresenter presenter = new GalleryViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryViewerView view = new GalleryViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<GalleryFolderContent>(GalleryFolderContent.class) { - @Override - public GalleryFolderContent create() { - final GalleryFolderContentPresenter presenter = new GalleryFolderContentPresenter( - i(StateManager.class), i(Session.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), i(I18nTranslationService.class), p(FileDownloadUtils.class), - p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryFolderContentView view = new GalleryFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class), i(StateManager.class), i(Session.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class GalleryClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "gallery"; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,40 +19,45 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - import cc.kune.common.client.ui.BasicThumb; +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.inject.Inject; public class GalleryFolderContentPanel extends FoldableContentPanel implements GalleryFolderContentView { private static final int TEXT_MAX_LENGHT = 15; private FlowPanel flowPanel; + private final Session session; private final StateManager stateManager; - private final Session session; - public GalleryFolderContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n, + @Inject + public GalleryFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res, final StateManager stateManager, final Session session) { - super(ws, i18n); + super(ws, i18n, res); this.stateManager = stateManager; this.session = session; } + @Override public void addThumb(final StateToken token, final String title, final String imgUrl) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { final BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, new ClickHandler() { + @Override public void onClick(final ClickEvent event) { stateManager.gotoToken(token); } @@ -67,6 +72,7 @@ }); } + @Override public void setThumbPanel() { if (flowPanel == null) { flowPanel = new FlowPanel(); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,13 +20,13 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; @@ -35,16 +35,16 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class GalleryFolderContentPresenter extends FoldableContentPresenter implements GalleryFolderContent { + private final Provider<FileDownloadUtils> downloadUtils; + private final I18nTranslationService i18n; private GalleryFolderContentView view; - private final I18nTranslationService i18n; - private final Provider<FileDownloadUtils> downloadUtils; public GalleryFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadUtils, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, @@ -61,7 +61,7 @@ @Override protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(GalleryClientTool.TYPE_ROOT)) { - ContainerDTO rootContainer = state.getRootContainer(); + final ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { view.setInfo(i18n.t("This gallery has no content")); } else { @@ -69,10 +69,10 @@ } } else if (state.isType(GalleryClientTool.TYPE_ALBUM) && (state.getContainer().getContents().size() > 0)) { view.setThumbPanel(); - for (ContentSimpleDTO content : state.getContainer().getContents()) { + for (final ContentSimpleDTO content : state.getContainer().getContents()) { if (content.getMimeType().isImage()) { - StateToken token = content.getStateToken(); - String imgUrl = downloadUtils.get().getImageResizedUrl(token, ImageSize.thumb); + final StateToken token = content.getStateToken(); + final String imgUrl = downloadUtils.get().getImageResizedUrl(token, ImageSize.thumb); view.addThumb(token, content.getTitle(), imgUrl); } } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; import cc.kune.core.shared.domain.utils.StateToken; public interface GalleryFolderContentView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface GalleryViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class GalleryViewerPanel extends FoldableContentPanel implements GalleryViewerView { - public GalleryViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public GalleryViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class GalleryViewerPresenter extends FoldableContentPresenter implements GalleryViewer { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface GalleryViewerView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -71,7 +71,6 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExt; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPresenter; @@ -101,6 +100,7 @@ import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,73 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.client.ui.rte.insertimg; - -import org.cobogw.gwt.user.client.CSS; -import org.ourproject.kune.platf.client.i18n.Resources; - -import com.google.gwt.dom.client.Element; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.HTML; - -public class ContentPosition { - - public static final String LEFT = "left"; - public static final String CENTER = "center"; - public static final String RIGHT = "right"; - - public static String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; - - private static Object[][] positionObjs; - - public synchronized static Object[][] getPositions() { - if (positionObjs == null) { - String[][] values = positions; - positionObjs = new Object[values.length][1]; - int i = 0; - for (String[] position : values) { - final Object[] obj = new Object[] { position[0], Resources.i18n.t(position[0]) }; - positionObjs[i++] = obj; - } - } - return positionObjs; - } - - public static String setCenterPosition(final String elementCode) { - return setPosition(elementCode, false, CENTER); - } - - public static Element setPosition(final Element element, final boolean wraptext, final String position) { - if (!wraptext || position.equals(ContentPosition.CENTER)) { - com.google.gwt.user.client.Element divEl = DOM.createDiv(); - CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); - divEl.setInnerHTML(element.getString()); - return divEl; - } else { - CSS.setProperty(element, CSS.A.FLOAT, position); - return element; - } - } - - public static String setPosition(final String elementCode, final boolean wraptext, final String position) { - HTML html = new HTML(elementCode); - html.removeStyleName("gwt-HTML"); - return setPosition(html.getElement(), wraptext, position).getString(); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -22,6 +22,8 @@ import org.cobogw.gwt.user.client.CSS; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DOM; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,6 +21,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,9 +21,10 @@ import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,10 +20,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,10 +20,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertElementAbstractPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogView; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.form.TextField; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,65 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.client.ui.rte.insertmedia.abstractmedia; - -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; - -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.domain.utils.StateToken; - -public class MediaUtils { - - public static final String DOC_URL_TAG = "###DOC_URL###"; - - private final Session session; - - private final FileDownloadUtils downloadUtils; - - public MediaUtils(final Session session, final FileDownloadUtils downloadUtils) { - this.session = session; - this.downloadUtils = downloadUtils; - } - - public String getAviEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getFlvEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getMp3Embed(final StateToken token) { - return setCenterPosition(session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getOggEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - private String setCenterPosition(final String elementCode) { - return ContentPosition.setCenterPosition(elementCode); - } - -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.wiki.client.cnt.WikiViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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.wiki.client; - -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentView; -import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPanel; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiViewerView; -import org.ourproject.kune.wiki.client.ctx.WikiContext; -import org.ourproject.kune.wiki.client.ctx.WikiContextPresenter; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class WikiClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<WikiClientTool>(WikiClientTool.class) { - @Override - public WikiClientTool create() { - i(WikiClientActions.class); - return new WikiClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiClientActions>(WikiClientActions.class) { - @Override - public WikiClientActions create() { - return new WikiClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(WikiViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiContext>(WikiContext.class) { - @Override - public WikiContext create() { - final WikiContextPresenter presenter = new WikiContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<WikiViewer>(WikiViewer.class) { - @Override - public WikiViewer create() { - final WikiViewerPresenter presenter = new WikiViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiViewerView view = new WikiViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<WikiFolderContent>(WikiFolderContent.class) { - @Override - public WikiFolderContent create() { - final WikiFolderContentPresenter presenter = new WikiFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiFolderContentView view = new WikiFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class WikiClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "wiki"; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,15 +19,18 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class WikiFolderContentPanel extends FoldableContentPanel implements WikiFolderContentView { - public WikiFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public WikiFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); super.setLabel(""); } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,29 +19,28 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class WikiFolderContentPresenter extends FoldableContentPresenter implements WikiFolderContent { - private WikiFolderContentView view; private final I18nTranslationService i18n; + private WikiFolderContentView view; public WikiFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); @@ -56,7 +55,7 @@ @Override protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(WikiClientTool.TYPE_ROOT)) { - ContainerDTO rootContainer = state.getRootContainer(); + final ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { view.setInfo(i18n.t("This wiki has no pages.")); } else { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface WikiFolderContentView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface WikiViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,16 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class WikiViewerPanel extends FoldableContentPanel implements WikiViewerView { - public WikiViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public WikiViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,19 +19,19 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class WikiViewerPresenter extends FoldableContentPresenter implements WikiViewer { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface WikiViewerView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -32,8 +32,6 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -44,6 +42,8 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContent; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.i18n.I18nUITranslationService; @@ -164,9 +164,8 @@ renameCtn.setTextDescription(textDescription); renameCtn.setParentMenuTitle(parentMenuTitle); renameCtn.setEnableCondition(notDeleted()); - // renameCtn.setShortcut(new ShortcutDescriptor(false, Keyboard.KEY_F2, - // i18n.tWithNT("F2", "The F2 Function key"))); - contentActionRegistry.addAction(renameCtn, registerInTypes); + + // contentActionRegistry.addAction(renameCtn, registerInTypes); } protected void createDelContainerAction(final String text, final String parentMenuTitle, @@ -211,7 +210,7 @@ delContent.setConfirmationTitle(i18n.t("Please confirm")); delContent.setConfirmationText(i18n.t("Are you sure?")); delContent.setEnableCondition(notDefAndNotDeleted()); - contentActionRegistry.addAction(delContent, registerInTypes); + // contentActionRegistry.addAction(delContent, registerInTypes); } protected void createDownloadActions(final String typeUploadedfile) { @@ -238,7 +237,7 @@ downloadCtx.setTextDescription(i18n.t("Download")); downloadCtx.setIconUrl("images/nav/download.png"); - contentActionRegistry.addAction(download, typeUploadedfile); + // contentActionRegistry.addAction(download, typeUploadedfile); contextActionRegistry.addAction(downloadCtx, typeUploadedfile); } @@ -310,7 +309,7 @@ editContent.setIconUrl("images/content_edit.png"); editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); editContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(editContent, registerInTypes); + // contentActionRegistry.addAction(editContent, registerInTypes); return editContent; } @@ -420,7 +419,7 @@ refreshCnt.setParentMenuTitle(parentMenuTitle); refreshCnt.setTextDescription(i18n.t("Refresh")); refreshCnt.setIconUrl("images/nav/refresh.png"); - contentActionRegistry.addAction(refreshCnt, registerInTypes); + // contentActionRegistry.addAction(refreshCnt, registerInTypes); return refreshCnt; } @@ -480,7 +479,8 @@ setAsDefGroupContent.setIconUrl("images/group-home.png"); setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); - contentActionRegistry.addAction(setAsDefGroupContent, registerInTypes); + // contentActionRegistry.addAction(setAsDefGroupContent, + // registerInTypes); return setAsDefGroupContent; } @@ -512,7 +512,7 @@ return session.getContentState().getMimeType().isImage(); } }); - contentActionRegistry.addAction(setGroupBackImage, registerInTypes); + // contentActionRegistry.addAction(setGroupBackImage, registerInTypes); } protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, @@ -536,7 +536,7 @@ action.setTextDescription(textDescription); action.setParentMenuTitle(PUBLICATION_MENU); action.setParentMenuIconUrl("images/anybody.png"); - contentActionRegistry.addAction(action, contentsModerated); + // contentActionRegistry.addAction(action, contentsModerated); } protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { @@ -579,7 +579,7 @@ translateContent.setToolTip(i18n.t("Translate this document to other languages")); translateContent.setIconUrl("images/language.gif"); translateContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(translateContent, registerInTypes); + // contentActionRegistry.addAction(translateContent, registerInTypes); return translateContent; } @@ -647,7 +647,7 @@ if (position.equals(Position.ctx)) { contextActionRegistry.addAction(action, registerInTypes); } else if (position.equals(Position.cnt)) { - contentActionRegistry.addAction(action, registerInTypes); + // contentActionRegistry.addAction(action, registerInTypes); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,11 +20,11 @@ package org.ourproject.kune.workspace.client; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.oldsn.GroupActionRegistry; import org.ourproject.kune.workspace.client.oldsn.UserActionRegistry; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.registry.AclEditableRegistry; import cc.kune.core.client.registry.AuthorableRegistry; import cc.kune.core.client.registry.CanBeHomepageRegistry; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -40,11 +40,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbarPresenter; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; @@ -203,15 +200,16 @@ import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.HistoryTokenCallback; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteCommonTokens; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummary; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tags.TagsSummary; import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.decorator.Singleton; @@ -982,16 +980,20 @@ } }); - register(NoDecoration.class, new Factory<ActionContentToolbar>(ActionContentToolbar.class) { - @Override - public ActionContentToolbar create() { - final ActionCntCtxToolbarPanel<StateToken> tbar = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTENT_TOPBAR, p(ActionManager.class), - i(WorkspaceSkeleton.class)); - final ActionContentToolbar toolbar = new ActionContentToolbarPresenter(tbar); - return toolbar; - } - }); + // register(NoDecoration.class, new + // Factory<ActionContentToolbar>(ActionContentToolbar.class) { + // @Override + // public ActionContentToolbar create() { + // final ActionCntCtxToolbarPanel<StateToken> tbar = new + // ActionCntCtxToolbarPanel<StateToken>( + // AbstractFoldableContentActions.CONTENT_TOPBAR, + // p(ActionManager.class), + // i(WorkspaceSkeleton.class)); + // final ActionContentToolbar toolbar = new + // ActionContentToolbarPresenter(tbar); + // return toolbar; + // } + // }); register(Singleton.class, new Factory<ContentEditor>(ContentEditor.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -30,13 +30,13 @@ import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummary; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.dto.AccessListsDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.gspace.client.tags.TagsSummary; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,8 +21,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -22,9 +22,9 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.client.tool.ToolSelectorItemPanel; -import cc.kune.core.client.tool.ToolSelectorItemPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelectorItemPanel; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter; public abstract class OldAbstractClientTool implements OldClientTool { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -23,8 +23,8 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; import cc.kune.core.shared.dto.BasicMimeTypeDTO; +import cc.kune.gspace.client.tool.ToolSelector; public abstract class OldFoldableAbstractClientTool extends OldAbstractClientTool { public static final String UPLOADEDFILE_SUFFIX = "uploaded"; Copied: trunk/src/test/java/cc/kune/gspace/client/tags (from rev 1281, trunk/src/test/java/cc/kune/core/client/tags) Modified: trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/tags/TagsSummaryPresenterTest.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import java.util.ArrayList; @@ -28,11 +28,12 @@ import cc.kune.core.client.state.EventBusTester; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryProxy; -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryView; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.domain.TagCount; import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryProxy; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView; public class TagsSummaryPresenterTest { Copied: trunk/src/test/java/cc/kune/gspace/client/tool (from rev 1291, trunk/src/test/java/cc/kune/core/client/tool) Modified: trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/tool/ToolSelectorPresenterTest.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import org.junit.Before; import org.junit.Test; @@ -25,8 +25,10 @@ import cc.kune.core.client.state.EventBusTester; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorProxy; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorView; +import cc.kune.gspace.client.tool.ToolSelectorItem; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorProxy; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorView; public class ToolSelectorPresenterTest { Modified: trunk/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -36,8 +36,8 @@ import org.ourproject.kune.workspace.client.socialnet.SNRolActionTest; import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; -import cc.kune.core.client.tags.TagsSummaryPresenterTest; -import cc.kune.core.client.tool.ToolSelectorPresenterTest; +import cc.kune.gspace.client.tags.TagsSummaryPresenterTest; +import cc.kune.gspace.client.tool.ToolSelectorPresenterTest; /** * Rescan with :

1 0

r1292 - in kune-sandbox: . lib src/cc/kune/sandbox src/cc/kune/sandbox/client war
by Vicente J. Ruiz Jurado 25 Mar '11

25 Mar '11

Author: vjrj_ Date: 2011-03-25 11:09:09 +0100 (Fri, 25 Mar 2011) New Revision: 1292 Added: kune-sandbox/.classpath kune-sandbox/.project kune-sandbox/lib/gin-r137.jar kune-sandbox/lib/guice-3.0-rc2.jar kune-sandbox/lib/gwtp-all-0.5.jar kune-sandbox/war/cbg_button.css kune-sandbox/war/kune-chat.css kune-sandbox/war/kune-common.css kune-sandbox/war/kune-hablar.css kune-sandbox/war/kune-message.css kune-sandbox/war/ws.css Modified: kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java kune-sandbox/war/Kune_sandbox.css kune-sandbox/war/Kune_sandbox.html Log: sandbox updated Added: kune-sandbox/.classpath =================================================================== --- kune-sandbox/.classpath (rev 0) +++ kune-sandbox/.classpath 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" output="test-classes" path="test"/> + <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/GWT FX v0.5.0 MS 1.jar"/> + <classpathentry kind="lib" path="lib/gxt.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/kune"/> + <classpathentry kind="lib" path="lib/gin-r137.jar"/> + <classpathentry kind="lib" path="lib/guice-3.0-rc2.jar"/> + <classpathentry kind="lib" path="lib/gwtp-all-0.5.jar"/> + <classpathentry kind="output" path="war/WEB-INF/classes"/> +</classpath> Added: kune-sandbox/.project =================================================================== --- kune-sandbox/.project (rev 0) +++ kune-sandbox/.project 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>kune-sandbox</name> + <comment></comment> + <projects> + <project>kune</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + </natures> +</projectDescription> Added: kune-sandbox/lib/gin-r137.jar =================================================================== (Binary files differ) Property changes on: kune-sandbox/lib/gin-r137.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: kune-sandbox/lib/guice-3.0-rc2.jar =================================================================== (Binary files differ) Property changes on: kune-sandbox/lib/guice-3.0-rc2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: kune-sandbox/lib/gwtp-all-0.5.jar =================================================================== (Binary files differ) Property changes on: kune-sandbox/lib/gwtp-all-0.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml =================================================================== --- kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml 2011-03-24 23:10:11 UTC (rev 1291) +++ kune-sandbox/src/cc/kune/sandbox/KuneSandbox.gwt.xml 2011-03-25 10:09:09 UTC (rev 1292) @@ -4,6 +4,7 @@ <inherits name='com.google.gwt.user.User' /> <inherits name="cc.kune.msgs.KuneMsgs" /> <inherits name="cc.kune.core.Core" /> + <inherits name="cc.kune.wave.KuneWave" /> <inherits name="org.adamtacy.GWTEffects"></inherits>   @@ -19,5 +20,5 @@ <public path="public" /> <stylesheet src="kune-sandbox.css" /> <set-property name="user.agent" value="safari,gecko1_8" /> - <inherits name="com.extjs.gxt.ui.GXT" /> + <inherits name="com.extjs.gxt.ui.GXT" /> </module> Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java =================================================================== --- kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-03-24 23:10:11 UTC (rev 1291) +++ kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-03-25 10:09:09 UTC (rev 1292) @@ -1,9 +1,12 @@ package cc.kune.sandbox.client; import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.ui.PopupPanelBottomCentered; -import cc.kune.common.client.ui.PopupPanelTopCentered; -import cc.kune.core.client.ui.dialogs.TwoButtonsDialog; +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.client.ui.PopupBottomPanel; +import cc.kune.common.client.ui.PopupTopPanel; +import cc.kune.core.client.tool.ToolSelectorItemPanel; +import cc.kune.core.client.tool.ToolSelectorPanel; +import cc.kune.core.client.ui.dialogs.BasicDialog; import cc.kune.msgs.client.CloseCallback; import cc.kune.msgs.client.UserMessage; import cc.kune.msgs.client.UserMessagesPanel; @@ -11,9 +14,11 @@ import com.extjs.gxt.ui.client.widget.button.Button; import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; /** @@ -21,48 +26,115 @@ */ public class KuneSandboxEntryPoint implements EntryPoint { + private PopupBottomPanel pop; + /** * This is the entry point method. */ @Override public void onModuleLoad() { + // testUserMessages(); + // testDialogs(); + ToolSelectorPanel toolSelector = new ToolSelectorPanel(); + ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); + toolItem1.getLabel().setText("documents"); + ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel(); + toolItem2.getLabel().setText("something very longgggggg"); + ToolSelectorItemPanel toolItem3 = new ToolSelectorItemPanel(); + toolItem3.getLabel().setText("media"); + toolSelector.addItem(toolItem1); + toolSelector.addItem(toolItem2); + toolSelector.addItem(toolItem3); + toolItem1.setSelected(true); + toolItem2.setSelected(false); + toolItem3.setSelected(false); + toolSelector.asWidget().setWidth("200px"); + // toolSelector.addWidget(new Label("Test")); + RootPanel.get().add(toolSelector.asWidget()); + } + + private void postAdd(final PopupBottomPanel pop) { + pop.setCenterPosition(); + } + + private void postAdd(final PopupTopPanel pop) { + pop.setCenterPosition(); + } + + private void testDialogs() { + final PopupTopPanel pop2 = new PopupTopPanel(false, true); + pop2.setGlassEnabled(true); + final BasicDialog dialog = new BasicDialog(); + pop2.add(dialog); + + dialog.getTitleText().setText("Title"); + dialog.getFirstBtnText().setText("Accept"); + dialog.getSecondBtnText().setText("Cancel"); + dialog.setFirstBtnTabIndex(2); + dialog.setSecondBtnTabIndex(3); + final VerticalPanel sPanel = new VerticalPanel(); + sPanel.add(new Label("lo que sea")); + final Button btn = new Button("lo que sea"); + btn.setTabIndex(1); + btn.focus(); + sPanel.add(btn); + sPanel.setSize("300px", "150px"); + dialog.getInnerPanel().add((IsWidget) sPanel); + final Label label = new Label("Test label"); + // final NotifyLevelImages levelImg = + // GWT.create(NotifyLevelImages.class); + // dialog.getBottomPanel().add(new MessagePanel(levelImg, "kk")); + final MaskWidget mask = new MaskWidget(); + + RootPanel.get().add(label); + pop2.showNear(label); + // final String zIndex = DOM.getStyleAttribute(pop2.getElement(), + // "zIndex"); + DOM.setStyleAttribute(pop.getElement(), "zIndex", "10000"); + mask.mask(pop2, "JAarrrrr!"); + } + + private void testUserMessages() { final UserMessagesPanel panel = new UserMessagesPanel(); UserMessage.setFadeMills(3000); UserMessage.setCloseTitle("Close message"); panel.setWidth("422px"); final UserMessagesPresenter presenter = new UserMessagesPresenter(); presenter.init(panel); - final PopupPanelBottomCentered pop = new PopupPanelBottomCentered(); + + pop = new PopupBottomPanel(); final CloseCallback closeCalback = new CloseCallback() { @Override public void onClose() { pop.setCenterPosition(); } }; - presenter.add(NotifyLevel.info, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", false, + presenter.add(NotifyLevel.info, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", false, closeCalback); postAdd(pop); - presenter.add(NotifyLevel.error, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", false, - closeCalback); + presenter.add(NotifyLevel.error, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", + false, closeCalback); pop.add(panel); + postAdd(pop); - Timer time = new Timer() { + + final Timer time = new Timer() { @Override public void run() { presenter.add( NotifyLevel.error, "", "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - true, closeCalback); + "", true, closeCalback); postAdd(pop); } }; - Timer time2 = new Timer() { + final Timer time2 = new Timer() { @Override public void run() { - presenter.add(NotifyLevel.important, "", "Lorem ", false, closeCalback); + presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); postAdd(pop); - presenter.add(NotifyLevel.important, "Title", "Lorem ", true, closeCalback); + presenter.add(NotifyLevel.important, "Title", "Lorem ", "", true, closeCalback); postAdd(pop); } }; @@ -70,27 +142,5 @@ time2.schedule(2000); pop.show(); - PopupPanelTopCentered pop2 = new PopupPanelTopCentered(false, true); - pop2.setGlassEnabled(true); - TwoButtonsDialog dialog = new TwoButtonsDialog(); - pop2.add(dialog); - - dialog.getTitleText().setText("Title"); - dialog.getFirstBtnText().setText("Accept"); - dialog.getSecondBtnText().setText("Cancel"); - VerticalPanel sPanel = new VerticalPanel(); - sPanel.add(new Label("lo que sea")); - sPanel.add(new Button("lo que sea")); - sPanel.setSize("300px", "150px"); - dialog.getInnerPanel().add((IsWidget) sPanel); - pop2.show(); } - - private void postAdd(final PopupPanelTopCentered pop) { - pop.setCenterPosition(); - } - - private void postAdd(final PopupPanelBottomCentered pop) { - pop.setCenterPosition(); - } } Modified: kune-sandbox/war/Kune_sandbox.css =================================================================== --- kune-sandbox/war/Kune_sandbox.css 2011-03-24 23:10:11 UTC (rev 1291) +++ kune-sandbox/war/Kune_sandbox.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -32,3 +32,12 @@ #closeButton { margin: 15px 6px 6px; } + +.k-lateral-focusTab { + background: red; +} + +.k-central-nav { + background: grey; +} + Modified: kune-sandbox/war/Kune_sandbox.html =================================================================== --- kune-sandbox/war/Kune_sandbox.html 2011-03-24 23:10:11 UTC (rev 1291) +++ kune-sandbox/war/Kune_sandbox.html 2011-03-25 10:09:09 UTC (rev 1292) @@ -6,44 +6,67 @@  <html> - <head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<link rel="stylesheet" type="text/css" + href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css"> + +<script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> +<script> + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); +</script> + + + +<link type="text/css" rel="stylesheet" href="ExtGWT/css/gxt-all.css"> +<link type="text/css" rel="stylesheet" href="Kune_sandbox.css"> + + + +<title></title> +<link + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'> + +<link type="text/css" rel="stylesheet" href="kune-chat.css"> +<link type="text/css" rel="stylesheet" href="kune-hablar.css"> +<link type="text/css" rel="stylesheet" href="kune-common.css"> +<link type="text/css" rel="stylesheet" + href="fontface/ubuntufontface.css"> +<link type="text/css" rel="stylesheet" href="kune-message.css"> +<link type="text/css" rel="stylesheet" href="ws.css"> + + + + + +<script type="text/javascript" language="javascript" + src="kune_sandbox/kune_sandbox.nocache.js"></script> +</head> -  -  -  - <link type="text/css" rel="stylesheet" href="ExtGWT/css/gxt-all.css"> - <link type="text/css" rel="stylesheet" href="Kune_sandbox.css"> -  -  -  - <title></title> - -  -  -  -  -  - <script type="text/javascript" language="javascript" src="kune_sandbox/kune_sandbox.nocache.js"></script> - </head> + + + + + +<body> -  -  -  -  -  - <body> + +<iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' + style="position: absolute; width: 0; height: 0; border: 0"></iframe> -  - <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> - -  - <noscript> - <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled - in order for this application to display correctly. - </div> - </noscript> + +<noscript> +<div + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> +Your web browser must have JavaScript enabled in order for this +application to display correctly.</div> +</noscript> - </body> +</body> </html> Added: kune-sandbox/war/cbg_button.css =================================================================== --- kune-sandbox/war/cbg_button.css (rev 0) +++ kune-sandbox/war/cbg_button.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,78 @@ +/* Button Style */ + +/* specific for Opera */ +.cbg-ButtonContent::selection { + background-color:transparent; +} + +.cbg-Button { + font-family: Arial, Helvetica, sans-serif; + font-size: 70%; /*relative to inherit 16px font-size*/ +} + +.cbg-Button .cbg-ButtonOuter { + border-color: #bcbcbc; +} + +.cbg-Button .cbg-ButtonInner { + background-color: #e2e2e2; + border-color: #bcbcbc; +} + +.cbg-Button .cbg-ButtonTop { + background-color: #f9f9f9; + border-bottom-color: #ededed; + border-bottom-width: 0.2em; + height: 0.9em; +} + +.cbg-Button .cbg-ButtonContent { + color: black; + line-height: 1.8em; + padding: 0 8px; +} + +.cbg-Button-active .cbg-ButtonInner { + background-color: #f9f9f9; +} + +.cbg-Button-active .cbg-ButtonTop { + background-color: #e2e2e2; +} + +.cbg-Button-disabled .cbg-ButtonContent { + color: #878787; +} + +.cbg-Button-hover .cbg-ButtonOuter { + border-color: #939393; +} + +.cbg-Button-hover .cbg-ButtonInner { + border-color: #939393; +} + +.cbg-Button-focus .cbg-ButtonOuter { + border-color: #444444; +} + +.cbg-Button-focus .cbg-ButtonInner { + border-color: #444444; +} + +/* ButtonBar specific style */ +.cbg-ButtonBar .cbg-BCLeft .cbg-ButtonInner { + border-left-color: white; +} + +.cbg-ButtonBar .cbg-Button-hover .cbg-ButtonInner { + border-color: #939393; +} + +.cbg-ButtonBar .cbg-Button-focus .cbg-ButtonInner { + border-color: #444444; +} + +.cbg-ButtonBar .cbg-BCRight .cbg-ButtonInner { + border-right-color: #bcbcbc; +} Added: kune-sandbox/war/kune-chat.css =================================================================== --- kune-sandbox/war/kune-chat.css (rev 0) +++ kune-sandbox/war/kune-chat.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,7 @@ +.k-chat-icon { + +} + +.k-chat-panel { + margin: 10px; +} \ No newline at end of file Added: kune-sandbox/war/kune-common.css =================================================================== --- kune-sandbox/war/kune-common.css (rev 0) +++ kune-sandbox/war/kune-common.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,412 @@ +.k-popup-top-centered { + +} + +.k-popup-bottom-centered { /* z-index:100000; */ + +} + +.k-floatleft,.k-fl { + float: left; +} + +.k-floatright,.k-fr { + float: right; +} + +.k-pointer { + cursor: pointer; + cursor: hand; +} + +.k-opacity80 { + kfilter: alpha(opacity = 80); + -moz-opacity: 0.80; + -khtml-opacity: 0.80; + opacity: 0.80; +} + +.k-opacity90 { + kfilter: alpha(opacity = 90); + -moz-opacity: 0.90; + -khtml-opacity: 0.90; + opacity: 0.90; +} + +.k-opacity95 { + kfilter: alpha(opacity = 95); + -moz-opacity: 0.95; + -khtml-opacity: 0.95; + opacity: 0.95; +} + +.gwt-PopupPanelGlass { + background-color: #f7ebe3 !important; + kfilter: alpha(opacity = 68) !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important; +} + +.k-box-5shadow { + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); +} + +.k-box-10shadow { + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); +} + +.k-bottom-5corners { + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; +} + +.k-bottom-10corners { + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; +} + +.k-top-5corners { + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; +} + +.k-top-10corners { + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; +} + +.k-2corners { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.k-3corners { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.k-5corners { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.k-10corners { + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; +} + +.k-dialog-outerp { + background-color: #552200; + border-top: 4px solid #000; + padding: 22px 4px 3px 4px; +} + +.k-dialog-title { + color: #552200; + font-size: 20px; + font-weight: bold; + margin: 5px 0 0 12px; +} + +.k-dialog-innerp { + background-color: #FFFFFF; + border: solid 1px #F2F2F2; + margin: 34px 16px 20px 16px; +} + +.k-dialog-btn-area { + padding:0 15px 15px 15px; + margin-bottom:30px; +} + +.k-dialog-btn-area div { + margin: 10px +} + +.k-dialog-innerp table { + margin: 5px; +} + +.k-dialog-btn { + text-shadow: 1px 1px 1px #FFFFFF; + font-weight: bold; +} + +.k-dialog-firstBtn { + float: left; +} + +.k-dialog-secondBtn { + float: right; +} + +.k-z100000 { + z-index: 100000; +} + +.k-z10000 { + z-index: 10000; +} + +.k-z1000 { + z-index: 1000; +} + +.oc-user-msg { + background-color: #FFCC00; + padding: 3px; +} + +.oc-user-msg-popup { + padding: 0px; + border: 0px; +} + +.oc-floatleft { + float: left; +} + +.oc-floatright { + float: right; +} + +.x-toolbar { + background: none !important; + border-color: transparent !important; +} + +.oc-testico { + background-image: url(/common/img/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; +} + +.oc-ico-pad { + padding-left: 20px; + white-space: normal; +} + +.oc-tb-spacer { + margin: 2px; + width: 2px; +} + +.oc-tb-bottom-line { + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; +} + +.oc-blank-toolbar { + background: #FFF none repeat scroll 0% 50%; +} + +.oc-tb-sep { + padding-top: 4px; + padding-left: 5px; +} + +.oc-transp .x-panel-body { + background: transparent; +} + +.oc-menu { + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + border: 1 px solid #BBBBBB; +} + +.oc-menu .gwt-MenuItem { + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; +} + +.oc-button { + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2; +} + +.oc-button:hover { + border: 2px orange solid; + background: #f0f0f0; + color: #855585; +} + +.oc-button:active { + border-top-color: #ffffff; + background: #ffffff; +} + +#oc-mshortcut { + position: absolute; + right: 10px; +} + +#oc-mshortcut-hidden { + visibility: hidden; +} + +#oc-mshortcut a { + text-decoration: none; + color: black; +} + +.oc-user-msg { + background-color: #FFCC00; + padding: 3px; +} + +.oc-user-msg-popup { + padding: 0px; + border: 0px; +} + +.oc-floatleft { + float: left; +} + +.oc-floatright { + float: right; +} + +.x-toolbar { + background: none !important; + border-color: transparent !important; +} + +.oc-testico { + background-image: url(/common/img/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; +} + +.oc-ico-pad { + padding-left: 20px; + white-space: normal; +} + +.oc-tb-spacer { + margin: 2px; + width: 2px; +} + +.oc-tb-bottom-line { + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; +} + +.oc-blank-toolbar { + background: #FFF none repeat scroll 0% 50%; +} + +.oc-tb-sep { + padding-top: 4px; + padding-left: 5px; +} + +.oc-transp .x-panel-body { + background: transparent; +} + +.oc-menu { + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + border: 1 px solid #BBBBBB; +} + +.oc-menu .gwt-MenuItem { + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; +} + +.oc-button { + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2; +} + +.oc-button:hover { + border: 2px orange solid; + background: #f0f0f0; + color: #855585; +} + +.oc-button:active { + border-top-color: #ffffff; + background: #ffffff; +} + +#oc-mshortcut { + position: absolute; + right: 10px; +} + +#oc-mshortcut-hidden { + visibility: hidden; +} + +#oc-mshortcut a { + text-decoration: none; + color: black; +} + +.k-no-backimage,.k-no-backimage td { + background-image: none; +} \ No newline at end of file Added: kune-sandbox/war/kune-hablar.css =================================================================== --- kune-sandbox/war/kune-hablar.css (rev 0) +++ kune-sandbox/war/kune-hablar.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,602 @@ +/** Colors */ +.hablar-clearBackground { + background-color: white; +} + +.hablar-lightBackground { + background-color: #e9e9e9; +} + +.hablar-highlightBackground { + background-color: highlight; +} + +.hablar-defaultBackground { + background-color: #bbbbbb; +} + +.hablar-darkBackground { + background-color: #bbbbbb; +} + +.hablar-selectedBackground { + background-color: highlight; +} + +.hablar-selectedBackground div.hablar-RosterItemWidget:hover { + background-color: transparent; +} + +/** Text colors **/ +.hablar-clearColor { + color: black; +} + +.hablar-lightColor { + color: #BBBBBB; +} + +.hablar-mediumColor { + color: gray; +} + +.hablar-darkColor { + color: black; +} + +.hablar-errorColor { + color: #c00; +} + +/** Non generalizable styles **/ +div.hablar-ActionWidget:hover { + background-color: #BBBBBB; +} + +div.hablar-GroupHeaderWidget:hover { + background-color: #BBBBBB; + color: black; +} + +div.hablar-RosterItemWidget:hover { + background-color: #E9E9E9; +} + +div.hablar-SearchResultItemWidget:hover { + background-color: #e9e9e9; +} + +.hablar-ChatWidget .actions div.hablar-OccupantsWidget:hover { + background-color: #BBBBBB; + color: white; +} + +.hablar-Logger a.gwt-Anchor:hover { + color: white; + background-color: #BBBBBB; +} + +.hablar-HablarWidget .gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { + background-color: #AAAAAA; + padding: 0px 1px; + margin: 0 0px 0 0; + border-left: 1px solid #bbbbbb; + border-top: 1px solid #e9e9e9; + border-right: 1px solid e9e9e9; +} + +.hablar-HablarWidget .gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected + { + background-color: #e9e9e9; + border-left: 1px solid white; + border-top: 1px solid white; + border-right: 1px solid white; +} +/* +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { + background-color: #bbbbbb; + border-left: 1px solid gray; + border-right: 1px solid #e9e9e9; +} +*/ + +input[disabled] { + background-color: #e9e9e9; + color: black; +} + +.hablar-Header.unattended { + color: #cc0000; + font-weight: bold; +} + +.hablar-Header.unattended.blinkOn { + color: #000000; + background-color: highlight; +} + +/** Classes for borders **/ +.hablar-lightBordered { + border: 3px solid #E9E9E9; +} + +.hablar-partialLightBordered { + border-top: 1px solid #E9E9E9; + border-bottom: 1px solid #E9E9E9; +} + +.hablar-bottomLightBordered { + border-bottom: 1px solid #E9E9E9; +} + +.hablar-defaultBordered { + border-left: 1px solid #BBBBBB; + /* This border affects scroll visibility */ + border-top: 1px solid #BBBBBB; +} + +.hablar-topDefaultBordered { + border-top: 1px solid #BBBBBB; +} + +.hablar-bottomDefaultBordered { + border-bottom: 1px solid #BBBBBB; +} + +.hablar-partialDarkBordered { + border-left: 1px solid #BBBBBB; + border-top: 1px solid #BBBBBB; +} + +.hablar-darkBordered { + border: 1px solid #BBBBBB; +} + +.hablar-bottomDarkBordered { + border-bottom: 1px solid #BBBBBB; +} + +.hablar-disabledBordered { + border-left: 1px solid #8C8C8C; + border-top: 1px solid #8C8C8C; +} + +/** Accordion effects **/ +.hablar-AccordionHeaderWidget.notFocused { + border-top: 1px solid #E9E9E9; + border-bottom: 1px solid #BBB; +} + +.hablar-AccordionHeaderWidget.focused { + border-top: 1px solid white; + border-bottom: 1px solid #BBB; +} + +/** Chat messages **/ +.chatMessage .body.incoming { + +} + +.chatMessage .body.sent { + color: #808080; +} + +.chatMessage .body.info { + color: #808080; + font-style: italic; +} + +.chatMessage .body.alert { + color: #c00; +} + +.hablar-ChatWidget .chatMessage { + display: block; + width: 94%; + overflow: hidden; + padding: 2px 3% 2px 3%; +} + +.hablar-ChatWidget .chatMessage.odd { + background-color: #efefef; +} + +.chatMessage .author { + display: inline; + font-weight: bold; +} + +.chatMessage .metadata { + display: inline; + color: #808080; + font-size: 90%; +} + +.chatMessage .body { + display: inline; +} + +.hablar-EmoticonImage { + vertical-align: text-top; +} + +/** MUC room occupants **/ +.gwt-PopupPanel.occupants { + border-top: 1px solid #E9E9E9; + border-left: 1px solid #BBBBBB; + border-right: 1px solid #BBBBBB; + border-bottom: 1px solid #BBBBBB; + background-color: #e9e9e9; + z-index: 10000; +} + +/** IE6 ZINDEX BUG **/ +.hablar-HablarWidget { + z-index: 1; +} + +html { + font-family: Tahoma, sans-serif; + font-size: 80%; +} + +body { + height: 90%; +} + +/** HABLAR HEADER **/ +.hablar-Header { + width: 100%; + overflow: hidden; + cursor: pointer; + padding: 3px 0; +} + +.hablar-Header .icon { + float: left; + margin-right: 3px; + margin-left: 3px; +} + +.hablar-RosterGroupWidget .icon { + float: left; + margin-right: 3px; +} + +.hablar-Header .title { + float: left; +} + +.hablar-AccordionHeaderWidget .icon { + float: left; + margin: 0 3px 0 3px; +} + +.hablar-AccordionHeaderWidget .title { + display: block; + margin: 0 3px; +} + +.hablar-AccordionHeaderWidget .close { + float: right; + margin: 0px 3px 0 0; +} + +.hablar-TabsHeaderWidget { + padding: 0; + margin: 0; + background-color: transparent; + border: none; +} + +.hablar-TabsHeaderWidget .close { + margin: 2px 3px; +} + +.hablar-AccordionHeader .close { + margin: 2px 3px 0 0; +} + +.hablar-AccordionHeader .icon { + +} + +.hablar-AccordionHeader .title { + display: block; +} + +.hablar-TabsHeaderWidget .title { + display: inline; + margin-right: 10px; +} + +/** DOCKS **/ +.hablar-DockContainer-top { + background-color: transparent; + z-index: 4000; +} + +.hablar-Header.DockHeaderWidget-top { + background-color: transparent; + border: 1px transparent; +} + +.hablar-Header.DockHeaderWidget-left { + cursor: default; + -moz-user-select: none; +} + +.DockHeaderWidget-left .icon { + margin-left: 3px; +} + +/** LIST ITEMS **/ +.hablar-ListItem { + display: block; + width: 100%; + overflow: hidden; + padding: 5px 0px 0 0px; +} + +.clickable { + cursor: pointer; +} + +/** USER **/ +.hablar-UserWidget .container { + padding: 0px 10px; + z-index: 3000; +} + +.hablar-UserWidget h2 { + margin: 15px 0 5px 0; +} + +.hablar-UserWidget .actions { + padding: 5px 0 0 10px; +} + +/** ROSTER **/ +.hablar-RosterWidget .item { + width: 100%; + overflow: hidden; +} + +.hablar-RosterWidget .actions { + width: 100%; + overflow: hidden; +} + +.hablar-RosterWidget .actions .hablar-ActionWidget { + float: left; + margin-right: 1px; +} + +.hablar-GroupHeaderWidget { + overflow: hidden; + padding: 3px; + cursor: pointer; + border-bottom: 1px solid #BBBBBB; + border-top: 1px solid white; +} + +.hablar-GroupHeaderWidget .label { + display: block; + margin: 3px; +} + +.hablar-GroupHeaderWidget .menu { + float: right; + margin-right: 3px; +} + +.hablar-RosterItemWidget .user { + float: left; +} + +.hablar-RosterItemWidget .icon { + display: block; + float: left; + margin: 2px 5px 2px 2px; +} + +.hablar-RosterItemWidget .name { + display: block; + float: left; + margin-right: 5px; +} + +.hablar-RosterItemWidget .menu { + float: right; +} + +.hablar-RosterGroupWidget .menu { + float: right; + cursor: pointer; +} + +/** CHAT PAGE **/ +.hablar-ChatWidget .actions div { + float: right; +} + +/** SEARCH PAGE **/ +.hablar-SearchWidget .searchBox { + width: 75%; + padding: 3px; + margin-right: 1%; +} + +.hablar-SearchWidget .gwt-Button { + width: 20%; +} + +/** ROOMS **/ +.hablar-ChatWidget .actions .hablar-OccupantsWidget { + display: block; + float: left; + padding: 2px 5px; + margin-left: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + cursor: pointer; +} + +.hablar-OccupantWidget { + width: 100%; + overflow: hidden; + margin: 2px 5px; + cursor: default; +} + +.hablar-OccupantWidget .icon { + display: block; + float: left; + margin-right: 5px; +} + +.hablar-OccupantWidget .name { + display: block; + float: left; +} + +/** ROOM INVITATION **/ +.hablar-OpenRoomWidget .list { + padding: 5px; +} + +/** LOGGER **/ +.hablar-Logger .gwt-Label { + opacity: 0.5; +} + +.hablar-Logger .gwt-Label.ready { + opacity: 1; +} + +.hablar-Logger .output { + color: blue; +} + +.hablar-Logger .input { + color: #0c0; +} + +/** OVERLAY **/ +.hablar-Overlay { + z-index: 7000; + padding: 20px 10px 10px 10px; +} + +/** FORMS **/ +.form p { + width: 100%; + overflow: hidden; + margin: 3px 0; +} + +.form h2 { + font-size: 200%; +} + +.form span.option { + display: block; + margin: 0 0 15px 30px; +} + +.form p label { + display: block; + margin-top: 5px; + margin-right: 10px; + margin-right: 0.5em; +} + +.form p .gwt-Label { + font-weight: bold; +} + +.form .actions { + padding-left: 5px; + margin-top: 15px; + padding-top: 5px; +} + +.form .gwt-TextBox,.form .gwt-PasswordTextBox { + padding: 2px; + width: 98%; + border: 0; +} + +.form p .gwt-RadioButton,.form p .gwt-CheckBox { + display: block; + width: 100%; + overflow: hidden; +} + +.form p .gwt-RadioButton input,.form p .gwt-CheckBox input { + float: left; + margin-right: 5px; +} + +.form p .gwt-RadioButton label,.form p .gwt-CheckBox label { + float: left; + margin: 0; +} + +.hablar-PopupPanel { + z-index: 5000; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); +} + +.hablar-PresenceWidget .controls { + width: 100%; + overflow: hidden; +} + +.hablar-PresenceWidget .menu,.hablar-PresenceWidget .icon { + float: left; + margin-top: 4px; +} + +.loading { + width: 100%; + overflow: hidden; +} + +.loading .icon { + display: block; + float: left; + margin-right: 5px; +} + +/** SEMANTIC CSS PLEASE! **/ +.overflowhidden { + overflow: hidden; +} + +/** ADD TO GROUP **/ +.hablar-ManageGroupsWidget .list { + padding: 5px; +} + +/** COPY TO CLIPBOARD **/ +.hablar-CopyToClipboardWidget .gwt-TextArea { + width: 100%; + height: 10em; + margin-top: 3px; +} + +.ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; + -moz-binding: url('ellipsis.xml#ellipsis'); + width: 100% +} + +.gwt-TextArea { + border: 1px solid #bbbbbb; +} \ No newline at end of file Added: kune-sandbox/war/kune-message.css =================================================================== --- kune-sandbox/war/kune-message.css (rev 0) +++ kune-sandbox/war/kune-message.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,33 @@ +.k-msg-panel { + background-color: #892c00; + border-collapse: separate; + border-spacing: 15px 8px; +} + +.k-msg-panel-title { + color: #ffe9da; + font-weight: bold; + margin-bottom: 10px; +} + +.k-msg { + border: solid 1px #F2F2F2; + background: #fff0e6; + color: #280b0b; + border-collapse: separate; + border-spacing: 0px; +} + +.k-msg-close { + position: relative; + right: -14px; + top: 0px; +} + +.k-msg-icon { + padding: 10px 10px 5px; +} + +.k-msg-label { + font-size: 17px; +} \ No newline at end of file Added: kune-sandbox/war/ws.css =================================================================== --- kune-sandbox/war/ws.css (rev 0) +++ kune-sandbox/war/ws.css 2011-03-25 10:09:09 UTC (rev 1292) @@ -0,0 +1,1089 @@ +@CHARSET "UTF-8"; + +body { + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; +} + +* { + font-family: 'Ubuntu', Arial; +} + +body.fontface { + font: 'Ubuntu', Arial; +} + +/* +a { + color: darkblue; +} + +a:visited { + color: darkblue; +} +*/ +.gwt-DialogBox { + border: 2px solid #AAAAAA; + background-color: white; +} + +.gwt-DialogBox .Caption { + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; +} + +.gwt-MenuBar { + background-color: #C3D9FF; + cursor: default; +} + +.gwt-MenuItem { + font-size: 14px; + margin: 1px; + cursor: default; +} + +.gwt-MenuItem-selected { + background-color: #E8EEF7; +} + +.gwt-Tree { + +} + +.gwt-Tree .gwt-TreeItem { + font-size: 14px; + cursor: default; +} + +.gwt-Tree .gwt-TreeItem-selected { + background-color: #C3D9FF; +} + +.gwt-StackPanel { + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; +} + +.gwt-StackPanel .gwt-StackPanelItem { + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; +} + +.gwt-StackPanel .gwt-StackPanelItem-selected { + +} + +.gwt-TabPanel { + +} + +.gwt-TabPanelBottom { + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; +} + +.gwt-TabBar { + font-size: smaller; +} + +.gwt-TabBar .gwt-TabBarFirst { + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; +} + +.gwt-TabBar .gwt-TabBarRest { + border-bottom: 1px solid #87b3ff; + padding-right: 3px; +} + +.gwt-TabBar .gwt-TabBarItem { + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; +} + +.gwt-TabBar .gwt-TabBarItem-selected { + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; +} + +.gwt-PushButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-RichTextArea { + border: 1px solid black; + background-color: white; +} + +.gwt-RichTextToolbar { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-RichTextToolbar .gwt-PushButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-HorizontalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-HorizontalSplitPanel .splitter { + background-color: #C3D9FF; + cursor: move; +} + +.gwt-HorizontalSplitPanel .left { + background-color: #E8EEF7; +} + +.gwt-VerticalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-VerticalSplitPanel .splitter { + background-color: #C3D9FF; + height: 8px; + cursor: move; +} + +.gwt-SuggestBoxPopup { + border: 2px solid #C3D9FF; +} + +.gwt-SuggestBoxPopup .item { + padding: 2px; +} + +.gwt-SuggestBoxPopup .item-selected { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-DisclosurePanel { + border: 2px solid #C3D9FF; +} + +.gwt-DisclosurePanel .header { + background-color: #e8eef7; + cursor: hand; +} + +.gwt-SplitLayoutPanel { + +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { + background-color: white; + background: url("images/spliter-top.png") no-repeat scroll center bottom + white; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { + background-color: white; + background: none; + cursor: row-resize; +} + +.kLoadingPanel { + background-color: #FF9999; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + padding: 0 1px 0 3px; + border-collapse: separate; + border-spacing: 2px; +} + +.kLoadingLabel { + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 5px 0 5px; +} + +.k-space-sel { + margin-right: 10px; + background-color: #F2F2F2; +} + +.k-space-sel-btn { + padding: 0 1px 0 1px; + margin: 0 0 -2px; +} + +.k-sitebar-logo { + margin-top: 2px; +} + +.x-btn button,button { /* font: 18px/27px 'Ubuntu', arial; */ + +} + +.k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span { + text-decoration: underline; +} + +.k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button { + font: 13px 'Ubuntu', arial; + color: #B3B3B3; + cursor: pointer; + white-space: nowrap; + background: none; + border: 0px; + padding: 0 3px 0 0 !important; +} + +.k-sitebar-wave-status { + font: 13px 'Ubuntu', arial; + /* font-weight: bold; */ + color: #B3B3B3; + white-space: nowrap; + background: none; + border: 0px; + padding: 1px 7px 0 0 !important; +} + +.k-sitebar-wave-status,.k-sitebar-wave-status-online { + color: red; +} + +.k-sitebar-wave-status,.k-sitebar-wave-status-offline { + color: green; +} + +.k-sitebar button:hover { + border: 0px; + background: none; +} + +.k-btn-sitebar button { + margin-top: -5px; +} + +.k-sitebar { /* margin-top: -30px; */ + +} + +.k-link { + text-decoration: underline; + color: green; + cursor: pointer; +} + +/* Margins */ +.kune-Margin-40-trbl { + margin: 40px; +} + +.kune-Margin-40-lr { + margin-left: 40px; + margin-right: 40px; +} + +.kune-Margin-40-tl { + margin-top: 40px; + margin-left: 40px; +} + +.kune-Margin-40-tb { + margin-top: 40px; + margin-bottom: 40px; +} + +.kune-Margin-40-t { + margin-top: 40px; +} + +.kune-Margin-40-r { + margin-right: 40px; +} + +.kune-Margin-40-l { + margin-left: 40px; +} + +.kune-Margin-20-trbl { + margin: 20px; +} + +.kune-Margin-20-lr { + margin-left: 20px; + margin-right: 20px; +} + +.kune-Margin-20-tl { + margin-top: 20px; + margin-left: 20px; +} + +.kune-Margin-20-tb { + margin-top: 20px; + margin-bottom: 20px; +} + +.kune-Margin-20-t { + margin-top: 20px; +} + +.kune-Margin-20-r { + margin-right: 20px; +} + +.kune-Margin-20-l { + margin-left: 20px; +} + +.kune-Margin-Large-trbl { + margin: 10px; +} + +.kune-Margin-Large-lr { + margin-left: 10px; + margin-right: 10px; +} + +.kune-Margin-Large-tl { + margin-top: 10px; + margin-left: 10px; +} + +.kune-Margin-Large-tb { + margin-top: 10px; + margin-bottom: 10px; +} + +.kune-Margin-Large-t { + margin-top: 10px; +} + +.kune-Margin-Large-r { + margin-right: 10px; +} + +.kune-Margin-Large-l { + margin-left: 10px; +} + +.kune-Margin-7-trbl { + margin: 7px; +} + +.kune-Margin-7-lr { + margin-left: 7px; + margin-right: 7px; +} + +.kune-Margin-7-tl { + margin-top: 7px; + margin-left: 7px; +} + +.kune-Margin-7-tb { + margin-top: 7px; + margin-bottom: 7px; +} + +.kune-Margin-7-t { + margin-top: 7px; +} + +.kune-Margin-7-r { + margin-right: 7px; +} + +.kune-Margin-7-b { + margin-bottom: 7px; +} + +.kune-Margin-7-l { + margin-left: 7px; +} + +.kune-Margin-Medium-trbl { + margin: 5px; +} + +.kune-Margin-Medium-lr { + margin-left: 5px; + margin-right: 5px; +} + +.kune-Margin-Medium-tl { + margin-top: 5px; + margin-left: 5px; +} + +.kune-Margin-Medium-tb { + margin-top: 5px; + margin-bottom: 5px; +} + +.kune-Margin-Medium-t { + margin-top: 5px; +} + +.kune-Margin-Medium-r { + margin-right: 5px; +} + +.kune-Margin-Medium-b { + margin-bottom: 5px; +} + +.kune-Margin-Medium-l { + margin-left: 5px; +} + +.kune-Margin-Small-trbl { + margin: 3px; +} + +.kune-Margin-Small-lr { + margin-left: 3px; + margin-right: 3px; +} + +.kune-Margin-Small-tl { + margin-top: 3px; + margin-left: 3px; +} + +.kune-Margin-Small-tb { + margin-top: 3px; + margin-bottom: 3px; +} + +.kune-Margin-Small-t { + margin-top: 3px; +} + +.kune-Margin-Small-l { + margin-left: 3px; +} + +.kune-Margin-Small-r { + margin-right: 3px; +} + +.kune-Margin-Small-b { + margin-bottom: 3px; +} + +.kune-Margin-Mini-trbl { + margin: 1px; +} + +.kune-Margin-Mini-lr { + margin-left: 1px; + margin-right: 1px; +} + +.kune-Margin-Mini-tl { + margin-top: 1px; + margin-left: 1px; +} + +.kune-Margin-Mini-tb { + margin-top: 1px; + margin-bottom: 1px; +} + +.kune-Margin-Mini-t { + margin-top: 1px; +} + +.kune-Margin-Mini-r { + margin-right: 1px; +} + +.kune-Margin-Mini-b { + margin-bottom: 1px; +} + +.kune-Margin-Mini-l { + margin-left: 1px; +} + +.k-publicspace-msg { + background-color: #E0E0E0; +} + +.k-publicspace-mask { /* background-color: #fff !important; + kfilter: alpha(opacity = 68) !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important;*/ + +} + +.k-publicspace-panel { + margin: 5px; + display: table-row; +} + +.k-publicspace-icon { + margin: 3px 3px 3px 0; + float: left; +} + +.k-publicspace-title { + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; +} + +.k-publicspace-description { + font-size: 14px; + display: table-cell; +} + +.k-publicspace-actions { + display: inline; +} + +.k-message-panel { + margin: 5px; + display: table-row; +} + +.k-message-icon { + margin: 3px 3px 3px 0; + float: left; +} + +.k-message-title { + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; +} + +.k-message-description { + font-size: 14px; + display: table-cell; +} + +.k-error-tb { + background: #FFB380 none repeat scroll 0% 50%; + /* color: #250; */ + padding: 10px; +} + +.k-error-tb img { + margin: 0 10px; + float: left; +} + +.k-error-tb div { + font-size: 14px; + display: table-cell; +} + +.k-mask { + background-color: #F2F2F2 !important; + /* kfilter: alpha(opacity = 78) !important; */ + -moz-opacity: 0.78 !important; + -khtml-opacity: 0.78 !important; + opacity: 0.78 !important; +} + +.x-form-item-label { + font-size: 14px; + font-weight: bold; + color: brown; +} + +.x-form-text { + font-size: 14px; +} + +.x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { + font-size: 14px; + font-family: 'Ubuntu', Arial; +} + +.k-form-intro { + font-size: 14px; + margin-bottom: 10px; +} + +.k-form-fieldset { + font-size: 16px; + margin-left: 105px; +} + +.k-basic-thumb { + background-color: #F2F2F2; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.k-basic-thumb img { + margin: 2px 2px 0px 2px; +} + +.k-basic-thumb div { + margin: -3px 0px 0px 0px; + font-weight: normal; + font-size: 12px; +} + +.k-sn-mainpanel { + font-size: 16px; + font-weight: bold; +} + +.k-sn-maintitle { + margin: 5px; +} + +.k-sn-maintitle { + color: #a05a2c; + font-size: 20px; +} + +.k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel { + color: #FFF; + text-transform: lowercase; + padding-left: 10px; + float: left; +} + +.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel + { + float: left; + padding-left: 5px; + color: #e0e0e0; +} + +.k-sn-adminslabel { + +} + +.k-sn-mainpanel .k-basic-thumb { + float: left; +} + +/* +.k-sn-mainpanel .x-btn button { + text-decoration: underline; + white-space: nowrap; +} +*/ +.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button { + font: 13px 'Ubuntu', arial; + border: 2px solid #CCCCCC; + cursor: pointer; + margin: 0; + padding: 3px 0; + text-decoration: none; + background-color: #F2F2F2; + color: #855585; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + vertical-align: middle; + line-height: 2em !important; + height: 26px !important; + font-weight: bold; + /* +font-size:small; + cursor: pointer; + border: 2px gray solid; + padding-left: 25px !important; */ +} + +.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover { + border: 2px orange solid; + background: #f0f0f0; + color: #855585; +} + +.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active { + border-top-color: #ffffff; + background: #ffffff; +} + +.k-sn-collabslabel { + +} + +.k-sn-pendingslabel { + +} + +.k-sn-orphan-label { + padding: 10px; +} + +.k-sn-novisible-label { + padding: 10px; +} + +.k-sn-adminspanel { + background-color: #a05a2c; +} + +.k-sn-collabspanel { + background-color: #d38d5f; +} + +.k-sn-pendingspanel { /* background-color: #a05a2c; */ + +} + +.k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { + +} + +.k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow { + margin-left: 10px; +} + +.k-sn-adminsscroll { + +} + +.k-sn-collabsscroll { + +} + +.k-sn-pendingsscroll { + +} + +.k-userconfirm-label { + width: 300px; + margin: 10px; +} + +.k-sn-deck { + +} + +.k-sn-bottomPanel { + padding: 8px 10px 0; + float: left; +} + +.k-sn-bottomPanel-actions { + width: 100%; +} + +.k-sn-novisible-label,.k-sn-orphan-label { + color: #FFF; + font-size: 16px; + font-weight: bold; +} + +.k-frame-def { + margin: 0px; + border: 0px; +} + +.k-maxsize { + width: 100%; + height: 100%; +} + +.k-footer-license-label { + float: right; + margin-top: 8px; + cursor: pointer; + font-weight: bold; + font-size: 16px; + color: #784421; +} + +.k-footer-license-label-title { + margin-right: 5px; + color: #280b0b; +} + +.k-footer-license-img { + float: right; + margin: 10px 15px 0px 5px; + cursor: pointer; +} + +.k-sn-options-menu { + float: left; +} + +.k-sn-options-menu button { + background-color: none; +} + +.k-sn-join { + float: left; +} + +.k-entitytextlogo-border { + border: 2px solid #F2F2F2; +} + +.k-entitytextlogo-no-border { + border: none; +} + +.k-entitytextlogo { + height: 60px; + margin: 5px; + overflow: hidden; + width: 468px; +} + +.k-entitytextlogo table { + vertical-align: middle; +} + +.k-elogo-l-l { + font-size: 46px; +} + +.k-elogo-l-m { + font-size: 167%; +} + +.k-elogo-l-s { + font-size: 108%; +} + +.k-entitytextlogo .gwt-Label { + font-weight: 700; + margin: 5px; + height: 27px; +} + +.k-entitytextlogo-default .gwt-Label { + color: #69312F; +} + +.k-entitytextlogo-green .gwt-Label { + color: #250; +} + +.k-entitytextlogo-blue .gwt-Label { + color: #000080; +} + +.k-entitytextlogo-grey .gwt-Label { + color: #1A1A1A; +} + +.k-entitytextlogo-purple .gwt-Label { + color: #440055; +} + +.k-entitytextlogo-red .gwt-Label { + color: #800000; +} + +.k-elogo-plink { + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; +} + +.k-elogop-expand { + background-color: transparent; +} + +.k-tsp-tag { + float: left; + padding: 3px; + cursor: pointer; + color: #5B4683; +} + +.k-tsp-cloud { + line-height: 1.5em; + text-align: center; +} + +.k-tool-panel { + background-color: #DEAA87; +} + +.k-tool-item { + display: block; + cursor: pointer; +} + +.k-tool-item-focus { + background-color: #d38d5f; +} + +.k-tool-item-nofocus { +} + +.k-tool-item-selected { + background-color: #C87137; +} + +.k-tool-item-notselected { + background-color: inherits; +} \ No newline at end of file

1 0

Jump to page: