Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4438] magnoliamodules/trunk/openutils-mgnlmessages/ src/main
|
From: <fg...@us...> - 2013-11-01 14:39:23
|
Revision: 4438
http://openutils.svn.sourceforge.net/openutils/?rev=4438&view=rev
Author: fgiust
Date: 2013-11-01 14:39:20 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
cleaning up
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
Copied: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java (from rev 4406, magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -0,0 +1,64 @@
+/**
+ *
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmessages;
+
+import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.objectfactory.Components;
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MessagesModule implements ModuleLifecycle
+{
+
+ /**
+ *
+ */
+ public static final String REPO = "messages";
+
+ private Logger log = LoggerFactory.getLogger(MessagesModule.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext ctx)
+ {
+ log.info("Starting module messages");
+ ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
+
+ Components.getComponent(MessagesManager.class).init();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext ctx)
+ {
+ log.info("Stopping module messages");
+ }
+
+}
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -27,9 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
-
/**
* @author molaschi
* @version $Id: $
@@ -58,7 +56,7 @@
try
{
- MessagesConfigurationManager.saveKeyValue(key, text, locale);
+ MessagesUtils.saveKeyValue(key, text, locale);
}
catch (RepositoryException ex)
{
Added: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -0,0 +1,73 @@
+/**
+ *
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmessages;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MessagesUtils
+{
+
+ public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
+ {
+ Session session;
+ try
+ {
+ session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
+ String path = "/" + StringUtils.replace(key, ".", "/");
+
+ Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
+
+ if (!StringUtils.isEmpty(locale))
+ {
+ if (!StringUtils.isEmpty(value))
+ {
+ content.setProperty(locale, value);
+ }
+ else
+ {
+ NodeUtilsExt.deletePropertyIfExist(content, locale);
+ }
+ }
+
+ session.save();
+ }
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -40,7 +40,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
import org.apache.commons.lang.StringUtils;
@@ -153,37 +153,6 @@
}
}
- public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
- {
- Session session;
- try
- {
- session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
- }
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
-
- String path = "/" + StringUtils.replace(key, ".", "/");
-
- Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
-
- if (!StringUtils.isEmpty(locale))
- {
- if (!StringUtils.isEmpty(value))
- {
- content.setProperty(locale, value);
- }
- else
- {
- NodeUtilsExt.deletePropertyIfExist(content, locale);
- }
- }
-
- session.save();
- }
-
/**
* Returns the locales.
* @return the locales
Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -1,64 +0,0 @@
-/**
- *
- * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
- * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmessages.lifecycle;
-
-import info.magnolia.cms.i18n.MessagesManager;
-import info.magnolia.module.ModuleLifecycle;
-import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.objectfactory.Components;
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- */
-public class MessagesModuleLifecycle implements ModuleLifecycle
-{
-
- /**
- *
- */
- public static final String REPO = "messages";
-
- private Logger log = LoggerFactory.getLogger(MessagesModuleLifecycle.class);
-
- /**
- * {@inheritDoc}
- */
- public void start(ModuleLifecycleContext ctx)
- {
- log.info("Starting module messages");
- ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
-
- Components.getComponent(MessagesManager.class).init();
- }
-
- /**
- * {@inheritDoc}
- */
- public void stop(ModuleLifecycleContext ctx)
- {
- log.info("Stopping module messages");
- }
-
-}
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -43,9 +43,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
+import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.el.MessagesEl;
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -171,7 +172,7 @@
{
try
{
- MessagesConfigurationManager.saveKeyValue(key, text, locale);
+ MessagesUtils.saveKeyValue(key, text, locale);
json = "rootObj = {value: 'OK'}";
}
catch (RepositoryException e)
@@ -187,7 +188,7 @@
{
try
{
- Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+ Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
String path = "/" + StringUtils.replace(key, ".", "/");
session.removeItem(path);
@@ -285,7 +286,7 @@
*/
protected void moveNode(String source, String destination) throws RepositoryException
{
- Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+ Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
String goTo = destination;
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java 2013-11-01 14:39:20 UTC (rev 4438)
@@ -44,6 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import org.apache.commons.io.IOUtils;
@@ -296,7 +297,7 @@
{
try
{
- MessagesConfigurationManager.saveKeyValue(key, value, locales.get(c - 1));
+ MessagesUtils.saveKeyValue(key, value, locales.get(c - 1));
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-11-01 14:39:20 UTC (rev 4438)
@@ -4,7 +4,7 @@
<name>messages</name>
<displayName>magnolia messages module</displayName>
<description>magnolia messages module</description>
- <class>net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle</class>
+ <class>net.sourceforge.openutils.mgnlmessages.MessagesModule</class>
<versionHandler>net.sourceforge.openutils.mgnlmessages.setup.MessagesModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
