Author: vjrj_ Date: 2012-03-18 21:18:29 +0100 (Sun, 18 Mar 2012) New Revision: 1770 Added: trunk/img/icons/custom-iconic/trash.svg trunk/script/export-svg-to-png.sh trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java trunk/src/main/java/cc/kune/trash/ trunk/src/main/java/cc/kune/trash/server/ trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java trunk/src/main/java/cc/kune/trash/shared/ trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java Removed: trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java trunk/src/main/java/cc/kune/events/shared/EventsConstants.java trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/barters/client/BartersParts.java trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/PlatformServerModule.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/CreationServiceDefault.java trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java trunk/src/main/java/cc/kune/core/shared/ToolConstants.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsParts.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsGinjector.java trunk/src/main/java/cc/kune/events/client/EventsParts.java trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java trunk/src/main/java/cc/kune/events/server/EventsServerTool.java trunk/src/main/java/cc/kune/events/server/EventsServlet.java trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/lists/client/ListsParts.java trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksParts.java trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiParts.java trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java trunk/src/main/resources/kune.properties trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.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/ContainerManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java trunk/src/test/java/cc/kune/docs/DocumentToolTest.java trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 Added: trunk/img/icons/custom-iconic/trash.svg =================================================================== --- trunk/img/icons/custom-iconic/trash.svg (rev 0) +++ trunk/img/icons/custom-iconic/trash.svg 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="32px" + height="32px" + viewBox="0 0 32 32" + style="enable-background:new 0 0 32 32;" + xml:space="preserve" + inkscape:version="0.48.2 r9819" + sodipodi:docname="trash.svg"><metadata + id="metadata3056"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs3054"> + + + + + +</defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1078" + inkscape:window-height="919" + id="namedview3052" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="16" + inkscape:window-x="0" + inkscape:window-y="972" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="false" + showguides="false"><inkscape:grid + type="xygrid" + id="grid3077" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /></sodipodi:namedview> +<path + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 1,0 C 0.44600003,0 0,0.446 0,1 l 0,2 c 0,0.554 0.44600003,1 1,1 1.3041959,0 1.6744253,0 3,0 l 0,22 c 0,3.312 2.688,6 6,6 l 12,0 c 3.312,0 6,-2.688 6,-6 l 0,-22 2,0 1,0 c 0.554,0 1,-0.446 1,-1 L 32,1 C 32,0.446 31.554,0 31,0 L 30,0 26,0 C 24.589979,0 24,0.5207576 24,2.03125 L 24,26 c 0,1.102 -0.898,2 -2,2 L 10,28 C 8.898,28 8,27.102 8,26 8.00153,18.235176 8.00126,7.8861416 8,1 8,0.43960056 7.5213789,0 7,0 5.3333333,0 2.6666667,0 1,0 z" + id="rect3871" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssccssssccsssscssssscccc" /> +<rect + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3086" + width="4" + height="22" + x="10" + y="4" + ry="0.99999994" + rx="1" /><rect + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3860" + width="4" + height="22" + x="18" + y="4" + ry="0.99999994" + rx="1" /></svg> \ No newline at end of file Added: trunk/script/export-svg-to-png.sh =================================================================== --- trunk/script/export-svg-to-png.sh (rev 0) +++ trunk/script/export-svg-to-png.sh 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,8 @@ +DEST=/tmp/ +SIZE=16 +for i in `ls img/icons/custom-iconic/* svg` +do + inkscape --export-png=$DEST/`basename $i .svg`.png \ + --export-width=$SIZE --export-height=$SIZE \ + $i +done \ No newline at end of file Property changes on: trunk/script/export-svg-to-png.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.barters.client; -import static cc.kune.barters.shared.BartersConstants.NAME; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.NAME; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/barters/client/BartersParts.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/BartersParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ package cc.kune.barters.client; import cc.kune.barters.client.actions.BartersClientActions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.core.shared.SessionConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final BartersClientActions bartersActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, BartersConstants.TYPE_BARTER); - viewerSelector.register(folderViewer, true, BartersConstants.TYPE_ROOT, BartersConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, BartersToolConstants.TYPE_BARTER); + viewerSelector.register(folderViewer, true, BartersToolConstants.TYPE_ROOT, BartersToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.barters.client.actions; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, BartersConstants.TYPE_ROOT); + super(i18n, action, res, session, BartersToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewBartersBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.barterAdd(), shorcutReg, i18n.t("New barter"), - i18n.t("Create a New Barter here"), i18n.t("New barter"), BartersConstants.TYPE_BARTER); + i18n.t("Create a New Barter here"), i18n.t("New barter"), BartersToolConstants.TYPE_BARTER); } } Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"), - i18n.t("New folder"), BartersConstants.TYPE_FOLDER); + i18n.t("New folder"), BartersToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.barters.server; -import static cc.kune.barters.shared.BartersConstants.NAME; -import static cc.kune.barters.shared.BartersConstants.ROOT_NAME; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.NAME; +import static cc.kune.barters.shared.BartersToolConstants.ROOT_NAME; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import java.net.URL; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java =================================================================== --- trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.barters.shared; - -public final class BartersConstants { - - public static final String NAME = "barters"; - public static final String ROOT_NAME = "barters"; - public static final String TYPE_BARTER = NAME + "." + "barter"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private BartersConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.barters.shared; + +public final class BartersToolConstants { + + public static final String NAME = "barters"; + public static final String ROOT_NAME = "barters"; + public static final String TYPE_BARTER = NAME + "." + "barter"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private BartersToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.blogs.client; -import static cc.kune.blogs.shared.BlogsConstants.NAME; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; -import cc.kune.blogs.shared.BlogsConstants; +import static cc.kune.blogs.shared.BlogsToolConstants.NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; @@ -44,7 +44,7 @@ final IconicResources icons) { super( NAME, - i18n.t(BlogsConstants.ROOT_NAME), + i18n.t(BlogsToolConstants.ROOT_NAME), i18n.t("Blogs are a chronological list of posts (ordered by date) about a specific topic. Each post can be commented by the visitors"), icons.blogs(), toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ package cc.kune.blogs.client; import cc.kune.blogs.client.actions.BlogsClientActions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.core.shared.SessionConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final BlogsClientActions blogsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, BlogsConstants.TYPE_POST); - viewerSelector.register(folderViewer, true, BlogsConstants.TYPE_ROOT, BlogsConstants.TYPE_BLOG); + viewerSelector.register(contentViewer, true, BlogsToolConstants.TYPE_POST); + viewerSelector.register(folderViewer, true, BlogsToolConstants.TYPE_ROOT, BlogsToolConstants.TYPE_BLOG); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.blogs.client.actions; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentBlogBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, BlogsConstants.TYPE_ROOT); + super(i18n, action, res, session, BlogsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; @@ -32,7 +32,7 @@ public NewBlogBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.blogAdd(), i18n.t("New blog"), i18n.t("Create a new blog"), - i18n.t("New blog"), BlogsConstants.TYPE_BLOG); + i18n.t("New blog"), BlogsToolConstants.TYPE_BLOG); } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewPostIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.blogAdd(), shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), - i18n.t("New post"), BlogsConstants.TYPE_POST); + i18n.t("New post"), BlogsToolConstants.TYPE_POST); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewPostMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final BlogsNewMenu blogsNewMenu) { super(i18n, action, res.blogAdd(), shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), - i18n.t("New post"), BlogsConstants.TYPE_POST, blogsNewMenu.get()); + i18n.t("New post"), BlogsToolConstants.TYPE_POST, blogsNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.blogs.server; -import static cc.kune.blogs.shared.BlogsConstants.NAME; -import static cc.kune.blogs.shared.BlogsConstants.ROOT_NAME; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.ROOT_NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.blogs.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class BlogsConstants { - - public static final String NAME = "blogs"; - public static final String ROOT_NAME = "blogs"; - public static final String TYPE_BLOG = NAME + "." + "blog"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private BlogsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.blogs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class BlogsToolConstants { + + public static final String NAME = "blogs"; + public static final String ROOT_NAME = "blogs"; + public static final String TYPE_BLOG = NAME + "." + "blog"; + public static final String TYPE_POST = NAME + "." + "post"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private BlogsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.chat.client; -import static cc.kune.chat.shared.ChatConstants.NAME; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.NAME; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import cc.kune.chat.client.resources.ChatResources; import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; @@ -61,7 +61,7 @@ private void registerIcons() { registerTutorial(TYPE_ROOT); - registerTutorial(TYPE_ROOM); + // registerTutorial(TYPE_ROOM); registerContentTypeIcon(TYPE_ROOT, icons.chats()); registerContentTypeIcon(TYPE_ROOM, res.groupChat()); final String emptyMsg = i18n.tWithNT("See the archive of old conversations" Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,7 +28,7 @@ import cc.kune.chat.client.actions.StartChatWithMemberAction; import cc.kune.chat.client.actions.StartChatWithThisBuddyAction; import cc.kune.chat.client.actions.StartChatWithThisPersonAction; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; @@ -81,8 +81,8 @@ final Provider<OpenGroupPublicChatRoomAction> openGroupRoomAction, // final Provider<OpenGroupPublicChatRoomButton> openGroupRoom, final ContentViewerSelector viewerSelector, final FolderViewerPresenter folderViewer) { - viewerSelector.register(folderViewer, true, ChatConstants.TYPE_ROOT); - viewerSelector.register(folderViewer, true, ChatConstants.TYPE_ROOM); + viewerSelector.register(folderViewer, true, ChatToolConstants.TYPE_ROOT); + viewerSelector.register(folderViewer, true, ChatToolConstants.TYPE_ROOM); clientTool.get(); session.onAppStart(true, new AppStartHandler() { @Override Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ \*/ package cc.kune.chat.client.actions; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.chat.client.actions; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentChatBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, ChatConstants.TYPE_ROOT); + super(i18n, action, res, session, ChatToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.chat.server; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.GroupNotFoundException; @@ -63,7 +63,7 @@ try { return creationService.createFolder(groupManager.findByShortName(groupShortName), ContentUtils.parseId(parentToken.getFolder()), roomName, user.getLanguage(), - ChatConstants.TYPE_ROOM); + ChatToolConstants.TYPE_ROOM); } catch (final ContentNotFoundException e) { xmppManager.destroyRoom(connection, roomName); throw new ContentNotFoundException(); Modified: trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.chat.server; -import static cc.kune.chat.shared.ChatConstants.NAME; -import static cc.kune.chat.shared.ChatConstants.ROOT_NAME; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.NAME; +import static cc.kune.chat.shared.ChatToolConstants.ROOT_NAME; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import java.util.Arrays; import java.util.Collections; Deleted: trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java =================================================================== --- trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.chat.shared; - -public final class ChatConstants { - - public static final String NAME = "chats"; - public static final String ROOT_NAME = "chats"; - public static final String TYPE_CHAT = NAME + "." + "chat"; - public static final String TYPE_ROOM = NAME + "." + "room"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private ChatConstants() { - } -} Copied: trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.chat.shared; + +public final class ChatToolConstants { + + public static final String NAME = "chats"; + public static final String ROOT_NAME = "chats"; + public static final String TYPE_CHAT = NAME + "." + "chat"; + public static final String TYPE_ROOM = NAME + "." + "room"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private ChatToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -80,13 +80,13 @@ /* Tools (order in GUI) */ ginjector.getDocsParts(); - ginjector.getBartersParts(); ginjector.getBlogsParts(); + ginjector.getWikiParts(); + ginjector.getEventsParts(); + ginjector.getTasksParts(); + ginjector.getListsParts(); ginjector.getChatParts(); - ginjector.getListsParts(); - ginjector.getMeetingsParts(); - ginjector.getTasksParts(); - ginjector.getWikiParts(); + ginjector.getBartersParts(); ginjector.getSiteLogo(); ginjector.getChatClient(); Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -148,7 +148,8 @@ logException(caught, true); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Oops! Something has gone wrong with our servers. Retry later, please."))); - final String error = "Other kind of exception received in ErrorHandler"; + final String error = "Other kind of exception received in ErrorHandler (" + caught.getMessage() + + ")"; Log.error(error, caught); StackErrorEvent.fire(eventBus, caught); } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -68,7 +68,7 @@ StateContentDTO copyContent(String userHash, StateToken parentToken, StateToken token) throws DefaultException; - StateContentDTO delContent(String userHash, StateToken token) throws DefaultException; + StateContainerDTO delContent(String userHash, StateToken token) throws DefaultException; StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -68,7 +68,7 @@ void copyContent(String userHash, StateToken parentToken, StateToken token, AsyncCallback<StateContentDTO> callback); - void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback); + void delContent(String userHash, StateToken token, AsyncCallback<StateContainerDTO> asyncCallback); void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); Modified: trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,8 +24,8 @@ import cc.kune.common.client.notify.ProgressShowEvent; import cc.kune.core.client.events.AppStartEvent; +import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.events.UserSignInOrSignOutEvent; -import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.ContentCache; @@ -76,7 +76,9 @@ private StateAbstractDTO getCached(final StateToken newState) { assert newState != null; - return useCache ? cacheMap.get(newState) : null; + final StateAbstractDTO cached = cacheMap.get(newState); + // We use cache always for docs (waves) + return useCache ? cached : newState.hasAll() ? cached : null; } @Override Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -67,6 +67,7 @@ import cc.kune.lists.client.rpc.ListsService; import cc.kune.lists.server.ListsServerModule; import cc.kune.tasks.server.TaskServerModule; +import cc.kune.trash.server.TrashServerModule; import cc.kune.wave.server.KuneWaveServerUtils; import cc.kune.wave.server.kspecific.WaveEmailNotifier; import cc.kune.wiki.server.WikiServerModule; @@ -191,13 +192,14 @@ }); builder.use(new PlatformServerModule()); builder.use(new DocumentServerModule()); + builder.use(new WikiServerModule()); builder.use(new BlogServerModule()); - builder.use(new WikiServerModule()); - builder.use(new ChatServerModule()); - builder.use(new BarterServerModule()); builder.use(new EventsServerModule()); builder.use(new TaskServerModule()); builder.use(new ListsServerModule()); + builder.use(new ChatServerModule()); + builder.use(new BarterServerModule()); + builder.use(new TrashServerModule()); // builder.use(new GalleryServerModule()); builder.use(new RESTServicesModule()); builder.use(configModule); Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -109,7 +109,6 @@ import cc.kune.core.server.users.UserInfoServiceDefault; import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.server.xmpp.XmppManagerDefault; -import cc.kune.domain.SocialNetwork; import cc.kune.hspace.client.ClientStatsService; import cc.kune.lists.client.rpc.ListsService; import cc.kune.lists.server.rpc.ListsRPC; @@ -123,12 +122,7 @@ public class PlatformServerModule extends AbstractExtendedModule { private void bindFinders() { - // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Injec... - // (...) 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(SocialNetwork.class); } private void bindManagers() { Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -31,10 +31,14 @@ Container createFolder(Group group, Container parent, String name, I18nLanguage language, String typeId); - Container createRootFolder(Group group, String toolName, String name, String type); + Container createRootFolder(Group group, String toolName, String name, final String rootType); boolean findIfExistsTitle(Container container, String title); + Container getTrashFolder(Group group); + + boolean hasTrashFolder(Group group); + void moveContainer(Container container, Container newContainer); Container renameFolder(Group group, Container container, String newName) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -42,6 +42,7 @@ import cc.kune.domain.I18nLanguage; import cc.kune.domain.finders.ContainerFinder; import cc.kune.domain.finders.ContentFinder; +import cc.kune.trash.shared.TrashToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -76,9 +77,9 @@ @Override public Container createRootFolder(final Group group, final String toolName, final String name, - final String type) { + final String rootType) { final Container container = new Container(name, group, toolName); - container.setTypeId(type); + container.setTypeId(rootType); return persist(container); } @@ -99,6 +100,16 @@ } @Override + public Container getTrashFolder(final Group group) { + return containerFinder.findTypeId(group, TrashToolConstants.TYPE_ROOT); + } + + @Override + public boolean hasTrashFolder(final Group group) { + return containerFinder.findIfExistsTypeId(group, TrashToolConstants.TYPE_ROOT) > 0; + } + + @Override public void moveContainer(final Container container, final Container newContainer) { if (newContainer.equals(container.getParent())) { throw new MoveOnSameContainerException(); Modified: trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -40,7 +40,6 @@ private final ContainerManager containerManager; private final ContentManagerDefault contentManager; - private final ServerToolRegistry tools; @Inject Modified: trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -77,6 +77,8 @@ Group getSiteDefaultGroup(); + void initTrash(Group group); + SearchResult<Group> search(String search); SearchResult<Group> search(String search, Integer firstResult, Integer maxResults); Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -65,6 +65,7 @@ import cc.kune.domain.finders.GroupFinder; import cc.kune.domain.finders.LicenseFinder; import cc.kune.domain.finders.UserFinder; +import cc.kune.trash.server.TrashServerTool; import com.google.inject.Inject; import com.google.inject.Provider; @@ -80,27 +81,27 @@ private final LicenseFinder licenseFinder; private final LicenseManager licenseManager; private final KuneBasicProperties properties; - private final ServerToolRegistry registry; private final ServerToolRegistry serverToolRegistry; + private final Provider<TrashServerTool> trashTool; private final UserFinder userFinder; @Inject public GroupManagerDefault(@DataSourceKune final Provider<EntityManager> provider, final GroupFinder finder, final UserFinder userFinder, final KuneProperties kuneProperties, - final KuneBasicProperties properties, final ServerToolRegistry registry, - final LicenseManager licenseManager, final LicenseFinder licenseFinder, - final FileManager fileManager, final ServerToolRegistry serverToolRegistry, + final KuneBasicProperties properties, final LicenseManager licenseManager, + final LicenseFinder licenseFinder, final FileManager fileManager, + final ServerToolRegistry serverToolRegistry, final Provider<TrashServerTool> trashTool, final I18nTranslationService i18n) { super(provider, Group.class); this.finder = finder; this.userFinder = userFinder; this.kuneProperties = kuneProperties; this.properties = properties; - this.registry = registry; this.licenseManager = licenseManager; this.licenseFinder = licenseFinder; this.fileManager = fileManager; this.serverToolRegistry = serverToolRegistry; + this.trashTool = trashTool; this.i18n = i18n; } @@ -271,11 +272,13 @@ } throw e; } - for (final ServerTool tool : registry.all()) { + for (final ServerTool tool : serverToolRegistry.all()) { if (toolsToEnable.contains(tool.getName())) { tool.initGroup(user, group, vars); } } + // Init always the trash + initTrash(group); } private void initSocialNetwork(final Group group, final Group userGroup, @@ -291,6 +294,11 @@ } @Override + public void initTrash(final Group group) { + trashTool.get().initGroup(group); + } + + @Override public SearchResult<Group> search(final String search) { return this.search(search, null, null); } Modified: trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -87,6 +87,11 @@ jpm.properties(dbProperties); } + // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Injec... + // (...) 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) + jpm.addFinder(ContainerFinder.class); jpm.addFinder(ContentFinder.class); jpm.addFinder(ExtMediaDescripFinder.class); Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -255,10 +255,19 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @KuneTransactional - public StateContentDTO delContent(final String userHash, final StateToken token) + public StateContainerDTO delContent(final String userHash, final StateToken token) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - return getState(getCurrentUser(), contentManager.setStatus(contentId, ContentStatus.inTheDustbin)); + final Content content = finderService.getContent(contentId); + contentManager.setStatus(contentId, ContentStatus.inTheDustbin); + final Container previousParent = content.getContainer(); + final Group group = previousParent.getOwner(); + if (!containerManager.hasTrashFolder(group)) { + groupManager.initTrash(group); + } + final Container trash = containerManager.getTrashFolder(group); + moveContent(userHash, token, trash.getStateToken()); + return getState(getCurrentUser(), previousParent); } @Override Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,9 @@ */ package cc.kune.core.server.state; -import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.errors.DefaultException; import cc.kune.core.server.access.AccessRightsService; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.manager.GroupManager; @@ -36,7 +34,7 @@ import cc.kune.domain.Revision; import cc.kune.domain.User; import cc.kune.events.server.utils.EventsServerConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.wave.server.kspecific.KuneWaveService; import com.google.inject.Inject; @@ -74,7 +72,7 @@ @Override public StateContainer create(final User userLogged, final Container container) { - final boolean isCalendar = container.getTypeId().equals(EventsConstants.TYPE_ROOT); + final boolean isCalendar = container.getTypeId().equals(EventsToolConstants.TYPE_ROOT); final StateContainer state = isCalendar ? new StateEventContainer() : new StateContainer(); state.setTitle(container.getName()); state.setTypeId(container.getTypeId()); @@ -126,8 +124,12 @@ state.setTitle(wavelet.getTitle()); state.setIsParticipant(userLogged != User.UNKNOWN_USER ? kuneWaveManager.isParticipant(wavelet, userLogged.getShortName()) : false); - } catch (final InvalidWaveRefException e) { - throw new DefaultException("Error retriving Wave"); + } catch (final Exception e) { + state.setContent(i18n.t("Error accessing this document. " + + "Please contact the administrators providing this reference ([%s]) " + + "and any other relevant info.", waveId)); + state.setTitle(revision.getTitle()); + // throw new DefaultException("Error retriving Wave"); } } else { state.setContent(textBody); Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import cc.kune.core.server.properties.KuneProperties; +import cc.kune.trash.shared.TrashToolConstants; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -86,6 +87,10 @@ } public void register(final ServerTool tool) { + if (tool.getName().equals(TrashToolConstants.NAME)) { + // Trash is a special tool but we don't register it + return; + } final String name = tool.getName(); final String rootName = tool.getRootName(); final boolean userAvailable = usersAvailableToolsInProp.contains(name); Modified: trunk/src/main/java/cc/kune/core/shared/ToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/ToolConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/shared/ToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,12 +21,10 @@ public final class ToolConstants { - public static final String UPLOADEDFILE_SUFFIX = "uploaded"; - @Deprecated - public static final String WAVE_SUFFIX = "wave"; + public static final String UPLOADEDFILE_SUFFIX = "uploaded"; - private ToolConstants() { + private ToolConstants() { - } + } } Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,16 +19,16 @@ */ package cc.kune.docs.client; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -45,7 +45,7 @@ final IconicResources icons) { super( NAME, - i18n.t(DocsConstants.ROOT_NAME), + i18n.t(DocsToolConstants.ROOT_NAME), i18n.t("Here you can create or upload your personal, group or public documents. These documents can be edited and commented collaboratively and simultaneously. These docs can be static pages in your web page if you publish them"), icons.docs(), toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; Modified: trunk/src/main/java/cc/kune/docs/client/DocsParts.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/DocsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.core.shared.SessionConstants; import cc.kune.docs.client.actions.DocsClientActions; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final DocsClientActions docsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, DocsConstants.TYPE_DOCUMENT); - viewerSelector.register(folderViewer, true, DocsConstants.TYPE_ROOT, DocsConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, DocsToolConstants.TYPE_DOCUMENT); + viewerSelector.register(folderViewer, true, DocsToolConstants.TYPE_ROOT, DocsToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.docs.client.actions; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, DocsConstants.TYPE_ROOT); + super(i18n, action, res, session, DocsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; @@ -35,7 +35,7 @@ final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.pageAdd(), shorcutReg, i18n.t("New doc"), i18n.t("Create a New Document. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New document"), DocsConstants.TYPE_DOCUMENT); + i18n.t("New document"), DocsToolConstants.TYPE_DOCUMENT); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; @@ -42,7 +42,7 @@ i18n.t("New document"), i18n.t("Create a New Document here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New document"), DocsConstants.TYPE_DOCUMENT, docsFolderNewMenu.get()); + i18n.t("New document"), DocsToolConstants.TYPE_DOCUMENT, docsFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"), - i18n.t("New folder"), DocsConstants.TYPE_FOLDER); + i18n.t("New folder"), DocsToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContainerMenuItem; import com.google.inject.Inject; @@ -33,7 +33,7 @@ final NavResources res, final DocsFolderNewMenu docsFolderNewMenu) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), DocsConstants.TYPE_FOLDER, docsFolderNewMenu.get()); + i18n.t("New folder"), DocsToolConstants.TYPE_FOLDER, docsFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.docs.server; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.ROOT_NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.ROOT_NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; @@ -35,7 +35,7 @@ import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -62,7 +62,7 @@ final boolean hasVars = otherVars.length >= 2; final String title = hasVars ? (String) otherVars[0] : i18n.t("Document sample"); final String body = hasVars ? (String) otherVars[1] : i18n.t("This is only a sample of document"); - final String contentType = DocsConstants.TYPE_DOCUMENT; + final String contentType = DocsToolConstants.TYPE_DOCUMENT; final Content content = createInitialContent(user, group, rootFolder, title, body, contentType); group.setDefaultContent(content); Deleted: trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.docs.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class DocsConstants { - - public static final String NAME = "docs"; - public static final String ROOT_NAME = "documents"; - 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 + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private DocsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.docs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class DocsToolConstants { + + public static final String NAME = "docs"; + public static final String ROOT_NAME = "documents"; + 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 + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private DocsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/domain/Content.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -52,16 +52,16 @@ import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.validator.NotNull; -import cc.kune.barters.shared.BartersConstants; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.barters.shared.BartersToolConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.utils.HasStateToken; -import cc.kune.events.shared.EventsConstants; -import cc.kune.lists.shared.ListsConstants; -import cc.kune.tasks.shared.TasksConstants; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.events.shared.EventsToolConstants; +import cc.kune.lists.shared.ListsToolConstants; +import cc.kune.tasks.shared.TasksToolConstants; +import cc.kune.wiki.shared.WikiToolConstants; @Entity @Table(name = "contents") @@ -265,11 +265,11 @@ @Transient public boolean isWave() { - return (typeId.equals(DocsConstants.TYPE_DOCUMENT)) - || typeId.equals(TasksConstants.TYPE_TASK) - || typeId.equals(ListsConstants.TYPE_POST) - || typeId.equals(WikiConstants.TYPE_WIKIPAGE) - || (typeId.equals(BlogsConstants.TYPE_POST) || typeId.equals(BartersConstants.TYPE_BARTER) || typeId.equals(EventsConstants.TYPE_MEETING)); + return (typeId.equals(DocsToolConstants.TYPE_DOCUMENT)) + || typeId.equals(TasksToolConstants.TYPE_TASK) + || typeId.equals(ListsToolConstants.TYPE_POST) + || typeId.equals(WikiToolConstants.TYPE_WIKIPAGE) + || (typeId.equals(BlogsToolConstants.TYPE_POST) || typeId.equals(BartersToolConstants.TYPE_BARTER) || typeId.equals(EventsToolConstants.TYPE_MEETING)); } public void removeAuthor(final User user) { Modified: trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java =================================================================== --- trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,11 +20,19 @@ package cc.kune.domain.finders; import cc.kune.domain.Container; +import cc.kune.domain.Group; import com.google.inject.name.Named; import com.google.inject.persist.finder.Finder; public interface ContainerFinder { - @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.parent = :container AND c.name LIKE :title") - public Long findIfExistsTitle(@Named("container") final Container container, @Named("title") final String title); + @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.parent = :container AND c.name LIKE :title") + public Long findIfExistsTitle(@Named("container") final Container container, + @Named("title") final String title); + + @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.typeId = :typeId AND c.owner = :owner") + public Long findIfExistsTypeId(@Named("owner") final Group group, @Named("typeId") final String typeId); + + @Finder(query = "FROM Container c WHERE c.typeId = :typeId AND c.owner = :owner") + public Container findTypeId(@Named("owner") final Group group, @Named("typeId") final String typeId); } Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.events.client; -import static cc.kune.events.shared.EventsConstants.NAME; -import static cc.kune.events.shared.EventsConstants.ROOT_NAME; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.NAME; +import static cc.kune.events.shared.EventsToolConstants.ROOT_NAME; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/events/client/EventsGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinjector.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsGinjector.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,5 +28,5 @@ AsyncProvider<CalendarViewerPresenter> getCalendarViewerPresenter(); - EventsParts getMeetingsParts(); + EventsParts getEventsParts(); } Modified: trunk/src/main/java/cc/kune/events/client/EventsParts.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.core.shared.SessionConstants; import cc.kune.events.client.actions.EventsClientActions; import cc.kune.events.client.viewer.CalendarViewer; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -37,7 +37,7 @@ final ContentViewerPresenter contentViewer, final CalendarViewer calendarViewer) { clientTool.get(); // remove this... - viewerSelector.register(contentViewer, true, EventsConstants.TYPE_MEETING); - viewerSelector.register(calendarViewer, true, EventsConstants.TYPE_ROOT); + viewerSelector.register(contentViewer, true, EventsToolConstants.TYPE_MEETING); + viewerSelector.register(calendarViewer, true, EventsToolConstants.TYPE_ROOT); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -18,7 +18,7 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.events.client.viewer.CalendarViewer; import cc.kune.events.shared.EventsClientConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import com.bradrydzewski.gwt.calendar.client.Appointment; import com.bradrydzewski.gwt.calendar.client.AppointmentStyle; @@ -102,8 +102,8 @@ appt.setStyle(AppointmentStyle.ORANGE); contService.get().addNewContentWithGadgetAndState(session.getUserHash(), - session.getContainerState().getStateToken(), EventsConstants.TYPE_MEETING_DEF_GADGETNAME, - EventsConstants.TYPE_MEETING, title, "", EventsClientConversionUtil.toMap(appt), + session.getContainerState().getStateToken(), EventsToolConstants.TYPE_MEETING_DEF_GADGETNAME, + EventsToolConstants.TYPE_MEETING, title, "", EventsClientConversionUtil.toMap(appt), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onFailure(final Throwable caught) { Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ \*/ package cc.kune.events.client.actions; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, EventsConstants.TYPE_ROOT); + super(i18n, action, res, session, EventsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -12,7 +12,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; import cc.kune.events.client.viewer.CalendarViewerPresenter.CalendarViewerView; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.armor.GSpaceArmor; import cc.kune.gspace.client.viewers.AbstractFolderViewerPanel; import cc.kune.gspace.client.viewers.ContentTitleWidget; @@ -283,7 +283,7 @@ final String dateFormatted = fmt.format(currentDate); final ForIsWidget docHeader = gsArmor.getDocHeader(); UiUtils.clear(docHeader); - contentTitle.setTitle(i18n.t("Events in [%s]", dateFormatted), EventsConstants.TYPE_ROOT, null, + contentTitle.setTitle(i18n.t("Events in [%s]", dateFormatted), EventsToolConstants.TYPE_ROOT, null, false); docHeader.add(contentTitle); } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ import cc.kune.core.shared.dto.StateEventContainerDTO; import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.events.shared.EventsClientConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; import cc.kune.gspace.client.viewers.FolderViewerUtils; @@ -172,7 +172,7 @@ map.put(ICalConstants.DATE_TIME_START, DateUtils.toString(app.getStart())); map.put(ICalConstants.DATE_TIME_END, DateUtils.toString(app.getEnd())); contentService.get().setGadgetProperties(session.getUserHash(), new StateToken(app.getId()), - EventsConstants.TYPE_MEETING_DEF_GADGETNAME, map, new AsyncCallback<Void>() { + EventsToolConstants.TYPE_MEETING_DEF_GADGETNAME, map, new AsyncCallback<Void>() { @Override public void onFailure(final Throwable caught) { event.setCancelled(true); Modified: trunk/src/main/java/cc/kune/events/server/EventsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.events.server; -import static cc.kune.events.shared.EventsConstants.NAME; -import static cc.kune.events.shared.EventsConstants.ROOT_NAME; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.NAME; +import static cc.kune.events.shared.EventsToolConstants.ROOT_NAME; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import java.net.URL; import java.util.Arrays; @@ -59,7 +59,7 @@ final CreationService creationService) { super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_MEETING), Arrays.asList(TYPE_ROOT), Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, - creationService, configurationManager, i18n, ServerToolTarget.forGroups); + creationService, configurationManager, i18n, ServerToolTarget.forBoth); gadgetUrl = UrlUtils.of(MEETING_GADGET); } Modified: trunk/src/main/java/cc/kune/events/server/EventsServlet.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -37,7 +37,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; import cc.kune.events.server.utils.EventsServerConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import com.google.inject.Inject; @@ -68,7 +68,7 @@ try { final Container cnt = getContainer(userHash, token); - if (cnt.getTypeId().equals(EventsConstants.TYPE_ROOT)) { + if (cnt.getTypeId().equals(EventsToolConstants.TYPE_ROOT)) { final List<Map<String, String>> listOfProps = EventsServerConversionUtil.getAppointments(cnt); for (final Map<String, String> props : listOfProps) { try { Deleted: trunk/src/main/java/cc/kune/events/shared/EventsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/shared/EventsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.events.shared; - -public final class EventsConstants { - - public static final String NAME = "events"; - public static final String ROOT_NAME = "events"; - public static final String TYPE_MEETING = NAME + "." + "meeting"; - public static final String TYPE_MEETING_DEF_GADGETNAME = "massmob"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private EventsConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/events/shared/EventsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.events.shared; + +public final class EventsToolConstants { + + public static final String NAME = "events"; + public static final String ROOT_NAME = "events"; + public static final String TYPE_MEETING = NAME + "." + "meeting"; + public static final String TYPE_MEETING_DEF_GADGETNAME = "massmob"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private EventsToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.gallery.server; -import static cc.kune.gallery.shared.GalleryConstants.NAME; -import static cc.kune.gallery.shared.GalleryConstants.ROOT_NAME; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_ALBUM; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_ROOT; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_UPLOADEDFILE; +import static cc.kune.gallery.shared.GalleryToolConstants.NAME; +import static cc.kune.gallery.shared.GalleryToolConstants.ROOT_NAME; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_ALBUM; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_ROOT; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.gallery.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class GalleryConstants { - public static final String NAME = "gallery"; - public static final String ROOT_NAME = "gallery"; - public static final String TYPE_ALBUM = NAME + "." + "album"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private GalleryConstants() { - } -} Copied: trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,33 @@ +/* + * + * 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.gallery.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class GalleryToolConstants { + public static final String NAME = "gallery"; + public static final String ROOT_NAME = "gallery"; + public static final String TYPE_ALBUM = NAME + "." + "album"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private GalleryToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -34,8 +34,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; +import cc.kune.core.shared.dto.StateContainerDTO; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -48,21 +47,19 @@ private final Provider<ContentServiceAsync> contentService; private final EventBus eventBus; private final I18nTranslationService i18n; - private final Provider<FolderViewerPresenter> presenter; private final Session session; private final StateManager stateManager; @Inject public DelContentAction(final EventBus eventBus, final StateManager stateManager, final Session session, final Provider<ContentServiceAsync> contentService, - final I18nTranslationService i18n, final Provider<FolderViewerPresenter> presenter) { + final I18nTranslationService i18n) { super(AccessRolDTO.Administrator, true); this.eventBus = eventBus; this.stateManager = stateManager; this.session = session; this.contentService = contentService; this.i18n = i18n; - this.presenter = presenter; } @Override @@ -74,20 +71,14 @@ public void onSuccess() { NotifyUser.showProgress(); contentService.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<StateContentDTO>() { + new AsyncCallbackSimple<StateContainerDTO>() { @Override - public void onSuccess(final StateContentDTO state) { - // Is this necessary? - // session.setCurrentState(state); - final StateToken parent = token.copy().clearDocument(); - if (session.getCurrentStateToken().equals(parent)) { - stateManager.refreshCurrentStateWithoutCache(); - // Warning: the previous action - // is asynchronous (it gets a - // content) - presenter.get().refreshState(); + public void onSuccess(final StateContainerDTO state) { + final StateToken parentToken = state.getStateToken(); + if (session.getCurrentStateToken().equals(parentToken)) { + stateManager.setRetrievedStateAndGo(state); } else { - stateManager.gotoStateToken(parent, false); + stateManager.gotoStateToken(parentToken, false); } NotifyUser.hideProgress(); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -128,6 +128,8 @@ @Override public void onSuccess(final StateAbstractDTO result) { NotifyUser.hideProgress(); + stateManager.setRetrievedStateAndGo(result); + sendChangeEntityEvent(); if (askChangeLanguage) { i18n.changeToLanguageIfNecessary(lang.getCode(), i18n.t(lang.getEnglishName()), true, new I18nLanguageChangeNeeded() { @@ -138,8 +140,6 @@ @Override public void onChangeNotNeeded() { askChangeLanguage = false; - stateManager.setRetrievedStateAndGo(result); - sendChangeEntityEvent(); } }); } Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.lists.client; -import static cc.kune.lists.shared.ListsConstants.NAME; -import static cc.kune.lists.shared.ListsConstants.ROOT_NAME; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.NAME; +import static cc.kune.lists.shared.ListsToolConstants.ROOT_NAME; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; @@ -67,7 +67,7 @@ private void registerIcons() { registerTutorial(TYPE_ROOT); - registerTutorial(TYPE_LIST); + // registerTutorial(TYPE_LIST); registerContentTypeIcon(TYPE_ROOT, icons.lists()); registerContentTypeIcon(TYPE_LIST, navResources.list()); registerContentTypeIcon(TYPE_POST, navResources.email()); Modified: trunk/src/main/java/cc/kune/lists/client/ListsParts.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/ListsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.actions.ListsClientActions; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final ListsClientActions listsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, ListsConstants.TYPE_POST); - viewerSelector.register(folderViewer, true, ListsConstants.TYPE_ROOT, ListsConstants.TYPE_LIST); + viewerSelector.register(contentViewer, true, ListsToolConstants.TYPE_POST); + viewerSelector.register(folderViewer, true, ListsToolConstants.TYPE_ROOT, ListsToolConstants.TYPE_LIST); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, ListsConstants.TYPE_ROOT); + super(i18n, action, res, session, ListsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.lists.client.actions; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -34,7 +34,7 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.rpc.ListsServiceAsync; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -106,7 +106,7 @@ NotifyUser.showProgress(); diag.hide(); listsService.get().createList(session.getUserHash(), session.getCurrentStateToken(), - diag.getTextFieldValue(), ListsConstants.TYPE_LIST, true, + diag.getTextFieldValue(), ListsToolConstants.TYPE_LIST, true, new AsyncCallbackSimple<StateContainerDTO>() { @Override public void onSuccess(final StateContainerDTO state) { Modified: trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.lists.server; -import static cc.kune.lists.shared.ListsConstants.NAME; -import static cc.kune.lists.shared.ListsConstants.ROOT_NAME; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.NAME; +import static cc.kune.lists.shared.ListsToolConstants.ROOT_NAME; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import java.util.ArrayList; import java.util.Arrays; Modified: trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -38,7 +38,7 @@ import cc.kune.domain.Container; import cc.kune.domain.Group; import cc.kune.lists.client.rpc.ListsService; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -67,7 +67,7 @@ public StateContainerDTO createList(final String userHash, final StateToken parentToken, final String listaName, final String description, final boolean isPublic) { final StateContainerDTO result = contentRPC.addFolder(userHash, parentToken, - composeListName(parentToken, listaName), ListsConstants.TYPE_LIST); + composeListName(parentToken, listaName), ListsToolConstants.TYPE_LIST); // Not public list, don't permit subscriptions neither view posts return contentRPC.getState(setContainerAcl(result.getStateToken(), isPublic)); } @@ -89,7 +89,7 @@ final String postTitle) { final Container container = getContainer(parentToken); final StateContentDTO content = contentRPC.addContent(userHash, parentToken, - "[" + container.getName() + "] " + postTitle, ListsConstants.TYPE_POST); + "[" + container.getName() + "] " + postTitle, ListsToolConstants.TYPE_POST); // FIXME In the future use tabs here return content; } Deleted: trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.lists.shared; - -public final class ListsConstants { - - public static final String NAME = "lists"; - public static final String ROOT_NAME = "lists"; - public static final String TYPE_LIST = NAME + "." + "list"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private ListsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.lists.shared; + +public final class ListsToolConstants { + + public static final String NAME = "lists"; + public static final String ROOT_NAME = "lists"; + public static final String TYPE_LIST = NAME + "." + "list"; + public static final String TYPE_POST = NAME + "." + "post"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private ListsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.tasks.client; -import static cc.kune.tasks.shared.TasksConstants.NAME; -import static cc.kune.tasks.shared.TasksConstants.ROOT_NAME; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.NAME; +import static cc.kune.tasks.shared.TasksToolConstants.ROOT_NAME; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/tasks/client/TasksParts.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/TasksParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.tasks.client.actions.TasksClientActions; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final TasksClientActions tasksActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, TasksConstants.TYPE_TASK); - viewerSelector.register(folderViewer, true, TasksConstants.TYPE_ROOT, TasksConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, TasksToolConstants.TYPE_TASK); + viewerSelector.register(folderViewer, true, TasksToolConstants.TYPE_ROOT, TasksToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, TasksConstants.TYPE_ROOT); + super(i18n, action, res, session, TasksToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.taskfolderadd(), i18n.t("New task folder"), i18n.t("Create a new folder"), - i18n.t("New task folder"), TasksConstants.TYPE_FOLDER); + i18n.t("New task folder"), TasksToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -34,7 +34,7 @@ public NewTaskIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.taskadd(), shorcutReg, i18n.t("New task"), i18n.t("Create a new task"), - i18n.t("New task"), TasksConstants.TYPE_TASK); + i18n.t("New task"), TasksToolConstants.TYPE_TASK); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -34,7 +34,7 @@ public NewTaskMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final TasksFolderNewMenu tasksNewMenu) { super(i18n, action, res.taskadd(), shorcutReg, i18n.t("New task"), i18n.t("Create a new task"), - i18n.t("New task"), TasksConstants.TYPE_TASK, tasksNewMenu.get()); + i18n.t("New task"), TasksToolConstants.TYPE_TASK, tasksNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.tasks.client.actions; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.tasks.server; -import static cc.kune.tasks.shared.TasksConstants.NAME; -import static cc.kune.tasks.shared.TasksConstants.ROOT_NAME; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.NAME; +import static cc.kune.tasks.shared.TasksToolConstants.ROOT_NAME; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import java.util.Arrays; import java.util.Date; Deleted: trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.tasks.shared; - -public final class TasksConstants { - - public static final String NAME = "tasks"; - public static final String ROOT_NAME = "tasks"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_TASK = NAME + "." + "task"; - - private TasksConstants() { - } -} Copied: trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.tasks.shared; + +public final class TasksToolConstants { + + public static final String NAME = "tasks"; + public static final String ROOT_NAME = "tasks"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_TASK = NAME + "." + "task"; + + private TasksToolConstants() { + } +} Added: trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,11 @@ +package cc.kune.trash.server; + +import com.google.inject.Binder; +import com.google.inject.Module; + +public class TrashServerModule implements Module { + @Override + public void configure(final Binder binder) { + binder.bind(TrashServerTool.class).asEagerSingleton(); + } +} Added: trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,42 @@ +package cc.kune.trash.server; + +import static cc.kune.trash.shared.TrashToolConstants.NAME; +import static cc.kune.trash.shared.TrashToolConstants.ROOT_NAME; +import static cc.kune.trash.shared.TrashToolConstants.TYPE_ROOT; + +import java.util.Arrays; +import java.util.Collections; + +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.server.AbstractServerTool; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.CreationService; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class TrashServerTool extends AbstractServerTool { + + @Inject + public TrashServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, final I18nTranslationService i18n, + final CreationService creationService) { + super(NAME, ROOT_NAME, TYPE_ROOT, Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), + Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, + creationService, configurationManager, i18n, ServerToolTarget.forBoth); + } + + public Group initGroup(final Group group) { + return initGroup(null, group); + } + + @Override + public Group initGroup(final User user, final Group group, final Object... vars) { + createRoot(group); + return group; + } +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,17 @@ +package cc.kune.trash.shared; + + +public final class TrashToolConstants { + + public static final String NAME = "trash"; + public static final String ROOT_NAME = "trash"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + // public static final String[] ALLOWED_CONTENTS = + // {DocsToolConstants.TYPE_FOLDER, + // DocsToolConstants.TYPE_DOCUMENT, BlogsToolConstants.TYPE_BLOG, + // BlogsToolConstants.TYPE_POST, ETC + // }; + private TrashToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.wiki.client; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/wiki/client/WikiParts.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/WikiParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.wiki.client.actions.WikiClientActions; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final WikiClientActions wikiActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, WikiConstants.TYPE_WIKIPAGE); - viewerSelector.register(folderViewer, true, WikiConstants.TYPE_ROOT, WikiConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, WikiToolConstants.TYPE_WIKIPAGE); + viewerSelector.register(folderViewer, true, WikiToolConstants.TYPE_ROOT, WikiToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, WikiConstants.TYPE_ROOT); + super(i18n, action, res, session, WikiToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -33,6 +33,6 @@ final NavResources res) { super(i18n, action, res.wikiAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), WikiConstants.TYPE_FOLDER); + i18n.t("New folder"), WikiToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerMenuItem; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -33,7 +33,7 @@ final NavResources res, final WikiFolderNewMenu wikiFolderNewMenu) { super(i18n, action, res.wikiAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), WikiConstants.TYPE_FOLDER, wikiFolderNewMenu.get()); + i18n.t("New folder"), WikiToolConstants.TYPE_FOLDER, wikiFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -41,7 +41,7 @@ i18n.t("New wikipage"), i18n.t("Create a New Wikipage here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE); + i18n.t("New wikipage"), WikiToolConstants.TYPE_WIKIPAGE); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -42,7 +42,7 @@ i18n.t("New wikipage"), i18n.t("Create a New Wikipage here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get()); + i18n.t("New wikipage"), WikiToolConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.wiki.client.actions; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.wiki.server; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.ROOT_NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.ROOT_NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import java.util.Arrays; import java.util.Date; Deleted: trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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 cc.kune.wiki.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class WikiConstants { - - public static final String NAME = "wiki"; - public static final String ROOT_NAME = "wiki"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - - private WikiConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -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.wiki.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class WikiToolConstants { + + public static final String NAME = "wiki"; + public static final String ROOT_NAME = "wiki"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; + + private WikiToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/resources/kune.properties 2012-03-18 20:18:29 UTC (rev 1770) @@ -88,11 +88,11 @@ kune.site.welcomewave = # which tools are available in this site by users -kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,barters +kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,events,barters # From these which tools are enabled for users after registration # Possible values: # kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,barters -kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks +kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,events,barters # WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools # which tools are available in this site by groups Modified: trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.blogs.server; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; import static org.junit.Assert.assertEquals; import java.util.TimeZone; Modified: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ */ package cc.kune.core.server.integration; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -104,6 +104,7 @@ final List<String> enabledTools = groupManager.findEnabledTools(defaultGroup.getId()); assertNotNull(enabledTools); assertTrue(enabledTools.size() > 0); + assertNotNull(containerManager.getTrashFolder(defaultGroup).getId()); } } Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -45,6 +45,7 @@ import cc.kune.events.server.EventsServerModule; import cc.kune.lists.server.ListsServerModule; import cc.kune.tasks.server.TaskServerModule; +import cc.kune.trash.server.TrashServerModule; import cc.kune.wave.server.CustomSettingsBinder; import cc.kune.wiki.server.WikiServerModule; @@ -90,7 +91,7 @@ new ListsServerModule(), new RobotApiModule(), new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule(false, 1, 2, 2), federationModule, new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), - new EventsServerModule()); + new EventsServerModule(), new TrashServerModule()); try { childInjector.getInstance(WaveServerImpl.class).initialize(); } catch (final WaveServerException e) { 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 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.core.server.integration.content; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -40,7 +40,7 @@ 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.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class ContentServiceAddTest extends ContentServiceIntegrationTest { @@ -95,7 +95,7 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState); assertNotNull(newState.getGroupMembers()); assertNotNull(newState.getParticipation()); @@ -130,11 +130,11 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState); final StateContainerDTO newState2 = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState2); final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); 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 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server.integration.content; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -42,7 +42,7 @@ 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.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { @@ -121,7 +121,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - defaultContent.getStateToken(), oldTitle, DocsConstants.TYPE_FOLDER); + defaultContent.getStateToken(), oldTitle, DocsToolConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); @@ -229,7 +229,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - folder.getStateToken(), oldTitle, DocsConstants.TYPE_FOLDER); + folder.getStateToken(), oldTitle, DocsToolConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server.manager; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,7 +30,7 @@ import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.server.PersistencePreLoadedDataTest; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.Container; public class ContainerManagerDefaultTest extends PersistencePreLoadedDataTest { @@ -39,8 +39,8 @@ @Before public void before() { - rootFolder = containerManager.createRootFolder(user.getUserGroup(), DocsConstants.NAME, - DocsConstants.ROOT_NAME, TYPE_FOLDER); + rootFolder = containerManager.createRootFolder(user.getUserGroup(), DocsToolConstants.NAME, + DocsToolConstants.ROOT_NAME, TYPE_FOLDER); } private Container createContainer(final Container parent) { Modified: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ */ package cc.kune.core.server.manager; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: trunk/src/test/java/cc/kune/docs/DocumentToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,23 +19,23 @@ */ package cc.kune.docs; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; import static org.junit.Assert.assertEquals; import org.junit.Test; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class DocumentToolTest { @Test public void clientAndServerSync() { - assertEquals(NAME, DocsConstants.NAME); - assertEquals(TYPE_ROOT, DocsConstants.TYPE_ROOT); - assertEquals(TYPE_FOLDER, DocsConstants.TYPE_FOLDER); - assertEquals(TYPE_DOCUMENT, DocsConstants.TYPE_DOCUMENT); + assertEquals(NAME, DocsToolConstants.NAME); + assertEquals(TYPE_ROOT, DocsToolConstants.TYPE_ROOT); + assertEquals(TYPE_FOLDER, DocsToolConstants.TYPE_FOLDER); + assertEquals(TYPE_DOCUMENT, DocsToolConstants.TYPE_DOCUMENT); } } Modified: trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.docs.server; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.lists.server; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -41,7 +41,7 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.lists.client.rpc.ListsService; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -60,7 +60,7 @@ final UserInfoDTO userInfoDTO = doLogin(); userGroup = userInfoDTO.getUserGroup(); final StateAbstractDTO rootList = contentService.getContent(getHash(), new StateToken( - getDefSiteShortName(), ListsConstants.ROOT_NAME)); + getDefSiteShortName(), ListsToolConstants.ROOT_NAME)); openList = listsService.createList(getHash(), rootList.getStateToken(), "test list", "", true); closeList = listsService.createList(getHash(), rootList.getStateToken(), "test list", "", false); } Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,15 +22,15 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.chat.client.actions.OpenRoomBtn; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.core.client.sitebar.search.EntitySearchPanel; import cc.kune.core.client.sn.actions.AddEntityToThisGroupAction; import cc.kune.core.client.sn.actions.AddNewBuddiesAction; import cc.kune.core.client.sn.actions.registry.UserSNConfActions; -import cc.kune.docs.shared.DocsConstants; -import cc.kune.events.shared.EventsConstants; +import cc.kune.docs.shared.DocsToolConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import cc.kune.gspace.client.actions.NewContainerBtn; import cc.kune.gspace.client.actions.NewContentBtn; @@ -47,12 +47,12 @@ import cc.kune.lists.client.actions.NewListAction; import cc.kune.lists.client.actions.NewListPostAction; import cc.kune.lists.client.actions.SubscribeToListBtn; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import cc.kune.selenium.PageObject; import cc.kune.selenium.SeleniumConstants; import cc.kune.selenium.SeleniumUtils; -import cc.kune.tasks.shared.TasksConstants; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.tasks.shared.TasksToolConstants; +import cc.kune.wiki.shared.WikiToolConstants; public class GroupSpacePageObject extends PageObject { @@ -62,17 +62,17 @@ public WebElement addNewBuddieTextBox; @FindBy(id = SeleniumConstants.GWTDEV + AddEntityToThisGroupAction.ADD_NEW_MEMBER_TEXTBOX) public WebElement addNewMemberTextBox; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsToolConstants.NAME) public WebElement blogTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatToolConstants.NAME) public WebElement chatTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsToolConstants.NAME) public WebElement docTool; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/span") public WebElement entityTitle; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/input") public WebElement entityTitleTextarea; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsToolConstants.NAME) public WebElement eventTool; @FindBy(xpath = "//td/img") public WebElement firstAvatarOfGroup; @@ -98,7 +98,7 @@ public WebElement groupOptionsTools; @FindBy(id = SeleniumConstants.GWTDEV + SubscribeToListBtn.ID) public WebElement listSubscribeBtn; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsToolConstants.NAME) public WebElement listTool; @FindBy(id = SeleniumConstants.GWTDEV + NewContainerBtn.BTN_ID) public WebElement newContainerBtn; @@ -120,9 +120,9 @@ public WebElement searchEntitiesOk; @FindBy(xpath = "//div[3]/div/button") public WebElement socialNetOptions; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksToolConstants.NAME) public WebElement taskTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiToolConstants.NAME) public WebElement wikiTool; public void openFirtsContent() { Modified: trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.wiki.server; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import org.junit.Before; import org.junit.Test;