Mon Dec 19 22:49:19 CET 2011

Author: vjrj_
Date: 2011-12-19 22:49:18 +0100 (Mon, 19 Dec 2011)
New Revision: 1639

Added:
   trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java
   trunk/src/main/java/cc/kune/common/client/events/
   trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java
   trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java
   trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java
   trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java
   trunk/src/main/java/cc/kune/common/client/resources/alert.png
   trunk/src/main/java/cc/kune/common/client/resources/error.png
   trunk/src/main/java/cc/kune/common/client/resources/important-32.png
   trunk/src/main/java/cc/kune/common/client/resources/important.png
   trunk/src/main/java/cc/kune/common/client/resources/info.png
   trunk/src/main/java/cc/kune/common/client/resources/kune-anim-g.gif
   trunk/src/main/java/cc/kune/common/client/resources/kune-anim.gif
   trunk/src/main/java/cc/kune/common/shared/
   trunk/src/main/java/cc/kune/common/shared/i18n/
   trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java
   trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java
   trunk/src/main/java/cc/kune/core/client/ui/dialogs/
   trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java
   trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java
Removed:
   trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java
   trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java
   trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java
   trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java
   trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java
   trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java
   trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java
   trunk/src/main/java/cc/kune/core/client/resources/alert.png
   trunk/src/main/java/cc/kune/core/client/resources/error.png
   trunk/src/main/java/cc/kune/core/client/resources/important-32.png
   trunk/src/main/java/cc/kune/core/client/resources/important.png
   trunk/src/main/java/cc/kune/core/client/resources/info.png
   trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif
   trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif
   trunk/src/main/java/cc/kune/core/shared/i18n/
Modified:
   trunk/TODO
   trunk/script/server.sh
   trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java
   trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java
   trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.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/client/actions/OpenBartersMenuItem.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/BlogsGinModule.java
   trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java
   trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.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/client/actions/OpenBlogMenuItem.java
   trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java
   trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java
   trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
   trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java
   trunk/src/main/java/cc/kune/chat/client/ChatParts.java
   trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java
   trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java
   trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java
   trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java
   trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java
   trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java
   trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java
   trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java
   trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java
   trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java
   trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java
   trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java
   trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java
   trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java
   trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java
   trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java
   trunk/src/main/java/cc/kune/client/KuneGinjector.java
   trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml
   trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java
   trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java
   trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java
   trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java
   trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java
   trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml
   trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml
   trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml
   trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java
   trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java
   trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
   trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java
   trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java
   trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java
   trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java
   trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java
   trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java
   trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java
   trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java
   trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java
   trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java
   trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java
   trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java
   trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java
   trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java
   trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java
   trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java
   trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java
   trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java
   trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java
   trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
   trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java
   trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java
   trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java
   trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java
   trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
   trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
   trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java
   trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java
   trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java
   trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java
   trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
   trunk/src/main/java/cc/kune/core/client/resources/core.css
   trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java
   trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java
   trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java
   trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java
   trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java
   trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
   trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java
   trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java
   trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java
   trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
   trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java
   trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java
   trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java
   trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java
   trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java
   trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java
   trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
   trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java
   trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java
   trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java
   trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java
   trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java
   trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java
   trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java
   trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java
   trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java
   trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java
   trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
   trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java
   trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java
   trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java
   trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java
   trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.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/client/actions/OpenDocMenuItem.java
   trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java
   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/actions/Calendar1DayViewSelectBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java
   trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java
   trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.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/client/viewer/CalendarViewerPanel.java
   trunk/src/main/java/cc/kune/events/server/EventsServerTool.java
   trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java
   trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java
   trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java
   trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java
   trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
   trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java
   trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java
   trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java
   trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java
   trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java
   trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java
   trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java
   trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java
   trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java
   trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java
   trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java
   trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java
   trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java
   trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java
   trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
   trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java
   trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java
   trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java
   trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java
   trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java
   trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java
   trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java
   trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java
   trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java
   trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java
   trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java
   trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java
   trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
   trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java
   trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java
   trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java
   trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java
   trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java
   trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.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/OpenFolderMenuItem.java
   trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java
   trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java
   trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java
   trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java
   trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java
   trunk/src/main/java/cc/kune/wave/client/WebClient.java
   trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java
   trunk/src/main/java/cc/kune/wave/server/KuneAgent.java
   trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java
   trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java
   trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java
   trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java
   trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.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/OpenWikiMenuItem.java
   trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java
   trunk/src/main/java/com/example/client/HelloWorldActions.java
   trunk/src/main/resources/wave-server.properties
   trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java
   trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java
   trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java
Log:
Some refactorization for calendar tool

Modified: trunk/TODO
===================================================================

--- trunk/TODO	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/TODO	2011-12-19 21:49:18 UTC (rev 1639)
@@ -12,11 +12,13 @@
    nick == assigned to
 
 * SHORT-TERM (URGENT)
-** Reu FLOSS Ocuppy 10pm EST
-   DEADLINE: <2011-11-16 mié 9pm EST> 
 ** group.inexistentTool nasty error
 ** calendar support
 *** gwt-cal + http://ical4j.sourceforge.net/introduction.html
+*** add --> event --> rpc --> gadget + wave
+*** modification --> event ---> rpc gadget + wave
+*** delete ---> ?
+*** get --> list<waveref> ---> list<app>
 ** i18n usecase
 | logged | locale in URL  | i18n supported | useDB |
 | false  | false          | false          | true  |

Modified: trunk/script/server.sh
===================================================================
--- trunk/script/server.sh	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/script/server.sh	2011-12-19 21:49:18 UTC (rev 1639)
@@ -8,6 +8,7 @@
 
 Options:
 -j <jar file> : runs jar file generated via mvn assembly:assembly
+                or adding -Dgwt.compiler.skip=true to skip compilation
 -a: run as a daemon (only root user)
 -l LOGLEVEL : IGNORE|DEBUG|INFO|WARN
 

Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,9 +23,9 @@
 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 cc.kune.common.shared.i18n.I18nTranslationService;
 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;
 

Modified: trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/DelBartersMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.barters.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/DelFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.barters.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.barters.client.actions;
 
 import cc.kune.barters.shared.BartersConstants;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.barters.shared.BartersConstants;
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;
 

Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.barters.client.actions;
 
 import cc.kune.barters.shared.BartersConstants;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContainerBtn;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/client/actions/OpenBartersMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.barters.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Date;
 
+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;
@@ -39,7 +40,6 @@
 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;

Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,9 +25,9 @@
 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 cc.kune.common.shared.i18n.I18nTranslationService;
 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;
 

Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/BlogsGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,7 +22,7 @@
 import cc.kune.blogs.client.actions.BlogsClientActions;
 import cc.kune.blogs.client.actions.BlogsNewMenu;
 import cc.kune.blogs.client.actions.PostNewMenu;
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 
 public class BlogsGinModule extends ExtendedGinModule {
 

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/DelBlogMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.blogs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/DelPostMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.blogs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.blogs.client.actions;
 
 import cc.kune.blogs.shared.BlogsConstants;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.blogs.client.actions;
 
 import cc.kune.blogs.shared.BlogsConstants;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContainerBtn;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.blogs.shared.BlogsConstants;
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;
 

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.blogs.shared.BlogsConstants;
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentMenuItem;
 

Modified: trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/client/actions/OpenBlogMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.blogs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,13 +28,13 @@
 
 import java.util.Arrays;
 
+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.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Group;
 import cc.kune.domain.I18nLanguage;

Modified: trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/AvatarDecoratorImpl.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.common.client.ui.AbstractDecorator;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.AvatarDecorator;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.core.client.events.StateChangedEvent;
 import com.calclab.emite.core.client.events.StateChangedHandler;

Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -39,6 +39,7 @@
 import cc.kune.common.client.utils.SimpleResponseCallback;
 import cc.kune.common.client.utils.TextUtils;
 import cc.kune.common.client.utils.WindowUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.events.AvatarChangedEvent;
 import cc.kune.core.client.events.NewUserRegisteredEvent;
 import cc.kune.core.client.init.AppStartEvent;
@@ -52,7 +53,6 @@
 import cc.kune.core.client.state.UserSignOutEvent;
 import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
 import cc.kune.core.shared.dto.UserInfoDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.core.client.xmpp.session.XmppSession;
 import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;

Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,7 +22,7 @@
 import cc.kune.chat.client.actions.AddAsBuddieHeaderButton;
 import cc.kune.chat.client.actions.ChatClientActions;
 import cc.kune.chat.client.actions.ChatSitebarActions;
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.core.client.avatar.MediumAvatarDecorator;
 import cc.kune.core.client.avatar.SmallAvatarDecorator;
 import cc.kune.core.client.sn.SimpleContactManager;

Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatParts.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -33,6 +33,7 @@
 import cc.kune.common.client.actions.PropertyChangeEvent;
 import cc.kune.common.client.actions.PropertyChangeListener;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
 import cc.kune.core.client.sn.GroupSNPresenter;
@@ -50,7 +51,6 @@
 import cc.kune.core.client.sn.actions.registry.GroupSNPendingsMenuItemsRegistry;
 import cc.kune.core.client.sn.actions.registry.UserSNMenuItemsRegistry;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.tool.ContentViewerSelector;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 

Modified: trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client;
 
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.services.FileDownloadUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.hablar.signals.client.notifications.HablarNotifier;
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client;
 
 import cc.kune.chat.client.ChatClientDefault.ChatClientAction;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.services.FileDownloadUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.core.client.xmpp.session.XmppSession;
 import com.calclab.emite.xep.storage.client.PrivateStorageManager;

Modified: trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/MediumAvatarDecoratorImpl.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.chat.client;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.MediumAvatarDecorator;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/SmallAvatarDecoratorImpl.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.chat.client;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.SmallAvatarDecorator;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,6 +28,7 @@
 import cc.kune.common.client.actions.PropertyChangeEvent;
 import cc.kune.common.client.actions.PropertyChangeListener;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
@@ -36,7 +37,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.client.ws.entheader.EntityHeader;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.im.client.roster.events.RosterItemChangedEvent;
 import com.calclab.emite.im.client.roster.events.RosterItemChangedHandler;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,12 +24,12 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.UserSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,12 +24,12 @@
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -33,11 +33,11 @@
 import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.events.WindowFocusEvent;
 import cc.kune.core.client.sitebar.SiteUserOptions;
 import cc.kune.core.client.sitebar.SiteUserOptionsPresenter;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.core.client.events.StateChangedEvent;
 import com.calclab.emite.core.client.events.StateChangedHandler;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.chat.shared.ChatConstants;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 import cc.kune.common.client.ui.dialogs.PromptTopDialog;
 import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.resources.nav.NavResources;
@@ -35,7 +36,6 @@
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenChatAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.chat.client.ChatClient;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyLevel;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.state.Session;
@@ -31,7 +32,6 @@
 import cc.kune.core.shared.dto.AbstractContentSimpleDTO;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,6 +27,7 @@
 import cc.kune.chat.client.resources.ChatResources;
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolActionAutoUpdated;
 import cc.kune.core.client.state.AccessRightsClientManager;
 import cc.kune.core.client.state.Session;
@@ -37,7 +38,6 @@
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDTO;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;
 import com.calclab.emite.im.client.chat.ChatStates;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomArchiveMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.chat.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenRoomMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembers.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.registry.GroupSNConfActions;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartAssemblyWithMembersAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,12 +27,12 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.AccessRightsClientManager;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,10 +24,10 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.UserSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.chat.client.ChatClient;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisPersonAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.chat.client.actions;
 
 import cc.kune.chat.client.ChatClient;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,13 +27,13 @@
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Group;
 import cc.kune.domain.User;

Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java
===================================================================
--- trunk/src/main/java/cc/kune/client/KuneGinjector.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/client/KuneGinjector.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,6 +29,7 @@
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
 import cc.kune.common.client.log.EventBusWithLogging;
 import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.CoreGinModule;
 import cc.kune.core.client.CoreParts;
 import cc.kune.core.client.actions.xml.XMLActionsParser;
@@ -51,7 +52,6 @@
 import cc.kune.core.client.sub.SubtitlesManager;
 import cc.kune.core.client.ws.CorePresenter;
 import cc.kune.core.client.ws.entheader.EntityHeaderPresenter;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.client.DocsGinModule;
 import cc.kune.docs.client.DocsGinjector;
 import cc.kune.events.client.EventsGinModule;

Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module>
   <!-- Inherit the core Web Toolkit stuff. -->
-  <inherits name='com.google.gwt.user.User' />
+  <inherits name='com.google.gwt.user.User'/>
   <!-- Other module inherits -->
   <!-- Specify the app entry point class. -->
   <!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint'
     /> -->
   <!-- Specify the paths for translatable code -->
+  <source path="shared"/>
   <source path='client'
-    excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
-  <public path="public" />
-  <inherits name='org.cobogw.gwt.user.User' />
-  <inherits name='com.google.gwt.inject.Inject' />
-  <inherits name="com.extjs.gxt.ui.GXT" />
-  <stylesheet src="kune-common.css" />
+  excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
+  <public path="public"/>
+  <inherits name='org.cobogw.gwt.user.User'/>
+  <inherits name='com.google.gwt.inject.Inject'/>
+  <inherits name="com.extjs.gxt.ui.GXT"/>
+  <stylesheet src="kune-common.css"/>
 </module>
\ No newline at end of file

Deleted: trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,39 +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.common.client;
-
-import com.google.inject.Singleton;
-import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
-
-public abstract class ExtendedGinModule extends AbstractPresenterModule {
-
-    protected void eagle(final Class<?> type) {
-        bind(type).asEagerSingleton();
-    }
-
-    protected void s(final Class<?> type) {
-        bind(type).in(Singleton.class);
-    }
-
-    protected <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) {
-        bind(type).to(typeImpl).in(Singleton.class);
-    }
-
-}

Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -33,7 +33,7 @@
 import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor;
 import cc.kune.common.client.errors.UIException;
-import cc.kune.common.client.resources.CommonIconResources;
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.IconLabel;
 
@@ -47,7 +47,7 @@
 
   private IconLabel iconLabel;
   private GwtBaseMenuItem item;
