Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2012-03-20 18:09:27
|
Revision: 3860
http://openutils.svn.sourceforge.net/openutils/?rev=3860&view=rev
Author: diego_schivo
Date: 2012-03-20 18:09:18 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
openutils-mgnlmessages components
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
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 2012-03-20 18:08:40 UTC (rev 3859)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2012-03-20 18:09:18 UTC (rev 3860)
@@ -37,6 +37,7 @@
import java.util.List;
import java.util.Locale;
+import javax.inject.Singleton;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -47,6 +48,7 @@
/**
* @author molaschi
*/
+@Singleton
public class MessagesConfigurationManager extends ObservedManager
{
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 2012-03-20 18:08:40 UTC (rev 3859)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2012-03-20 18:09:18 UTC (rev 3860)
@@ -13,6 +13,13 @@
<value>net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager</value>
</property>
</properties>
+ <components>
+ <id>main</id>
+ <component>
+ <type>net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager</type>
+ <implementation>net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager</implementation>
+ </component>
+ </components>
<dependencies>
<dependency>
<name>adminInterface</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-12-10 20:23:01
|
Revision: 4149
http://openutils.svn.sourceforge.net/openutils/?rev=4149&view=rev
Author: fgiust
Date: 2012-12-10 20:22:55 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
MESSAGES-20 workaround for init() not called in magnolia 4.5
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
Modified: 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 2012-12-07 08:35:37 UTC (rev 4148)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2012-12-10 20:22:55 UTC (rev 4149)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmessages.lifecycle;
+import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
@@ -47,6 +48,8 @@
{
log.info("Starting module messages");
ctx.registerModuleObservingComponent("locales", MessagesConfigurationManager.getInstance());
+
+ MessagesManager.getInstance().init();
}
/**
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 2012-12-07 08:35:37 UTC (rev 4148)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2012-12-10 20:22:55 UTC (rev 4149)
@@ -20,6 +20,13 @@
<implementation>net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager</implementation>
</component>
</components>
+ <components>
+ <id>system</id>
+ <component>
+ <type>info.magnolia.cms.i18n.MessagesManager</type>
+ <implementation>net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager</implementation>
+ </component>
+ </components>
<dependencies>
<dependency>
<name>adminInterface</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <fg...@us...> - 2013-11-01 21:20:55
|
Revision: 4439
http://openutils.svn.sourceforge.net/openutils/?rev=4439&view=rev
Author: fgiust
Date: 2013-11-01 21:20:50 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
refactoring basename configuration
Modified 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
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/i18n/MultiBundleMessagesImpl.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/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java 2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -23,8 +23,13 @@
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
import info.magnolia.objectfactory.Components;
+
+import java.util.ArrayList;
+import java.util.List;
+
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,13 +40,12 @@
public class MessagesModule implements ModuleLifecycle
{
- /**
- *
- */
public static final String REPO = "messages";
private Logger log = LoggerFactory.getLogger(MessagesModule.class);
+ private List<String> basenames = new ArrayList<String>();
+
/**
* {@inheritDoc}
*/
@@ -50,7 +54,7 @@
log.info("Starting module messages");
ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
- Components.getComponent(MessagesManager.class).init();
+ Components.getComponent(MessagesManager.class).reload();
}
/**
@@ -61,4 +65,34 @@
log.info("Stopping module messages");
}
+ /**
+ * Returns the basenames.
+ * @return the basenames
+ */
+ public List<String> getBasenames()
+ {
+ return basenames;
+ }
+
+ /**
+ * Sets the basenames.
+ * @param basenames the basenames to set
+ */
+ public void setBasenames(List<String> basenames)
+ {
+ this.basenames = basenames;
+ }
+
+ /**
+ * Sets the basenames.
+ * @param basenames the basenames to set
+ */
+ public void addBasenames(String basename)
+ {
+ if (StringUtils.isNotBlank(basename))
+ {
+ this.basenames.add(basename);
+ }
+ }
+
}
Modified: 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 2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -26,10 +26,15 @@
import info.magnolia.objectfactory.Components;
import it.openutils.mgnlutils.util.NodeUtilsExt;
+import java.util.List;
+import java.util.Locale;
+
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
import org.apache.commons.lang.StringUtils;
@@ -70,4 +75,9 @@
session.save();
}
+
+ public static List<Locale> getAvaiableLocales()
+ {
+ return Components.getComponent(MessagesConfigurationManager.class).getLocales();
+ }
}
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:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -20,13 +20,9 @@
package net.sourceforge.openutils.mgnlmessages.configuration;
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.jcr.util.PropertyUtil;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.util.ArrayList;
@@ -38,13 +34,8 @@
import javax.inject.Singleton;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import net.sourceforge.openutils.mgnlmessages.MessagesModule;
-import org.apache.commons.lang.StringUtils;
-
-
/**
* @author molaschi
*/
@@ -116,43 +107,6 @@
}
}
- public static List<Locale> getAvaiableLocales()
- {
- return Components.getComponent(MessagesConfigurationManager.class).getLocales();
- }
-
- @SuppressWarnings("unchecked")
- public static List<String> getBaseNames()
- {
- Session session;
- try
- {
- session = Components.getComponent(SystemContext.class).getJCRSession(RepositoryConstants.CONFIG);
- }
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
- try
- {
- Node basenamesNode = session.getNode("/modules/messages/basenames");
-
- Iterable<Node> nodes = NodeUtil.getNodes(basenamesNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
-
- List<String> basenames = new ArrayList<String>();
-
- for (Node bn : nodes)
- {
- basenames.add(PropertyUtil.getString(bn, "basename"));
- }
- return basenames;
- }
- catch (RepositoryException e)
- {
- return new ArrayList<String>();
- }
- }
-
/**
* Returns the locales.
* @return the locales
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java 2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -20,6 +20,8 @@
package net.sourceforge.openutils.mgnlmessages.i18n;
import info.magnolia.cms.i18n.AbstractMessagesImpl;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.HashSet;
@@ -29,6 +31,7 @@
import java.util.MissingResourceException;
import java.util.Set;
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import org.apache.commons.collections.IteratorUtils;
@@ -52,9 +55,13 @@
{
super(null, locale);
messages = new ArrayList<OpenutilsMessagesImpl>();
- for (String basename : MessagesConfigurationManager.getBaseNames())
+ if (Components.getComponent(ModuleRegistry.class).getModuleInstance("messages") != null)
{
- messages.add(new OpenutilsMessagesImpl(basename, locale));
+ for (String basename : ((MessagesModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(
+ "messages")).getBasenames())
+ {
+ messages.add(new OpenutilsMessagesImpl(basename, locale));
+ }
}
}
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:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -45,7 +45,6 @@
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 org.apache.commons.lang.StringUtils;
@@ -125,7 +124,7 @@
}
Collections.sort(keys);
- locales = MessagesConfigurationManager.getAvaiableLocales();
+ locales = MessagesUtils.getAvaiableLocales();
Locale loc = this.request.getLocale();
if (locales != null && !locales.isEmpty() && !locales.contains(loc))
@@ -241,7 +240,7 @@
if (!StringUtils.isBlank(text))
{
Locale locBk = MgnlContext.getLocale();
- for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
+ for (Locale newLoc : MessagesUtils.getAvaiableLocales())
{
MgnlContext.setLocale(newLoc);
Messages messages = MgnlContext.getMessages();
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:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.objectfactory.Components;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,8 +45,8 @@
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 org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -93,9 +94,9 @@
HSSFWorkbook wb = new HSSFWorkbook();
Map<String, Set<Messages>> messages = new HashMap<String, Set<Messages>>();
- List<Locale> locales = MessagesConfigurationManager.getAvaiableLocales();
+ List<Locale> locales = MessagesUtils.getAvaiableLocales();
- for (String basename : MessagesConfigurationManager.getBaseNames())
+ for (String basename : Components.getComponent(MessagesModule.class).getBasenames())
{
Set<Messages> msgs = new LinkedHashSet<Messages>();
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java 2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java 2013-11-01 21:20:50 UTC (rev 4439)
@@ -19,13 +19,38 @@
package net.sourceforge.openutils.mgnlmessages.setup;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnltasks.MoveSubnodesAndDeleteTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author manuel
* @version $Id
*/
public class MessagesModuleVersionHandler extends SimpleModuleVersionHandler
{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List<Task> getStartupTasks(InstallContext installContext)
+ {
+ List<Task> tasks = new ArrayList<Task>();
+
+ tasks
+ .add(new MoveSubnodesAndDeleteTask(
+ RepositoryConstants.CONFIG,
+ "/modules/messages/basenames",
+ "/modules/messages/config/basenames",
+ "Basenames configuration has been migrated from /modules/messages/basenames to /modules/messages/config/basenames. Please check your configuration"));
+
+ return tasks;
+ }
}
Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml 2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml 2013-11-01 21:20:50 UTC (rev 4439)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="basenames" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ac73a05e-e7c3-4ec2-90a9-9a68c1042ebd</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-07-15T14:01:08.195Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-15T14:01:13.990Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-07-15T14:01:14.001Z</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="admin">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>6802fef7-bbed-4dd6-9c8e-e1b8069756d6</sv:value>
- </sv:property>
- <sv:property sv:name="basename" sv:type="String">
- <sv:value>info.magnolia.module.admininterface.messages</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-07-15T14:01:17.570Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-15T14:01:36.269Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-07-15T14:02:12.839Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml 2013-11-01 21:20:50 UTC (rev 4439)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="basenames" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>153abc2e-da60-4945-906d-99df11c7dc7b</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-07-15T14:01:08.195Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-15T14:01:13.990Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-11-01T15:39:37.102+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="admin">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ec64ae54-6127-4dd4-9aaf-988772ddfa05</sv:value>
+ </sv:property>
+ <sv:property sv:name="basename" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-07-15T14:01:17.570Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-15T14:01:36.269Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2008-07-15T14:02:12.839Z</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 14:40:19
|
Revision: 4611
http://openutils.svn.sourceforge.net/openutils/?rev=4611&view=rev
Author: molaschi
Date: 2015-04-13 14:40:17 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
fix jcr API usage and update jquery UI
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2015-03-05 14:31:16 UTC (rev 4610)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2015-04-13 14:40:17 UTC (rev 4611)
@@ -52,7 +52,7 @@
/**
* @author molaschi
- * @version $Id: RepositoryMessagesImpl.java 4465 2008-09-28 10:59:58Z fgiust $
+ * @version $Id: RepositoryMessagesImpl.java 3367 2015-04-10 13:09:11Z davide.bizzozero $
*/
public class RepositoryMessagesImpl extends AbstractMessagesImpl
{
@@ -91,8 +91,8 @@
{
String handle = StringUtils.replace(key, ".", "/");
Session hm = Components.getComponent(SystemContext.class).getJCRSession(
- MessagesConfigurationManager.MESSAGES_REPO);
- Node c = hm.getNode(handle);
+ MessagesConfigurationManager.MESSAGES_REPO);
+ Node c = hm.getNode("/" + handle);
String locale1 = this.locale.getLanguage() + "_" + this.locale.getCountry();
String locale2 = this.locale.getLanguage();
if (c == null || (!c.hasProperty(locale1) && !c.hasProperty(locale2)))
@@ -146,38 +146,40 @@
keys = new ArrayList<String>();
Criteria criteria = JCRCriteriaFactory
- .createCriteria()
- .setWorkspace(MessagesConfigurationManager.MESSAGES_REPO)
- .setBasePath("//*")
- .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
- .addOrder(Order.desc("@jcr:score"));
+ .createCriteria()
+ .setWorkspace(MessagesConfigurationManager.MESSAGES_REPO)
+ .setBasePath("//*")
+ .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
+ .addOrder(Order.desc("@jcr:score"));
AdvancedResult result = criteria.execute();
log.debug(
- "Number of messages loaded: {} with query {}",
- result.getTotalSize(),
- criteria.toXpathExpression());
+ "Number of messages loaded: {} with query {}",
+ result.getTotalSize(),
+ criteria.toXpathExpression());
for (AdvancedResultItem c : result.getItems())
{
-
PropertyIterator properties;
try
{
properties = c.getProperties();
- while (properties.hasNext())
+ String key = null;
+ while (properties.hasNext() && key == null)
{
Property nextProperty = properties.nextProperty();
try
{
- String key = StringUtils
- .substring(StringUtils.replace(nextProperty.getPath(), "/", "."), 1);
- if (StringUtils.isNotEmpty(key))
- {
- keys.add(key);
+ if (!nextProperty.getName().startsWith("jcr:") && !nextProperty.getName().startsWith("mgnl:")) {
+ key = StringUtils
+ .substring(StringUtils.replace(c.getPath(), "/", "."), 1);
+ if (StringUtils.isNotEmpty(key))
+ {
+ keys.add(key);
+ }
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-03-05 14:31:16 UTC (rev 4610)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 14:40:17 UTC (rev 4611)
@@ -8,11 +8,11 @@
<jsp:directive.attribute name="jquery" required="false" rtexprvalue="true" type="java.lang.Boolean" />
<c:if test="${mgnl.editMode and cmsfn:canEdit()}">
<c:if test="${not empty jquery and jquery}">
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"><!-- -->
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"><!-- -->
</script>
</c:if>
<c:if test="${not empty jqueryui and jqueryui}">
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"><!-- -->
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/jquery-ui.min.js"><!-- -->
</script>
</c:if>
<script type="text/javascript">
@@ -65,6 +65,7 @@
height: 220,
width: 350,
modal: true,
+ dialogClass: 'msgEditDialogContainer',
buttons: {
"Save": function() {
var valueTxt = $("#dialog-msgEdit-value").val();
@@ -108,7 +109,7 @@
})($);
$('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/messages.css" />');
- $('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/jquery-ui-1.8.5.custom.css" />');
+ $('head').append('<link type="text/css" rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/themes/smoothness/jquery-ui.css" />');
$(document).ready(function(){
$(".msgEdit").mgnlMessageEdit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X