Author: vjrj_ Date: 2011-08-16 21:51:42 +0200 (Tue, 16 Aug 2011) New Revision: 1497 Added: trunk/src/main/java/cc/kune/events/ trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml trunk/src/main/java/cc/kune/events/client/ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsGinModule.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/ trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java trunk/src/main/java/cc/kune/events/server/ trunk/src/main/java/cc/kune/events/server/EventsServerModule.java trunk/src/main/java/cc/kune/events/server/EventsServerTool.java trunk/src/main/java/cc/kune/events/shared/ trunk/src/main/java/cc/kune/events/shared/EventsConstants.java Removed: trunk/src/main/java/cc/kune/events/client/actions/DelMeetingsMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/MeetingsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/NewMeetingsBtn.java trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingsMenuItem.java trunk/src/main/java/cc/kune/events/server/MeetingServerModule.java trunk/src/main/java/cc/kune/events/server/MeetingServerTool.java trunk/src/main/java/cc/kune/events/shared/MeetingsConstants.java trunk/src/main/java/cc/kune/meets/KuneMeets.gwt.xml trunk/src/main/java/cc/kune/meets/client/ trunk/src/main/java/cc/kune/meets/server/ trunk/src/main/java/cc/kune/meets/shared/ Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java Log: CLOSED - # 95: Rename "Meets" for "Events" http://kune.ourproject.org/issues/ticket/95 Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-08-16 19:51:42 UTC (rev 1497) @@ -10,7 +10,7 @@ <inherits name="cc.kune.chat.KuneChat" /> <inherits name="cc.kune.docs.KuneDocs" /> <inherits name="cc.kune.wiki.KuneWiki" /> - <inherits name="cc.kune.meets.KuneMeets" /> + <inherits name="cc.kune.events.KuneEvents" /> <inherits name="cc.kune.tasks.KuneTasks" /> <inherits name="cc.kune.lists.KuneLists" /> <inherits name="cc.kune.pspace.PSpace" /> Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -54,12 +54,12 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.client.DocsGinModule; import cc.kune.docs.client.DocsGinjector; +import cc.kune.events.client.EventsGinjector; +import cc.kune.events.client.EventsGinModule; import cc.kune.gspace.client.GSpaceGinModule; import cc.kune.gspace.client.GSpaceGinjector; import cc.kune.lists.client.ListsGinModule; import cc.kune.lists.client.ListsGinjector; -import cc.kune.meets.client.MeetingsGinModule; -import cc.kune.meets.client.MeetingsGinjector; import cc.kune.pspace.client.PSpaceGinModule; import cc.kune.pspace.client.PSpaceParts; import cc.kune.pspace.client.PSpacePresenter; @@ -79,10 +79,10 @@ @GinModules({ KuneGinModule.class, CoreGinModule.class, WaveGinModule.class, PSpaceGinModule.class, GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class, ChatGinModule.class, - WikiGinModule.class, BartersGinModule.class, MeetingsGinModule.class, TasksGinModule.class, + WikiGinModule.class, BartersGinModule.class, EventsGinModule.class, TasksGinModule.class, ListsGinModule.class }) public interface KuneGinjector extends Ginjector, GSpaceGinjector, DocsGinjector, BlogsGinjector, - WikiGinjector, BartersGinjector, MeetingsGinjector, ChatGinjector, TasksGinjector, ListsGinjector { + WikiGinjector, BartersGinjector, EventsGinjector, ChatGinjector, TasksGinjector, ListsGinjector { /* * You have to add here all the GWTPresenters (as Provider or AsyncProvider) Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -55,9 +55,9 @@ import cc.kune.core.server.rest.TestJSONService; import cc.kune.core.server.rest.UserJSONService; import cc.kune.docs.server.DocumentServerModule; +import cc.kune.events.server.EventsServerModule; import cc.kune.lists.client.rpc.ListsService; import cc.kune.lists.server.ListsServerModule; -import cc.kune.meets.server.MeetingServerModule; import cc.kune.tasks.server.TaskServerModule; import cc.kune.wiki.server.WikiServerModule; @@ -167,7 +167,7 @@ builder.use(new WikiServerModule()); builder.use(new ChatServerModule()); builder.use(new BarterServerModule()); - builder.use(new MeetingServerModule()); + builder.use(new EventsServerModule()); builder.use(new TaskServerModule()); builder.use(new ListsServerModule()); // builder.use(new GalleryServerModule()); Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/main/java/cc/kune/domain/Content.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -58,8 +58,8 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.utils.HasStateToken; +import cc.kune.events.shared.EventsConstants; import cc.kune.lists.shared.ListsConstants; -import cc.kune.meets.shared.MeetingsConstants; import cc.kune.tasks.shared.TasksConstants; import cc.kune.wiki.shared.WikiConstants; @@ -269,7 +269,7 @@ || 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(MeetingsConstants.TYPE_MEETING)); + || (typeId.equals(BlogsConstants.TYPE_POST) || typeId.equals(BartersConstants.TYPE_BARTER) || typeId.equals(EventsConstants.TYPE_MEETING)); } public void removeAuthor(final User user) { Copied: trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml (from rev 1489, trunk/src/main/java/cc/kune/meets/KuneMeets.gwt.xml) =================================================================== --- trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,6 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> + <source path="shared" /> +</module> \ No newline at end of file Copied: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java (from rev 1496, trunk/src/main/java/cc/kune/meets/client/MeetingsClientTool.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,65 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.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 cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tool.FoldableAbstractClientTool; +import cc.kune.gspace.client.tool.selector.ToolSelector; + +import com.google.inject.Inject; + +public class EventsClientTool extends FoldableAbstractClientTool { + + @Inject + public EventsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + super(NAME, i18n.t(ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + + // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerAuthorableTypes(TYPE_MEETING); + registerDragableTypes(TYPE_MEETING); + registerDropableTypes(TYPE_ROOT); + // registerPublishModerableTypes(); + registerRateableTypes(TYPE_MEETING); + registerRenamableTypes(TYPE_MEETING); + registerTageableTypes(TYPE_MEETING); + registerTranslatableTypes(TYPE_MEETING); + + registerIcons(); + } + + @Override + public String getName() { + return NAME; + } + + private void registerIcons() { + registerContentTypeIcon(TYPE_ROOT, navResources.folder()); + registerContentTypeIcon(TYPE_MEETING, navResources.calendar()); + registerEmptyMessages(TYPE_ROOT, i18n.t("There isn't any meeting")); + } + +} Copied: trunk/src/main/java/cc/kune/events/client/EventsGinModule.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/MeetingsGinModule.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/EventsGinModule.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -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.events.client; + +import cc.kune.events.client.actions.EventsClientActions; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public class EventsGinModule extends AbstractPresenterModule { + + @Override + protected void configure() { + bind(EventsClientTool.class).in(Singleton.class); + bind(EventsClientActions.class).in(Singleton.class); + } + +} Copied: trunk/src/main/java/cc/kune/events/client/EventsGinjector.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/MeetingsGinjector.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinjector.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/EventsGinjector.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.events.client; + +import com.google.gwt.inject.client.Ginjector; + +public interface EventsGinjector extends Ginjector { + + EventsParts getMeetingsParts(); + +} Copied: trunk/src/main/java/cc/kune/events/client/EventsParts.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/MeetingsParts.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsParts.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/EventsParts.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,42 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.events.client; + +import cc.kune.core.client.state.Session; +import cc.kune.events.client.actions.EventsClientActions; +import cc.kune.events.shared.EventsConstants; +import cc.kune.gspace.client.tool.ContentViewerSelector; +import cc.kune.gspace.client.viewers.ContentViewerPresenter; +import cc.kune.gspace.client.viewers.FolderViewerPresenter; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventsParts { + + @Inject + public EventsParts(final Session session, final Provider<EventsClientTool> clientTool, + final ContentViewerSelector viewerSelector, final EventsClientActions meetsActions, + final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { + clientTool.get(); + viewerSelector.register(contentViewer, true, EventsConstants.TYPE_MEETING); + viewerSelector.register(folderViewer, true, EventsConstants.TYPE_ROOT); + } +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/events/client/actions (from rev 1489, trunk/src/main/java/cc/kune/meets/client/actions) Copied: trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/actions/DelMeetingsMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,34 @@ +/* + * + * 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.client.actions; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.DelContentMenuItem; + +import com.google.inject.Inject; + +public class DelMeetingMenuItem extends DelContentMenuItem { + + @Inject + public DelMeetingMenuItem(final I18nTranslationService i18n, final DelContentAction action, final CoreResources res) { + super(i18n, action, res); + } +} Deleted: trunk/src/main/java/cc/kune/events/client/actions/DelMeetingsMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/actions/DelMeetingsMenuItem.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/client/actions/DelMeetingsMenuItem.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,34 +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.meets.client.actions; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.actions.DelContentMenuItem; - -import com.google.inject.Inject; - -public class DelMeetingsMenuItem extends DelContentMenuItem { - - @Inject - public DelMeetingsMenuItem(final I18nTranslationService i18n, final DelContentAction action, final CoreResources res) { - super(i18n, action, res); - } -} Copied: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/actions/MeetingsClientActions.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,67 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.events.client.actions; + +import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import cc.kune.core.client.actions.ActionRegistryByType; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.gspace.client.actions.AbstractFoldableToolActions; +import cc.kune.gspace.client.actions.ActionGroups; +import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ParticipateInContentBtn; +import cc.kune.gspace.client.actions.RefreshContentMenuItem; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class EventsClientActions extends AbstractFoldableToolActions { + final String[] all = { TYPE_ROOT, TYPE_MEETING }; + final String[] containers = { TYPE_ROOT }; + final String[] containersNoRoot = {}; + final String[] contents = { TYPE_MEETING }; + + @Inject + public EventsClientActions(final I18nUITranslationService i18n, final Session session, + final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, + final Provider<NewMeetingBtn> newMeetingsBtn, final Provider<GoParentFolderBtn> folderGoUp, + final Provider<OpenMeetingMenuItem> openContentMenuItem, + final Provider<DelMeetingMenuItem> delContentMenuItem, + final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ParticipateInContentBtn> participateBtn, + final Provider<RefreshContentMenuItem> refresh) { + super(session, stateManager, i18n, registry); + actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, newMeetingsBtn, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, all); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); + } + + @Override + protected void createPostSessionInitActions() { + } +} Modified: trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/actions/GoParentFolderBtn.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.meets.client.actions; +package cc.kune.events.client.actions; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.events.shared.EventsConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.meets.shared.MeetingsConstants; 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, MeetingsConstants.TYPE_ROOT); + super(i18n, action, res, session, EventsConstants.TYPE_ROOT); } } Deleted: trunk/src/main/java/cc/kune/events/client/actions/MeetingsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/actions/MeetingsClientActions.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/client/actions/MeetingsClientActions.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,67 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.meets.client.actions; - -import static cc.kune.meets.shared.MeetingsConstants.TYPE_MEETING; -import static cc.kune.meets.shared.MeetingsConstants.TYPE_ROOT; -import cc.kune.core.client.actions.ActionRegistryByType; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.gspace.client.actions.AbstractFoldableToolActions; -import cc.kune.gspace.client.actions.ActionGroups; -import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; -import cc.kune.gspace.client.actions.ParticipateInContentBtn; -import cc.kune.gspace.client.actions.RefreshContentMenuItem; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class MeetingsClientActions extends AbstractFoldableToolActions { - final String[] all = { TYPE_ROOT, TYPE_MEETING }; - final String[] containers = { TYPE_ROOT }; - final String[] containersNoRoot = {}; - final String[] contents = { TYPE_MEETING }; - - @Inject - public MeetingsClientActions(final I18nUITranslationService i18n, final Session session, - final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, - final Provider<NewMeetingsBtn> newMeetingsBtn, final Provider<GoParentFolderBtn> folderGoUp, - final Provider<OpenMeetingsMenuItem> openContentMenuItem, - final Provider<DelMeetingsMenuItem> delContentMenuItem, - final Provider<ContentViewerOptionsMenu> optionsMenuContent, - final Provider<ParticipateInContentBtn> participateBtn, - final Provider<RefreshContentMenuItem> refresh) { - super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newMeetingsBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, all); - actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); - actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); - actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); - } - - @Override - protected void createPostSessionInitActions() { - } -} Copied: trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/actions/NewMeetingsBtn.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,40 @@ +/* + * + * 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.client.actions; + +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.events.shared.EventsConstants; +import cc.kune.gspace.client.actions.NewContentAction; +import cc.kune.gspace.client.actions.NewContentBtn; + +import com.google.inject.Inject; + +public class NewMeetingBtn extends NewContentBtn { + + @Inject + public NewMeetingBtn(final I18nTranslationService i18n, final NewContentAction action, + final NavResources res, final GlobalShortcutRegister shorcutReg) { + super(i18n, action, res.calendarAdd(), shorcutReg, i18n.t("New meeting"), + i18n.t("Create a New Meeting here"), i18n.t("New meeting"), EventsConstants.TYPE_MEETING); + } + +} Deleted: trunk/src/main/java/cc/kune/events/client/actions/NewMeetingsBtn.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/actions/NewMeetingsBtn.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/client/actions/NewMeetingsBtn.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,40 +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.meets.client.actions; - -import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.actions.NewContentAction; -import cc.kune.gspace.client.actions.NewContentBtn; -import cc.kune.meets.shared.MeetingsConstants; - -import com.google.inject.Inject; - -public class NewMeetingsBtn extends NewContentBtn { - - @Inject - public NewMeetingsBtn(final I18nTranslationService i18n, final NewContentAction action, - final NavResources res, final GlobalShortcutRegister shorcutReg) { - super(i18n, action, res.calendarAdd(), shorcutReg, i18n.t("New meeting"), - i18n.t("Create a New Meeting here"), i18n.t("New meeting"), MeetingsConstants.TYPE_MEETING); - } - -} Copied: trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java (from rev 1489, trunk/src/main/java/cc/kune/meets/client/actions/OpenMeetingsMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -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.events.client.actions; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.OpenContentMenuItem; + +import com.google.inject.Inject; + +public class OpenMeetingMenuItem extends OpenContentMenuItem { + + @Inject + public OpenMeetingMenuItem(final I18nTranslationService i18n, final OpenContentAction action, final NavResources res) { + super(i18n, action, res); + } + +} Deleted: trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingsMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/actions/OpenMeetingsMenuItem.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingsMenuItem.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -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.meets.client.actions; - -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.actions.OpenContentMenuItem; - -import com.google.inject.Inject; - -public class OpenMeetingsMenuItem extends OpenContentMenuItem { - - @Inject - public OpenMeetingsMenuItem(final I18nTranslationService i18n, final OpenContentAction action, final NavResources res) { - super(i18n, action, res); - } - -} Copied: trunk/src/main/java/cc/kune/events/server (from rev 1489, trunk/src/main/java/cc/kune/meets/server) Copied: trunk/src/main/java/cc/kune/events/server/EventsServerModule.java (from rev 1489, trunk/src/main/java/cc/kune/meets/server/MeetingServerModule.java) =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/events/server/EventsServerModule.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,29 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.events.server; + +import com.google.inject.Binder; +import com.google.inject.Module; + +public class EventsServerModule implements Module { + public void configure(final Binder binder) { + binder.bind(EventsServerTool.class).asEagerSingleton(); + } +} Copied: trunk/src/main/java/cc/kune/events/server/EventsServerTool.java (from rev 1489, trunk/src/main/java/cc/kune/meets/server/MeetingServerTool.java) =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServerTool.java (rev 0) +++ trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,101 @@ +/* + * + * 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.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 java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; + +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.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.server.tool.ServerWaveTool; +import cc.kune.core.server.utils.UrlUtils; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.GroupListMode; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class EventsServerTool extends AbstractServerTool implements ServerWaveTool { + + private static final String MEETING_GADGET = "http://mass-mob.appspot.com/massmob/org.ourproject.massmob.client.MassmobGad..."; + private final URL gadgetUrl; + + @Inject + public EventsServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, final I18nTranslationService i18n) { + super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_MEETING), Arrays.asList(TYPE_ROOT), + Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, + configurationManager, i18n, ServerToolTarget.forGroups); + gadgetUrl = UrlUtils.of(MEETING_GADGET); + } + + @Override + public URL getGadgetUrl() { + return gadgetUrl; + } + + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { + final Container rootFolder = createRoot(group); + + final Content content = createInitialContent(user, group, rootFolder, i18n.t("Meeting sample"), + i18n.t("This is only a meet sample. You can invite other participants to this meeting, " + + "but also publish to the general public allowing you to to help in the organization, " + + "call and speed-up of events."), TYPE_MEETING, gadgetUrl); + contentManager.save(content); + return group; + } + + @Override + public void onCreateContainer(final Container container, final Container parent) { + setContainerAcl(container); + } + + @Override + public void onCreateContent(final Content content, final Container parent) { + content.setStatus(ContentStatus.publishedOnline); + content.setPublishedOn(new Date()); + } + + @Override + protected void setContainerAcl(final Container container) { + final AccessLists meetsAcl = new AccessLists(); + meetsAcl.getAdmins().setMode(GroupListMode.NORMAL); + meetsAcl.getAdmins().add(container.getOwner()); + meetsAcl.getEditors().setMode(GroupListMode.NORMAL); + meetsAcl.getViewers().setMode(GroupListMode.EVERYONE); + containerManager.setAccessList(container, meetsAcl); + } +} Deleted: trunk/src/main/java/cc/kune/events/server/MeetingServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/meets/server/MeetingServerModule.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/server/MeetingServerModule.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,29 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.meets.server; - -import com.google.inject.Binder; -import com.google.inject.Module; - -public class MeetingServerModule implements Module { - public void configure(final Binder binder) { - binder.bind(MeetingServerTool.class).asEagerSingleton(); - } -} Deleted: trunk/src/main/java/cc/kune/events/server/MeetingServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/meets/server/MeetingServerTool.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/server/MeetingServerTool.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,101 +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.meets.server; - -import static cc.kune.meets.shared.MeetingsConstants.NAME; -import static cc.kune.meets.shared.MeetingsConstants.ROOT_NAME; -import static cc.kune.meets.shared.MeetingsConstants.TYPE_MEETING; -import static cc.kune.meets.shared.MeetingsConstants.TYPE_ROOT; - -import java.net.URL; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; - -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.manager.ToolConfigurationManager; -import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.server.tool.ServerWaveTool; -import cc.kune.core.server.utils.UrlUtils; -import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.domain.GroupListMode; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.domain.AccessLists; -import cc.kune.domain.Container; -import cc.kune.domain.Content; -import cc.kune.domain.Group; -import cc.kune.domain.User; - -import com.google.inject.Inject; - -public class MeetingServerTool extends AbstractServerTool implements ServerWaveTool { - - private static final String MEETING_GADGET = "http://mass-mob.appspot.com/massmob/org.ourproject.massmob.client.MassmobGad..."; - private final URL gadgetUrl; - - @Inject - public MeetingServerTool(final ContentManager contentManager, final ContainerManager containerManager, - final ToolConfigurationManager configurationManager, final I18nTranslationService i18n) { - super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_MEETING), Arrays.asList(TYPE_ROOT), - Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, - configurationManager, i18n, ServerToolTarget.forGroups); - gadgetUrl = UrlUtils.of(MEETING_GADGET); - } - - @Override - public URL getGadgetUrl() { - return gadgetUrl; - } - - @Override - public Group initGroup(final User user, final Group group, final Object... otherVars) { - final Container rootFolder = createRoot(group); - - final Content content = createInitialContent(user, group, rootFolder, i18n.t("Meeting sample"), - i18n.t("This is only a meet sample. You can invite other participants to this meeting, " - + "but also publish to the general public allowing you to to help in the organization, " - + "call and speed-up of events."), TYPE_MEETING, gadgetUrl); - contentManager.save(content); - return group; - } - - @Override - public void onCreateContainer(final Container container, final Container parent) { - setContainerAcl(container); - } - - @Override - public void onCreateContent(final Content content, final Container parent) { - content.setStatus(ContentStatus.publishedOnline); - content.setPublishedOn(new Date()); - } - - @Override - protected void setContainerAcl(final Container container) { - final AccessLists meetsAcl = new AccessLists(); - meetsAcl.getAdmins().setMode(GroupListMode.NORMAL); - meetsAcl.getAdmins().add(container.getOwner()); - meetsAcl.getEditors().setMode(GroupListMode.NORMAL); - meetsAcl.getViewers().setMode(GroupListMode.EVERYONE); - containerManager.setAccessList(container, meetsAcl); - } -} Copied: trunk/src/main/java/cc/kune/events/shared (from rev 1489, trunk/src/main/java/cc/kune/meets/shared) Copied: trunk/src/main/java/cc/kune/events/shared/EventsConstants.java (from rev 1496, trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/events/shared/EventsConstants.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -0,0 +1,31 @@ +/* + * + * 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_ROOT = NAME + "." + "root"; + + private EventsConstants() { + } +} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/events/shared/MeetingsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java 2011-08-11 00:58:21 UTC (rev 1489) +++ trunk/src/main/java/cc/kune/events/shared/MeetingsConstants.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,31 +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.meets.shared; - -public final class MeetingsConstants { - - public static final String NAME = "meets"; - public static final String ROOT_NAME = "meets"; - public static final String TYPE_MEETING = NAME + "." + "meet"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private MeetingsConstants() { - } -} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/meets/KuneMeets.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/meets/KuneMeets.gwt.xml 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/main/java/cc/kune/meets/KuneMeets.gwt.xml 2011-08-16 19:51:42 UTC (rev 1497) @@ -1,6 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> - <source path="shared" /> -</module> \ No newline at end of file Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-08-16 19:07:23 UTC (rev 1496) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-08-16 19:51:42 UTC (rev 1497) @@ -38,8 +38,8 @@ import cc.kune.core.server.init.FinderRegistry; import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.docs.server.DocumentServerModule; +import cc.kune.events.server.EventsServerModule; import cc.kune.lists.server.ListsServerModule; -import cc.kune.meets.server.MeetingServerModule; import cc.kune.tasks.server.TaskServerModule; import cc.kune.wave.server.CustomSettingsBinder; import cc.kune.wiki.server.WikiServerModule; @@ -66,7 +66,7 @@ new ListsServerModule(), new RobotApiModule(), new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule(false), federationModule, new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), - new MeetingServerModule(), new AbstractModule() { + new EventsServerModule(), new AbstractModule() { @Override protected void configure() { bindScope(SessionScoped.class, Scopes.SINGLETON);