Author: vjrj_ Date: 2011-05-06 04:36:59 +0200 (Fri, 06 May 2011) New Revision: 1352 Added: trunk/src/main/java/cc/kune/wiki/ trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/cc/kune/wiki/client/ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java trunk/src/main/java/cc/kune/wiki/client/WikiGinjector.java trunk/src/main/java/cc/kune/wiki/client/WikiParts.java trunk/src/main/java/cc/kune/wiki/client/actions/ 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/NewWikiBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java trunk/src/main/java/cc/kune/wiki/server/ trunk/src/main/java/cc/kune/wiki/shared/ trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java trunk/src/test/java/cc/kune/wiki/ trunk/src/test/java/cc/kune/wiki/server/ Removed: trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/ trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/ trunk/src/main/java/org/ourproject/kune/blogs/public/ trunk/src/main/java/org/ourproject/kune/wiki/server/ trunk/src/test/java/org/ourproject/kune/wiki/server/ Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java trunk/src/main/java/cc/kune/wiki/server/WikiServerModule.java trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java Log: Wiki tool Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-05-06 02:36:59 UTC (rev 1352) @@ -8,6 +8,7 @@ <inherits name="cc.kune.chat.KuneChat" /> <inherits name="cc.kune.docs.KuneDocs" /> <inherits name="cc.kune.blogs.KuneBlogs" /> + <inherits name="cc.kune.wiki.KuneWiki" /> <inherits name="cc.kune.pspace.PSpace" /> <inherits name="com.calclab.suco.Suco" /> <inherits name="org.adamtacy.GWTEffects"></inherits> @@ -34,7 +35,7 @@ <!-- NOTE: this only compiles for chromium/safari ============= --> <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> <!-- <set-property name="user.agent" value="gecko1_8" /> --> - <set-property name="user.agent" value="safari,gecko1_8" /> +<!-- <set-property name="user.agent" value="safari,gecko1_8" /> --> <!-- gwt-platform ============================================= --> <inherits name='com.gwtplatform.mvp.Mvp' /> <define-configuration-property name="gin.ginjector" Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -9,10 +9,11 @@ public class NewBlogBtn extends NewContainerBtn { - @Inject - public NewBlogBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { - super(i18n, action, res, i18n.t("New blog"), i18n.t("Create a new blog"), i18n.t("New blog"), - BlogsConstants.TYPE_BLOG); - } + @Inject + public NewBlogBtn(final I18nTranslationService i18n, final NewContainerAction action, + final NavResources res) { + super(i18n, action, res.blogAdd(), i18n.t("New blog"), i18n.t("Create a new blog"), + i18n.t("New blog"), BlogsConstants.TYPE_BLOG); + } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -10,11 +10,11 @@ public class NewPostBtn extends NewContentBtn { - @Inject - public NewPostBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, - final GlobalShortcutRegister shorcutReg) { - super(i18n, action, res, shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), i18n.t("New post"), - BlogsConstants.TYPE_POST); - } + @Inject + public NewPostBtn(final I18nTranslationService i18n, final NewContentAction action, + final NavResources res, final GlobalShortcutRegister shorcutReg) { + super(i18n, action, res.blogAdd(), shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), + i18n.t("New post"), BlogsConstants.TYPE_POST); + } } Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -35,55 +35,56 @@ */ public class KuneEntryPoint implements EntryPoint { - public final KuneGinjector ginjector = GWT.create(KuneGinjector.class); + public final KuneGinjector ginjector = GWT.create(KuneGinjector.class); - /* - * (non-Javadoc) - * - * @see com.google.gwt.core.client.EntryPoint#onModuleLoad() - */ - @Override - public void onModuleLoad() { - GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { - @Override - public void onUncaughtException(final Throwable e) { - Log.error("Error in 'onModuleLoad()' method", e); - e.printStackTrace(); - } - }); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - onModuleLoadCont(); - } - }); - } + /* + * (non-Javadoc) + * + * @see com.google.gwt.core.client.EntryPoint#onModuleLoad() + */ + @Override + public void onModuleLoad() { + GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { + @Override + public void onUncaughtException(final Throwable e) { + Log.error("Error in 'onModuleLoad()' method", e); + e.printStackTrace(); + } + }); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + onModuleLoadCont(); + } + }); + } - /** - * On module load cont. - */ - public void onModuleLoadCont() { - DelayedBindRegistry.bind(ginjector); - ginjector.getSpinerPresenter(); - ginjector.getGlobalShortcutRegister().enable(); - AsyncCallbackSimple.init(ginjector.getErrorHandler()); - ginjector.getEventLogger(); - NotifyUser.init(ginjector.getEventBus(), ginjector.getI18n()); - ginjector.getCorePresenter().get().forceReveal(); - ginjector.getOnAppStartFactory(); - ginjector.getStateManager(); - ginjector.getGwtGuiProvider(); - ginjector.getUserNotifierPresenter(); - ginjector.getSpinerPresenter(); - ginjector.getGroupMembersPresenter(); - ginjector.getDocsParts(); - ginjector.getBlogsParts(); - ginjector.getSiteLogoPresenter(); - ginjector.getSpacesTabPresenter(); - ginjector.getChatClient(); - ginjector.getCoreParts(); - ginjector.getGSpaceParts(); - ginjector.getPSpaceParts(); - ginjector.getContentViewerSelector().init(); - } + /** + * On module load cont. + */ + public void onModuleLoadCont() { + DelayedBindRegistry.bind(ginjector); + ginjector.getSpinerPresenter(); + ginjector.getGlobalShortcutRegister().enable(); + AsyncCallbackSimple.init(ginjector.getErrorHandler()); + ginjector.getEventLogger(); + NotifyUser.init(ginjector.getEventBus(), ginjector.getI18n()); + ginjector.getCorePresenter().get().forceReveal(); + ginjector.getOnAppStartFactory(); + ginjector.getStateManager(); + ginjector.getGwtGuiProvider(); + ginjector.getUserNotifierPresenter(); + ginjector.getSpinerPresenter(); + ginjector.getGroupMembersPresenter(); + ginjector.getDocsParts(); + ginjector.getBlogsParts(); + ginjector.getWikiParts(); + ginjector.getSiteLogoPresenter(); + ginjector.getSpacesTabPresenter(); + ginjector.getChatClient(); + ginjector.getCoreParts(); + ginjector.getGSpaceParts(); + ginjector.getPSpaceParts(); + ginjector.getContentViewerSelector().init(); + } } Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -59,6 +59,8 @@ import cc.kune.pspace.client.PSpacePresenter; import cc.kune.wave.client.WaveGinModule; import cc.kune.wave.client.WaveParts; +import cc.kune.wiki.client.WikiGinModule; +import cc.kune.wiki.client.WikiGinjector; import com.google.gwt.event.shared.EventBus; import com.google.gwt.inject.client.AsyncProvider; @@ -68,77 +70,79 @@ import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; @GinModules({ KuneGinModule.class, CoreGinModule.class, ChatGinModule.class, WaveGinModule.class, - PSpaceGinModule.class, GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class }) -public interface KuneGinjector extends Ginjector, GSpaceGinjector, DocsGinjector, BlogsGinjector { + PSpaceGinModule.class, GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class, + WikiGinModule.class }) +public interface KuneGinjector extends Ginjector, GSpaceGinjector, DocsGinjector, BlogsGinjector, + WikiGinjector { - /* - * You have to add here all the GWTPresenters (as Provider or AsyncProvider) - * see the GWTPlatform doc - */ + /* + * You have to add here all the GWTPresenters (as Provider or AsyncProvider) + * see the GWTPlatform doc + */ - AsyncProvider<UserSNPresenter> getBuddiesAndParticipationPresenter(); + AsyncProvider<UserSNPresenter> getBuddiesAndParticipationPresenter(); - ChatClient getChatClient(); + ChatClient getChatClient(); - ChatParts getChatParts(); + ChatParts getChatParts(); - AsyncProvider<CookiesManager> getCookiesManager(); + AsyncProvider<CookiesManager> getCookiesManager(); - CoreParts getCoreParts(); + CoreParts getCoreParts(); - Provider<CorePresenter> getCorePresenter(); + Provider<CorePresenter> getCorePresenter(); - AsyncProvider<EntityHeaderPresenter> getEntityHeaderPresenter(); + AsyncProvider<EntityHeaderPresenter> getEntityHeaderPresenter(); - ErrorHandler getErrorHandler(); + ErrorHandler getErrorHandler(); - EventBus getEventBus(); + EventBus getEventBus(); - EventBusWithLogging getEventLogger(); + EventBusWithLogging getEventLogger(); - GlobalShortcutRegister getGlobalShortcutRegister(); + GlobalShortcutRegister getGlobalShortcutRegister(); - AsyncProvider<GroupSNPresenter> getGroupMembersPresenter(); + AsyncProvider<GroupSNPresenter> getGroupMembersPresenter(); - GuiProvider getGuiProvider(); + GuiProvider getGuiProvider(); - GwtGuiProvider getGwtGuiProvider(); + GwtGuiProvider getGwtGuiProvider(); - GxtGuiProvider getGxtGuiProvider(); + GxtGuiProvider getGxtGuiProvider(); - I18nTranslationService getI18n(); + I18nTranslationService getI18n(); - AsyncProvider<NewGroupPresenter> getNewGroupPresenter(); + AsyncProvider<NewGroupPresenter> getNewGroupPresenter(); - OnAppStartFactory getOnAppStartFactory(); + OnAppStartFactory getOnAppStartFactory(); - ProxyFailureHandler getProxyFailureHandler(); + ProxyFailureHandler getProxyFailureHandler(); - PSpaceParts getPSpaceParts(); + PSpaceParts getPSpaceParts(); - AsyncProvider<PSpacePresenter> getPSpacePresenter(); + AsyncProvider<PSpacePresenter> getPSpacePresenter(); - AsyncProvider<RegisterPresenter> getRegisterPresenter(); + AsyncProvider<RegisterPresenter> getRegisterPresenter(); - AsyncProvider<SignInPresenter> getSignInPresenter(); + AsyncProvider<SignInPresenter> getSignInPresenter(); - AsyncProvider<SitebarActionsPresenter> getSitebarActionsPresenter(); + AsyncProvider<SitebarActionsPresenter> getSitebarActionsPresenter(); - AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); + AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); - SiteTokenListeners getSiteTokenListeners(); + SiteTokenListeners getSiteTokenListeners(); - AsyncProvider<SpaceSelectorPresenter> getSpacesTabPresenter(); + AsyncProvider<SpaceSelectorPresenter> getSpacesTabPresenter(); - AsyncProvider<SpinerPresenter> getSpinerPresenter(); + AsyncProvider<SpinerPresenter> getSpinerPresenter(); - StateManager getStateManager(); + StateManager getStateManager(); - TokenMatcher getTokenMatcher(); + TokenMatcher getTokenMatcher(); - AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); + AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); - AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); - WaveParts getWaveParts(); + WaveParts getWaveParts(); } Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -48,6 +48,7 @@ import cc.kune.core.server.rest.TestJSONService; import cc.kune.core.server.rest.UserJSONService; import cc.kune.docs.server.DocumentServerModule; +import cc.kune.wiki.server.WikiServerModule; import com.google.inject.AbstractModule; import com.google.inject.Module; @@ -59,93 +60,93 @@ import com.google.inject.servlet.SessionScoped; public class KuneRackModule implements RackModule { - public static final Log LOG = LogFactory.getLog(KuneRackModule.class); - private final Module configModule; + public static final Log LOG = LogFactory.getLog(KuneRackModule.class); + private final Module configModule; - public KuneRackModule() { - this("development", "kune.properties", null); - } + public KuneRackModule() { + this("development", "kune.properties", null); + } - public KuneRackModule(final String jpaUnit, final String propertiesFileName, final Scope sessionScope) { + public KuneRackModule(final String jpaUnit, final String propertiesFileName, final Scope sessionScope) { - configModule = new AbstractModule() { - @Override - public void configure() { - install(FinderRegistry.init(new JpaPersistModule(jpaUnit))); - bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); - bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); - if (sessionScope != null) { - bindScope(SessionScoped.class, sessionScope); - } - } - }; - } + configModule = new AbstractModule() { + @Override + public void configure() { + install(FinderRegistry.init(new JpaPersistModule(jpaUnit))); + bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); + bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); + if (sessionScope != null) { + bindScope(SessionScoped.class, sessionScope); + } + } + }; + } - @Override - @SuppressWarnings("unchecked") - public void configure(final RackBuilder builder) { - installGuiceModules(builder); + @Override + @SuppressWarnings("unchecked") + public void configure(final RackBuilder builder) { + installGuiceModules(builder); - builder.add(KuneContainerListener.class); + builder.add(KuneContainerListener.class); - builder.exclude("/http-bind.*"); - builder.exclude("/public/.*"); - builder.exclude("/images/.*"); - builder.exclude("/stylesheets/.*"); - builder.exclude("/javascripts/.*"); - builder.exclude("/templates/.*"); + builder.exclude("/http-bind.*"); + builder.exclude("/public/.*"); + builder.exclude("/images/.*"); + builder.exclude("/stylesheets/.*"); + builder.exclude("/javascripts/.*"); + builder.exclude("/templates/.*"); - /* Wave with context '/' */ - builder.exclude("/"); - builder.exclude("/attachment/.*"); - builder.exclude("/auth/signin"); - builder.exclude("/auth/signout"); - builder.exclude("/auth/register"); - builder.exclude("/fetch/.*"); - builder.exclude("/robot/dataapi"); - builder.exclude("/robot/dataapi/oauth/.*"); - builder.exclude("/robot/dataapi/rpc"); - builder.exclude("/robot/register/.*"); - builder.exclude("/robot/rpc"); - builder.exclude("/gadgets"); - builder.exclude("/gadgets/.*"); - builder.exclude("/socket.io/*"); - builder.exclude("/socket.io/.*]"); - builder.exclude("/socket"); - builder.exclude("/static/.*"); - builder.exclude("/webclient/.*"); + /* Wave with context '/' */ + builder.exclude("/"); + builder.exclude("/attachment/.*"); + builder.exclude("/auth/signin"); + builder.exclude("/auth/signout"); + builder.exclude("/auth/register"); + builder.exclude("/fetch/.*"); + builder.exclude("/robot/dataapi"); + builder.exclude("/robot/dataapi/oauth/.*"); + builder.exclude("/robot/dataapi/rpc"); + builder.exclude("/robot/register/.*"); + builder.exclude("/robot/rpc"); + builder.exclude("/gadgets"); + builder.exclude("/gadgets/.*"); + builder.exclude("/socket.io/*"); + builder.exclude("/socket.io/.*]"); + builder.exclude("/socket"); + builder.exclude("/static/.*"); + builder.exclude("/webclient/.*"); - builder.at(".*").install(new LogFilter()); - builder.at(".*").install(new GuiceFilter()); + builder.at(".*").install(new LogFilter()); + builder.at(".*").install(new GuiceFilter()); - // NOTE: Commented this while testing Wave - // builder.at("^/$").install(new RedirectFilter("/ws/")); - builder.at("^/ws").install(new RedirectFilter("/ws/")); + // NOTE: Commented this while testing Wave + // builder.at("^/$").install(new RedirectFilter("/ws/")); + builder.at("^/ws").install(new RedirectFilter("/ws/")); - builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class), - new ForwardFilter("/ws/ws.html")); + builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class), + new ForwardFilter("/ws/ws.html")); - builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class, - UserService.class, SocialNetworkService.class, I18nService.class); - builder.installRESTServices("^/ws/json/", TestJSONService.class, GroupJSONService.class, UserJSONService.class, - I18nTranslationJSONService.class, ContentJSONService.class); - builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, - EntityLogoUploadManager.class, EntityLogoDownloadManager.class); + builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class, + UserService.class, SocialNetworkService.class, I18nService.class); + builder.installRESTServices("^/ws/json/", TestJSONService.class, GroupJSONService.class, + UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); + builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, + EntityLogoUploadManager.class, EntityLogoDownloadManager.class); - builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}")); - } + builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}")); + } - private void installGuiceModules(final RackBuilder builder) { - // https://code.google.com/p/google-guice/wiki/ServletModule - builder.use(new ServletModule()); - builder.use(new PlatformServerModule()); - builder.use(new DocumentServerModule()); - builder.use(new BlogServerModule()); - // builder.use(new WikiServerModule()); - // builder.use(new ChatServerModule()); - // builder.use(new GalleryServerModule()); - builder.use(new RESTServicesModule()); - builder.use(configModule); - } + private void installGuiceModules(final RackBuilder builder) { + // https://code.google.com/p/google-guice/wiki/ServletModule + builder.use(new ServletModule()); + builder.use(new PlatformServerModule()); + builder.use(new DocumentServerModule()); + builder.use(new BlogServerModule()); + builder.use(new WikiServerModule()); + // builder.use(new ChatServerModule()); + // builder.use(new GalleryServerModule()); + builder.use(new RESTServicesModule()); + builder.use(configModule); + } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -10,12 +10,13 @@ public class NewDocBtn extends NewContentBtn { - @Inject - public NewDocBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, - final GlobalShortcutRegister shorcutReg) { - super(i18n, action, res, shorcutReg, i18n.t("New document"), i18n.t("Create a New Document here. " - + "This document will be a new 'Page' in the public web if you publish it"), i18n.t("New document"), - DocsConstants.TYPE_DOCUMENT); - } + @Inject + public NewDocBtn(final I18nTranslationService i18n, final NewContentAction action, + final NavResources res, final GlobalShortcutRegister shorcutReg) { + super(i18n, action, res.pageAdd(), shorcutReg, i18n.t("New document"), + i18n.t("Create a New Document here. " + + "This document will be a new 'Page' in the public web if you publish it"), + i18n.t("New document"), DocsConstants.TYPE_DOCUMENT); + } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -9,11 +9,12 @@ public class NewFolderBtn extends NewContainerBtn { - @Inject - public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { - super(i18n, action, res, i18n.t("New folder"), - i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), - i18n.t("New folder"), DocsConstants.TYPE_FOLDER); - } + @Inject + public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, + final NavResources res) { + super(i18n, action, res.folderAdd(), i18n.t("New folder"), + i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), + i18n.t("New folder"), DocsConstants.TYPE_FOLDER); + } } Modified: trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -4,17 +4,13 @@ public final class DocsConstants { - public static final String NAME = "docs"; - public static final String ROOT_NAME = "documents"; - public static final String TYPE_DOCUMENT = NAME + "." + "doc"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + public static final String NAME = "docs"; + public static final String ROOT_NAME = "documents"; + public static final String TYPE_DOCUMENT = NAME + "." + "doc"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - // @Deprecated - // public static final String TYPE_WAVE = NAME + "." + - // ToolConstants.WAVE_SUFFIX; - - private DocsConstants() { - } + private DocsConstants() { + } } Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/domain/Content.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -57,6 +57,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.utils.HasStateToken; +import cc.kune.wiki.shared.WikiConstants; @Entity @Table(name = "contents") @@ -259,7 +260,8 @@ @Transient public boolean isWave() { - return (typeId.equals(DocsConstants.TYPE_DOCUMENT)) || (typeId.equals(BlogsConstants.TYPE_POST)); + return (typeId.equals(DocsConstants.TYPE_DOCUMENT)) || typeId.equals(WikiConstants.TYPE_WIKIPAGE) + || (typeId.equals(BlogsConstants.TYPE_POST)); } public void removeAuthor(final User user) { Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -4,7 +4,6 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.actions.RolAction; -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.ContentCache; @@ -15,6 +14,7 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.resources.client.ImageResource; import com.google.inject.Inject; import com.google.inject.Provider; @@ -63,12 +63,12 @@ private static final String NEW_NAME = "ctnernewname"; public NewContainerBtn(final I18nTranslationService i18n, final NewContainerAction action, - final NavResources res, final String title, final String tooltip, final String newName, + final ImageResource icon, final String title, final String tooltip, final String newName, final String id) { super(action); // The name given to this new content action.putValue(NEW_NAME, newName); action.putValue(ID, id); - this.withText(title).withToolTip(tooltip).withIcon(res.folderAdd()).withStyles("k-def-docbtn, k-fr"); + this.withText(title).withToolTip(tooltip).withIcon(icon).withStyles("k-def-docbtn, k-fr"); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -7,7 +7,6 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.core.client.actions.RolAction; -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.ContentCache; @@ -18,6 +17,7 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.resources.client.ImageResource; import com.google.inject.Inject; import com.google.inject.Provider; @@ -64,7 +64,7 @@ private static final String NEW_NAME = "ctnnewname"; public NewContentBtn(final I18nTranslationService i18n, final NewContentAction action, - final NavResources res, final GlobalShortcutRegister shorcutReg, final String title, + final ImageResource icon, final GlobalShortcutRegister shorcutReg, final String title, final String tooltip, final String newName, final String id) { super(action); // The name given to this new content @@ -72,7 +72,7 @@ action.putValue(ID, id); final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('N')); shorcutReg.put(shortcut, action); - this.withText(title).withToolTip(tooltip).withIcon(res.pageAdd()).withShortcut(shortcut).withStyles( + this.withText(title).withToolTip(tooltip).withIcon(icon).withShortcut(shortcut).withStyles( "k-def-docbtn, k-fr"); } Added: trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,6 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> + <source path="shared" /> +</module> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,70 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.wiki.client; + +import static cc.kune.wiki.shared.WikiConstants.NAME; +import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.gspace.client.tool.old.FoldableAbstractClientTool; +import cc.kune.gspace.client.tool.selector.ToolSelector; + +import com.google.inject.Inject; + +public class WikiClientTool extends FoldableAbstractClientTool { + + private final NavResources navResources; + + @Inject + public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + super(NAME, i18n.t("wiki"), toolSelector, cntCapRegistry); + this.navResources = navResources; + + // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); + registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); + registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); + // registerPublishModerableTypes(); + registerRateableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerRenamableTypes(TYPE_FOLDER, TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerTageableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerTranslatableTypes(TYPE_FOLDER, TYPE_WIKIPAGE); + + registerIcons(); + } + + @Override + public String getName() { + return NAME; + } + + private void registerIcons() { + registerContentTypeIcon(TYPE_FOLDER, navResources.folder()); + registerContentTypeIcon(TYPE_ROOT, navResources.folder()); + registerContentTypeIcon(TYPE_WIKIPAGE, navResources.wikipage()); + registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,16 @@ +package cc.kune.wiki.client; + +import cc.kune.wiki.client.actions.WikiClientActions; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public class WikiGinModule extends AbstractPresenterModule { + + @Override + protected void configure() { + bind(WikiClientTool.class).in(Singleton.class); + bind(WikiClientActions.class).in(Singleton.class); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/WikiGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/WikiGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiGinjector.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/WikiGinjector.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,9 @@ +package cc.kune.wiki.client; + +import com.google.gwt.inject.client.Ginjector; + +public interface WikiGinjector extends Ginjector { + + WikiParts getWikiParts(); + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/WikiGinjector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/WikiParts.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiParts.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/WikiParts.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,23 @@ +package cc.kune.wiki.client; + +import cc.kune.core.client.state.Session; +import cc.kune.gspace.client.tool.ContentViewerSelector; +import cc.kune.gspace.client.viewers.ContentViewerPresenter; +import cc.kune.gspace.client.viewers.FolderViewerPresenter; +import cc.kune.wiki.client.actions.WikiClientActions; +import cc.kune.wiki.shared.WikiConstants; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class WikiParts { + + @Inject + public WikiParts(final Session session, final Provider<WikiClientTool> clientTool, + final ContentViewerSelector viewerSelector, final WikiClientActions wikiActions, + final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { + clientTool.get(); + viewerSelector.register(contentViewer, true, WikiConstants.TYPE_WIKIPAGE); + viewerSelector.register(folderViewer, true, WikiConstants.TYPE_ROOT, WikiConstants.TYPE_FOLDER); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/wiki/client/WikiParts.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,16 @@ +package cc.kune.wiki.client.actions; + +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; + +public class DelFolderMenuItem extends DelContainerMenuItem { + + @Inject + public DelFolderMenuItem(final I18nTranslationService i18n, final DelContainerAction action, final CoreResources res) { + super(i18n, action, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/DelFolderMenuItem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,15 @@ +package cc.kune.wiki.client.actions; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.DelContentMenuItem; + +import com.google.inject.Inject; + +public class DelWikiMenuItem extends DelContentMenuItem { + + @Inject + public DelWikiMenuItem(final I18nTranslationService i18n, final DelContentAction action, final CoreResources res) { + super(i18n, action, res); + } +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/DelWikiMenuItem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,16 @@ +package cc.kune.wiki.client.actions; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.GoParentContainerBtn; + +import com.google.inject.Inject; + +public class GoParentFolderBtn extends GoParentContainerBtn { + + @Inject + public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res) { + super(i18n, action, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,20 @@ +package cc.kune.wiki.client.actions; + +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; + +import com.google.inject.Inject; + +public class NewFolderBtn extends NewContainerBtn { + + @Inject + public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, + final NavResources res) { + super(i18n, action, res.wikiAdd(), i18n.t("New folder"), + i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), + i18n.t("New folder"), WikiConstants.TYPE_FOLDER); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiBtn.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,22 @@ +package cc.kune.wiki.client.actions; + +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.NewContentBtn; +import cc.kune.wiki.shared.WikiConstants; + +import com.google.inject.Inject; + +public class NewWikiBtn extends NewContentBtn { + + @Inject + public NewWikiBtn(final I18nTranslationService i18n, final NewContentAction action, + final NavResources res, final GlobalShortcutRegister shorcutReg) { + super(i18n, action, res.wikipageAdd(), shorcutReg, i18n.t("New wikipage"), + i18n.t("Create a New Wikipage here. " + + "This document will be a new 'Page' in the public web if you publish it"), + i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiBtn.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,16 @@ +package cc.kune.wiki.client.actions; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.OpenContentMenuItem; + +import com.google.inject.Inject; + +public class OpenWikiMenuItem extends OpenContentMenuItem { + + @Inject + public OpenWikiMenuItem(final I18nTranslationService i18n, final OpenContentAction action, final NavResources res) { + super(i18n, action, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/OpenWikiMenuItem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,77 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.wiki.client.actions; + +import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import cc.kune.core.client.actions.ActionRegistryByType; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.docs.client.actions.DelFolderMenuItem; +import cc.kune.docs.client.actions.NewFolderBtn; +import cc.kune.gspace.client.actions.AbstractFoldableToolActions; +import cc.kune.gspace.client.actions.ActionGroups; +import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ParticipateInContentBtn; +import cc.kune.gspace.client.actions.RefreshContentMenuItem; +import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class WikiClientActions extends AbstractFoldableToolActions { + final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_FOLDER }; + final String[] containersNoRoot = { TYPE_FOLDER }; + final String[] contents = { TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + + @Inject + public WikiClientActions(final I18nUITranslationService i18n, final Session session, + final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, + final Provider<GoParentFolderBtn> folderGoUp, final Provider<NewWikiBtn> newWikiBtn, + final Provider<NewFolderBtn> newFolderBtn, final Provider<OpenWikiMenuItem> openContentMenuItem, + final Provider<DelWikiMenuItem> delContentMenuItem, + final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ParticipateInContentBtn> participateBtn, + final Provider<DelFolderMenuItem> delFolderMenuItem, + final Provider<RefreshContentMenuItem> refresh, final Provider<SetAsHomePageMenuItem> setAsHomePage) { + super(session, stateManager, i18n, registry); + actionsRegistry.addAction(ActionGroups.VIEW, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.VIEW, refresh, all); + actionsRegistry.addAction(ActionGroups.VIEW, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.VIEW, folderGoUp, containersNoRoot); + actionsRegistry.addAction(ActionGroups.VIEW, newWikiBtn, containers); + actionsRegistry.addAction(ActionGroups.VIEW, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.VIEW, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.MENUITEM, openContentMenuItem, contents); + actionsRegistry.addAction(ActionGroups.MENUITEM, openContentMenuItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.MENUITEM, delContentMenuItem, contents); + actionsRegistry.addAction(ActionGroups.MENUITEM, delFolderMenuItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.MENUITEM, setAsHomePage, contents); + } + + @Override + protected void createPostSessionInitActions() { + } +} Property changes on: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/wiki/server (from rev 1339, trunk/src/main/java/org/ourproject/kune/wiki/server) Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerModule.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/wiki/server/WikiServerModule.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.wiki.server; +package cc.kune.wiki.server; import com.google.inject.Binder; import com.google.inject.Module; Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -17,8 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.wiki.server; +package cc.kune.wiki.server; +import static cc.kune.wiki.shared.WikiConstants.NAME; +import static cc.kune.wiki.shared.WikiConstants.ROOT_NAME; +import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; + import java.util.Date; import cc.kune.core.client.errors.ContainerNotPermittedException; @@ -29,7 +36,6 @@ import cc.kune.core.server.tool.ServerTool; import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.core.shared.ToolConstants; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -43,123 +49,119 @@ import com.google.inject.Inject; public class WikiServerTool implements ServerTool { - public static final String NAME = "wiki"; - public static final String ROOT_NAME = "wiki"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; + private final ToolConfigurationManager configurationManager; + private final ContainerManager containerManager; + private final ContentManager contentManager; + private final I18nTranslationService i18n; - private final ToolConfigurationManager configurationManager; - private final ContainerManager containerManager; - private final ContentManager contentManager; - private final I18nTranslationService i18n; + @Inject + public WikiServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, + final I18nTranslationService translationService) { + this.contentManager = contentManager; + this.containerManager = containerManager; + this.configurationManager = configurationManager; + this.i18n = translationService; + } - @Inject - public WikiServerTool(final ContentManager contentManager, final ContainerManager containerManager, - final ToolConfigurationManager configurationManager, final I18nTranslationService translationService) { - this.contentManager = contentManager; - this.containerManager = containerManager; - this.configurationManager = configurationManager; - this.i18n = translationService; + void checkContainerTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_FOLDER)) { + // ok valid container + if ((typeId.equals(TYPE_FOLDER) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER)))) { + // ok + } else { + throw new ContainerNotPermittedException(); + } + } else { + throw new ContainerNotPermittedException(); } + } - void checkContainerTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_FOLDER)) { - // ok valid container - if ((typeId.equals(TYPE_FOLDER) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER)))) { - // ok - } else { - throw new ContainerNotPermittedException(); - } - } else { - throw new ContainerNotPermittedException(); - } + void checkContentTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_WIKIPAGE) || typeId.equals(TYPE_UPLOADEDFILE)) { + // ok valid content + final boolean parentIsFolderOrRoot = parentTypeId.equals(TYPE_ROOT) + || parentTypeId.equals(TYPE_FOLDER); + if ((typeId.equals(TYPE_UPLOADEDFILE) && parentIsFolderOrRoot) + || (typeId.equals(TYPE_WIKIPAGE) && parentIsFolderOrRoot)) { + // ok + } else { + throw new ContentNotPermittedException(); + } + } else { + throw new ContentNotPermittedException(); } + } - void checkContentTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_WIKIPAGE) || typeId.equals(TYPE_UPLOADEDFILE)) { - // ok valid content - final boolean parentIsFolderOrRoot = parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER); - if ((typeId.equals(TYPE_UPLOADEDFILE) && parentIsFolderOrRoot) - || (typeId.equals(TYPE_WIKIPAGE) && parentIsFolderOrRoot)) { - // ok - } else { - throw new ContentNotPermittedException(); - } - } else { - throw new ContentNotPermittedException(); - } - } + @Override + public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { + checkContainerTypeId(parentTypeId, typeId); + } - @Override - public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { - checkContainerTypeId(parentTypeId, typeId); - } + @Override + public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { + checkContentTypeId(parentTypeId, typeId); + } - @Override - public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { - checkContentTypeId(parentTypeId, typeId); - } + @Override + public String getName() { + return NAME; + } - @Override - public String getName() { - return NAME; - } + @Override + public String getRootName() { + return ROOT_NAME; + } - @Override - public String getRootName() { - return ROOT_NAME; - } + @Override + public ServerToolTarget getTarget() { + return ServerToolTarget.forBoth; + } - @Override - public ServerToolTarget getTarget() { - return ServerToolTarget.forBoth; - } + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { + final ToolConfiguration config = new ToolConfiguration(); + final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); + setContainerWikiAcl(rootFolder); + config.setRoot(rootFolder); + group.setToolConfig(NAME, config); + configurationManager.persist(config); + final Content content = contentManager.createContent(i18n.t("Wiki page sample"), + i18n.t("This is only a wiki page sample. You can edit or rename it, but also any other user."), + user, rootFolder, TYPE_WIKIPAGE); + content.addAuthor(user); + content.setLanguage(user.getLanguage()); + content.setTypeId(TYPE_WIKIPAGE); + content.setStatus(ContentStatus.publishedOnline); - @Override - public Group initGroup(final User user, final Group group, final Object... otherVars) { - final ToolConfiguration config = new ToolConfiguration(); - final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); - setContainerWikiAcl(rootFolder); - config.setRoot(rootFolder); - group.setToolConfig(NAME, config); - configurationManager.persist(config); - final Content descriptor = contentManager.createContent(i18n.t("Wiki page sample"), "", user, rootFolder, - WikiServerTool.TYPE_WIKIPAGE); - descriptor.addAuthor(user); - descriptor.setLanguage(user.getLanguage()); - descriptor.setTypeId(TYPE_WIKIPAGE); - descriptor.setStatus(ContentStatus.publishedOnline); - contentManager.save(user, descriptor, - i18n.t("This is only a wiki page sample. You can edit or rename it, as any other user.")); - return group; - } + contentManager.save(user, content); + return group; + } - @Override - public void onCreateContainer(final Container container, final Container parent) { - setContainerWikiAcl(container); - } + @Override + public void onCreateContainer(final Container container, final Container parent) { + setContainerWikiAcl(container); + } - @Override - public void onCreateContent(final Content content, final Container parent) { - content.setStatus(ContentStatus.publishedOnline); - content.setPublishedOn(new Date()); - } + @Override + public void onCreateContent(final Content content, final Container parent) { + content.setStatus(ContentStatus.publishedOnline); + content.setPublishedOn(new Date()); + } - @Override - @Inject - public void register(final ServerToolRegistry registry) { - registry.register(this); - } + @Override + @Inject + public void register(final ServerToolRegistry registry) { + registry.register(this); + } - private void setContainerWikiAcl(final Container container) { - final AccessLists wikiAcl = new AccessLists(); - wikiAcl.getAdmins().setMode(GroupListMode.NORMAL); - wikiAcl.getAdmins().add(container.getOwner()); - wikiAcl.getEditors().setMode(GroupListMode.EVERYONE); - wikiAcl.getViewers().setMode(GroupListMode.EVERYONE); - containerManager.setAccessList(container, wikiAcl); - } + private void setContainerWikiAcl(final Container container) { + final AccessLists wikiAcl = new AccessLists(); + wikiAcl.getAdmins().setMode(GroupListMode.NORMAL); + wikiAcl.getAdmins().add(container.getOwner()); + wikiAcl.getEditors().setMode(GroupListMode.EVERYONE); + wikiAcl.getViewers().setMode(GroupListMode.EVERYONE); + containerManager.setAccessList(container, wikiAcl); + } } Added: trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -0,0 +1,16 @@ +package cc.kune.wiki.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class WikiConstants { + + public static final String NAME = "wiki"; + public static final String ROOT_NAME = "wiki"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; + + private WikiConstants() { + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2011-05-06 02:36:59 UTC (rev 1352) @@ -1,7 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> -<module> - <inherits name="cc.kune.core.Core" /> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> - <source path="client" /> -</module> \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -1,112 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.blogs.client; - -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_BLOG; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_POST; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_ROOT; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; - -import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.cnt.ContentActionRegistry; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.gspace.client.style.GSpaceBackManager; - -import com.calclab.suco.client.ioc.Provider; - -public class BlogClientActions extends OldAbstractFoldableContentActions { - public BlogClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final GSpaceBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_BLOG, TYPE_POST, TYPE_UPLOADEDFILE }; - final String[] contentsModerated = { TYPE_POST, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_BLOG }; - final String[] containersNoRoot = { TYPE_BLOG }; - final String[] contents = { TYPE_POST, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("Post"); - final String parentMenuTitleCtx = i18n.t("Blog"); - - createNewContainerAction(TYPE_BLOG, "images/nav/blog_add.png", i18n.t("New blog"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New blog"), Position.ctx, TYPE_ROOT); - createNewContentAction(TYPE_POST, "images/nav/post_add.png", i18n.t("New post"), parentMenuTitleCtx, - Position.ctx, TYPE_BLOG); - - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createEditAction(parentMenuTitle, TYPE_POST); - createContentModeratedActions(parentMenuTitle, contentsModerated); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), - null, containersNoRoot); - - createSetAsDefContent(parentMenuTitle, contents); - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createGoAction(all); - createGoHomeAction(containers); - - // ContentRPC Authorized must permit folders - // contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); - - createDelContainerAction("Delete blog", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -1,64 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.blogs.client; - -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.gspace.client.tool.selector.ToolSelector; - -public class BlogClientTool extends OldFoldableAbstractClientTool { - public static final String NAME = "blogs"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_BLOG = NAME + "." + "blog"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + OldFoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; - - public BlogClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final WsThemeManager wsThemePresenter, final WorkspaceSkeleton ws, - final ContentCapabilitiesRegistry cntCapReg) { - super(NAME, i18n.t("blogs"), toolSelector, wsThemePresenter, ws, cntCapReg); - - // registerAclEditableTypes(); - registerAuthorableTypes(TYPE_POST, TYPE_UPLOADEDFILE); - registerDragableTypes(TYPE_UPLOADEDFILE); - registerDropableTypes(TYPE_ROOT); - registerPublishModerableTypes(TYPE_POST, TYPE_UPLOADEDFILE); - registerRateableTypes(TYPE_POST, TYPE_UPLOADEDFILE); - registerRenamableTypes(TYPE_BLOG, TYPE_POST, TYPE_UPLOADEDFILE); - registerTageableTypes(TYPE_BLOG, TYPE_UPLOADEDFILE, TYPE_POST); - // registerTranslatableTypes(); - - registerIcons(); - } - - public String getName() { - return NAME; - } - - private void registerIcons() { - registerContentTypeIcon(TYPE_BLOG, "images/nav/blog.png"); - registerContentTypeIcon(TYPE_POST, "images/nav/post.png"); - registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -1,23 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.blogs.client; - -public interface BlogsMessages { -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -28,39 +28,41 @@ import cc.kune.gspace.client.tool.selector.ToolSelector; public class WikiClientTool extends OldFoldableAbstractClientTool { - public static final String NAME = "wiki"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + OldFoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; + public static final String NAME = "wiki"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + + OldFoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final WsThemeManager wsThemePresenter, final WorkspaceSkeleton ws, - final ContentCapabilitiesRegistry cntCapabReg) { - super(NAME, i18n.t("wiki"), toolSelector, wsThemePresenter, ws, cntCapabReg); + public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, + final WsThemeManager wsThemePresenter, final WorkspaceSkeleton ws, + final ContentCapabilitiesRegistry cntCapabReg) { + super(NAME, i18n.t("wiki"), toolSelector, wsThemePresenter, ws, cntCapabReg); - // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); - registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); - registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); - // registerPublishModerableTypes(); - registerRateableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerRenamableTypes(TYPE_FOLDER, TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerTageableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerTranslatableTypes(TYPE_FOLDER, TYPE_WIKIPAGE); + // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); + registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); + registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); + // registerPublishModerableTypes(); + registerRateableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerRenamableTypes(TYPE_FOLDER, TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerTageableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); + registerTranslatableTypes(TYPE_FOLDER, TYPE_WIKIPAGE); - registerIcons(); - } + registerIcons(); + } - public String getName() { - return NAME; - } + @Override + public String getName() { + return NAME; + } - private void registerIcons() { - registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); - // registerContentTypeIcon(TYPE_FOLDER, "images/nav/wiki.png"); - registerContentTypeIcon(TYPE_WIKIPAGE, "images/nav/wikipage.png"); - registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - } + private void registerIcons() { + registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); + // registerContentTypeIcon(TYPE_FOLDER, "images/nav/wiki.png"); + registerContentTypeIcon(TYPE_WIKIPAGE, "images/nav/wikipage.png"); + registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); + } } Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -23,7 +23,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.ourproject.kune.chat.server.ChatServerModule; -import org.ourproject.kune.wiki.server.WikiServerModule; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.persistence.PersistenceModule; @@ -39,6 +38,7 @@ import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.docs.server.DocumentServerModule; import cc.kune.wave.server.CustomSettingsBinder; +import cc.kune.wiki.server.WikiServerModule; import com.google.inject.AbstractModule; import com.google.inject.Guice; Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-05-06 01:29:11 UTC (rev 1351) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -20,6 +20,8 @@ package cc.kune.core.server.integration.content; import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.wiki.shared.WikiConstants.NAME; +import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,7 +29,6 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.wiki.server.WikiServerTool; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.UserMustBeLoggedException; @@ -43,127 +44,130 @@ public class ContentServiceAddTest extends ContentServiceIntegrationTest { - private StateContentDTO defaultContent; + private StateContentDTO defaultContent; - @Before - public void init() throws Exception { - new IntegrationTestHelper(this); - } + @Before + public void init() throws Exception { + new IntegrationTestHelper(this); + } - @Test(expected = UserMustBeLoggedException.class) - public void noLoggedInShouldThrowIllegalAccess() throws ContentNotFoundException, Exception { - defaultContent = getSiteDefaultContent(); - contentService.addContent(session.getHash(), defaultContent.getContainer().getStateToken(), "a name", - TYPE_DOCUMENT); - } + @Test(expected = UserMustBeLoggedException.class) + public void noLoggedInShouldThrowIllegalAccess() throws ContentNotFoundException, Exception { + defaultContent = getSiteDefaultContent(); + contentService.addContent(session.getHash(), defaultContent.getContainer().getStateToken(), + "a name", TYPE_DOCUMENT); + } - @Test - public void testAddContent() throws Exception { - doLogin(); - defaultContent = getSiteDefaultContent(); - assertEquals(1, defaultContent.getContainer().getContents().size()); - final AccessRights cntRights = defaultContent.getContentRights(); - final AccessRights ctxRights = defaultContent.getContainerRights(); - final AccessRights groupRights = defaultContent.getGroupRights(); + @Test + public void testAddContent() throws Exception { + doLogin(); + defaultContent = getSiteDefaultContent(); + assertEquals(1, defaultContent.getContainer().getContents().size()); + final AccessRights cntRights = defaultContent.getContentRights(); + final AccessRights ctxRights = defaultContent.getContainerRights(); + final AccessRights groupRights = defaultContent.getGroupRights(); - final String title = "New Content Title"; - final StateContentDTO added = contentService.addContent(session.getHash(), - defaultContent.getContainer().getStateToken(), title, TYPE_DOCUMENT); - assertNotNull(added); - final List<ContentSimpleDTO> contents = added.getContainer().getContents(); - assertEquals(title, added.getTitle()); - assertEquals(2, contents.size()); - assertEquals(cntRights, added.getContentRights()); - assertEquals(ctxRights, added.getContainerRights()); - assertEquals(groupRights, added.getGroupRights()); - assertNotNull(added.getGroupMembers()); - assertNotNull(added.getParticipation()); - assertNotNull(added.getAccessLists()); + final String title = "New Content Title"; + final StateContentDTO added = contentService.addContent(session.getHash(), + defaultContent.getContainer().getStateToken(), title, TYPE_DOCUMENT); + assertNotNull(added); + final List<ContentSimpleDTO> contents = added.getContainer().getContents(); + assertEquals(title, added.getTitle()); + assertEquals(2, contents.size()); + assertEquals(cntRights, added.getContentRights()); + assertEquals(ctxRights, added.getContainerRights()); + assertEquals(groupRights, added.getGroupRights()); + assertNotNull(added.getGroupMembers()); + assertNotNull(added.getParticipation()); + assertNotNull(added.getAccessLists()); - final StateToken newState = added.getStateToken(); - final StateContentDTO sameAgain = (StateContentDTO) contentService.getContent(session.getHash(), newState); - assertNotNull(sameAgain); - assertEquals(2, sameAgain.getContainer().getContents().size()); - } + final StateToken newState = added.getStateToken(); + final StateContentDTO sameAgain = (StateContentDTO) contentService.getContent(session.getHash(), + newState); + assertNotNull(sameAgain); + assertEquals(2, sameAgain.getContainer().getContents().size()); + } - @Test - public void testAddFolder() throws Exception { - doLogin(); - defaultContent = getSiteDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String title = "folder name"; - final StateContainerDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsConstants.TYPE_FOLDER); - assertNotNull(newState); - assertNotNull(newState.getGroupMembers()); - assertNotNull(newState.getParticipation()); - assertNotNull(newState.getAccessLists()); - assertNotNull(newState.getContainerRights()); - assertNotNull(newState.getGroupRights()); - assertNotNull(newState.getRootContainer().getContents().get(0).getRights()); + @Test + public void testAddFolder() throws Exception { + doLogin(); + defaultContent = getSiteDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String title = "folder name"; + final StateContainerDTO newState = contentService.addFolder(session.getHash(), + parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + assertNotNull(newState); + assertNotNull(newState.getGroupMembers()); + assertNotNull(newState.getParticipation()); + assertNotNull(newState.getAccessLists()); + assertNotNull(newState.getContainerRights()); + assertNotNull(newState.getGroupRights()); + assertNotNull(newState.getRootContainer().getContents().get(0).getRights()); - final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); - final ContainerSimpleDTO child = parentAgain.getChilds().get(0); - assertEquals(parent.getId(), child.getParentFolderId()); + final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); + final ContainerSimpleDTO child = parentAgain.getChilds().get(0); + assertEquals(parent.getId(), child.getParentFolderId()); - assertEquals(parent.getId(), parentAgain.getId()); - assertEquals(1, parentAgain.getChilds().size()); - } + assertEquals(parent.getId(), parentAgain.getId()); + assertEquals(1, parentAgain.getChilds().size()); + } - // @Test - public void testAddRoom() throws Exception { - doLogin(); - defaultContent = getSiteDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String roomName = "testroom"; - final StateContainerDTO newState = contentService.addRoom(session.getHash(), parent.getStateToken(), roomName); - assertNotNull(newState); - } + // @Test + public void testAddRoom() throws Exception { + doLogin(); + defaultContent = getSiteDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String roomName = "testroom"; + final StateContainerDTO newState = contentService.addRoom(session.getHash(), parent.getStateToken(), + roomName); + assertNotNull(newState); + } - @Test - public void testAddTwoFolders() throws Exception { - doLogin(); - defaultContent = getSiteDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String title = "folder name"; - final StateContainerDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsConstants.TYPE_FOLDER); - assertNotNull(newState); + @Test + public void testAddTwoFolders() throws Exception { + doLogin(); + defaultContent = getSiteDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String title = "folder name"; + final StateContainerDTO newState = contentService.addFolder(session.getHash(), + parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + assertNotNull(newState); - final StateContainerDTO newState2 = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsConstants.TYPE_FOLDER); - assertNotNull(newState2); + final StateContainerDTO newState2 = contentService.addFolder(session.getHash(), + parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + assertNotNull(newState2); - final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); + final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); - assertEquals(parent.getId(), parentAgain.getId()); - assertEquals(2, parentAgain.getChilds().size()); - } + assertEquals(parent.getId(), parentAgain.getId()); + assertEquals(2, parentAgain.getChilds().size()); + } - @Test - public void testAddWikiContent() throws Exception { - doLogin(); + @Test + public void testAddWikiContent() throws Exception { + doLogin(); - final StateToken wikiToken = new StateToken(super.getDefSiteGroupName(), WikiServerTool.NAME); - final StateContainerDTO wiki = (StateContainerDTO) contentService.getContent(session.getHash(), wikiToken); + final StateToken wikiToken = new StateToken(super.getDefSiteGroupName(), NAME); + final StateContainerDTO wiki = (StateContainerDTO) contentService.getContent(session.getHash(), + wikiToken); - final String title = "New wikipage"; - final StateContentDTO added = contentService.addContent(session.getHash(), wiki.getStateToken(), title, - WikiServerTool.TYPE_WIKIPAGE); - assertNotNull(added); - final ContainerDTO wikiContainer = added.getContainer(); - final List<ContentSimpleDTO> contents = wikiContainer.getContents(); - assertEquals(title, added.getTitle()); - assertEquals(2, contents.size()); - doLogout(); + final String title = "New wikipage"; + final StateContentDTO added = contentService.addContent(session.getHash(), wiki.getStateToken(), + title, TYPE_WIKIPAGE); + assertNotNull(added); + final ContainerDTO wikiContainer = added.getContainer(); + final List<ContentSimpleDTO> contents = wikiContainer.getContents(); + assertEquals(title, added.getTitle()); + assertEquals(2, contents.size()); + doLogout(); - doLoginWithDummyUser(); - contentService.save(getHash(), added.getStateToken(), "some new test"); - // assertEquals(cntRights, added.getContentRights()); - // assertEquals(ctxRights, added.getContainerRights()); - // assertEquals(groupRights, added.getGroupRights()); - // assertNotNull(added.getGroupMembers()); - // assertNotNull(added.getParticipation()); - // assertNotNull(added.getAccessLists()); - } + doLoginWithDummyUser(); + contentService.save(getHash(), added.getStateToken(), "some new test"); + // assertEquals(cntRights, added.getContentRights()); + // assertEquals(ctxRights, added.getContainerRights()); + // assertEquals(groupRights, added.getGroupRights()); + // assertNotNull(added.getGroupMembers()); + // assertNotNull(added.getParticipation()); + // assertNotNull(added.getAccessLists()); + } } Copied: trunk/src/test/java/cc/kune/wiki/server (from rev 1339, trunk/src/test/java/org/ourproject/kune/wiki/server) Modified: trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/wiki/server/WikiServerToolTest.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java 2011-05-06 02:36:59 UTC (rev 1352) @@ -17,37 +17,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.wiki.server; +package cc.kune.wiki.server; -import static org.ourproject.kune.wiki.server.WikiServerTool.TYPE_FOLDER; -import static org.ourproject.kune.wiki.server.WikiServerTool.TYPE_ROOT; -import static org.ourproject.kune.wiki.server.WikiServerTool.TYPE_UPLOADEDFILE; -import static org.ourproject.kune.wiki.server.WikiServerTool.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; import org.junit.Before; import org.junit.Test; +import cc.kune.wiki.server.WikiServerTool; + public class WikiServerToolTest { // extends PersistenceTest { - private WikiServerTool serverTool; + private WikiServerTool serverTool; - @Before - public void before() { - serverTool = new WikiServerTool(null, null, null, null); - } + @Before + public void before() { + serverTool = new WikiServerTool(null, null, null, null); + } - @Test - public void testCreateContainerInCorrectContainer() { - serverTool.checkContainerTypeId(TYPE_ROOT, TYPE_FOLDER); - serverTool.checkContainerTypeId(TYPE_FOLDER, TYPE_FOLDER); - } + @Test + public void testCreateContainerInCorrectContainer() { + serverTool.checkContainerTypeId(TYPE_ROOT, TYPE_FOLDER); + serverTool.checkContainerTypeId(TYPE_FOLDER, TYPE_FOLDER); + } - @Test - public void testCreateContentInCorrectContainer() { - serverTool.checkContentTypeId(TYPE_ROOT, TYPE_WIKIPAGE); - serverTool.checkContentTypeId(TYPE_ROOT, TYPE_UPLOADEDFILE); - serverTool.checkContentTypeId(TYPE_FOLDER, TYPE_WIKIPAGE); - serverTool.checkContentTypeId(TYPE_FOLDER, TYPE_UPLOADEDFILE); - } + @Test + public void testCreateContentInCorrectContainer() { + serverTool.checkContentTypeId(TYPE_ROOT, TYPE_WIKIPAGE); + serverTool.checkContentTypeId(TYPE_ROOT, TYPE_UPLOADEDFILE); + serverTool.checkContentTypeId(TYPE_FOLDER, TYPE_WIKIPAGE); + serverTool.checkContentTypeId(TYPE_FOLDER, TYPE_UPLOADEDFILE); + } } \ No newline at end of file