-  private final CommonIconResources res = CommonIconResources.INSTANCE;
+  private final CommonResources res = CommonResources.INSTANCE;
 
   private void confCheckListener(final MenuCheckItemDescriptor descriptor, final GwtCheckItem checkItem) {
     descriptor.addPropertyChangeListener(new PropertyChangeListener() {

Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSimpleGuiItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,7 +22,7 @@
 import cc.kune.common.client.actions.ui.AbstractComposedGuiItem;
 import cc.kune.common.client.actions.ui.AbstractGuiItem;
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.HasRTL;
 
 import com.google.gwt.user.client.ui.HorizontalPanel;
 
@@ -30,7 +30,7 @@
 
   private final HorizontalPanel bar;
 
-  public GwtSimpleGuiItem(final GuiProvider provider, final I18nTranslationService i18n) {
+  public GwtSimpleGuiItem(final GuiProvider provider, final HasRTL i18n) {
     super(provider, i18n);
     bar = new HorizontalPanel();
     initWidget(bar);

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,16 +28,16 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.actions.ui.descrip.HasChilds;
 import cc.kune.common.client.errors.UIException;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.HasRTL;
 
 import com.google.gwt.user.client.ui.Composite;
 
 public abstract class AbstractComposedGuiItem extends Composite implements IsActionExtensible {
   private final GuiProvider bindings;
   private GuiActionDescCollection guiItems;
-  private final I18nTranslationService i18n;
+  private final HasRTL i18n;
 
-  public AbstractComposedGuiItem(final GuiProvider bindings, final I18nTranslationService i18n) {
+  public AbstractComposedGuiItem(final GuiProvider bindings, final HasRTL i18n) {
     super();
     this.bindings = bindings;
     this.i18n = i18n;

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,11 +25,10 @@
 import cc.kune.common.client.actions.PropertyChangeEvent;
 import cc.kune.common.client.actions.PropertyChangeListener;
 import cc.kune.common.client.actions.ui.bind.GuiBinding;
+import cc.kune.common.client.actions.ui.descrip.DropTarget;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.errors.NotImplementedException;
 import cc.kune.common.client.utils.TextUtils;
-import cc.kune.core.client.dnd.DropTarget;
-import cc.kune.core.client.resources.IconConstants;
 
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.user.client.ui.Composite;
@@ -154,7 +153,7 @@
   protected abstract void setIconBackground(String backgroundColor);
 
   public void setIconResource(final ImageResource icon) {
-    setIconStyle((IconConstants.CSS_SUFFIX + icon.getName()));
+    setIconStyle(("k-icon-" + icon.getName()));
   }
 
   protected abstract void setIconStyle(String style);

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionFlowPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,7 +20,7 @@
 package cc.kune.common.client.actions.ui;
 
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.HasRTL;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.inject.Inject;
@@ -30,7 +30,7 @@
   private final FlowPanel bar;
 
   @Inject
-  public ActionFlowPanel(final GuiProvider guiProvider, final I18nTranslationService i18n) {
+  public ActionFlowPanel(final GuiProvider guiProvider, final HasRTL i18n) {
     super(guiProvider, i18n);
     bar = new FlowPanel();
     initWidget(bar);

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,7 +20,7 @@
 package cc.kune.common.client.actions.ui;
 
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.HasRTL;
 
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.inject.Inject;
@@ -30,7 +30,7 @@
   private final HorizontalPanel bar;
 
   @Inject
-  public ActionSimplePanel(final GuiProvider guiProvider, final I18nTranslationService i18n) {
+  public ActionSimplePanel(final GuiProvider guiProvider, final HasRTL i18n) {
     super(guiProvider, i18n);
     bar = new HorizontalPanel();
     initWidget(bar);

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,7 +27,6 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ChangeableObject;
 import cc.kune.common.client.actions.KeyStroke;
-import cc.kune.core.client.dnd.DropTarget;
 
 import com.google.gwt.i18n.client.HasDirection.Direction;
 

Copied: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/DropTarget.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -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.common.client.actions.ui.descrip;
+
+import com.google.gwt.user.client.ui.Widget;
+
+public interface DropTarget {
+
+  void init(Widget dropTarget);
+
+}

Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,7 +23,6 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.KeyStroke;
 import cc.kune.common.client.actions.PropertyChangeListener;
-import cc.kune.core.client.dnd.DropTarget;
 
 import com.google.gwt.i18n.client.HasDirection.Direction;
 

Copied: trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/events/ProgressHideEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,81 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.common.client.events;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.event.shared.HasHandlers;
+
+public class ProgressHideEvent extends GwtEvent<ProgressHideEvent.ProgressHideHandler> {
+
+  public interface HasProgressHideHandlers extends HasHandlers {
+    HandlerRegistration addProgressHideHandler(ProgressHideHandler handler);
+  }
+
+  public interface ProgressHideHandler extends EventHandler {
+    public void onProgressHide(ProgressHideEvent event);
+  }
+
+  private static final Type<ProgressHideHandler> TYPE = new Type<ProgressHideHandler>();
+
+  public static void fire(final HasHandlers source) {
+    source.fireEvent(new ProgressHideEvent());
+  }
+
+  public static Type<ProgressHideHandler> getType() {
+    return TYPE;
+  }
+
+  public ProgressHideEvent() {
+  }
+
+  @Override
+  protected void dispatch(final ProgressHideHandler handler) {
+    handler.onProgressHide(this);
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (other != null && other.getClass().equals(this.getClass())) {
+      final ProgressHideEvent o = (ProgressHideEvent) other;
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public Type<ProgressHideHandler> getAssociatedType() {
+    return TYPE;
+  }
+
+  @Override
+  public int hashCode() {
+    int hashCode = 23;
+    hashCode = (hashCode * 37) + getClass().hashCode();
+    return hashCode;
+  }
+
+  @Override
+  public String toString() {
+    return "ProgressHideEvent[" + "]";
+  }
+
+}

Copied: trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java (from rev 1630, trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/events/ProgressShowEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,93 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.common.client.events;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.event.shared.HasHandlers;
+
+public class ProgressShowEvent extends GwtEvent<ProgressShowEvent.ProgressShowHandler> {
+
+  public interface HasProgressShowHandlers extends HasHandlers {
+    HandlerRegistration addProgressShowHandler(ProgressShowHandler handler);
+  }
+
+  public interface ProgressShowHandler extends EventHandler {
+    public void onProgressShow(ProgressShowEvent event);
+  }
+
+  private static final Type<ProgressShowHandler> TYPE = new Type<ProgressShowHandler>();
+
+  public static void fire(final HasHandlers source, final java.lang.String message) {
+    source.fireEvent(new ProgressShowEvent(message));
+  }
+
+  public static Type<ProgressShowHandler> getType() {
+    return TYPE;
+  }
+
+  private final java.lang.String message;
+
+  public ProgressShowEvent() {
+    this("");
+  }
+
+  public ProgressShowEvent(final java.lang.String message) {
+    this.message = message;
+  }
+
+  @Override
+  protected void dispatch(final ProgressShowHandler handler) {
+    handler.onProgressShow(this);
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (other != null && other.getClass().equals(this.getClass())) {
+      final ProgressShowEvent o = (ProgressShowEvent) other;
+      return true && ((o.message == null && this.message == null) || (o.message != null && o.message.equals(this.message)));
+    }
+    return false;
+  }
+
+  @Override
+  public Type<ProgressShowHandler> getAssociatedType() {
+    return TYPE;
+  }
+
+  public java.lang.String getMessage() {
+    return message;
+  }
+
+  @Override
+  public int hashCode() {
+    int hashCode = 23;
+    hashCode = (hashCode * 37) + getClass().hashCode();
+    hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode());
+    return hashCode;
+  }
+
+  @Override
+  public String toString() {
+    return "ProgressShowEvent[" + message + "]";
+  }
+
+}

Copied: trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java (from rev 1635, trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/events/UserNotifyEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,155 @@
+/*
+ *
+ * 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.common.client.events;
+
+import cc.kune.common.client.notify.NotifyLevel;
+
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.event.shared.HasHandlers;
+
+public class UserNotifyEvent extends GwtEvent<UserNotifyEvent.UserNotifyHandler> {
+
+  public interface HasUserNotifyHandlers extends HasHandlers {
+    HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler);
+  }
+
+  public interface UserNotifyCloser {
+    public void close();
+  }
+
+  public interface UserNotifyHandler extends EventHandler {
+    public void onUserNotify(UserNotifyEvent event);
+  }
+
+  private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>();
+
+  public static void fire(final HasHandlers source, final NotifyLevel level,
+      final java.lang.String message) {
+    source.fireEvent(new UserNotifyEvent(level, "", message));
+  }
+
+  public static void fire(final HasHandlers source, final NotifyLevel level,
+      final java.lang.String message, final Boolean closeable) {
+    source.fireEvent(new UserNotifyEvent(level, "", message, closeable));
+  }
+
+  public static void fire(final HasHandlers source, final NotifyLevel level,
+      final java.lang.String title, final java.lang.String message) {
+    source.fireEvent(new UserNotifyEvent(level, title, message));
+  }
+
+  public static UserNotifyEvent fire(final HasHandlers source, final NotifyLevel level,
+      final java.lang.String title, final java.lang.String message, final Boolean closeable) {
+    final UserNotifyEvent event = new UserNotifyEvent(level, title, message, closeable);
+    source.fireEvent(event);
+    return event;
+  }
+
+  public static Type<UserNotifyHandler> getType() {
+    return TYPE;
+  }
+
+  private ClickHandler clickHandler;
+  private final Boolean closeable;
+  private UserNotifyCloser closer;
+  private java.lang.String id;
+  private final NotifyLevel level;
+  private final java.lang.String message;
+  private final java.lang.String title;
+
+  public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) {
+    this(level, "", message, false);
+  }
+
+  public UserNotifyEvent(final NotifyLevel level, final java.lang.String message, final Boolean closeable) {
+    this(level, "", message, closeable);
+  }
+
+  public UserNotifyEvent(final NotifyLevel level, final java.lang.String title,
+      final java.lang.String message) {
+    this(level, title, message, false);
+  }
+
+  public UserNotifyEvent(final NotifyLevel level, final java.lang.String title,
+      final java.lang.String message, final Boolean closeable) {
+    this.level = level;
+    this.title = title;
+    this.message = message;
+    this.closeable = closeable;
+  }
+
+  public UserNotifyEvent(final String message) {
+    this(NotifyLevel.info, message);
+  }
+
+  @Override
+  protected void dispatch(final UserNotifyHandler handler) {
+    handler.onUserNotify(this);
+  }
+
+  @Override
+  public Type<UserNotifyHandler> getAssociatedType() {
+    return TYPE;
+  }
+
+  public ClickHandler getClickHandler() {
+    return clickHandler;
+  }
+
+  public Boolean getCloseable() {
+    return closeable;
+  }
+
+  public UserNotifyCloser getCloser() {
+    return closer;
+  }
+
+  public java.lang.String getId() {
+    return id;
+  }
+
+  public NotifyLevel getLevel() {
+    return level;
+  }
+
+  public java.lang.String getMessage() {
+    return message;
+  }
+
+  public java.lang.String getTitle() {
+    return title;
+  }
+
+  public void setClickHandler(final ClickHandler clickHandler) {
+    this.clickHandler = clickHandler;
+  }
+
+  public void setCloser(final UserNotifyCloser closer) {
+    this.closer = closer;
+  }
+
+  public void setId(final String id) {
+    this.id = id;
+  }
+
+}

Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,31 +19,31 @@
  */
 package cc.kune.common.client.notify;
 
-import cc.kune.core.client.resources.CoreResources;
+import cc.kune.common.client.resources.CommonResources;
 
 import com.google.gwt.resources.client.ImageResource;
 import com.google.inject.Inject;
 
 public class NotifyLevelImages {
 
-    private final CoreResources images;
+  private final CommonResources res;
 
-    @Inject
-    public NotifyLevelImages(final CoreResources images) {
-        this.images = images;
-    }
+  @Inject
+  public NotifyLevelImages(final CommonResources res) {
+    this.res = res;
+  }
 
-    public ImageResource getImage(final NotifyLevel level) {
-        switch (level) {
-        case info:
-            return images.info();
-        case important:
-            return images.important();
-        case veryImportant:
-            return images.alert();
-        case error:
-        default:
-            return images.error();
-        }
+  public ImageResource getImage(final NotifyLevel level) {
+    switch (level) {
+    case info:
+      return res.info();
+    case important:
+      return res.important();
+    case veryImportant:
+      return res.alert();
+    case error:
+    default:
+      return res.error();
     }
+  }
 }

Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,12 +19,12 @@
  */
 package cc.kune.common.client.notify;
 
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.ProgressShowEvent;
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.utils.SimpleResponseCallback;
 import cc.kune.common.client.utils.TextUtils;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
-import cc.kune.core.client.notify.spiner.ProgressShowEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.shared.EventBus;

Deleted: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,56 +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.common.client.resources;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.ImageResource;
-
-public interface CommonIconResources extends ClientBundle {
-
-  public static final CommonIconResources INSTANCE = GWT.create(CommonIconResources.class);
-
-  @Source("checked.png")
-  ImageResource checked();
-
-  @Source("clear.png")
-  ImageResource clear();
-
-  @Source("kune-close.png")
-  ImageResource kuneClose();
-
-  @Source("kune-close-grey.png")
-  ImageResource kuneCloseGrey();
-
-  @Source("kune-close-greylight.png")
-  ImageResource kuneCloseGreylight();
-
-  @Source("radiochecked.png")
-  ImageResource radioChecked();
-
-  @Source("radiounchecked.png")
-  ImageResource radioUnChecked();
-
-  @Source("cross.png")
-  ImageResource redCross();
-
-  @Source("unchecked.png")
-  ImageResource unChecked();
-}

Copied: trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java (from rev 1630, trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,77 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.common.client.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.ImageResource;
+
+public interface CommonResources extends ClientBundle {
+
+  public static final CommonResources INSTANCE = GWT.create(CommonResources.class);
+
+  @Source("alert.png")
+  ImageResource alert();
+
+  @Source("checked.png")
+  ImageResource checked();
+
+  @Source("clear.png")
+  ImageResource clear();
+
+  @Source("error.png")
+  ImageResource error();
+
+  @Source("important.png")
+  ImageResource important();
+
+  @Source("important-32.png")
+  ImageResource important32();
+
+  @Source("info.png")
+  ImageResource info();
+
+  @Source("kune-anim.gif")
+  ImageResource kuneAnim();
+
+  @Source("kune-anim-g.gif")
+  ImageResource kuneAnimG();
+
+  @Source("kune-close.png")
+  ImageResource kuneClose();
+
+  @Source("kune-close-grey.png")
+  ImageResource kuneCloseGrey();
+
+  @Source("kune-close-greylight.png")
+  ImageResource kuneCloseGreylight();
+
+  @Source("radiochecked.png")
+  ImageResource radioChecked();
+
+  @Source("radiounchecked.png")
+  ImageResource radioUnChecked();
+
+  @Source("cross.png")
+  ImageResource redCross();
+
+  @Source("unchecked.png")
+  ImageResource unChecked();
+}

Copied: trunk/src/main/java/cc/kune/common/client/resources/alert.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/alert.png)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/error.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/error.png)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/important-32.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/important-32.png)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/important.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/important.png)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/info.png (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/info.png)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/kune-anim-g.gif (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif)
===================================================================
(Binary files differ)

Copied: trunk/src/main/java/cc/kune/common/client/resources/kune-anim.gif (from rev 1630, trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif)
===================================================================
(Binary files differ)

Modified: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml	2011-12-19 21:49:18 UTC (rev 1639)
@@ -2,7 +2,7 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
   xmlns:g="urn:import:com.google.gwt.user.client.ui">
   <ui:with field='res'
-    type='cc.kune.common.client.resources.CommonIconResources'/>
+    type='cc.kune.common.client.resources.CommonResources'/>
   <ui:style>
 
   </ui:style>

Modified: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,7 +1,7 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
   xmlns:g="urn:import:com.google.gwt.user.client.ui">
-  <ui:with field='img' type='cc.kune.core.client.resources.CoreResources' />
+  <ui:with field='img' type='cc.kune.common.client.resources.CommonResources' />
   <ui:style>
     .main {
 

Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,7 +1,7 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
   xmlns:k="urn:import:cc.kune.common.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui">
-  <ui:with field='res' type='cc.kune.common.client.resources.CommonIconResources'/>
+  <ui:with field='res' type='cc.kune.common.client.resources.CommonResources'/>
   <g:VerticalPanel addStyleNames="k-dialog-outerp, k-bottom-10corners">
     <g:FlowPanel>
       <g:PushButton visible="false" ui:field="closeBtn"

Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,8 +23,7 @@
 import cc.kune.common.client.ui.MaskWidget;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder;
-import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -40,7 +39,7 @@
 public class WizardDialog implements WizardDialogView {
 
   private final Button backButton;
-  private final DeckPanel deck;
+  protected final DeckPanel deck;
   private final BasicTopDialog dialog;
   private final I18nTranslationService i18n;
   private WizardListener listener;
@@ -130,11 +129,9 @@
   public void clear() {
   }
 
-  private int getWidgetCount(final IsWidget view) {
+  protected int getWidgetCount(final IsWidget view) {
     if (view instanceof Widget) {
       return deck.getWidgetIndex((Widget) view);
-    } else if (view instanceof DefaultForm) {
-      return deck.getWidgetIndex(((DefaultForm) view).getFormPanel());
     }
     return -1;
   }
@@ -261,11 +258,9 @@
 
   }
 
-  private Widget toWidget(final IsWidget view) {
+  protected Widget toWidget(final IsWidget view) {
     if (view instanceof Widget) {
       return (Widget) view;
-    } else if (view instanceof DefaultForm) {
-      return ((DefaultForm) view).getFormPanel();
     } else {
       NotifyUser.error("Trying to add a unknown element in WizardDialog");
       return null;

Copied: trunk/src/main/java/cc/kune/common/shared/i18n (from rev 1630, trunk/src/main/java/cc/kune/core/shared/i18n)

Added: trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java
===================================================================
--- trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/common/shared/i18n/HasRTL.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,11 @@
+package cc.kune.common.shared.i18n;
+
+public interface HasRTL {
+
+  /**
+   * Describe if the current language is Right to Left (RTL)
+   * 
+   * @return true, if is the current language is RTL
+   */
+  boolean isRTL();
+}

Modified: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java	2011-11-28 16:19:48 UTC (rev 1630)
+++ trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationService.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package cc.kune.core.shared.i18n;
+package cc.kune.common.shared.i18n;
 
 import cc.kune.common.client.utils.Pair;
 
 import com.google.gwt.i18n.client.HasDirection.Direction;
 
-public abstract class I18nTranslationService {
+public abstract class I18nTranslationService implements HasRTL {
 
   protected static final String RTL = "rtl";
 
@@ -40,6 +40,7 @@
     return isRTL() ? Direction.RTL : Direction.LTR;
   }
 
+  @Override
   public abstract boolean isRTL();
 
   /**

Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,6 @@
  */
 package cc.kune.core.client;
 
-import cc.kune.common.client.ExtendedGinModule;
 import cc.kune.common.client.actions.gxtui.GxtGuiProvider;
 import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider;
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
@@ -28,6 +27,8 @@
 import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
 import cc.kune.common.client.ui.MaskWidget;
 import cc.kune.common.client.ui.MaskWidgetView;
+import cc.kune.common.shared.i18n.HasRTL;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.ActionRegistryByType;
 import cc.kune.core.client.actions.xml.XMLActionsParser;
 import cc.kune.core.client.auth.AnonUsersManager;
@@ -110,7 +111,6 @@
 import cc.kune.core.client.ws.entheader.EntityHeaderPanel;
 import cc.kune.core.client.ws.entheader.EntityHeaderPresenter;
 import cc.kune.core.shared.dto.ReservedWordsRegistryDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.msgs.client.UserMessagesPanel;
 import cc.kune.msgs.client.UserMessagesPresenter;
 
@@ -138,6 +138,7 @@
     bind(RootPresenter.class).asEagerSingleton();
     bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class);
     s(I18nUITranslationService.class);
+    bind(HasRTL.class).to(I18nUITranslationService.class);
     bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class);
     bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class);
     s(AnonUsersManager.class);
@@ -191,6 +192,8 @@
 
     // UI
     bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class);
+
+    // FIXME: revise this!
     s(GxtGuiProvider.class);
     // s(GwtGuiProvider.class);
 

Copied: trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java (from rev 1630, trunk/src/main/java/cc/kune/common/client/ExtendedGinModule.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/ExtendedGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,39 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.client;
+
+import com.google.inject.Singleton;
+import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
+
+public abstract class ExtendedGinModule extends AbstractPresenterModule {
+
+    protected void eagle(final Class<?> type) {
+        bind(type).asEagerSingleton();
+    }
+
+    protected void s(final Class<?> type) {
+        bind(type).in(Singleton.class);
+    }
+
+    protected <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) {
+        bind(type).to(typeImpl).in(Singleton.class);
+    }
+
+}

Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/actions/xml/AddGadgetAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,13 +22,13 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Provider;
 

Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -32,7 +33,6 @@
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.ContentViewerPresenter;
 
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,13 +28,13 @@
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.ActionRegistryByType;
 import cc.kune.core.client.errors.ErrorHandler;
 import cc.kune.core.client.registry.NewMenusForTypeIdsRegistry;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.ActionGroups;
 import cc.kune.gspace.client.viewers.ContentViewerPresenter;
 

Modified: trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,13 +19,13 @@
  */
 package cc.kune.core.client.auth;
 
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.utils.TextUtils;
 import cc.kune.core.client.cookies.CookiesManager;
 import cc.kune.core.client.i18n.I18nUITranslationService;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.SiteTokens;
 import cc.kune.core.client.state.UserSignInEvent;

Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  \*/
 package cc.kune.core.client.auth;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
 import com.extjs.gxt.ui.client.widget.form.TextField;

Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,11 +22,11 @@
 import cc.kune.common.client.notify.NotifyLevelImages;
 import cc.kune.common.client.ui.MaskWidgetView;
 import cc.kune.common.client.ui.dialogs.MessageToolbar;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.RegisterPresenter.RegisterView;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.ui.KuneUiUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;

Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,7 +25,7 @@
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder;
 import cc.kune.common.client.ui.dialogs.MessageToolbar;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.logical.shared.HasCloseHandlers;

Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.core.client.auth;
 
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.event.Events;
 import com.extjs.gxt.ui.client.event.FieldEvent;

Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.core.client.auth;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel;
 import com.extjs.gxt.ui.client.widget.form.TextField;

Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,10 +23,10 @@
 import cc.kune.common.client.ui.MaskWidgetView;
 import cc.kune.common.client.ui.dialogs.MessageToolbar;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.SignInPresenter.SignInView;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.ui.KuneUiUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.VerticalPanel;
 import com.extjs.gxt.ui.client.widget.form.Field;

Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,6 +19,8 @@
  */
 package cc.kune.core.client.auth;
 
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.ProgressShowEvent;
 import cc.kune.common.client.log.Log;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.utils.OnAcceptCallback;
@@ -29,8 +31,6 @@
 import cc.kune.core.client.cookies.CookiesManager;
 import cc.kune.core.client.errors.UserAuthException;
 import cc.kune.core.client.i18n.I18nUITranslationService;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
-import cc.kune.core.client.notify.spiner.ProgressShowEvent;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.Session;

Modified: trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.core.client.auth;
 
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,7 +21,7 @@
 
 import cc.kune.common.client.actions.ui.ActionFlowPanel;
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;

Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import org.waveprotocol.wave.model.waveref.WaveRef;
 
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.ui.IconLabel;
-import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.wave.client.WaveClientManager;
 
@@ -45,7 +45,7 @@
   private final FlowPanel messagePanel;
 
   public FoldableContentPanel(final GSpaceArmor ws, final I18nTranslationService i18n,
-      final CoreResources res, final WaveClientManager waveClientManager) {
+      final CommonResources res, final WaveClientManager waveClientManager) {
     super(ws);
     this.i18n = i18n;
     messageLabel = new IconLabel("");

Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,6 +21,7 @@
 
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.services.ImageSize;
 import cc.kune.core.client.services.MediaUtils;
@@ -33,7 +34,6 @@
 import cc.kune.core.shared.dto.StateAbstractDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Provider;
 

Deleted: trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/dnd/DropTarget.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,28 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.dnd;
-
-import com.google.gwt.user.client.ui.Widget;
-
-public interface DropTarget {
-
-  void init(Widget dropTarget);
-
-}

Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,10 @@
  */
 package cc.kune.core.client.dnd;
 
+import cc.kune.common.client.actions.ui.descrip.DropTarget;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.ErrorHandler;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.ContentCache;
@@ -28,7 +30,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderItemWidget;
 
 import com.allen_sauer.gwt.dnd.client.DragContext;

Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/dnd/NotAllowedDropController.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.core.client.dnd;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.allen_sauer.gwt.dnd.client.DragContext;
 import com.allen_sauer.gwt.dnd.client.VetoDragException;

Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropController.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,7 +21,7 @@
 
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.TextUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.allen_sauer.gwt.dnd.client.DragContext;
 import com.allen_sauer.gwt.dnd.client.VetoDragException;

Modified: trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/dnd/NotImplementedDropManager.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.core.client.dnd;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.event.logical.shared.AttachEvent;

Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,15 +22,15 @@
 import org.waveprotocol.wave.client.common.safehtml.SafeHtml;
 import org.waveprotocol.wave.client.common.util.AsyncHolder.Accessor;
 
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.log.Log;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.TextUtils;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.wave.client.WaveClientProvider;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.core.client.groups.newgroup;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -26,9 +26,9 @@
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder;
 import cc.kune.common.client.ui.dialogs.MessageToolbar;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.client.ui.DefaultFormUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
 import com.extjs.gxt.ui.client.widget.form.FieldSet;

Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.errors.UIException;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.errors.GroupLongNameInUseException;
 import cc.kune.core.client.errors.GroupShortNameInUseException;
@@ -37,7 +38,6 @@
 import cc.kune.core.shared.dto.LicenseDTO;
 import cc.kune.core.shared.dto.ReservedWordsRegistryDTO;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptions;
 
 import com.google.gwt.core.client.Scheduler;

Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,7 +20,7 @@
 package cc.kune.core.client.i18n;
 
 import cc.kune.common.client.utils.TextUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 public class I18nTranslationServiceMocked extends I18nTranslationService {
   @Override

Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -34,12 +34,12 @@
 import cc.kune.common.client.utils.SimpleResponseCallback;
 import cc.kune.common.client.utils.TextUtils;
 import cc.kune.common.client.utils.WindowUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.I18nServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.UserSignInEvent;
 import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
 import cc.kune.core.shared.dto.I18nLanguageDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.RepeatingCommand;

Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,13 +19,13 @@
  */
 package cc.kune.core.client.init;
 
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.log.Log;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.utils.SimpleResponseCallback;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
-import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.SiteServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.dto.InitDataDTO;
@@ -45,13 +45,13 @@
 public class AppStarterDefault implements AppStarter {
   private final EventBus eventBus;
   private final PrefetchUtilities prefetchUtilities;
-  private final CoreResources res;
+  private final CommonResources res;
   private final Session session;
   private final SiteServiceAsync siteService;
 
   @Inject
   public AppStarterDefault(final Session session, final SiteServiceAsync siteService,
-      final EventBus eventBus, final PrefetchUtilities prefetchUtilities, final CoreResources res) {
+      final EventBus eventBus, final PrefetchUtilities prefetchUtilities, final CommonResources res) {
     this.session = session;
     this.siteService = siteService;
     this.eventBus = eventBus;

Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.common.client.notify.ConfirmAskEvent;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;

Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,6 +19,7 @@
  */
 package cc.kune.core.client.notify.msgs;
 
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy;
 import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView;

Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,6 +19,7 @@
  */
 package cc.kune.core.client.notify.msgs;
 
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.ui.PopupBottomPanel;
 import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView;
 import cc.kune.msgs.client.CloseCallback;

Deleted: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,155 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.notify.msgs;
-
-import cc.kune.common.client.notify.NotifyLevel;
-
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.shared.EventHandler;
-import com.google.gwt.event.shared.GwtEvent;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
-
-public class UserNotifyEvent extends GwtEvent<UserNotifyEvent.UserNotifyHandler> {
-
-  public interface HasUserNotifyHandlers extends HasHandlers {
-    HandlerRegistration addUserNotifyHandler(UserNotifyHandler handler);
-  }
-
-  public interface UserNotifyCloser {
-    public void close();
-  }
-
-  public interface UserNotifyHandler extends EventHandler {
-    public void onUserNotify(UserNotifyEvent event);
-  }
-
-  private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>();
-
-  public static void fire(final HasHandlers source, final NotifyLevel level,
-      final java.lang.String message) {
-    source.fireEvent(new UserNotifyEvent(level, "", message));
-  }
-
-  public static void fire(final HasHandlers source, final NotifyLevel level,
-      final java.lang.String message, final Boolean closeable) {
-    source.fireEvent(new UserNotifyEvent(level, "", message, closeable));
-  }
-
-  public static void fire(final HasHandlers source, final NotifyLevel level,
-      final java.lang.String title, final java.lang.String message) {
-    source.fireEvent(new UserNotifyEvent(level, title, message));
-  }
-
-  public static UserNotifyEvent fire(final HasHandlers source, final NotifyLevel level,
-      final java.lang.String title, final java.lang.String message, final Boolean closeable) {
-    final UserNotifyEvent event = new UserNotifyEvent(level, title, message, closeable);
-    source.fireEvent(event);
-    return event;
-  }
-
-  public static Type<UserNotifyHandler> getType() {
-    return TYPE;
-  }
-
-  private ClickHandler clickHandler;
-  private final Boolean closeable;
-  private UserNotifyCloser closer;
-  private java.lang.String id;
-  private final NotifyLevel level;
-  private final java.lang.String message;
-  private final java.lang.String title;
-
-  public UserNotifyEvent(final NotifyLevel level, final java.lang.String message) {
-    this(level, "", message, false);
-  }
-
-  public UserNotifyEvent(final NotifyLevel level, final java.lang.String message, final Boolean closeable) {
-    this(level, "", message, closeable);
-  }
-
-  public UserNotifyEvent(final NotifyLevel level, final java.lang.String title,
-      final java.lang.String message) {
-    this(level, title, message, false);
-  }
-
-  public UserNotifyEvent(final NotifyLevel level, final java.lang.String title,
-      final java.lang.String message, final Boolean closeable) {
-    this.level = level;
-    this.title = title;
-    this.message = message;
-    this.closeable = closeable;
-  }
-
-  public UserNotifyEvent(final String message) {
-    this(NotifyLevel.info, message);
-  }
-
-  @Override
-  protected void dispatch(final UserNotifyHandler handler) {
-    handler.onUserNotify(this);
-  }
-
-  @Override
-  public Type<UserNotifyHandler> getAssociatedType() {
-    return TYPE;
-  }
-
-  public ClickHandler getClickHandler() {
-    return clickHandler;
-  }
-
-  public Boolean getCloseable() {
-    return closeable;
-  }
-
-  public UserNotifyCloser getCloser() {
-    return closer;
-  }
-
-  public java.lang.String getId() {
-    return id;
-  }
-
-  public NotifyLevel getLevel() {
-    return level;
-  }
-
-  public java.lang.String getMessage() {
-    return message;
-  }
-
-  public java.lang.String getTitle() {
-    return title;
-  }
-
-  public void setClickHandler(final ClickHandler clickHandler) {
-    this.clickHandler = clickHandler;
-  }
-
-  public void setCloser(final UserNotifyCloser closer) {
-    this.closer = closer;
-  }
-
-  public void setId(final String id) {
-    this.id = id;
-  }
-
-}

Deleted: trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressHideEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,85 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.notify.spiner;
-
-import com.google.gwt.event.shared.EventHandler;
-import com.google.gwt.event.shared.GwtEvent;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
-import com.gwtplatform.mvp.client.HasEventBus;
-
-public class ProgressHideEvent extends GwtEvent<ProgressHideEvent.ProgressHideHandler> { 
-
-  public interface HasProgressHideHandlers extends HasHandlers {
-    HandlerRegistration addProgressHideHandler(ProgressHideHandler handler);
-  }
-
-  public interface ProgressHideHandler extends EventHandler {
-    public void onProgressHide(ProgressHideEvent event);
-  }
-
-  private static final Type<ProgressHideHandler> TYPE = new Type<ProgressHideHandler>();
-
-  public static void fire(HasEventBus source) {
-    source.fireEvent(new ProgressHideEvent());
-  }
-
-  public static Type<ProgressHideHandler> getType() {
-    return TYPE;
-  }
-
-
-  public ProgressHideEvent() {
-  }
-
-  @Override
-  public Type<ProgressHideHandler> getAssociatedType() {
-    return TYPE;
-  }
-
-  @Override
-  protected void dispatch(ProgressHideHandler handler) {
-    handler.onProgressHide(this);
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (other != null && other.getClass().equals(this.getClass())) {
-          ProgressHideEvent o = (ProgressHideEvent) other;
-      return true
-        ;
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 23;
-    hashCode = (hashCode * 37) + getClass().hashCode();
-    return hashCode;
-  }
-
-  @Override
-  public String toString() {
-    return "ProgressHideEvent["
-    + "]";
-  }
-
-}

Deleted: trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/spiner/ProgressShowEvent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,94 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.notify.spiner;
-
-import com.google.gwt.event.shared.EventHandler;
-import com.google.gwt.event.shared.GwtEvent;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
-import com.gwtplatform.mvp.client.HasEventBus;
-
-public class ProgressShowEvent extends GwtEvent<ProgressShowEvent.ProgressShowHandler> {
-
-    public interface HasProgressShowHandlers extends HasHandlers {
-        HandlerRegistration addProgressShowHandler(ProgressShowHandler handler);
-    }
-
-    public interface ProgressShowHandler extends EventHandler {
-        public void onProgressShow(ProgressShowEvent event);
-    }
-
-    private static final Type<ProgressShowHandler> TYPE = new Type<ProgressShowHandler>();
-
-    public static void fire(final HasEventBus source, final java.lang.String message) {
-        source.fireEvent(new ProgressShowEvent(message));
-    }
-
-    public static Type<ProgressShowHandler> getType() {
-        return TYPE;
-    }
-
-    private final java.lang.String message;
-
-    public ProgressShowEvent() {
-        this("");
-    }
-
-    public ProgressShowEvent(final java.lang.String message) {
-        this.message = message;
-    }
-
-    @Override
-    protected void dispatch(final ProgressShowHandler handler) {
-        handler.onProgressShow(this);
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        if (other != null && other.getClass().equals(this.getClass())) {
-            final ProgressShowEvent o = (ProgressShowEvent) other;
-            return true && ((o.message == null && this.message == null) || (o.message != null && o.message.equals(this.message)));
-        }
-        return false;
-    }
-
-    @Override
-    public Type<ProgressShowHandler> getAssociatedType() {
-        return TYPE;
-    }
-
-    public java.lang.String getMessage() {
-        return message;
-    }
-
-    @Override
-    public int hashCode() {
-        int hashCode = 23;
-        hashCode = (hashCode * 37) + getClass().hashCode();
-        hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode());
-        return hashCode;
-    }
-
-    @Override
-    public String toString() {
-        return "ProgressShowEvent[" + message + "]";
-    }
-
-}

Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,10 @@
  */
 package cc.kune.core.client.notify.spiner;
 
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.ProgressShowEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.i18n.I18nReadyEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -37,9 +37,6 @@
   @Source("add-green.png")
   ImageResource addGreen();
 
-  @Source("alert.png")
-  ImageResource alert();
-
   @Source("anybody.png")
   ImageResource anybody();
 
@@ -349,9 +346,6 @@
   @Source("emite-room.png")
   ImageResource emiteRoom();
 
-  @Source("error.png")
-  ImageResource error();
-
   @Source("everybody.png")
   ImageResource everybody();
 
@@ -376,24 +370,9 @@
   @Source("group-home.png")
   ImageResource groupHome();
 
-  @Source("important.png")
-  ImageResource important();
-
-  @Source("important-32.png")
-  ImageResource important32();
-
-  @Source("info.png")
-  ImageResource info();
-
   @Source("info-light.png")
   ImageResource infoLight();
 
-  @Source("kune-anim.gif")
-  ImageResource kuneAnim();
-
-  @Source("kune-anim-g.gif")
-  ImageResource kuneAnimG();
-
   @Source("kune-close.png")
   ImageResource kuneClose();
 

Deleted: trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,39 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.resources;
-
-import com.google.gwt.resources.client.ImageResource;
-
- at Deprecated
-public final class IconConstants {
-
-    @Deprecated
-    public static final String CSS_SUFFIX = "k-icon-";
-
-    private static final String PATH_PREFIX = "images/";
-
-    @Deprecated
-    public static String toPath(final ImageResource img) {
-        return PATH_PREFIX + img.getName() + ".png";
-    }
-
-    private IconConstants() {
-    }
-}

Deleted: trunk/src/main/java/cc/kune/core/client/resources/alert.png
===================================================================
(Binary files differ)

Modified: trunk/src/main/java/cc/kune/core/client/resources/core.css
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/core.css	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/resources/core.css	2011-12-19 21:49:18 UTC (rev 1639)
@@ -9,9 +9,9 @@
   margin-top: 2px;
 }
 
- at sprite div .k-icon-info {
-  gwt-image: "info";
-}
+/* @sprite div .k-icon-info { */
+/*   gwt-image: "info"; */
+/* } */
 
 @sprite div .k-icon-language {
   gwt-image: "language";

Deleted: trunk/src/main/java/cc/kune/core/client/resources/error.png
===================================================================
(Binary files differ)

Deleted: trunk/src/main/java/cc/kune/core/client/resources/important-32.png
===================================================================
(Binary files differ)

Deleted: trunk/src/main/java/cc/kune/core/client/resources/important.png
===================================================================
(Binary files differ)

Deleted: trunk/src/main/java/cc/kune/core/client/resources/info.png
===================================================================
(Binary files differ)

Deleted: trunk/src/main/java/cc/kune/core/client/resources/kune-anim-g.gif
===================================================================
(Binary files differ)

Deleted: trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif
===================================================================
(Binary files differ)

Modified: trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,6 +19,7 @@
  \*/
 package cc.kune.core.client.services;
 
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.core.client.resources.CoreResources;
 
 import com.google.gwt.resources.client.ImageResource;
@@ -27,405 +28,407 @@
 
 public class ImageUtils {
 
-    private final CoreResources img;
+  private final CommonResources commonRes;
+  private final CoreResources img;
 
-    @Inject
-    public ImageUtils(final CoreResources img) {
-        this.img = img;
-    }
+  @Inject
+  public ImageUtils(final CoreResources img, final CommonResources commonRes) {
+    this.img = img;
+    this.commonRes = commonRes;
+  }
 
-    public ImageResource getImage(final ImageDescriptor imageDescriptor) {
-        switch (imageDescriptor) {
-        case accept: {
-            return img.accept();
-        }
-        case add: {
-            return img.add();
-        }
-        case addGreen: {
-            return img.addGreen();
-        }
-        case alert: {
-            return img.alert();
-        }
-        case anybody: {
-            return img.anybody();
-        }
-        case arrowDownBlack: {
-            return img.arrowDownBlack();
-        }
-        case arrowDownGreen: {
-            return img.arrowDownGreen();
-        }
-        case arrowDownWhite: {
-            return img.arrowDownWhite();
-        }
-        case arrowLeftGreen: {
-            return img.arrowLeftGreen();
-        }
-        case arrowRightBlack: {
-            return img.arrowRightBlack();
-        }
-        case arrowRightGreen: {
-            return img.arrowRightGreen();
-        }
-        case arrowRightWhite: {
-            return img.arrowRightWhite();
-        }
-        case arrowUpGreen: {
-            return img.arrowUpGreen();
-        }
-        case bulletAdd: {
-            return img.bulletAdd();
-        }
-        case bulletBlack: {
-            return img.bulletBlack();
-        }
-        case bulletBlue: {
-            return img.bulletBlue();
-        }
-        case bulletDelete: {
-            return img.bulletDelete();
-        }
-        case bulletGreen: {
-            return img.bulletGreen();
-        }
-        case bulletPink: {
-            return img.bulletPink();
-        }
-        case bulletPurple: {
-            return img.bulletPurple();
-        }
-        case bulletRed: {
-            return img.bulletRed();
-        }
-        case bulletStar: {
-            return img.bulletStar();
-        }
-        case bulletToggleMinus: {
-            return img.bulletToggleMinus();
-        }
-        case bulletTogglePlus: {
-            return img.bulletTogglePlus();
-        }
-        case bulletYellow: {
-            return img.bulletYellow();
-        }
-        case button15cblue: {
-            return img.button15cblue();
-        }
-        case button15cdark: {
-            return img.button15cdark();
-        }
-        case button15clight: {
-            return img.button15clight();
-        }
-        case button15cxlight: {
-            return img.button15cxlight();
-        }
-        case button15lblue: {
-            return img.button15lblue();
-        }
-        case button15ldark: {
-            return img.button15ldark();
-        }
-        case button15llight: {
-            return img.button15llight();
-        }
-        case button15lxlight: {
-            return img.button15lxlight();
-        }
-        case button15rblue: {
-            return img.button15rblue();
-        }
-        case button15rdark: {
-            return img.button15rdark();
-        }
-        case button15rlight: {
-            return img.button15rlight();
-        }
-        case button15rxlight: {
-            return img.button15rxlight();
-        }
-        case button17cblue: {
-            return img.button17cblue();
-        }
-        case button17cdark: {
-            return img.button17cdark();
-        }
-        case button17clight: {
-            return img.button17clight();
-        }
-        case button17cxlight: {
-            return img.button17cxlight();
-        }
-        case button17lblue: {
-            return img.button17lblue();
-        }
-        case button17ldark: {
-            return img.button17ldark();
-        }
-        case button17llight: {
-            return img.button17llight();
-        }
-        case button17lxlight: {
-            return img.button17lxlight();
-        }
-        case button17rblue: {
-            return img.button17rblue();
-        }
-        case button17rdark: {
-            return img.button17rdark();
-        }
-        case button17rlight: {
-            return img.button17rlight();
-        }
-        case button17rxlight: {
-            return img.button17rxlight();
-        }
-        case button20cblue: {
-            return img.button20cblue();
-        }
-        case button20cdark: {
-            return img.button20cdark();
-        }
-        case button20clight: {
-            return img.button20clight();
-        }
-        case button20cxlight: {
-            return img.button20cxlight();
-        }
-        case button20lblue: {
-            return img.button20lblue();
-        }
-        case button20ldark: {
-            return img.button20ldark();
-        }
-        case button20llight: {
-            return img.button20llight();
-        }
-        case button20lxlight: {
-            return img.button20lxlight();
-        }
-        case button20rblue: {
-            return img.button20rblue();
-        }
-        case button20rdark: {
-            return img.button20rdark();
-        }
-        case button20rlight: {
-            return img.button20rlight();
-        }
-        case button20rxlight: {
-            return img.button20rxlight();
-        }
-        case buttonArrowDown: {
-            return img.buttonArrowDown();
-        }
-        case buttonHelpBlue: {
-            return img.buttonHelpBlue();
-        }
-        case buttonHelpDark: {
-            return img.buttonHelpDark();
-        }
-        case buttonHelpLight: {
-            return img.buttonHelpLight();
-        }
-        case buttonSitebarArrowDown: {
-            return img.arrowdownsquarewhite();
-        }
-        case by80x15: {
-            return img.by80x15();
-        }
-        case bync80x15: {
-            return img.bync80x15();
-        }
-        case byncnd80x15: {
-            return img.byncnd80x15();
-        }
-        case byncsa80x15: {
-            return img.byncsa80x15();
-        }
-        case bynd80x15: {
-            return img.bynd80x15();
-        }
-        case bysa80x15: {
-            return img.bysa80x15();
-        }
-        case cancel: {
-            return img.cancel();
-        }
-        case clear: {
-            return img.clear();
-        }
-        case copyleft: {
-            return img.copyleft();
-        }
-        case cross: {
-            return img.cross();
-        }
-        case crossDark: {
-            return img.crossDark();
-        }
-        case del: {
-            return img.del();
-        }
-        case emblemImportant: {
-            return img.emblemImportant();
-        }
-        case emblemSystem: {
-            return img.emblemSystem();
-        }
-        case error: {
-            return img.error();
-        }
-        case everybody: {
-            return img.everybody();
-        }
-        case fullscreen: {
-            return img.fullscreen();
-        }
-        case gnuFdl: {
-            return img.gnuFdl();
-        }
-        case groupDefIcon: {
-            return img.groupDefIcon();
-        }
-        case groupHome: {
-            return img.groupHome();
-        }
-        case important: {
-            return img.important();
-        }
-        case info: {
-            return img.info();
-        }
-        case infoLight: {
-            return img.infoLight();
-        }
-        case kuneClose: {
-            return img.kuneClose();
-        }
-        case kuneExternalWindow: {
-            return img.kuneExternalWindow();
-        }
-        case kuneHelpTranslationIcon: {
-            return img.kuneHelpTranslationIcon();
-        }
-        case kuneIcon16: {
-            return img.kuneIcon16();
-        }
-        case kuneLogo16px: {
-            return img.kuneLogo16px();
-        }
-        case kunePreferences: {
-            return img.kunePreferences();
-        }
-        case kuneSearchIco: {
-            return img.kuneSearchIco();
-        }
-        case kuneSearchIcoPush: {
-            return img.kuneSearchIcoPush();
-        }
-        case language: {
-            return img.language();
-        }
-        case nobody: {
-            return img.nobody();
-        }
-        case noCopyleft: {
-            return img.noCopyleft();
-        }
-        case nt: {
-            return img.nt();
-        }
-        case opentriangle: {
-            return img.opentriangle();
-        }
-        case personDef: {
-            return img.personDef();
-        }
-        case remove: {
-            return img.remove();
-        }
-        case rssIcon: {
-            return img.rssIcon();
-        }
-        case searchIco: {
-            return img.searchIco();
-        }
-        case spinKuneThundGreen: {
-            return img.spinKuneThundGreen();
-        }
-        case splitterVertBar: {
-            return img.splitterVertBar();
-        }
-        case star10: {
-            return img.star10();
-        }
-        case star20: {
-            return img.star20();
-        }
-        case star30: {
-            return img.star30();
-        }
-        case star40: {
-            return img.star40();
-        }
-        case star50: {
-            return img.star50();
-        }
-        case star60: {
-            return img.star60();
-        }
-        case star70: {
-            return img.star70();
-        }
-        case star80: {
-            return img.star80();
-        }
-        case star90: {
-            return img.star90();
-        }
-        case starGrey: {
-            return img.starGrey();
-        }
-        case starSmallYellow: {
-            return img.starSmallYellow();
-        }
-        case starVsmallYellow: {
-            return img.starVsmallYellow();
-        }
-        case starYellow: {
-            return img.starYellow();
-        }
-        case step1: {
-            return img.step1();
-        }
-        case step2: {
-            return img.step2();
-        }
-        case step3: {
-            return img.step3();
-        }
-        case step4: {
-            return img.step4();
-        }
-        case step5: {
-            return img.step5();
-        }
-        case themeChoose: {
-            return img.themeChoose();
-        }
-        case triangle: {
-            return img.triangle();
-        }
-        default:
-            return null;
-        }
+  public ImageResource getImage(final ImageDescriptor imageDescriptor) {
+    switch (imageDescriptor) {
+    case accept: {
+      return img.accept();
     }
+    case add: {
+      return img.add();
+    }
+    case addGreen: {
+      return img.addGreen();
+    }
+    case alert: {
+      return commonRes.alert();
+    }
+    case anybody: {
+      return img.anybody();
+    }
+    case arrowDownBlack: {
+      return img.arrowDownBlack();
+    }
+    case arrowDownGreen: {
+      return img.arrowDownGreen();
+    }
+    case arrowDownWhite: {
+      return img.arrowDownWhite();
+    }
+    case arrowLeftGreen: {
+      return img.arrowLeftGreen();
+    }
+    case arrowRightBlack: {
+      return img.arrowRightBlack();
+    }
+    case arrowRightGreen: {
+      return img.arrowRightGreen();
+    }
+    case arrowRightWhite: {
+      return img.arrowRightWhite();
+    }
+    case arrowUpGreen: {
+      return img.arrowUpGreen();
+    }
+    case bulletAdd: {
+      return img.bulletAdd();
+    }
+    case bulletBlack: {
+      return img.bulletBlack();
+    }
+    case bulletBlue: {
+      return img.bulletBlue();
+    }
+    case bulletDelete: {
+      return img.bulletDelete();
+    }
+    case bulletGreen: {
+      return img.bulletGreen();
+    }
+    case bulletPink: {
+      return img.bulletPink();
+    }
+    case bulletPurple: {
+      return img.bulletPurple();
+    }
+    case bulletRed: {
+      return img.bulletRed();
+    }
+    case bulletStar: {
+      return img.bulletStar();
+    }
+    case bulletToggleMinus: {
+      return img.bulletToggleMinus();
+    }
+    case bulletTogglePlus: {
+      return img.bulletTogglePlus();
+    }
+    case bulletYellow: {
+      return img.bulletYellow();
+    }
+    case button15cblue: {
+      return img.button15cblue();
+    }
+    case button15cdark: {
+      return img.button15cdark();
+    }
+    case button15clight: {
+      return img.button15clight();
+    }
+    case button15cxlight: {
+      return img.button15cxlight();
+    }
+    case button15lblue: {
+      return img.button15lblue();
+    }
+    case button15ldark: {
+      return img.button15ldark();
+    }
+    case button15llight: {
+      return img.button15llight();
+    }
+    case button15lxlight: {
+      return img.button15lxlight();
+    }
+    case button15rblue: {
+      return img.button15rblue();
+    }
+    case button15rdark: {
+      return img.button15rdark();
+    }
+    case button15rlight: {
+      return img.button15rlight();
+    }
+    case button15rxlight: {
+      return img.button15rxlight();
+    }
+    case button17cblue: {
+      return img.button17cblue();
+    }
+    case button17cdark: {
+      return img.button17cdark();
+    }
+    case button17clight: {
+      return img.button17clight();
+    }
+    case button17cxlight: {
+      return img.button17cxlight();
+    }
+    case button17lblue: {
+      return img.button17lblue();
+    }
+    case button17ldark: {
+      return img.button17ldark();
+    }
+    case button17llight: {
+      return img.button17llight();
+    }
+    case button17lxlight: {
+      return img.button17lxlight();
+    }
+    case button17rblue: {
+      return img.button17rblue();
+    }
+    case button17rdark: {
+      return img.button17rdark();
+    }
+    case button17rlight: {
+      return img.button17rlight();
+    }
+    case button17rxlight: {
+      return img.button17rxlight();
+    }
+    case button20cblue: {
+      return img.button20cblue();
+    }
+    case button20cdark: {
+      return img.button20cdark();
+    }
+    case button20clight: {
+      return img.button20clight();
+    }
+    case button20cxlight: {
+      return img.button20cxlight();
+    }
+    case button20lblue: {
+      return img.button20lblue();
+    }
+    case button20ldark: {
+      return img.button20ldark();
+    }
+    case button20llight: {
+      return img.button20llight();
+    }
+    case button20lxlight: {
+      return img.button20lxlight();
+    }
+    case button20rblue: {
+      return img.button20rblue();
+    }
+    case button20rdark: {
+      return img.button20rdark();
+    }
+    case button20rlight: {
+      return img.button20rlight();
+    }
+    case button20rxlight: {
+      return img.button20rxlight();
+    }
+    case buttonArrowDown: {
+      return img.buttonArrowDown();
+    }
+    case buttonHelpBlue: {
+      return img.buttonHelpBlue();
+    }
+    case buttonHelpDark: {
+      return img.buttonHelpDark();
+    }
+    case buttonHelpLight: {
+      return img.buttonHelpLight();
+    }
+    case buttonSitebarArrowDown: {
+      return img.arrowdownsquarewhite();
+    }
+    case by80x15: {
+      return img.by80x15();
+    }
+    case bync80x15: {
+      return img.bync80x15();
+    }
+    case byncnd80x15: {
+      return img.byncnd80x15();
+    }
+    case byncsa80x15: {
+      return img.byncsa80x15();
+    }
+    case bynd80x15: {
+      return img.bynd80x15();
+    }
+    case bysa80x15: {
+      return img.bysa80x15();
+    }
+    case cancel: {
+      return img.cancel();
+    }
+    case clear: {
+      return img.clear();
+    }
+    case copyleft: {
+      return img.copyleft();
+    }
+    case cross: {
+      return img.cross();
+    }
+    case crossDark: {
+      return img.crossDark();
+    }
+    case del: {
+      return img.del();
+    }
+    case emblemImportant: {
+      return img.emblemImportant();
+    }
+    case emblemSystem: {
+      return img.emblemSystem();
+    }
+    case error: {
+      return commonRes.error();
+    }
+    case everybody: {
+      return img.everybody();
+    }
+    case fullscreen: {
+      return img.fullscreen();
+    }
+    case gnuFdl: {
+      return img.gnuFdl();
+    }
+    case groupDefIcon: {
+      return img.groupDefIcon();
+    }
+    case groupHome: {
+      return img.groupHome();
+    }
+    case important: {
+      return commonRes.important();
+    }
+    case info: {
+      return commonRes.info();
+    }
+    case infoLight: {
+      return img.infoLight();
+    }
+    case kuneClose: {
+      return img.kuneClose();
+    }
+    case kuneExternalWindow: {
+      return img.kuneExternalWindow();
+    }
+    case kuneHelpTranslationIcon: {
+      return img.kuneHelpTranslationIcon();
+    }
+    case kuneIcon16: {
+      return img.kuneIcon16();
+    }
+    case kuneLogo16px: {
+      return img.kuneLogo16px();
+    }
+    case kunePreferences: {
+      return img.kunePreferences();
+    }
+    case kuneSearchIco: {
+      return img.kuneSearchIco();
+    }
+    case kuneSearchIcoPush: {
+      return img.kuneSearchIcoPush();
+    }
+    case language: {
+      return img.language();
+    }
+    case nobody: {
+      return img.nobody();
+    }
+    case noCopyleft: {
+      return img.noCopyleft();
+    }
+    case nt: {
+      return img.nt();
+    }
+    case opentriangle: {
+      return img.opentriangle();
+    }
+    case personDef: {
+      return img.personDef();
+    }
+    case remove: {
+      return img.remove();
+    }
+    case rssIcon: {
+      return img.rssIcon();
+    }
+    case searchIco: {
+      return img.searchIco();
+    }
+    case spinKuneThundGreen: {
+      return img.spinKuneThundGreen();
+    }
+    case splitterVertBar: {
+      return img.splitterVertBar();
+    }
+    case star10: {
+      return img.star10();
+    }
+    case star20: {
+      return img.star20();
+    }
+    case star30: {
+      return img.star30();
+    }
+    case star40: {
+      return img.star40();
+    }
+    case star50: {
+      return img.star50();
+    }
+    case star60: {
+      return img.star60();
+    }
+    case star70: {
+      return img.star70();
+    }
+    case star80: {
+      return img.star80();
+    }
+    case star90: {
+      return img.star90();
+    }
+    case starGrey: {
+      return img.starGrey();
+    }
+    case starSmallYellow: {
+      return img.starSmallYellow();
+    }
+    case starVsmallYellow: {
+      return img.starVsmallYellow();
+    }
+    case starYellow: {
+      return img.starYellow();
+    }
+    case step1: {
+      return img.step1();
+    }
+    case step2: {
+      return img.step2();
+    }
+    case step3: {
+      return img.step3();
+    }
+    case step4: {
+      return img.step4();
+    }
+    case step5: {
+      return img.step5();
+    }
+    case themeChoose: {
+      return img.themeChoose();
+    }
+    case triangle: {
+      return img.triangle();
+    }
+    default:
+      return null;
+    }
+  }
 
-    public String getImageHtml(final ImageDescriptor imageDescriptor) {
-        return AbstractImagePrototype.create(getImage(imageDescriptor)).getHTML();
-    }
+  public String getImageHtml(final ImageDescriptor imageDescriptor) {
+    return AbstractImagePrototype.create(getImage(imageDescriptor)).getHTML();
+  }
 }

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,7 +20,7 @@
 package cc.kune.core.client.sitebar;
 
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,11 +19,11 @@
  */
 package cc.kune.core.client.sitebar;
 
+import cc.kune.common.client.events.UserNotifyEvent;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.dialogs.BasicTopDialog;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.msgs.client.resources.UserMessageImagesUtil;
 
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -30,6 +30,7 @@
 import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
 import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor;
 import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.services.FileDownloadUtils;
@@ -42,7 +43,6 @@
 import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.UserInfoDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import cc.kune.common.client.actions.ui.ActionSimplePanel;
 import cc.kune.common.client.actions.ui.IsActionExtensible;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView;
 import cc.kune.core.client.sitebar.logo.SiteLogo;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.user.client.ui.Widget;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -30,10 +30,11 @@
 import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor;
 import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor;
 import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type;
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.ui.KuneWindowUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
@@ -67,8 +68,8 @@
   private static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor();
   private static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor();
   public static final String SITE_OPTIONS_MENU = "kune-sop-om";
+  private final CommonResources commonRes;
   private final I18nTranslationService i18n;
-  private final CoreResources icons;
   private final Provider<SitebarNewGroupLink> newGroupLink;
   private final CoreResources res;
   private final Provider<SitebarSignInLink> signInLink;
@@ -78,14 +79,15 @@
   public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view,
       final SitebarActionsProxy proxy, final I18nTranslationService i18n,
       final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink,
-      final Provider<SitebarSignInLink> signInLink, final CoreResources res, final CoreResources icons) {
+      final Provider<SitebarSignInLink> signInLink, final CoreResources res,
+      final CommonResources commonRes) {
     super(eventBus, view, proxy);
     this.i18n = i18n;
     this.newGroupLink = newGroupLink;
     this.signOutLink = signOutLink;
     this.signInLink = signInLink;
     this.res = res;
-    this.icons = icons;
+    this.commonRes = commonRes;
     init();
   }
 
@@ -98,7 +100,7 @@
           }
         });
     gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site"));
-    gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16());
+    gotoKuneDevSite.putValue(Action.SMALL_ICON, res.kuneIcon16());
     return gotoKuneDevSite;
   }
 
@@ -135,7 +137,7 @@
       }
     };
     bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems"));
-    bugsAction.putValue(Action.SMALL_ICON, icons.bug());
+    bugsAction.putValue(Action.SMALL_ICON, res.bug());
 
     final AbstractExtendedAction errorAction = new AbstractExtendedAction() {
       @Override
@@ -161,9 +163,9 @@
     wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered"));
     wavePowered.putValue(Action.SMALL_ICON, res.waveIcon());
     aboutAction.putValue(Action.NAME, i18n.t("About kune"));
-    aboutAction.putValue(Action.SMALL_ICON, res.info());
+    aboutAction.putValue(Action.SMALL_ICON, commonRes.info());
     errorAction.putValue(Action.NAME, i18n.t("Errors info"));
-    errorAction.putValue(Action.SMALL_ICON, res.important());
+    errorAction.putValue(Action.SMALL_ICON, commonRes.important());
     // aboutAction.setShortcut(shortcut);
     // shortcutReg.put(shortcut, aboutAction);
 

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,9 +23,9 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.SiteTokens;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,20 +25,20 @@
 import cc.kune.common.client.actions.BeforeActionCollection;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.errors.UIException;
+import cc.kune.common.client.events.ProgressHideEvent;
+import cc.kune.common.client.events.ProgressShowEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.WaveClientSimpleAuthenticator;
 import cc.kune.core.client.cookies.CookiesManager;
 import cc.kune.core.client.errors.ErrorHandler;
 import cc.kune.core.client.errors.SessionExpiredException;
 import cc.kune.core.client.errors.UserMustBeLoggedException;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
-import cc.kune.core.client.notify.spiner.ProgressShowEvent;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.UserSignInEvent;
 import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
 import cc.kune.core.client.state.UserSignOutEvent;
 import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.rpc.AsyncCallback;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  \*/
 package cc.kune.core.client.sitebar.search;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.log.Log;
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.ui.MaskWidgetView;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.events.WindowFocusEvent;
 import cc.kune.core.client.init.AppStartEvent;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.client.state.TokenUtils;
 import cc.kune.core.client.state.UserSignOutEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.style.GSpaceBackManager;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,10 +29,10 @@
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.BasicThumb;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.SmallAvatarDecorator;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.dnd.NotImplementedDropManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,12 +24,12 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.BasicThumb;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.SmallAvatarDecorator;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.dnd.NotImplementedDropManager;
 import cc.kune.core.client.sn.GroupSNPresenter.GroupSNView;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.user.client.ui.Widget;

Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.ui.BasicThumb;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.avatar.SmallAvatarDecorator;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.dnd.NotImplementedDropManager;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.sn.UserSNPresenter.UserSNView;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.UserSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.user.client.ui.Label;

Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 
 import cc.kune.common.client.actions.ui.IsActionExtensible;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.sn.UserSNPresenter.UserSNProxy;
 import cc.kune.core.client.sn.UserSNPresenter.UserSNView;
@@ -41,7 +42,6 @@
 import cc.kune.core.shared.dto.StateAbstractDTO;
 import cc.kune.core.shared.dto.UserBuddiesDataDTO;
 import cc.kune.core.shared.dto.UserSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -32,7 +33,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,11 +24,11 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.sitebar.search.EntitySearchPanel;
 import cc.kune.core.client.sitebar.search.OnEntitySelectedInSearch;
 import cc.kune.core.client.sn.SimpleContactManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,9 +22,9 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.core.client.sn.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.core.client.sn.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoYourHomePageAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.core.client.sn.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -35,7 +36,6 @@
 import cc.kune.core.client.state.TokenUtils;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.SocialNetworkRequestResult;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,11 +22,11 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.domain.AdmissionType;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,11 +22,11 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.domain.SocialNetworkVisibility;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.Action;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/SNRolAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,6 +19,7 @@
  */
 package cc.kune.core.client.sn.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolActionAutoUpdated;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -26,7 +27,6 @@
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -32,7 +33,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,12 +22,12 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.UserSNetVisibility;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,13 +24,13 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.utils.StateToken;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.core.client.sn.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.registry.GroupSNConfActions;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToMembers.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.core.client.sn.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.registry.GroupSNConfActions;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,6 +20,7 @@
 package cc.kune.core.client.sn.actions.registry;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.AcceptJoinGroupAction;
 import cc.kune.core.client.sn.actions.ChangeToAdminAction;
 import cc.kune.core.client.sn.actions.ChangeToCollabAction;
@@ -37,7 +38,6 @@
 import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition;
 import cc.kune.core.client.sn.actions.conditions.IsPersonCondition;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,6 +20,7 @@
 package cc.kune.core.client.sn.actions.registry;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.AcceptJoinGroupAction;
 import cc.kune.core.client.sn.actions.ChangeToAdminAction;
 import cc.kune.core.client.sn.actions.ChangeToCollabAction;
@@ -37,7 +38,6 @@
 import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition;
 import cc.kune.core.client.sn.actions.conditions.IsPersonCondition;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -26,6 +26,7 @@
 import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.sn.GroupSNPresenter;
 import cc.kune.core.client.sn.actions.AddEntityToThisGroupAction;
@@ -45,7 +46,6 @@
 import cc.kune.core.shared.domain.SocialNetworkVisibility;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
 import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.sn.UserSNPresenter;
 import cc.kune.core.client.sn.actions.AddNewBuddiesAction;
@@ -35,7 +36,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.UserSNetVisibility;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,6 +20,7 @@
 package cc.kune.core.client.sn.actions.registry;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sn.actions.AcceptJoinGroupAction;
 import cc.kune.core.client.sn.actions.ChangeToAdminAction;
 import cc.kune.core.client.sn.actions.ChangeToCollabAction;
@@ -39,7 +40,6 @@
 import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition;
 import cc.kune.core.client.sn.actions.conditions.IsPersonCondition;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,9 +22,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import cc.kune.common.client.events.ProgressShowEvent;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
-import cc.kune.core.client.notify.spiner.ProgressShowEvent;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
 import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler;
 import cc.kune.core.shared.domain.utils.StateToken;

Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,11 +27,11 @@
 
 import cc.kune.common.client.actions.BeforeActionCollection;
 import cc.kune.common.client.actions.BeforeActionListener;
+import cc.kune.common.client.events.ProgressHideEvent;
 import cc.kune.common.client.log.Log;
 import cc.kune.common.client.utils.Pair;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
-import cc.kune.core.client.notify.spiner.ProgressHideEvent;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.sitebar.spaces.Space;
 import cc.kune.core.client.sitebar.spaces.SpaceConfEvent;

Modified: trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/ui/ContentPosition.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,7 +21,7 @@
 
 import org.cobogw.gwt.user.client.CSS;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.DOM;

Added: trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/WizardFormDialog.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.client.ui.dialogs;
+
+import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.client.ui.dialogs.wizard.WizardDialog;
+import cc.kune.common.shared.i18n.I18nTranslationService;
+import cc.kune.core.client.ui.DefaultForm;
+
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.Widget;
+
+public class WizardFormDialog extends WizardDialog {
+
+  public WizardFormDialog(final String dialogId, final String header, final boolean modal,
+      final boolean minimizable, final String width, final String height, final String backId,
+      final String nextId, final String finishId, final String cancelId, final String closeId,
+      final I18nTranslationService i18n, final MaskWidget maskWidget) {
+    super(dialogId, header, modal, minimizable, width, height, backId, nextId, finishId, cancelId,
+        closeId, i18n, maskWidget);
+  }
+
+  @Override
+  protected int getWidgetCount(final IsWidget view) {
+    if (view instanceof Widget) {
+      return deck.getWidgetIndex((Widget) view);
+    } else if (view instanceof DefaultForm) {
+      return deck.getWidgetIndex(((DefaultForm) view).getFormPanel());
+    }
+    return -1;
+  }
+
+  @Override
+  protected Widget toWidget(final IsWidget view) {
+    if (view instanceof Widget) {
+      return (Widget) view;
+    } else if (view instanceof DefaultForm) {
+      return ((DefaultForm) view).getFormPanel();
+    } else {
+      NotifyUser.error("Trying to add a unknown element in WizardDialog");
+      return null;
+    }
+  }
+}

Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,13 +23,13 @@
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.utils.UrlParam;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.ws.entheader.EntityHeaderPresenter.EntityHeaderView;
 import cc.kune.core.shared.FileConstants;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.user.client.ui.AbstractImagePrototype;

Modified: trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/AbstractServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import java.util.Date;
 import java.util.List;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.ContainerNotPermittedException;
 import cc.kune.core.client.errors.ContentNotPermittedException;
 import cc.kune.core.server.content.ContainerManager;
@@ -32,7 +33,6 @@
 import cc.kune.core.server.tool.ServerToolRegistry;
 import cc.kune.core.server.tool.ServerToolTarget;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.AccessLists;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;

Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import static cc.kune.core.server.OutermostCallInterceptor.outermostCall;
 import cc.kune.chat.server.ChatManager;
 import cc.kune.chat.server.ChatManagerDefault;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.ContentService;
 import cc.kune.core.client.rpcservices.GroupService;
 import cc.kune.core.client.rpcservices.I18nService;
@@ -101,7 +102,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.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.SocialNetwork;
 import cc.kune.hspace.client.ClientStatsService;
 import cc.kune.lists.client.rpc.ListsService;

Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.core.server.i18n;
 
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.UserSessionManager;
 import cc.kune.core.server.manager.I18nTranslationManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.I18nTranslation;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.auth.ActionLevel;
 import cc.kune.core.server.auth.Authenticated;
 import cc.kune.core.server.auth.Authorizated;
@@ -33,7 +34,6 @@
 import cc.kune.core.server.properties.KuneProperties;
 import cc.kune.core.shared.domain.AccessRol;
 import cc.kune.core.shared.domain.utils.StateToken;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.BasicMimeType;
 import cc.kune.domain.Group;
 

Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoUploadManager.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,6 +29,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.auth.ActionLevel;
 import cc.kune.core.server.auth.Authenticated;
 import cc.kune.core.server.auth.Authorizated;
@@ -37,7 +38,6 @@
 import cc.kune.core.shared.FileConstants;
 import cc.kune.core.shared.domain.AccessRol;
 import cc.kune.core.shared.domain.utils.StateToken;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.BasicMimeType;
 import cc.kune.domain.Group;
 

Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/FileJsonUploadManagerAbstract.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,7 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.sf.json.JSONObject;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManager.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 
 import org.apache.commons.fileupload.FileItem;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.UserSessionManager;
 import cc.kune.core.server.access.AccessService;
 import cc.kune.core.server.auth.ActionLevel;
@@ -37,7 +38,6 @@
 import cc.kune.core.server.utils.StringW;
 import cc.kune.core.shared.domain.AccessRol;
 import cc.kune.core.shared.domain.utils.StateToken;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.BasicMimeType;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;

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	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -32,6 +32,7 @@
 import org.apache.lucene.search.Query;
 import org.hibernate.exception.ConstraintViolationException;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.AccessViolationException;
 import cc.kune.core.client.errors.DefaultException;
 import cc.kune.core.client.errors.EmailAddressInUseException;
@@ -52,7 +53,6 @@
 import cc.kune.core.shared.domain.SocialNetworkVisibility;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.GroupType;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.AccessLists;
 import cc.kune.domain.Content;
 import cc.kune.domain.Group;

Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -44,6 +44,7 @@
 import org.waveprotocol.wave.model.waveref.WaveRef;
 
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.DefaultException;
 import cc.kune.core.client.errors.EmailAddressInUseException;
 import cc.kune.core.client.errors.GroupLongNameInUseException;
@@ -65,7 +66,6 @@
 import cc.kune.core.shared.domain.UserSNetVisibility;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
 import cc.kune.core.shared.dto.UserDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Group;
 import cc.kune.domain.I18nCountry;
 import cc.kune.domain.I18nLanguage;

Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,13 +22,13 @@
 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;
 import cc.kune.core.server.manager.SocialNetworkManager;
 import cc.kune.core.server.manager.TagUserContentManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;
 import cc.kune.domain.Group;

Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,9 +24,9 @@
 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 cc.kune.common.shared.i18n.I18nTranslationService;
 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.docs.shared.DocsConstants;
 import cc.kune.gspace.client.tool.FoldableAbstractClientTool;
 import cc.kune.gspace.client.tool.selector.ToolSelector;

Modified: trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/DocsGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.docs.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.docs.client.actions.DocsClientActions;
 import cc.kune.docs.client.actions.DocsFolderNewMenu;
 import cc.kune.docs.client.actions.DocsNewMenu;

Modified: trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/DelDocMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/DelFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 

Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.docs.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;

Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.docs.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentMenuItem;

Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.gspace.client.actions.NewContainerBtn;
 

Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.gspace.client.actions.NewContainerMenuItem;
 

Modified: trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/client/actions/OpenDocMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.docs.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,13 +28,13 @@
 
 import java.util.Arrays;
 
+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.core.shared.i18n.I18nTranslationService;
 import cc.kune.docs.shared.DocsConstants;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;

Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,9 +23,9 @@
 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.common.shared.i18n.I18nTranslationService;
 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;
 

Modified: trunk/src/main/java/cc/kune/events/client/EventsGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/EventsGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/EventsGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.events.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.events.client.actions.Calendar1DayViewSelectBtn;
 import cc.kune.events.client.actions.Calendar3DaysViewSelectBtn;
 import cc.kune.events.client.actions.Calendar7DaysViewSelectBtn;

Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/Calendar1DayViewSelectBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,6 +1,6 @@
 package cc.kune.events.client.actions;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.bradrydzewski.gwt.calendar.client.CalendarViews;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/Calendar3DaysViewSelectBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,6 +1,6 @@
 package cc.kune.events.client.actions;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.bradrydzewski.gwt.calendar.client.CalendarViews;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/Calendar7DaysViewSelectBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,6 +1,6 @@
 package cc.kune.events.client.actions;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.bradrydzewski.gwt.calendar.client.CalendarViews;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoNextBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,7 +1,7 @@
 package cc.kune.events.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.ToolbarStyles;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoPrevBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,7 +1,7 @@
 package cc.kune.events.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.ToolbarStyles;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/CalendarGoTodayBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,7 +1,7 @@
 package cc.kune.events.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.ToolbarStyles;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/CalendarMonthViewSelectBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -1,6 +1,6 @@
 package cc.kune.events.client.actions;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.bradrydzewski.gwt.calendar.client.CalendarViews;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/DelMeetingMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.events.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.events.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;
 

Modified: trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/NewMeetingBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.events.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.events.shared.EventsConstants;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;

Modified: trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/actions/OpenMeetingMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.events.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -4,11 +4,11 @@
 import java.util.Date;
 
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.dnd.FolderViewerDropController;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.events.client.viewer.CalendarViewerPresenter.CalendarViewerView;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.viewers.AbstractFolderViewerPanel;

Modified: trunk/src/main/java/cc/kune/events/server/EventsServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/events/server/EventsServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/events/server/EventsServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,6 +29,7 @@
 import java.util.Collections;
 import java.util.Date;
 
+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;
@@ -39,7 +40,6 @@
 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;

Modified: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,13 +27,13 @@
 
 import java.util.Arrays;
 
+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.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Group;
 import cc.kune.domain.User;

Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.gspace.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.core.client.sitebar.search.SitebarSearchPanel;
 import cc.kune.core.client.sitebar.search.SitebarSearchPresenter;
 import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractNewMenu.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,11 +20,11 @@
 package cc.kune.gspace.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.AccessRightsChangedEvent;
 import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler;
 import cc.kune.core.client.state.AccessRightsClientManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.ConfirmAskEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
@@ -32,7 +33,6 @@
 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.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.ConfirmAskEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -34,7 +35,6 @@
 import cc.kune.core.shared.dto.AbstractContentSimpleDTO;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
@@ -31,7 +32,6 @@
 import cc.kune.core.shared.dto.StateAbstractDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
@@ -31,7 +32,6 @@
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.HasContent;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 
 import com.google.gwt.resources.client.ImageResource;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
@@ -35,7 +36,6 @@
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.HasContent;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 
 import com.google.gwt.resources.client.ImageResource;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,6 +21,7 @@
 
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
@@ -29,7 +30,6 @@
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.ContentViewerPresenter;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,7 +21,7 @@
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.resources.client.ImageResource;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,7 +24,7 @@
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.resources.client.ImageResource;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/OpenContentMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,10 +22,10 @@
 import cc.kune.common.client.actions.AbstractExtendedAction;
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AbstractContentSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -32,7 +33,6 @@
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/RefreshContentMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.gspace.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,6 +20,7 @@
 package cc.kune.gspace.client.actions;
 
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.ErrorHandler;
 import cc.kune.core.client.errors.NameInUseException;
 import cc.kune.core.client.errors.NameNotPermittedException;
@@ -32,7 +33,6 @@
 import cc.kune.core.shared.dto.StateAbstractDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.rpc.AsyncCallback;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -31,7 +32,6 @@
 import cc.kune.core.shared.dto.AbstractContentSimpleDTO;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.ContentSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.ConfirmAskEvent;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.ContentServiceAsync;
@@ -34,7 +35,6 @@
 import cc.kune.core.shared.dto.AbstractContentSimpleDTO;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/AbstractLanguageSelectorPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,10 +21,10 @@
 
 import cc.kune.common.client.errors.UIException;
 import cc.kune.common.client.utils.SimpleCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.data.BaseModel;
 import com.extjs.gxt.ui.client.event.BaseEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.i18n;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.IsWidget;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslateRecomendPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.gspace.client.i18n;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Frame;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatedGridPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.i18n;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.IsWidget;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -17,9 +17,9 @@
 
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
 import cc.kune.core.shared.dto.I18nTranslationDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.BlurEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,9 +22,9 @@
 import cc.kune.common.client.notify.NotifyLevelImages;
 import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
 import cc.kune.common.client.utils.SimpleCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign;

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.i18n;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/LanguageSelectorWithoutEnglishPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.i18n;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/SiteOptionsI18nTranslatorAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolActionAutoUpdated;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.sitebar.SitebarActionsPresenter;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,13 +21,13 @@
 
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.SimpleResponseCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.ui.footer.license.LicenseChangedEvent;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,15 +20,15 @@
 package cc.kune.gspace.client.licensewizard;
 
 import cc.kune.common.client.ui.MaskWidget;
-import cc.kune.common.client.ui.dialogs.wizard.WizardDialog;
 import cc.kune.common.client.ui.dialogs.wizard.WizardListener;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.core.client.ui.dialogs.WizardFormDialog;
 
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
 
-public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView {
+public class LicenseWizardPanel extends WizardFormDialog implements LicenseWizardView {
 
   public static final String BACK_BTN_ID = "k-lwp-back-btn";
   public static final String CANCEL_BTN_ID = "k-lwp-cancel-btn";

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import cc.kune.common.client.utils.SimpleCallback;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.client.ui.DefaultFormUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.Style.Orientation;
 import com.extjs.gxt.ui.client.event.BaseEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFlags.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,10 +19,11 @@
  */
 package cc.kune.gspace.client.licensewizard.pages;
 
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.KuneWindowUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -35,13 +36,15 @@
   private final IconLabel nonCopyleft;
   private final IconLabel nonCulturalWorks;
 
-  public LicenseWizardFlags(final CoreResources images, final I18nTranslationService i18n) {
+  public LicenseWizardFlags(final CoreResources images, final CommonResources commonRes,
+      final I18nTranslationService i18n) {
     copyleft = new IconLabel(images.copyleft(), i18n.t("This is a copyleft license."));
     nonCopyleft = new IconLabel(images.noCopyleft(), i18n.t("This is not a copyleft license."));
-    culturalWorks = new IconLabel(images.info(), i18n.t("This is appropriate for free cultural works."));
-    nonCulturalWorks = new IconLabel(images.alert(),
+    culturalWorks = new IconLabel(commonRes.info(),
+        i18n.t("This is appropriate for free cultural works."));
+    nonCulturalWorks = new IconLabel(commonRes.alert(),
         i18n.t("This is not appropriate for free cultural works."));
-    nonCommercialReasons = new IconLabel(images.alert(),
+    nonCommercialReasons = new IconLabel(commonRes.alert(),
         i18n.t("Reasons not to use a non commercial license."));
     addLink(copyleft, "http://en.wikipedia.org/wiki/Copyleft");
     addLink(nonCopyleft, "http://en.wikipedia.org/wiki/Copyleft");

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,10 +20,10 @@
 package cc.kune.gspace.client.licensewizard.pages;
 
 import cc.kune.common.client.utils.SimpleCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.data.BaseModel;
 import com.extjs.gxt.ui.client.event.BaseEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.gspace.client.licensewizard.pages;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.client.ui.DefaultFormUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.FieldSet;
 import com.extjs.gxt.ui.client.widget.form.Radio;

Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,11 +19,12 @@
  */
 package cc.kune.gspace.client.licensewizard.pages;
 
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.utils.SimpleCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.ui.DefaultForm;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.Style.Orientation;
 import com.extjs.gxt.ui.client.event.BaseEvent;
@@ -56,7 +57,8 @@
   private Radio permitModSaRadio;
 
   @Inject
-  public LicenseWizardTrdForm(final I18nTranslationService i18n, final CoreResources res) {
+  public LicenseWizardTrdForm(final I18nTranslationService i18n, final CoreResources res,
+      final CommonResources commonRes) {
     super.setFrame(true);
     super.setPadding(10);
     super.setAutoHeight(true);
@@ -77,7 +79,7 @@
     createRadios(i18n, commercialfieldSet, modificationsfieldSet);
     createRadioListeners();
 
-    info = new LicenseWizardFlags(res, i18n);
+    info = new LicenseWizardFlags(res, commonRes, i18n);
 
     add(intro);
     add(commercialfieldSet);

Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,9 +22,9 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.notify.NotifyLevelImages;
 import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.ws.entheader.EntityHeader;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateChangedEvent;
@@ -33,7 +34,6 @@
 import cc.kune.core.client.state.UserSignOutEvent;
 import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import cc.kune.common.client.notify.NotifyLevelImages;
 import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.ws.entheader.EntityHeader;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.sitebar.SiteUserOptions;
 import cc.kune.core.client.state.Session;
@@ -32,7 +33,6 @@
 import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
 import cc.kune.core.client.state.UserSignOutEvent;
 import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.gspace.client.options.general;
 
 import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.groups.newgroup.GroupFieldFactory;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,10 +20,10 @@
 package cc.kune.gspace.client.options.general;
 
 import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.UserFieldFactory;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.i18n.LanguageSelectorPanel;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.gspace.client.options.general;
 
 import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.auth.UserFieldFactory;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.gwt.event.dom.client.HasClickHandlers;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptPassPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,10 +20,10 @@
 package cc.kune.gspace.client.options.general;
 
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.WrongCurrentPasswordException;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptions;
 
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,9 +23,9 @@
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.KuneWindowUtils;
 import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptionsView;
 
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.options.license;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.options.license;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -26,10 +26,10 @@
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.FileConstants;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptionsView;
 
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,9 +24,9 @@
 import gwtupload.client.IUploader.OnFinishUploaderHandler;
 import gwtupload.client.IUploader.OnStartUploaderHandler;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptions;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.gspace.client.options.logo;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.FileConstants;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,12 +19,12 @@
  */
 package cc.kune.gspace.client.options.logo;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
 import cc.kune.core.client.state.GroupChangedEvent;
 import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptions;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.gspace.client.options.logo;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.FileConstants;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,6 +20,7 @@
 package cc.kune.gspace.client.options.logo;
 
 import gwtupload.client.IUploader;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.events.AvatarChangedEvent;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.UserServiceAsync;
@@ -28,7 +29,6 @@
 import cc.kune.core.client.state.UserSignInEvent;
 import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptions;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -26,8 +26,8 @@
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptionsView;
 import cc.kune.gspace.client.options.logo.EntityUploaderForm;
 import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -25,6 +25,7 @@
 import gwtupload.client.IUploader.OnStartUploaderHandler;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.services.FileDownloadUtils;
@@ -36,7 +37,6 @@
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptions;
 import cc.kune.gspace.client.style.ClearBackImageEvent;
 import cc.kune.gspace.client.style.GSpaceBackManager;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.options.style;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,11 +19,11 @@
  */
 package cc.kune.gspace.client.options.style;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptions;
 import cc.kune.gspace.client.style.GSpaceBackManager;
 import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.gspace.client.options.style;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,11 +19,11 @@
  */
 package cc.kune.gspace.client.options.style;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptions;
 import cc.kune.gspace.client.style.GSpaceBackManager;
 import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -26,10 +26,10 @@
 import cc.kune.common.client.ui.IconLabel;
 import cc.kune.common.client.ui.MaskWidget;
 import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.ui.DefaultForm;
 import cc.kune.core.shared.dto.ToolSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptionsView;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,12 +24,12 @@
 
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.ToolSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.EntityOptions;
 
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.gspace.client.options.tools;
 
 import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.GroupChangedEvent;
 import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler;
@@ -30,7 +31,6 @@
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.ContentSimpleDTO;
 import cc.kune.core.shared.dto.ToolSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.GroupOptions;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.gspace.client.options.tools;
 
 import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.GroupServiceAsync;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
@@ -29,7 +30,6 @@
 import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.ToolSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.UserOptions;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.gspace.client.tags;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,7 +22,7 @@
 import cc.kune.common.client.actions.ui.ActionExtensibleView;
 import cc.kune.common.client.actions.ui.ActionFlowPanel;
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,13 +27,13 @@
 import cc.kune.common.client.actions.ui.ActionExtensibleView;
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.dto.GSpaceTheme;
 import cc.kune.core.shared.dto.InitDataDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.themes.GSpaceThemeChangeEvent.GSpaceThemeChangeHandler;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,11 +20,11 @@
 package cc.kune.gspace.client.tool;
 
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.domain.ContentStatus;
 import cc.kune.core.shared.dto.BasicMimeTypeDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.tool.selector.ToolSelector;
 
 import com.google.gwt.resources.client.ImageResource;

Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.KuneWindowUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,11 +23,11 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.ui.HasEditHandler;
 import cc.kune.common.client.ui.UiUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.dnd.FolderViewerDropController;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,9 +22,9 @@
 import cc.kune.common.client.ui.EditableLabel;
 import cc.kune.common.client.ui.HasEditHandler;
 import cc.kune.common.client.ui.UiUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.registry.IconsRegistry;
 import cc.kune.core.shared.dto.BasicMimeTypeDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.resources.client.ImageResource;

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -30,21 +30,21 @@
 import org.waveprotocol.wave.model.waveref.WaveRef;
 import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder;
 
-import cc.kune.common.client.actions.BeforeActionListener;
 import cc.kune.common.client.actions.ui.IsActionExtensible;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.errors.UIException;
 import cc.kune.common.client.ui.HasEditHandler;
 import cc.kune.common.client.ui.UiUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.viewers.ContentViewerPresenter.ContentViewerView;
 import cc.kune.wave.client.KuneStagesProvider;
 import cc.kune.wave.client.WaveClientClearEvent;
 import cc.kune.wave.client.WaveClientProvider;
+import cc.kune.wave.client.WaveClientUtils;
 import cc.kune.wave.client.WaveClientView;
 import cc.kune.wave.client.WebClientMock;
 
@@ -84,6 +84,8 @@
   @UiField
   InlineHTML onlyViewPanel;
   private ProfileManager profiles;
+  private final StateManager stateManager;
+
   /** The wave panel, if a wave is open. */
   private KuneStagesProvider wave;
 
@@ -93,9 +95,7 @@
 
   @UiField
   ImplPanel waveHolderParent;
-
   private final WaveStore waveStore = new SimpleWaveStore();
-
   private final Widget widget;
 
   @Inject
@@ -106,6 +106,7 @@
     this.waveClientProv = waveClient;
     this.capabilitiesRegistry = capabilitiesRegistry;
     this.i18n = i18n;
+    this.stateManager = stateManager;
     widget = uiBinder.createAndBindUi(this);
     contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry());
     eventBus.addHandler(WaveClientClearEvent.getType(),
@@ -115,15 +116,6 @@
             waveClear();
           }
         });
-    stateManager.addBeforeStateChangeListener(new BeforeActionListener() {
-      @Override
-      public boolean beforeAction() {
-        // This fix lot of problems when you are editing and move to other
-        // location (without stop editing)
-        waveClear();
-        return true;
-      }
-    });
   }
 
   @Override
@@ -178,6 +170,7 @@
       channel = webClient.getChannel();
       profiles = webClient.getProfiles();
       idGenerator = ClientIdGenerator.create();
+      WaveClientUtils.addListener(stateManager, wave, waveHolder, waveHolderParent);
     }
   }
 
@@ -266,18 +259,7 @@
   }
 
   private void waveClear() {
-    if (wave != null) {
-      // try {
-      wave.destroy();
-      // } catch (final RuntimeException e) {
-      // When editing: java.lang.RuntimeException: Component not found: MENU
-      // }
-      wave = null;
-    }
-    if (waveHolder != null && waveHolder.isAttached()) {
-      waveHolder.removeFromParent();
-      waveHolderParent.remove(waveHolder);
-    }
+    WaveClientUtils.clear(wave, waveHolder, waveHolderParent);
   }
 
 }

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,11 +24,11 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.ui.BasicThumb;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.dnd.FolderViewerDropController;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,13 +27,13 @@
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
 import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
 import cc.kune.common.client.tooltip.Tooltip;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.dnd.FolderViewerDropController;
 import cc.kune.core.client.dnd.KuneDragController;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.shared.domain.ContentStatus;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -4,6 +4,7 @@
 
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.ActionRegistryByType;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.registry.IconsRegistry;
@@ -21,7 +22,6 @@
 import cc.kune.core.shared.dto.ContentSimpleDTO;
 import cc.kune.core.shared.dto.HasContent;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.ActionGroups;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/NoHomePageViewer.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,10 +20,10 @@
 package cc.kune.gspace.client.viewers;
 
 import cc.kune.common.client.ui.UiUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.resources.CoreMessages;
 import cc.kune.core.shared.dto.HasContent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.gspace.client.tool.ContentViewer;
 

Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,13 +22,13 @@
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.dnd.FolderViewerDropController;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.registry.IconsRegistry;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.ContainerDTO;
 import cc.kune.core.shared.dto.ContainerSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GotoTokenAction;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,12 +24,12 @@
 import org.waveprotocol.wave.client.common.util.DateUtils;
 
 import cc.kune.common.client.ui.DottedTabPanel;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.state.SiteTokens;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.ContentSimpleDTO;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.hspace.client.HSpacePresenter.HSpaceView;
 

Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,6 +21,7 @@
 
 import java.util.List;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.events.InboxUnreadUpdatedEvent;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.state.Session;
@@ -29,7 +30,6 @@
 import cc.kune.core.shared.dto.ContentSimpleDTO;
 import cc.kune.core.shared.dto.GroupDTO;
 import cc.kune.core.shared.dto.HomeStatsDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.HasText;

Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,9 +24,9 @@
 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 cc.kune.common.shared.i18n.I18nTranslationService;
 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;
 

Modified: trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/ListsGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.lists.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.lists.client.actions.ListsClientActions;
 import cc.kune.lists.client.actions.ListsNewMenu;
 import cc.kune.lists.client.actions.OptionsListMenu;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/DelListMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.lists.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/DelPostMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.lists.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.lists.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 import cc.kune.lists.shared.ListsConstants;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -23,6 +23,7 @@
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.ui.dialogs.PromptTopDialog;
 import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.state.ContentCache;
@@ -30,7 +31,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 import cc.kune.lists.client.rpc.ListsServiceAsync;
 import cc.kune.lists.shared.ListsConstants;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.lists.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.lists.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.ui.dialogs.PromptTopDialog;
 import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -34,7 +35,6 @@
 import cc.kune.core.client.state.TokenUtils;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.viewers.FolderViewerPresenter;
 import cc.kune.lists.client.rpc.ListsServiceAsync;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 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.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostIconMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,8 +21,8 @@
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 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.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/OpenFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.lists.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/RefreshListMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.lists.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.RefreshCurrentStateAction;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,13 +21,13 @@
 
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.lists.client.rpc.ListsServiceAsync;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/SetListOpenessMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,10 +20,10 @@
 package cc.kune.lists.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.shared.dto.GroupListDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import cc.kune.common.client.actions.AbstractAction;
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,9 +20,9 @@
 package cc.kune.lists.client.actions;
 
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/client/actions/SubscriteToListAction.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,6 +24,7 @@
 import cc.kune.common.client.notify.NotifyLevel;
 import cc.kune.common.client.notify.NotifyUser;
 import cc.kune.common.client.utils.OnAcceptCallback;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.actions.RolAction;
 import cc.kune.core.client.auth.SignIn;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
@@ -33,7 +34,6 @@
 import cc.kune.core.client.state.TokenUtils;
 import cc.kune.core.shared.dto.AccessRolDTO;
 import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.lists.client.rpc.ListsServiceAsync;
 
 import com.google.gwt.event.shared.EventBus;

Modified: trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -31,6 +31,7 @@
 import java.util.Date;
 import java.util.Set;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.AbstractServerTool;
 import cc.kune.core.server.UserSessionManager;
 import cc.kune.core.server.content.ContainerManager;
@@ -39,7 +40,6 @@
 import cc.kune.core.server.manager.ToolConfigurationManager;
 import cc.kune.core.server.tool.ServerToolTarget;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;
 import cc.kune.domain.Group;

Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpaceInDevelopment.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,6 +21,7 @@
 
 import cc.kune.common.client.utils.TextUtils;
 import cc.kune.common.client.utils.UrlParam;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.services.FileDownloadUtils;
 import cc.kune.core.client.state.GroupChangedEvent;
@@ -29,7 +30,6 @@
 import cc.kune.core.client.state.StateManager;
 import cc.kune.core.shared.domain.utils.StateToken;
 import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.options.logo.CurrentEntityChangedEvent;
 import cc.kune.gspace.client.options.logo.CurrentEntityChangedEvent.CurrentEntityChangedHandler;
 

Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -22,8 +22,8 @@
 import cc.kune.common.client.actions.ui.ActionFlowPanel;
 import cc.kune.common.client.actions.ui.IsActionExtensible;
 import cc.kune.common.client.actions.ui.bind.GuiProvider;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.GSpaceArmor;
 import cc.kune.pspace.client.PSpacePresenter.PSpaceView;
 

Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,6 +21,7 @@
 
 import cc.kune.common.client.actions.ui.IsActionExtensible;
 import cc.kune.common.client.utils.TextUtils;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.init.AppStartEvent;
 import cc.kune.core.client.state.Session;
 import cc.kune.core.client.state.StateChangedEvent;
@@ -33,7 +34,6 @@
 import cc.kune.core.shared.dto.StateContainerDTO;
 import cc.kune.core.shared.dto.StateContentDTO;
 import cc.kune.core.shared.dto.StateTokenUtils;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.HasText;

Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -24,10 +24,10 @@
 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 cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.tool.FoldableAbstractClientTool;
 import cc.kune.gspace.client.tool.selector.ToolSelector;
 

Modified: trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/TasksGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.tasks.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.tasks.client.actions.TasksClientActions;
 import cc.kune.tasks.client.actions.TasksFolderNewMenu;
 import cc.kune.tasks.client.actions.TasksNewMenu;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/DelFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 import cc.kune.tasks.shared.TasksConstants;
 

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContainerBtn;
 import cc.kune.tasks.shared.TasksConstants;
 

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.tasks.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;
 import cc.kune.tasks.shared.TasksConstants;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.tasks.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentMenuItem;
 import cc.kune.tasks.shared.TasksConstants;

Modified: trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/client/actions/OpenFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.tasks.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.Date;
 
+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;
@@ -35,7 +36,6 @@
 import cc.kune.core.server.manager.ToolConfigurationManager;
 import cc.kune.core.server.tool.ServerToolTarget;
 import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;
 import cc.kune.domain.Group;

Modified: trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/KuneParticipantController.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -36,7 +36,7 @@
 import org.waveprotocol.wave.model.wave.ParticipantId;
 
 import cc.kune.common.client.notify.NotifyUser;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -54,7 +54,8 @@
 import org.waveprotocol.wave.model.wave.ParticipantId;
 import org.waveprotocol.wave.model.waveref.WaveRef;
 
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.common.client.log.Log;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.dom.client.Element;
 
@@ -209,15 +210,27 @@
       wave = null;
     }
     if (three != null) {
-      three.getEditActions().stopEditing();
+      try {
+        three.getEditActions().stopEditing();
+      } catch (final Exception e) {
+        Log.info("Some exception stoping editing", e);
+      }
       three = null;
     }
     if (two != null) {
+      try {
       two.getConnector().close();
+      } catch (final Exception e) {
+        Log.info("Some exception closing connector", e);
+      }
       two = null;
     }
     if (one != null) {
+      try {
       one.getWavePanel().destroy();
+      } catch (final Exception e) {
+        Log.info("Some exception destroying panel", e);
+      }
       one = null;
     }
     closed = true;

Added: trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/wave/client/WaveClientUtils.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -0,0 +1,40 @@
+package cc.kune.wave.client;
+
+import org.waveprotocol.wave.client.widget.common.ImplPanel;
+
+import cc.kune.common.client.actions.BeforeActionListener;
+import cc.kune.common.client.log.Log;
+import cc.kune.core.client.state.StateManager;
+
+import com.google.gwt.user.client.ui.HasWidgets;
+
+public class WaveClientUtils {
+  public static void addListener(final StateManager stateManager, final KuneStagesProvider wave,
+      final ImplPanel waveHolder, final HasWidgets parent) {
+    stateManager.addBeforeStateChangeListener(new BeforeActionListener() {
+      @Override
+      public boolean beforeAction() {
+        // This fix lot of problems when you are editing and move to other
+        // location (without stop editing)
+        clear(wave, waveHolder, parent);
+        return true;
+      }
+    });
+  }
+
+  public static void clear(KuneStagesProvider wave, final ImplPanel waveHolder, final HasWidgets parent) {
+    if (wave != null) {
+      try {
+        wave.destroy();
+      } catch (final RuntimeException e) {
+        // When editing: java.lang.RuntimeException: Component not found: MENU
+        Log.error("Error clearing wave panel", e);
+      }
+      wave = null;
+    }
+    if (waveHolder != null && waveHolder.isAttached()) {
+      waveHolder.removeFromParent();
+      parent.remove(waveHolder);
+    }
+  }
+}

Modified: trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.wave.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.wave.client.inboxcount.InboxCountPanel;
 import cc.kune.wave.client.inboxcount.InboxCountPresenter;
 import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView;

Modified: trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -28,11 +28,11 @@
 import cc.kune.common.client.actions.ActionEvent;
 import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
 import cc.kune.core.client.sitebar.SitebarActionsPresenter;
 import cc.kune.core.client.sn.actions.SessionAction;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/WebClient.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/WebClient.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -69,12 +69,12 @@
 import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder;
 
 import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.errors.DefaultException;
 import cc.kune.core.client.sitebar.spaces.Space;
 import cc.kune.core.client.sitebar.spaces.SpaceConfEvent;
 import cc.kune.core.client.state.SiteTokens;
 import cc.kune.core.client.state.TokenMatcher;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.wave.client.inboxcount.InboxCountPresenter;
 
 import com.google.gwt.core.client.GWT;
@@ -248,6 +248,7 @@
   @UiField
   SplitLayoutPanel splitPanel;
 
+
   @UiField
   Style style;
 
@@ -260,7 +261,6 @@
   FramedPanel waveFrame;
 
   ImplPanel waveHolder;
-
   private final WaveStore waveStore = new SimpleWaveStore();
   /**
    * Create a remote websocket to talk to the server-side FedOne service.
@@ -272,7 +272,6 @@
    */
   @Inject
   public WebClient(final EventBus eventBus, final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, final TokenMatcher tokenMatcher, final cc.kune.core.client.state.Session session, final I18nTranslationService i18n) {
-    // Window.alert("webclient! " + new Date());
     this.eventBus = eventBus;
     this.profiles = profiles;
     this.inboxCount = inboxCount;
@@ -315,6 +314,8 @@
 
     setupUi();
 
+    //WaveClientUtils.addListener(stateManager, wave, waveHolder, waveFrame);
+
     if (tokenMatcher.isWaveToken(History.getToken())) {
       History.fireCurrentHistoryState();
     }
@@ -323,14 +324,8 @@
 
   @Override
   public void clear() {
-    // Duplicate below
-  if (wave != null) {
-    wave.destroy();
-    wave = null;
-  }
-  if (waveHolder.isAttached()) {
-    waveHolder.removeFromParent();
-  }
+  WaveClientUtils.clear(wave, waveHolder, waveFrame);
+  waveFrame.clear();
 }
 
   private void createWebSocket() {
@@ -416,15 +411,7 @@
     LOG.info("WebClient.openWave()");
 
     WaveClientClearEvent.fire(eventBus);
-    if (wave != null) {
-      wave.destroy();
-      wave = null;
-    }
-    if (waveHolder.isAttached()) {
-      waveHolder.removeFromParent();
-    }
-      waveFrame.remove(waveHolder);
-      waveFrame.clear();
+    clear();
     waveFrame.add(waveHolder);
 
     // Release the display:none.

Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -21,9 +21,9 @@
 
 import cc.kune.common.client.tooltip.Tooltip;
 import cc.kune.common.client.ui.BlinkAnimation;
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.sitebar.spaces.Space;
 import cc.kune.core.client.sitebar.spaces.SpaceSelectEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView;
 
 import com.google.gwt.event.dom.client.ClickEvent;

Modified: trunk/src/main/java/cc/kune/wave/server/KuneAgent.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/server/KuneAgent.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/server/KuneAgent.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -172,6 +172,13 @@
   }
 
   @Override
+  public void setGadgetProperty(final WaveRef waveletName, final String author, final URL gadgetUrl,
+      final String someProperty, final String someValue) {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
   public void setTitle(final WaveRef waveName, final String title, final String author) {
     // TODO Auto-generated method stub
 

Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/server/KuneWaveService.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -58,6 +58,9 @@
 
   String render(WaveRef waveRef, String author);
 
+  void setGadgetProperty(WaveRef waveletName, String author, URL gadgetUrl, String someProperty,
+      String someValue);
+
   void setTitle(WaveRef waveName, String title, String author);
 
 }

Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -51,6 +51,7 @@
 import cc.kune.common.client.utils.TextUtils;
 import cc.kune.core.client.errors.DefaultException;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
@@ -80,6 +81,7 @@
 import com.google.wave.api.impl.DocumentModifyAction;
 import com.google.wave.api.impl.DocumentModifyAction.BundledAnnotation;
 import com.google.wave.api.impl.DocumentModifyAction.ModifyHow;
+import com.google.wave.api.impl.DocumentModifyQuery;
 import com.google.wave.api.impl.WaveletData;
 import com.google.wave.splash.rpc.ClientAction;
 import com.google.wave.splash.web.template.WaveRenderer;
@@ -178,10 +180,10 @@
     final OperationQueue opQueue = new OperationQueue();
     final Blip rootBlip = wavelet.getRootBlip();
 
-    opQueue.modifyDocument(rootBlip).addParameter(
-        Parameter.of(ParamsProperty.MODIFY_ACTION, new DocumentModifyAction(ModifyHow.INSERT, NO_VALUES,
-            NO_ANNOTATION_KEY, elementsIn, NO_BUNDLED_ANNOTATIONS, false)));
-    opQueue.modifyDocument(rootBlip).addParameter(Parameter.of(ParamsProperty.INDEX, 1));
+    final OperationRequest operationRequest = opQueue.modifyDocument(rootBlip);
+    operationRequest.addParameter(Parameter.of(ParamsProperty.MODIFY_ACTION, new DocumentModifyAction(
+        ModifyHow.INSERT, NO_VALUES, NO_ANNOTATION_KEY, elementsIn, NO_BUNDLED_ANNOTATIONS, false)));
+    operationRequest.addParameter(Parameter.of(ParamsProperty.INDEX, 1));
     doOperation(author, opQueue, "add gadget");
   }
 
@@ -326,26 +328,29 @@
   }
 
   private void doOperation(final String author, final OperationQueue opQueue, final String logComment) {
+    // FIXME: do here a callback!!!
     final OperationContextImpl context = new OperationContextImpl(waveletProvider,
         converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil);
-    final OperationRequest request = opQueue.getPendingOperations().get(0);
-    OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author));
-    final String reqId = request.getId();
-    final JsonRpcResponse response = context.getResponse(reqId);
-    if (response != null && response.isError()) {
-      onFailure(context.getResponse(reqId).getErrorMessage());
-    }
-    OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() {
-      @Override
-      public void onFailure(final String arg0) {
-        KuneWaveServiceDefault.this.onFailure("Wave " + logComment + " failed, onFailure: " + arg0);
+    for (final OperationRequest request : opQueue.getPendingOperations()) {
+      // final OperationRequest request = opQueue.getPendingOperations().get(0);
+      OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author));
+      final String reqId = request.getId();
+      final JsonRpcResponse response = context.getResponse(reqId);
+      if (response != null && response.isError()) {
+        onFailure(context.getResponse(reqId).getErrorMessage());
       }
+      OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() {
+        @Override
+        public void onFailure(final String arg0) {
+          KuneWaveServiceDefault.this.onFailure("Wave " + logComment + " failed, onFailure: " + arg0);
+        }
 
-      @Override
-      public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) {
-        LOG.info("Wave " + logComment + " success: " + arg1);
-      }
-    });
+        @Override
+        public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) {
+          LOG.info("Wave " + logComment + " success: " + arg1);
+        }
+      });
+    }
   }
 
   public void doOperations(final WaveRef waveName, final String author, final OperationQueue opQueue,
@@ -358,17 +363,6 @@
     OperationUtil.submitDeltas(context, waveletProvider, listener);
   }
 
-  // public void appendGadget(final WaveRef waveName, URL gadgetUrl, final
-  // String author, boolean toRoot) {
-  // final Wavelet wavelet = fetchWave(waveName, author);
-  // final OperationQueue opQueue = new OperationQueue();
-  // opQueue.
-  // final Gadget gadget = new Gadget(gadgetUrl.toString());
-  // Blip blip = toRoot? wavelet.getRootBlip():
-  // opQueue.appendBlipToWavelet(wavelet, author);
-  // blip.append(gadget);
-  // }
-
   @Override
   public Wavelet fetchWave(final WaveId waveId, final WaveletId waveletId, final String author) {
     final OperationQueue opQueue = new OperationQueue();
@@ -442,6 +436,41 @@
   }
 
   @Override
+  public void setGadgetProperty(final WaveRef waveletName, final String author, final URL gadgetUrl,
+      final String someProperty, final String someValue) {
+    // See BlipContentRefs DocumentModifyService
+    final Wavelet wavelet = fetchWave(waveletName, author);
+    // FIXME
+    final OperationQueue opQueue = new OperationQueue();
+    final Blip rootBlip = wavelet.getRootBlip();
+    for (final Element elem : rootBlip.getElements().values()) {
+      if (elem.isGadget()) {
+        final Map<String, String> properties = elem.getProperties();
+        if (properties.get(Gadget.URL).equals(gadgetUrl.toString())) {
+          // This is the gadget we want to modify (the first of that type)
+          final List<Element> updatedElementsIn = Lists.newArrayListWithCapacity(1);
+          properties.put(someProperty, someValue);
+          // properties.put(propertyNameToDelete, null);
+          final Gadget gadget = (Gadget) elem;
+          gadget.setProperty(someProperty, someValue);
+          // updatedElementsIn.add(new Gadget(properties));
+          updatedElementsIn.add(gadget);
+          final OperationRequest operationRequest = opQueue.modifyDocument(rootBlip);
+          operationRequest.addParameter(Parameter.of(ParamsProperty.MODIFY_ACTION,
+              new DocumentModifyAction(ModifyHow.UPDATE_ELEMENT, NO_VALUES, NO_ANNOTATION_KEY,
+                  updatedElementsIn, NO_BUNDLED_ANNOTATIONS, false)));
+          operationRequest.addParameter(Parameter.of(
+              ParamsProperty.MODIFY_QUERY,
+              new DocumentModifyQuery(ElementType.GADGET, ImmutableMap.of(Gadget.URL,
+                  gadgetUrl.toString()), 1)));
+          doOperation(author, opQueue, "set gadget property");
+          break;
+        }
+      }
+    }
+  }
+
+  @Override
   public void setTitle(final WaveRef waveName, final String title, final String author) {
     final Wavelet wavelet = fetchWave(waveName, author);
     final OperationQueue opQueue = new OperationQueue();
@@ -454,5 +483,4 @@
     set.addAll(Arrays.asList(array));
     return set;
   }
-
 }

Modified: trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,7 +19,7 @@
  */
 package cc.kune.wiki.client;
 
-import cc.kune.common.client.ExtendedGinModule;
+import cc.kune.core.client.ExtendedGinModule;
 import cc.kune.wiki.client.actions.WikiClientActions;
 import cc.kune.wiki.client.actions.WikiFolderNewMenu;
 import cc.kune.wiki.client.actions.WikiPageNewMenu;

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.DelContainerMenuItem;
 
 import com.google.inject.Inject;

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,9 +19,9 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.CoreResources;
 import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.GoParentContainerBtn;
 import cc.kune.wiki.shared.WikiConstants;
 

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContainerBtn;
 import cc.kune.wiki.shared.WikiConstants;
 

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.client.resources.nav.NavResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContainerMenuItem;
 import cc.kune.wiki.shared.WikiConstants;
 

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.wiki.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentBtn;
 import cc.kune.wiki.shared.WikiConstants;

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -20,8 +20,8 @@
 package cc.kune.wiki.client.actions;
 
 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.core.shared.i18n.I18nTranslationService;
 import cc.kune.gspace.client.actions.NewContentAction;
 import cc.kune.gspace.client.actions.NewContentMenuItem;
 import cc.kune.wiki.shared.WikiConstants;

Modified: trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -19,8 +19,8 @@
  */
 package cc.kune.wiki.client.actions;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 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;

Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Date;
 
+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;
@@ -37,7 +38,6 @@
 import cc.kune.core.server.tool.ServerToolTarget;
 import cc.kune.core.shared.domain.ContentStatus;
 import cc.kune.core.shared.domain.GroupListMode;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.AccessLists;
 import cc.kune.domain.Container;
 import cc.kune.domain.Content;

Modified: trunk/src/main/java/com/example/client/HelloWorldActions.java
===================================================================
--- trunk/src/main/java/com/example/client/HelloWorldActions.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/java/com/example/client/HelloWorldActions.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -5,7 +5,7 @@
 import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
 import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
 import cc.kune.common.client.notify.NotifyUser;
-import cc.kune.core.client.resources.CoreResources;
+import cc.kune.common.client.resources.CommonResources;
 import cc.kune.core.client.sitebar.SiteUserOptions;
 import cc.kune.core.client.sitebar.SitebarActions;
 
@@ -23,7 +23,7 @@
   }
 
   @Inject
-  public HelloWorldActions(final CoreResources coreResources, final SitebarActions sitebarActions,
+  public HelloWorldActions(final CommonResources res, final SitebarActions sitebarActions,
       final SiteUserOptions siteUserOptions) {
 
     // We can share the action if we don't want to create several (and for
@@ -32,14 +32,14 @@
 
     // An action in the sitebar
     final ButtonDescriptor siteBarBtn = new ButtonDescriptor(sharedAction);
-    siteBarBtn.withText("HWorld!").withIcon(coreResources.info());
+    siteBarBtn.withText("HWorld!").withIcon(res.info());
     siteBarBtn.setParent(sitebarActions.getLeftToolbar());
 
     // Other action in the sitebar options menu
 
     // An action in the user options menu
     final MenuItemDescriptor menuItem = new MenuItemDescriptor(sharedAction);
-    menuItem.withText("HWorld!").withIcon(coreResources.alert());
+    menuItem.withText("HWorld!").withIcon(res.alert());
     siteUserOptions.addAction(menuItem);
 
     // Another action in the SocialNet menu

Modified: trunk/src/main/resources/wave-server.properties
===================================================================
--- trunk/src/main/resources/wave-server.properties	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/main/resources/wave-server.properties	2011-12-19 21:49:18 UTC (rev 1639)
@@ -79,10 +79,10 @@
 # Thread counts
 #The number of threads to listen on wavelet updates. Default value: 1
 listener_executor_thread_count = 1
-#The number of threads for loading wavelets. Default value: 2
-wavelet_load_executor_thread_count = 2
-#The number of threads to persist deltas. Default value: 2
-delta_persist_executor_thread_count = 2
+#The number of threads for loading wavelets. Default value: 1
+wavelet_load_executor_thread_count = 1
+#The number of threads to persist deltas. Default value: 1
+delta_persist_executor_thread_count = 1
 
 # To enable federation, edit the server.federation.config file and include it here.
 #include = server.federation.config

Modified: trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/test/java/cc/kune/core/server/manager/I18nManagerDefaultTest.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -29,8 +29,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import cc.kune.common.shared.i18n.I18nTranslationService;
 import cc.kune.core.server.PersistenceTest;
-import cc.kune.core.shared.i18n.I18nTranslationService;
 import cc.kune.domain.I18nCountry;
 import cc.kune.domain.I18nLanguage;
 import cc.kune.domain.I18nTranslation;

Modified: trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java
===================================================================
--- trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -97,4 +97,72 @@
     return rootBlipText;
   }
 
+  // public void testCreation() {
+  // selenium.setSpeed("200");
+  // // selenium.while("index < 100");
+  // selenium.click("//div[2]/div[2]/div[4]");
+  // for (int second = 0;; second++) {
+  // if (second >= 60) {
+  // fail("timeout");
+  // }
+  // try {
+  // if (selenium.isElementPresent("//ul/div")) {
+  // break;
+  // }
+  // } catch (final Exception e) {
+  // }
+  // Thread.sleep(1000);
+  // }
+  //
+  // selenium.click("//ul/div");
+  // selenium.focus("//ul/div");
+  // selenium.mouseDownAt("//ul/div", "5,5");
+  // selenium.typeKeys("//ul/div", selenium.getEval("index"));
+  // selenium.clickAt("//div[3]/div/div/div/div/div/div/span", "5,5");
+  // selenium.clickAt("//div[10]/div/div/div/div[3]/div/div[2]", "5,5");
+  // selenium.click("//div[3]/div/div/div[2]/div/div/div/span");
+  // selenium.typeKeys("//div[2]/div/div[2]/div/div/ul/div",
+  // selenium.getEval("index + 'áñç|«@#|ð€Ω]'"));
+  // selenium.click("//div[@id='app']/div/div[2]/div/div[2]/div/div/div[10]/div/div[3]/div[2]/div/div");
+  // selenium.click("//div[@id='app']/div/div[2]/div/div[2]/div/div/div[10]/div/div[3]/div/div/div");
+  // for (int second = 0;; second++) {
+  // if (second >= 60) {
+  // fail("timeout");
+  // }
+  // try {
+  // if (selenium.isTextPresent("@#|")) {
+  // break;
+  // }
+  // } catch (final Exception e) {
+  // }
+  // Thread.sleep(1000);
+  // }
+  //
+  // for (int second = 0;; second++) {
+  // if (second >= 60) {
+  // fail("timeout");
+  // }
+  // try {
+  // if (selenium.isElementPresent("//div[3]/div/div/div[2]/div/div/div[3]")) {
+  // break;
+  // }
+  // } catch (final Exception e) {
+  // }
+  // Thread.sleep(1000);
+  // }
+  //
+  // selenium.clickAt("//div[3]/div/div/div[2]/div/div/div[3]", "1,1");
+  // selenium.clickAt("//div[3]/div/div/div/div/div/div/span[2]", "5,5");
+  // selenium.click("//div[2]/div/div/div/div[2]/div/div/ul/div");
+  // selenium.focus("//div[2]/div/div/div/div[2]/div/div/ul/div");
+  // selenium.mouseDownAt("//div[2]/div/div/div/div[2]/div/div/ul/div", "5,5");
+  // selenium.typeKeys("//div[2]/div/div/div/div[2]/div/div/ul/div",
+  // selenium.getEval("index + 'áñç|«@#|ð€Ω] la la la '"));
+  // selenium.clickAt("//div[10]/div/div/div/div[3]/div/div[2]", "5,5");
+  // selenium.clickAt("//div[3]/div/div[2]/div/div/ul/div", "5,5");
+  // selenium.typeKeys("//div[3]/div/div[2]/div/div/ul/div",
+  // selenium.getEval("index + 'áñç|«@#|ð€Ω] la la la la la'"));
+  // // selenium.endWhile();
+  // }
+
 }

Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java
===================================================================
--- trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java	2011-12-12 21:47:20 UTC (rev 1638)
+++ trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java	2011-12-19 21:49:18 UTC (rev 1639)
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -41,6 +42,8 @@
 import cc.kune.core.server.integration.IntegrationTestHelper;
 
 import com.google.inject.Inject;
+import com.google.wave.api.Element;
+import com.google.wave.api.Gadget;
 import com.google.wave.api.Wavelet;
 
 public class KuneWaveServiceDefaultTest extends IntegrationTest {
@@ -49,6 +52,8 @@
   private static final String NEW_PARTICIPANT = "newparti";
   private static final String NEW_PARTICIPANT2 = "newparti2";
   private static final String RICHTEXT_MESSAGE = "<b>" + MESSAGE + "</b>";
+  private static final String SOME_PROPERTY = "someProperty";
+  private static final String SOME_VALUE = "someValue";
   private static final String TEST_GADGET = "http://wave-api.appspot.com/public/gadgets/areyouin/gadget.xml";
   private static final String TITLE = "title";
   private static final String TITLENEW = "titleNew";
@@ -135,6 +140,27 @@
   }
 
   @Test
+  public void addGadgetAndCheckProperties() throws DefaultException, IOException {
+    doLogin();
+    final WaveRef waveletName = createTestWave();
+    assertNotNull(waveletName);
+    final URL gadgetUrl = new URL(TEST_GADGET);
+    manager.addGadget(waveletName, getSiteAdminShortName(), gadgetUrl);
+    final Wavelet fetchWavelet = manager.fetchWave(waveletName, getSiteAdminShortName());
+    final Gadget gadget = getFirstGadget(fetchWavelet, TEST_GADGET);
+    assertEquals(gadget.getUrl(), TEST_GADGET);
+    assertEquals(2, gadget.getProperties().size());
+    assertEquals(3, fetchWavelet.getRootBlip().getElements().size());
+    manager.setGadgetProperty(waveletName, getSiteAdminShortName(), gadgetUrl, SOME_PROPERTY, SOME_VALUE);
+    final Wavelet updatedWavelet = manager.fetchWave(waveletName, getSiteAdminShortName());
+    final Gadget gadgetUpdated = getFirstGadget(updatedWavelet, TEST_GADGET);
+    assertEquals(gadgetUpdated.getUrl(), TEST_GADGET);
+    assertEquals(3, updatedWavelet.getRootBlip().getElements().size());
+    assertEquals(3, gadgetUpdated.getProperties().size());
+    assertEquals(SOME_VALUE, gadgetUpdated.getProperties().get(SOME_PROPERTY));
+  }
+
+  @Test
   public void addingToSetMaintainsOrder() throws IOException {
     final String[] array = new String[] { NEW_PARTICIPANT, NEW_PARTICIPANT, NEW_PARTICIPANT2,
         NEW_PARTICIPANT2 };
@@ -206,6 +232,17 @@
     assertEquals(TITLE, fetchWavelet.getTitle());
   }
 
+  private Gadget getFirstGadget(final Wavelet fetchWavelet, final String testGadget) {
+    final Collection<Element> elements = fetchWavelet.getRootBlip().getElements().values();
+    // BlipContentRefs e = fetchWavelet.getRootBlip().first(ElementType.GADGET);
+    for (final Element e : elements) {
+      if (e.isGadget() && e.getProperty(Gadget.URL).equals(testGadget)) {
+        return (Gadget) e;
+      }
+    }
+    return null;
+  }
+
   @Test
   public void otherMemberAddParticipant() throws DefaultException, IOException {
     final String whoAdds = "otherMember";


