Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2009-05-24 09:48:22
|
Revision: 1202
http://openutils.svn.sourceforge.net/openutils/?rev=1202&view=rev
Author: fgiust
Date: 2009-05-24 09:48:14 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-4.0.2
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:47:36 UTC (rev 1201)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:48:14 UTC (rev 1202)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -10,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmessages</artifactId>
<name>openutils-mgnlmessages</name>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.2</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -83,4 +82,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:47:48
|
Revision: 1201
http://openutils.svn.sourceforge.net/openutils/?rev=1201&view=rev
Author: fgiust
Date: 2009-05-24 09:47:36 +0000 (Sun, 24 May 2009)
Log Message:
-----------
4.0.2? e le altre?
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmessages/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/site/changes/changes.xml 2009-05-24 09:46:15 UTC (rev 1200)
+++ trunk/openutils-mgnlmessages/src/site/changes/changes.xml 2009-05-24 09:47:36 UTC (rev 1201)
@@ -9,7 +9,7 @@
<author email="molaschi(at)users.sourceforge.net">Manuel Molaschi</author>
</properties>
<body>
- <release version="4.0" date="2009-05-24" description="">
+ <release version="4.0.2" date="2009-05-24" description="">
<action type="update" dev="fgiust">Dependencies updated to magnolia 4.0.1, removed useless patches and classes with
the "info.magnolia" package</action>
</release>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:46:27
|
Revision: 1200
http://openutils.svn.sourceforge.net/openutils/?rev=1200&view=rev
Author: fgiust
Date: 2009-05-24 09:46:15 +0000 (Sun, 24 May 2009)
Log Message:
-----------
cleaned up
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
trunk/openutils-mgnlmessages/src/site/apt/index.apt
trunk/openutils-mgnlmessages/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMgnlMessagesManager.java
Removed Paths:
-------------
trunk/openutils-mgnlmessages/src/main/java/info/
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.configuration;
import info.magnolia.cms.beans.config.ContentRepository;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.i18n;
import java.util.Enumeration;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.i18n;
import info.magnolia.cms.i18n.AbstractMessagesImpl;
Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -0,0 +1,42 @@
+/**
+ * Copyright Openmind 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.i18n;
+
+import info.magnolia.cms.i18n.DefaultMessagesImpl;
+
+import java.util.Locale;
+
+
+/**
+ * Needed just because DefaultMessagesImpl has a protected constructor.
+ * @author fgiust
+ * @version $Id$
+ */
+public class OpenutilsMessagesImpl extends DefaultMessagesImpl
+{
+
+ /**
+ * @param basename
+ * @param locale
+ */
+ protected OpenutilsMessagesImpl(String basename, Locale locale)
+ {
+ super(basename, locale);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Copied: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMgnlMessagesManager.java (from rev 1198, trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/OpenutilsMgnlMessagesManager.java)
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMgnlMessagesManager.java (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMgnlMessagesManager.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -0,0 +1,52 @@
+/**
+ * Copyright Openmind 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.i18n;
+
+import info.magnolia.cms.i18n.DefaultMessagesManager;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.i18n.MessagesChain;
+import info.magnolia.cms.i18n.MessagesManager;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class OpenutilsMgnlMessagesManager extends DefaultMessagesManager
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected Messages newMessages(MessagesID messagesID)
+ {
+ Messages msgs = new MessagesChain(new RepositoryMessagesImpl(messagesID.getBasename(), messagesID.getLocale()));
+ ((MessagesChain) msgs).chain(new ModulePropertyMessagesImpl(messagesID.getLocale()));
+ ((MessagesChain) msgs).chain(new OpenutilsMessagesImpl(messagesID.getBasename(), messagesID.getLocale()));
+
+ if (!getDefaultLocale().equals(messagesID.getLocale()))
+ {
+ msgs = ((MessagesChain) msgs).chain(MessagesManager.getMessages(
+ messagesID.getBasename(),
+ getDefaultLocale()));
+ }
+ return msgs;
+ }
+
+}
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.i18n;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.i18n;
import info.magnolia.cms.i18n.AbstractMessagesImpl;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.module.ModuleLifecycle;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.pages;
import info.magnolia.cms.util.ClasspathResourcesUtil;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.pages;
import info.magnolia.cms.beans.config.ContentRepository;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.pages;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.pages;
import info.magnolia.cms.beans.runtime.Document;
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java 2009-05-24 09:46:15 UTC (rev 1200)
@@ -1,3 +1,20 @@
+/**
+ * Copyright Openmind 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.setup;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
Modified: trunk/openutils-mgnlmessages/src/site/apt/index.apt
===================================================================
--- trunk/openutils-mgnlmessages/src/site/apt/index.apt 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/site/apt/index.apt 2009-05-24 09:46:15 UTC (rev 1200)
@@ -22,8 +22,11 @@
The module needs to be installed as usual, by declaring an additional dependency into your pom or by manually dropping the jar
into magnolia.
-
+ You also need to configure in magnolia.properties:
+ info.magnolia.cms.i18n.MessagesManager=net.sourceforge.openutils.mgnlmessages.i18n.OpenutilsMgnlMessagesManager
+
+
Released versions
{{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnlmessages}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnlmessages}}
Modified: trunk/openutils-mgnlmessages/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/site/changes/changes.xml 2009-05-24 09:36:15 UTC (rev 1199)
+++ trunk/openutils-mgnlmessages/src/site/changes/changes.xml 2009-05-24 09:46:15 UTC (rev 1200)
@@ -9,6 +9,10 @@
<author email="molaschi(at)users.sourceforge.net">Manuel Molaschi</author>
</properties>
<body>
+ <release version="4.0" date="2009-05-24" description="">
+ <action type="update" dev="fgiust">Dependencies updated to magnolia 4.0.1, removed useless patches and classes with
+ the "info.magnolia" package</action>
+ </release>
<release version="4.0-b3" date="2009-04-16" description="">
<action type="update" dev="fgiust">Stable release for Magnolia 4.x</action>
</release>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:36:20
|
Revision: 1199
http://openutils.svn.sourceforge.net/openutils/?rev=1199&view=rev
Author: fgiust
Date: 2009-05-24 09:36:15 +0000 (Sun, 24 May 2009)
Log Message:
-----------
remove magnolia patches
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Removed Paths:
-------------
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-11 17:51:11 UTC (rev 1198)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:36:15 UTC (rev 1199)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
Deleted: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java 2009-05-11 17:51:11 UTC (rev 1198)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java 2009-05-24 09:36:15 UTC (rev 1199)
@@ -1,350 +0,0 @@
-/**
- * This file Copyright (c) 2003-2009 Magnolia International
- * Ltd. (http://www.magnolia-cms.com). All rights reserved.
- *
- *
- * This file is dual-licensed under both the Magnolia
- * Network Agreement and the GNU General Public License.
- * You may elect to use one or the other of these licenses.
- *
- * This file is distributed in the hope that it will be
- * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
- * Redistribution, except as permitted by whichever of the GPL
- * or MNA you select, is prohibited.
- *
- * 1. For the GPL license (GPL), you can redistribute and/or
- * modify this file under the terms of the GNU General
- * Public License, Version 3, as published by the Free Software
- * Foundation. You should have received a copy of the GNU
- * General Public License, Version 3 along with this program;
- * if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 2. For the Magnolia Network Agreement (MNA), this file
- * and the accompanying materials are made available under the
- * terms of the MNA which accompanies this distribution, and
- * is available at http://www.magnolia-cms.com/mna.html
- *
- * Any modifications to this file must keep this entire header
- * intact.
- *
- */
-package info.magnolia.cms.i18n;
-
-import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.content2bean.Content2BeanUtil;
-import info.magnolia.context.MgnlContext;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.observation.EventIterator;
-import javax.jcr.observation.EventListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-
-/**
- * From this class you get the i18n messages. You should pass a a request, but if you can't the getMessages method will
- * handle it properly. The get() methods are easy to use.
- * @author philipp
- */
-public class DefaultMessagesManager extends MessagesManager
-{
-
- private final static Logger log = LoggerFactory.getLogger(DefaultMessagesManager.class);
-
- /**
- * The current locale of the application.
- */
- private Locale applicationLocale;
-
- /**
- * List of the available locales.
- */
- private final Collection availableLocales = new ArrayList();
-
- /**
- * Map for the messages.
- */
- private Map messages;
-
- private String defaultBasename = DEFAULT_BASENAME;
-
- public DefaultMessagesManager()
- {
- // setting default language (en)
- setDefaultLocale(FALLBACK_LOCALE);
-
- initMap();
- }
-
- // for tests
- @Override
- void setDefaultBasename(String defaultBasename)
- {
- this.defaultBasename = defaultBasename;
- }
-
- /**
- * Called through the initialization process. (startup of the container)
- */
- @Override
- public void init()
- {
- load();
- registerEventListener();
- }
-
- /**
- * The lazy Map creates messages objects with a fall back to the default locale.
- */
- protected void initMap()
- {
- // FIXME use LRU: new LRUMap(20);
- // LazyMap will instanciate bundles on demand.
- final Map map = LazyMap.decorate(new HashMap(), new Transformer()
- {
-
- // this transformer will wrap the Messages in a MessagesChain which
- // will fall back to a Messages instance for the same bundle with
- // default locale.
- public Object transform(Object input)
- {
- final MessagesID id = (MessagesID) input;
- return newMessages(id);
- }
- });
- messages = Collections.synchronizedMap(map);
- }
-
- /**
- * Initializes a new Messages instances for the given MessagesID. By default, we chain to the same bundle with the
- * default Locale. (so untranslated messages show up in the default language)
- */
- protected Messages newMessages(MessagesID messagesID)
- {
- Messages msgs = new DefaultMessagesImpl(messagesID.basename, messagesID.locale);
- if (!getDefaultLocale().equals(messagesID.locale))
- {
- msgs = new MessagesChain(msgs).chain(getMessages(messagesID.basename, getDefaultLocale()));
- }
- return msgs;
- }
-
- /**
- * Load i18n configuration.
- */
- protected void load()
- {
-
- // reading the configuration from the repository, no need for context
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
-
- try
- {
- log.info("Loading i18n configuration - " + I18N_CONFIG_PATH); //$NON-NLS-1$
-
- // checks if node exists
- if (!hm.isExist(I18N_CONFIG_PATH))
- {
- // configNode = ContentUtil.createPath(hm, I18N_CONFIG_PATH,
- // ItemType.CONTENT, true);
- log.warn(I18N_CONFIG_PATH + " does not exist yet; skipping.");
- return;
- }
-
- final Content configNode = hm.getContent(I18N_CONFIG_PATH); //$NON-NLS-1$
-
- setDefaultLocale(NodeDataUtil.getString(configNode, FALLBACK_NODEDATA, FALLBACK_LOCALE));
-
- // get the available languages - creates it if it does not exist -
- // necessary to update to 3.5
- final Content languagesNode;
- if (configNode.hasContent(LANGUAGES_NODE_NAME))
- {
- languagesNode = configNode.getContent(LANGUAGES_NODE_NAME);
- }
- else
- {
- languagesNode = configNode.createContent(LANGUAGES_NODE_NAME, ItemType.CONTENT);
- }
-
- Map languageDefinitions = Content2BeanUtil.toMap(languagesNode, true, LocaleDefinition.class);
-
- // clear collection for reload
- availableLocales.clear();
-
- for (Iterator iter = languageDefinitions.values().iterator(); iter.hasNext();)
- {
- LocaleDefinition ld = (LocaleDefinition) iter.next();
- if (ld.isEnabled())
- {
- availableLocales.add(ld.getLocale());
- }
- }
- }
- catch (Exception e)
- {
- log.error("Failed to load i18n configuration - " + I18N_CONFIG_PATH, e); //$NON-NLS-1$
- }
- }
-
- /**
- * Register an event listener: reload configuration when something changes.
- */
- private void registerEventListener()
- {
- log.info("Registering event listener for i18n"); //$NON-NLS-1$
- ObservationUtil.registerChangeListener(ContentRepository.CONFIG, I18N_CONFIG_PATH, new EventListener()
- {
-
- public void onEvent(EventIterator iterator)
- {
- // reload everything
- reload();
- }
- });
- }
-
- /**
- * Reload i18n configuration.
- */
- public void reload()
- {
- try
- {
- // reload all present
- for (Iterator iter = messages.values().iterator(); iter.hasNext();)
- {
- Messages msgs = (Messages) iter.next();
- msgs.reload();
- }
- }
- catch (Exception e)
- {
- log.error("Can't reload i18n messages", e);
- }
- initMap();
- load();
- }
-
- @Override
- public Messages getMessagesInternal(String basename, Locale locale)
- {
- if (StringUtils.isEmpty(basename))
- {
- basename = defaultBasename;
- }
- return (Messages) messages.get(new MessagesID(basename, locale));
- }
-
- @Override
- public Locale getDefaultLocale()
- {
- return applicationLocale;
- }
-
- /**
- * @param defaultLocale The defaultLocale to set.
- * @deprecated since 4.0 - not used and should not be. Use setLocale() on the SystemContext instead. --note: do not
- * remove the method, make it private. applicationLocale field is still needed. --and/or remove duplication with
- * SystemContext.locale
- */
- public void setDefaultLocale(String defaultLocale)
- {
- this.applicationLocale = new Locale(defaultLocale);
- // MgnlContext.getSystemContext().setLocale(applicationLocale);
- }
-
- @Override
- public Collection getAvailableLocales()
- {
- return availableLocales;
- }
-
- public void setMessages(Map messages)
- {
- this.messages = messages;
- }
-
- /**
- * Used as the key in the Map.
- * @author Philipp Bracher
- * @version $Revision: 21431 $ ($Author: gjoseph $)
- */
- public static class MessagesID
- {
-
- private final String basename;
-
- private final Locale locale;
-
- public MessagesID(String basename, Locale locale)
- {
- this.basename = basename;
- this.locale = locale;
- }
-
- // generated equals and hashcode methods
- @Override
- public boolean equals(Object o)
- {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
-
- MessagesID that = (MessagesID) o;
-
- if (basename != null ? !basename.equals(that.basename) : that.basename != null)
- return false;
- if (locale != null ? !locale.equals(that.locale) : that.locale != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- int result = basename != null ? basename.hashCode() : 0;
- result = 31 * result + (locale != null ? locale.hashCode() : 0);
- return result;
- }
-
- /**
- * Returns the basename.
- * @return the basename
- */
- public String getBasename()
- {
- return basename;
- }
-
- /**
- * Returns the locale.
- * @return the locale
- */
- public Locale getLocale()
- {
- return locale;
- }
-
- }
-}
Deleted: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java 2009-05-11 17:51:11 UTC (rev 1198)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java 2009-05-24 09:36:15 UTC (rev 1199)
@@ -1,123 +0,0 @@
-package info.magnolia.cms.i18n;
-
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.context.MgnlContext;
-
-import java.util.Collection;
-import java.util.Locale;
-
-/**
- *
- * @author molaschi
- *
- */
-public abstract class MessagesManager {
-
- /**
- * Use this locale if no other provided.
- */
- public static final String FALLBACK_LOCALE = "en"; //$NON-NLS-1$
-
- /**
- * Use this basename if no other is provided.
- */
- public static final String DEFAULT_BASENAME = "info.magnolia.module.admininterface.messages"; //$NON-NLS-1$
-
- /**
- * The node name where the configuration for i18n is stored.
- */
- public static final String I18N_CONFIG_PATH = "/server/i18n/system"; //$NON-NLS-1$
-
- /**
- * The name of the property to store the current system language.
- */
- public static final String FALLBACK_NODEDATA = "fallbackLanguage"; //$NON-NLS-1$
-
- /**
- * Under this node all the available languages are stored. They are showed
- * in the user dialog.
- */
- public static final String LANGUAGES_NODE_NAME = "languages"; //$NON-NLS-1$
-
- public static MessagesManager getInstance() {
- return (MessagesManager) FactoryUtil
- .getSingleton(MessagesManager.class);
- }
-
- public static Messages getMessages() {
- return getMessages(null, getCurrentLocale());
- }
-
- public static Messages getMessages(String basename) {
- return getMessages(basename, getCurrentLocale());
- }
-
- public static Messages getMessages(Locale locale) {
- return getMessages(null, locale);
- }
-
- public static Messages getMessages(String basename, Locale locale) {
- return getInstance().getMessagesInternal(basename, locale);
- }
-
- public static String get(String key) {
- return getMessages().get(key);
- }
-
- /**
- * Get a message with parameters inside: the value {0} must be a number.
- *
- * @param key
- * key to find
- * @param args
- * replacement strings
- * @return message
- */
- public static String get(String key, Object[] args) {
- return getMessages().get(key, args);
- }
-
- /**
- * Use a default string.
- *
- * @param key
- * key to find
- * @param defaultMsg
- * default message
- * @return message
- */
- public static String getWithDefault(String key, String defaultMsg) {
- return getMessages().getWithDefault(key, defaultMsg);
- }
-
- /**
- * Get a message with parameters inside: the value {0} must be a number. Use
- * a default message.
- *
- * @param key
- * key to find
- * @param args
- * replacement strings
- * @param defaultMsg
- * default message
- * @return message
- */
- public static String getWithDefault(String key, Object[] args,
- String defaultMsg) {
- return getMessages().getWithDefault(key, args, defaultMsg);
- }
-
- private static Locale getCurrentLocale() {
- return MgnlContext.getInstance().getLocale();
- }
-
- public abstract void init();
-
- public abstract Collection getAvailableLocales();
-
- public abstract Locale getDefaultLocale();
-
- public abstract Messages getMessagesInternal(String basename, Locale locale);
-
- abstract void setDefaultBasename(String basename);
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-11 17:51:24
|
Revision: 1198
http://openutils.svn.sourceforge.net/openutils/?rev=1198&view=rev
Author: fgiust
Date: 2009-05-11 17:51:11 +0000 (Mon, 11 May 2009)
Log Message:
-----------
ignore (log) missing media in MediaCustomSaveHandler
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-05-11 17:22:11 UTC (rev 1197)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-05-11 17:51:11 UTC (rev 1198)
@@ -24,6 +24,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.FieldSaveHandler;
+import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -31,6 +32,8 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,6 +44,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(MediaCustomSaveHandler.class);
+
+ /**
* {@inheritDoc}
*/
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
@@ -61,19 +69,27 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
- Content media = hm.getContentByUUID(value);
+ try
+ {
+ Content media = hm.getContentByUUID(value);
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(media);
- mtc.getHandler().onSavingPropertyMedia(
- media,
- parentNode,
- configNode,
- name,
- form,
- type,
- valueType,
- isRichEditValue,
- encoding);
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
+ media);
+ mtc.getHandler().onSavingPropertyMedia(
+ media,
+ parentNode,
+ configNode,
+ name,
+ form,
+ type,
+ valueType,
+ isRichEditValue,
+ encoding);
+ }
+ catch (ItemNotFoundException e)
+ {
+ log.warn("Missing media {} referenced in node {}", value, parentNode.getHandle());
+ }
}
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-05-11 17:22:11 UTC (rev 1197)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-05-11 17:51:11 UTC (rev 1198)
@@ -8,6 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0-b5" date="in svn" description="">
+ <action type="fix" dev="fgiust">MediaCustomSaveHandler now only warns about missing referenced media without
+ blocking</action>
+ </release>
<release version="4.0-b4" date="2009-04-29" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-11 17:22:26
|
Revision: 1197
http://openutils.svn.sourceforge.net/openutils/?rev=1197&view=rev
Author: fgiust
Date: 2009-05-11 17:22:11 +0000 (Mon, 11 May 2009)
Log Message:
-----------
fix multivalues in ConfigurableFreemarkerDialog
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java
trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2009-05-08 21:09:17 UTC (rev 1196)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2009-05-11 17:22:11 UTC (rev 1197)
@@ -31,12 +31,10 @@
import java.io.IOException;
import java.io.Writer;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import javax.jcr.PathNotFoundException;
@@ -68,39 +66,6 @@
private String uuid;
/**
- * {@inheritDoc}
- */
- @Override
- protected List readValues()
- {
-
- List values = new ArrayList();
-
- if (this.getStorageNode() != null)
- {
- try
- {
- // cycles on website content node to get multiple value
- int size = this.getStorageNode().getContent(this.getName()).getNodeDataCollection().size();
- for (int i = 0; i < size; i++)
- {
- NodeData data = this.getStorageNode().getContent(this.getName()).getNodeData("" + i);
- values.add(data.getString());
- }
- }
- catch (PathNotFoundException e)
- {
- // not yet existing: OK
- }
- catch (RepositoryException re)
- {
- log.error("can't set values", re);
- }
- }
- return values;
- }
-
- /**
* Get a recursive map view of a content node
* @param node content node
* @return recursive map view on content node properties and children
@@ -177,6 +142,8 @@
parameters.put("configuration", this.configuration);
parameters.put("uuid", this.uuid);
parameters.put("alreadyrendered", getRequest().getAttribute(alreadyRenderedKey) != null);
+ addToParameters(parameters);
+
this.drawHtmlPre(out);
try
@@ -199,6 +166,11 @@
getRequest().setAttribute(alreadyRenderedKey, Boolean.TRUE);
}
+ protected void addToParameters(Map parameters)
+ {
+ // do nothing, can be user in subclasses
+ }
+
/**
* @return ftl template path
*/
Modified: trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-05-08 21:09:17 UTC (rev 1196)
+++ trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-05-11 17:22:11 UTC (rev 1197)
@@ -8,13 +8,19 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0.1" date="in svn" description="">
+ <action type="add" dev="fgiust">Added a new mehod addToParameters in ConfigurableFreemarkerDialog that can be
+ overridden to supply custom values to the freemarker template</action>
+ <action type="fix" dev="fgiust">Update handling of multi-value properties in ConfigurableFreemarkerDialog to
+ magnolia 4.0</action>
+ </release>
<release version="4.0" date="2009-04-09" description="">
<action type="update" dev="fgiust">Update magnolia dependencies to version 4.0.</action>
<action type="fix" dev="fgiust">Fixed bug for column size on ie6 (see http://extjs.com/forum/showthread.php?p=151624
)</action>
- <action type="new" dev="fgiust">Added functionality to move rows in grid</action>
- <action type="new" dev="fgiust">New "date" type in grid</action>
- <action type="new" dev="fgiust">Misc fixes to "clear all" and "paste" features</action>
+ <action type="add" dev="fgiust">Added functionality to move rows in grid</action>
+ <action type="add" dev="fgiust">New "date" type in grid</action>
+ <action type="add" dev="fgiust">Misc fixes to "clear all" and "paste" features</action>
</release>
<release version="3.5.5" date="2008-07-29" description="">
<action type="fix" dev="fgiust">grid control now works properly also with fields containing non-standard chars in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 21:09:27
|
Revision: 1196
http://openutils.svn.sourceforge.net/openutils/?rev=1196&view=rev
Author: fgrilli
Date: 2009-05-08 21:09:17 +0000 (Fri, 08 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-08 21:09:08 UTC (rev 1195)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-08 21:09:17 UTC (rev 1196)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>openutils-mgnlcriteria</name>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<description>A Hibernate's Criteria-like API to programmatically
generate JCR queries with Magnolia</description>
<build>
@@ -97,10 +97,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-1.0</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 21:09:12
|
Revision: 1195
http://openutils.svn.sourceforge.net/openutils/?rev=1195&view=rev
Author: fgrilli
Date: 2009-05-08 21:09:08 +0000 (Fri, 08 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-1.0
Added Paths:
-----------
tags/openutils-mgnlcriteria-1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 21:08:03
|
Revision: 1194
http://openutils.svn.sourceforge.net/openutils/?rev=1194&view=rev
Author: fgrilli
Date: 2009-05-08 21:07:48 +0000 (Fri, 08 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-1.0
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-08 21:05:22 UTC (rev 1193)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-08 21:07:48 UTC (rev 1194)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>openutils-mgnlcriteria</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<description>A Hibernate's Criteria-like API to programmatically
generate JCR queries with Magnolia</description>
<build>
@@ -98,4 +97,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-1.0</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 21:05:27
|
Revision: 1193
http://openutils.svn.sourceforge.net/openutils/?rev=1193&view=rev
Author: fgrilli
Date: 2009-05-08 21:05:22 +0000 (Fri, 08 May 2009)
Log Message:
-----------
added license header to source files
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRMagnoliaCriteriaQueryTranslator.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl.MagnoliaCriteriaImpl;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRMagnoliaCriteriaQueryTranslator.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRMagnoliaCriteriaQueryTranslator.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRMagnoliaCriteriaQueryTranslator.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query;
import org.apache.commons.lang.exception.NestableRuntimeException;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import java.util.Calendar;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
/**
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
/**
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import java.util.ArrayList;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import java.io.Serializable;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
import java.util.Calendar;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.criterion;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath;
import org.apache.commons.lang.StringUtils;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath.impl;
import java.io.Serializable;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath.impl;
import org.apache.commons.lang.StringUtils;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath.impl;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath.impl;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2009-05-08 21:03:34 UTC (rev 1192)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2009-05-08 21:05:22 UTC (rev 1193)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright Openmind 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.mgnlcriteria.jcr.query.xpath.utils;
import org.apache.commons.lang.StringUtils;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 21:03:45
|
Revision: 1192
http://openutils.svn.sourceforge.net/openutils/?rev=1192&view=rev
Author: fgrilli
Date: 2009-05-08 21:03:34 +0000 (Fri, 08 May 2009)
Log Message:
-----------
removed javadoc style comment
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/etc/header.txt
Modified: trunk/openutils-mgnlcriteria/src/etc/header.txt
===================================================================
--- trunk/openutils-mgnlcriteria/src/etc/header.txt 2009-05-08 20:55:57 UTC (rev 1191)
+++ trunk/openutils-mgnlcriteria/src/etc/header.txt 2009-05-08 21:03:34 UTC (rev 1192)
@@ -1,17 +1,16 @@
-/**
- * Copyright Openmind 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/>.
- *
- */
\ No newline at end of file
+
+ Copyright Openmind 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/>.
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 20:56:07
|
Revision: 1191
http://openutils.svn.sourceforge.net/openutils/?rev=1191&view=rev
Author: fgrilli
Date: 2009-05-08 20:55:57 +0000 (Fri, 08 May 2009)
Log Message:
-----------
added header.txt with gplv3 license
Added Paths:
-----------
trunk/openutils-mgnlcriteria/src/etc/
trunk/openutils-mgnlcriteria/src/etc/header.txt
Added: trunk/openutils-mgnlcriteria/src/etc/header.txt
===================================================================
--- trunk/openutils-mgnlcriteria/src/etc/header.txt (rev 0)
+++ trunk/openutils-mgnlcriteria/src/etc/header.txt 2009-05-08 20:55:57 UTC (rev 1191)
@@ -0,0 +1,17 @@
+/**
+ * Copyright Openmind 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/>.
+ *
+ */
\ No newline at end of file
Property changes on: trunk/openutils-mgnlcriteria/src/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-08 20:54:41
|
Revision: 1190
http://openutils.svn.sourceforge.net/openutils/?rev=1190&view=rev
Author: fgrilli
Date: 2009-05-08 20:54:29 +0000 (Fri, 08 May 2009)
Log Message:
-----------
added mvn license plugin
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-07 12:44:25 UTC (rev 1189)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-08 20:54:29 UTC (rev 1190)
@@ -1,48 +1,101 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-mgnlcriteria</artifactId>
- <name>openutils-mgnlcriteria</name>
- <version>1.0-SNAPSHOT</version>
- <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repo.magnolia.info/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <name>openutils-mgnlcriteria</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>A Hibernate's Criteria-like API to programmatically
+ generate JCR queries with Magnolia</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <configuration>
+ <basedir>${basedir}</basedir>
+ <header>${basedir}/src/etc/header.txt</header>
+ <quiet>false</quiet>
+ <failIfMissing>true</failIfMissing>
+ <aggregate>false</aggregate>
+ <includes>
+ <include>src/**</include>
+ <include>**/test/**</include>
+ </includes>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>src/site/**</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <mapping>
+ <jwc>XML_STYLE</jwc>
+ <application>XML_STYLE</application>
+ <myFileExtension>JAVADOC_STYLE</myFileExtension>
+ </mapping>
+ <useDefaultMapping>true</useDefaultMapping>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>mc-release</id>
+ <name>Local Maven repository of releases</name>
+ <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repo.magnolia.info/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-05-07 12:44:32
|
Revision: 1189
http://openutils.svn.sourceforge.net/openutils/?rev=1189&view=rev
Author: molaschi
Date: 2009-05-07 12:44:25 +0000 (Thu, 07 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-07 12:44:04 UTC (rev 1188)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-07 12:44:25 UTC (rev 1189)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmessages</artifactId>
<name>openutils-mgnlmessages</name>
- <version>4.0.1</version>
+ <version>4.0.2-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -82,10 +82,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-05-07 12:44:11
|
Revision: 1188
http://openutils.svn.sourceforge.net/openutils/?rev=1188&view=rev
Author: molaschi
Date: 2009-05-07 12:44:04 +0000 (Thu, 07 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-4.0.1
Added Paths:
-----------
tags/openutils-mgnlmessages-4.0.1/
tags/openutils-mgnlmessages-4.0.1/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmessages-4.0.1/pom.xml
Deleted: tags/openutils-mgnlmessages-4.0.1/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-02 13:12:08 UTC (rev 1185)
+++ tags/openutils-mgnlmessages-4.0.1/pom.xml 2009-05-07 12:44:04 UTC (rev 1188)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlmessages</artifactId>
- <name>openutils-mgnlmessages</name>
- <version>4.0-b4-SNAPSHOT</version>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlmessages-4.0.1/pom.xml (from rev 1187, trunk/openutils-mgnlmessages/pom.xml)
===================================================================
--- tags/openutils-mgnlmessages-4.0.1/pom.xml (rev 0)
+++ tags/openutils-mgnlmessages-4.0.1/pom.xml 2009-05-07 12:44:04 UTC (rev 1188)
@@ -0,0 +1,91 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlmessages</artifactId>
+ <name>openutils-mgnlmessages</name>
+ <version>4.0.1</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repository.magnolia-cms.com/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-05-07 12:43:31
|
Revision: 1187
http://openutils.svn.sourceforge.net/openutils/?rev=1187&view=rev
Author: molaschi
Date: 2009-05-07 12:43:18 +0000 (Thu, 07 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-4.0.1
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-07 12:42:26 UTC (rev 1186)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-07 12:43:18 UTC (rev 1187)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -10,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmessages</artifactId>
<name>openutils-mgnlmessages</name>
- <version>4.0-b4-SNAPSHOT</version>
+ <version>4.0.1</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -83,4 +82,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-05-07 12:42:34
|
Revision: 1186
http://openutils.svn.sourceforge.net/openutils/?rev=1186&view=rev
Author: molaschi
Date: 2009-05-07 12:42:26 +0000 (Thu, 07 May 2009)
Log Message:
-----------
magnolia to v4.0.1
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-02 13:12:08 UTC (rev 1185)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-07 12:42:26 UTC (rev 1186)
@@ -39,17 +39,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 13:12:14
|
Revision: 1185
http://openutils.svn.sourceforge.net/openutils/?rev=1185&view=rev
Author: fgiust
Date: 2009-05-02 13:12:08 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 13:12:02 UTC (rev 1184)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 13:12:08 UTC (rev 1185)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>openutils-mgnlstripes</name>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -101,10 +101,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.2</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 13:12:03
|
Revision: 1184
http://openutils.svn.sourceforge.net/openutils/?rev=1184&view=rev
Author: fgiust
Date: 2009-05-02 13:12:02 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlstripes-4.0.2
Added Paths:
-----------
tags/openutils-mgnlstripes-4.0.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 13:11:20
|
Revision: 1183
http://openutils.svn.sourceforge.net/openutils/?rev=1183&view=rev
Author: fgiust
Date: 2009-05-02 13:11:18 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlstripes-4.0.2
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 13:10:23 UTC (rev 1182)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 13:11:18 UTC (rev 1183)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>openutils-mgnlstripes</name>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.2</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -101,4 +101,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 13:10:25
|
Revision: 1182
http://openutils.svn.sourceforge.net/openutils/?rev=1182&view=rev
Author: fgiust
Date: 2009-05-02 13:10:23 +0000 (Sat, 02 May 2009)
Log Message:
-----------
renderer reworked
Modified Paths:
--------------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
trunk/openutils-mgnlstripes/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 12:38:24 UTC (rev 1181)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 13:10:23 UTC (rev 1182)
@@ -24,8 +24,8 @@
import info.magnolia.module.templating.Paragraph;
import info.magnolia.module.templating.ParagraphRenderer;
import info.magnolia.module.templating.RenderException;
-import info.magnolia.module.templating.Template;
-import info.magnolia.module.templating.TemplateRenderer;
+import info.magnolia.module.templating.RenderableDefinition;
+import info.magnolia.module.templating.renderers.JspTemplateRenderer;
import java.io.IOException;
import java.io.Writer;
@@ -39,10 +39,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.stripes.action.Resolution;
import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.controller.DispatcherServlet;
-import net.sourceforge.stripes.controller.ExecutionContext;
import net.sourceforge.stripes.controller.StripesConstants;
import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.controller.StripesRequestWrapper;
@@ -75,7 +73,7 @@
* @author fgiust
* @version $Id$
*/
-public class StripesRenderer implements ParagraphRenderer, TemplateRenderer
+public class StripesRenderer extends JspTemplateRenderer implements ParagraphRenderer
{
private StripesDispatcherServlet stripesDispatcherServlet = new StripesDispatcherServlet();
@@ -88,53 +86,47 @@
/**
* {@inheritDoc}
*/
- public void renderTemplate(Template template, HttpServletRequest request, HttpServletResponse response)
- throws IOException, ServletException
+ public void render(Content content, Paragraph paragraph, Writer out) throws RenderException, IOException
{
try
{
- renderTemplate(MgnlContext.getAggregationState().getCurrentContent(), template, response.getWriter());
+ render(content, (RenderableDefinition) paragraph, out);
}
- catch (RenderException e)
+ finally
{
- throw new ServletException(e);
+ out.flush();
}
}
- /**
- * {@inheritDoc}
- */
- public void renderTemplate(Content content, Template template, Writer out) throws RenderException, IOException
+ @Override
+ protected void onRender(Content content, RenderableDefinition definition, Writer out, Map ctx, String templatePath)
+ throws RenderException
{
+
+ HttpServletResponse response = ((WebContext) MgnlContext.getInstance()).getResponse();
+ if (response.isCommitted())
+ {
+ log.warn("Attempting to forward to {}, but response is already committed.", templatePath);
+ }
+
Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent());
- renderCommon(template.getTemplatePath(), nodeDataMap, out);
+ try
+ {
+ renderCommon(definition.getTemplatePath(), nodeDataMap, out);
+ }
+ catch (IOException e)
+ {
+ throw new RenderException(e);
+ }
}
/**
- * <p>
- * Invokes the following instance level methods in order to coordinate the processing of requests:
- * </p>
- * <ul>
- * <li>{@link #resolveActionBean(ExecutionContext)}</li>
- * <li>{@link #resolveHandler(ExecutionContext)}</li>
- * <li>{@link #doBindingAndValidation(ExecutionContext)}</li>
- * <li>{@link #doCustomValidation(ExecutionContext)}</li>
- * <li>{@link #handleValidationErrors(ExecutionContext)}</li>
- * <li>{@link #invokeEventHandler(ExecutionContext)}</li>
- * </ul>
- * <p>
- * If any of the above methods return a {@link Resolution} the rest of the request processing is aborted and the
- * resolution is executed.
- * </p> {@inheritDoc}
+ * {@inheritDoc}
*/
- public void render(Content content, Paragraph paragraph, Writer out) throws IOException
+ @Override
+ protected Map newContext()
{
- // @fgiust start custom magnolia setup
-
- final String templatePath = paragraph.getTemplatePath();
- Map<String, String[]> nodeDataMap = contentToMap(content);
-
- renderCommon(templatePath, nodeDataMap, out);
+ return MgnlContext.getWebContext("StripesRenderer can only be used with a WebContext");
}
/**
@@ -174,7 +166,7 @@
try
{
- stripesDispatcherServlet.doPost(request, response);
+ stripesDispatcherServlet.service(request, response);
}
catch (ServletException e)
{
@@ -225,10 +217,9 @@
* {@inheritDoc}
*/
@Override
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
- IOException
+ public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException
{
- super.doPost(request, response);
+ super.service(request, response);
}
/**
Modified: trunk/openutils-mgnlstripes/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 12:38:24 UTC (rev 1181)
+++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 13:10:23 UTC (rev 1182)
@@ -8,7 +8,12 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="4.0" date="2009-05-02" description="">
+ <release version="4.0.2" date="2009-05-02" description="">
+ <action type="add" dev="fgiust">Stripes renderer updated to set magnolia 4.0 implicit objects by default (actpage,
+ content...)</action>
+ <action type="fix" dev="fgiust">Fixed "post not supported error" with stripes 1.5.1</action>
+ </release>
+ <release version="4.0.1" date="2009-05-02" description="">
<action type="update" dev="fgiust">updated to Stripes 1.5.1</action>
<action type="add" dev="fgiust">added dependency from openutils-mgnltasks</action>
<action type="add" dev="fgiust">i18n basename for paragraphs can now be set using the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 12:38:26
|
Revision: 1181
http://openutils.svn.sourceforge.net/openutils/?rev=1181&view=rev
Author: fgiust
Date: 2009-05-02 12:38:24 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:38:14 UTC (rev 1180)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:38:24 UTC (rev 1181)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>openutils-mgnlstripes</name>
- <version>4.0.1</version>
+ <version>4.0.2-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -101,10 +101,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 12:38:16
|
Revision: 1180
http://openutils.svn.sourceforge.net/openutils/?rev=1180&view=rev
Author: fgiust
Date: 2009-05-02 12:38:14 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlstripes-4.0.1
Added Paths:
-----------
tags/openutils-mgnlstripes-4.0.1/
tags/openutils-mgnlstripes-4.0.1/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlstripes-4.0.1/pom.xml
Deleted: tags/openutils-mgnlstripes-4.0.1/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:36:19 UTC (rev 1178)
+++ tags/openutils-mgnlstripes-4.0.1/pom.xml 2009-05-02 12:38:14 UTC (rev 1180)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlstripes</artifactId>
- <name>openutils-mgnlstripes</name>
- <version>4.1-SNAPSHOT</version>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.stripes</groupId>
- <artifactId>stripes</artifactId>
- <version>1.5.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repo.magnolia.info/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlstripes-4.0.1/pom.xml (from rev 1179, trunk/openutils-mgnlstripes/pom.xml)
===================================================================
--- tags/openutils-mgnlstripes-4.0.1/pom.xml (rev 0)
+++ tags/openutils-mgnlstripes-4.0.1/pom.xml 2009-05-02 12:38:14 UTC (rev 1180)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlstripes</artifactId>
+ <name>openutils-mgnlstripes</name>
+ <version>4.0.1</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.stripes</groupId>
+ <artifactId>stripes</artifactId>
+ <version>1.5.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repo.magnolia.info/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 12:37:52
|
Revision: 1179
http://openutils.svn.sourceforge.net/openutils/?rev=1179&view=rev
Author: fgiust
Date: 2009-05-02 12:37:51 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlstripes-4.0.1
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:36:19 UTC (rev 1178)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:37:51 UTC (rev 1179)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -11,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>openutils-mgnlstripes</name>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0.1</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -102,4 +101,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 12:36:21
|
Revision: 1178
http://openutils.svn.sourceforge.net/openutils/?rev=1178&view=rev
Author: fgiust
Date: 2009-05-02 12:36:19 +0000 (Sat, 02 May 2009)
Log Message:
-----------
patches + i18nbasename support
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
trunk/openutils-mgnlstripes/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -39,7 +40,7 @@
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
- <version>1.5</version>
+ <version>1.5.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -58,6 +59,11 @@
<version>4.0</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -96,4 +102,4 @@
</snapshots>
</repository>
</repositories>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -97,6 +97,7 @@
paragraph.setDialog(name);
paragraph.setTemplatePath(binding);
paragraph.setType("stripes");
+ paragraph.setI18nBasename(StripesModule.getInstance().getI18nbasename());
paragraphs.add(paragraph);
log.info("Registering stripes paragraph {}", paragraph.getName()); //$NON-NLS-1$
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -45,6 +45,10 @@
class MgnlStripesRequestWrapper extends HttpServletRequestWrapper
{
+ private static final String SERVLET_PATH = "mgnlStripesServletPath";
+
+ private static final String ALREADY_INCLUDED = "mgnlAlreadyIncluded";
+
/**
* Hacked servlet path.
*/
@@ -139,7 +143,7 @@
@Override
public RequestDispatcher getRequestDispatcher(String path)
{
- return new MagnoliaRequestDispatcher(path, out);
+ return new MagnoliaRequestDispatcher(path, out, (HttpServletRequest) this.getRequest());
}
/**
@@ -157,14 +161,17 @@
private Writer out;
+ private HttpServletRequest originalRequest;
+
/**
* Created a new MagnoliaRequestDispatcher for the given url.
* @param url url passed to {@link HttpServletRequest#getRequestDispatcher()}
*/
- public MagnoliaRequestDispatcher(String url, Writer out)
+ public MagnoliaRequestDispatcher(String url, Writer out, HttpServletRequest originalRequest)
{
this.url = url;
this.out = out;
+ this.originalRequest = originalRequest;
}
/**
@@ -172,7 +179,16 @@
*/
public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException
{
- ((WebContext) MgnlContext.getInstance()).include(url, out);
+ request.setAttribute(SERVLET_PATH, url);
+ if (request.getAttribute(ALREADY_INCLUDED) == null)
+ {
+ request.setAttribute(ALREADY_INCLUDED, true);
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+ else
+ {
+ originalRequest.getRequestDispatcher(url).include(request, response);
+ }
}
/**
@@ -180,7 +196,16 @@
*/
public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException
{
- ((WebContext) MgnlContext.getInstance()).include(url, out);
+ request.setAttribute(SERVLET_PATH, url);
+ if (request.getAttribute(ALREADY_INCLUDED) == null)
+ {
+ request.setAttribute(ALREADY_INCLUDED, true);
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+ else
+ {
+ originalRequest.getRequestDispatcher(url).include(request, response);
+ }
}
}
Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -0,0 +1,82 @@
+/**
+ * Copyright Openmind 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 it.openutils.magnoliastripes;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class StripesModule implements ModuleLifecycle
+{
+
+ private static StripesModule instance;
+
+ /**
+ * Basename for Stripes paragraphs.
+ */
+ private String i18nbasename;
+
+ public StripesModule()
+ {
+ instance = this;
+ }
+
+ public static StripesModule getInstance()
+ {
+ return instance;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ // nothing to do
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ // nothing to do
+ }
+
+ /**
+ * Returns the i18nbasename.
+ * @return the i18nbasename
+ */
+ public String getI18nbasename()
+ {
+ return i18nbasename;
+ }
+
+ /**
+ * Sets the i18nbasename.
+ * @param i18nbasename the i18nbasename to set
+ */
+ public void setI18nbasename(String i18nbasename)
+ {
+ this.i18nbasename = i18nbasename;
+ }
+
+}
Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -225,7 +225,8 @@
* {@inheritDoc}
*/
@Override
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+ IOException
{
super.doPost(request, response);
}
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -17,11 +17,13 @@
*/
package it.openutils.magnoliastripes.setup;
+import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AddMimeMappingTask;
import info.magnolia.module.delta.FilterOrderingTask;
import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.CreateMissingPropertyTask;
import java.util.List;
@@ -44,6 +46,14 @@
tasks.add(new AddMimeMappingTask("action", "text/plain", "/.resources/file-icons/htm.png"));
+ tasks.add(new CreateMissingPropertyTask(
+ "Adding property: /modules/stripes/config/i18nbasename",
+ "Adding property: /modules/stripes/config/i18nbasename",
+ ContentRepository.CONFIG,
+ "/modules/stripes/config",
+ "i18nbasename",
+ "it.openutils.magnoliastripes"));
+
tasks.add(new FilterOrderingTask(
"stripes",
new String[]{"context", "login", "uriSecurity", "multipartRequest" }));
Modified: trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -4,6 +4,7 @@
<name>stripes</name>
<displayName>stripes</displayName>
<description>Stripes integration module</description>
+ <class>it.openutils.magnoliastripes.StripesModule</class>
<versionHandler>it.openutils.magnoliastripes.setup.StripesModuleVersionHandler</versionHandler>
<version>${project.version}</version>
-</module>
+</module>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -8,8 +8,15 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0" date="2009-05-02" description="">
+ <action type="update" dev="fgiust">updated to Stripes 1.5.1</action>
+ <action type="add" dev="fgiust">added dependency from openutils-mgnltasks</action>
+ <action type="add" dev="fgiust">i18n basename for paragraphs can now be set using the
+ /modules/stripes/config/i18nbasename property</action>
+ </release>
<release version="4.0" date="2009-01-30" description="">
- <action type="update" dev="molaschi">port to magnolia 4.0 (created the branch "openutils-mgnlstripes-3.6.x" to continue supporting magnolia 3.6.x integration)</action>
+ <action type="update" dev="molaschi">port to magnolia 4.0 (created the branch "openutils-mgnlstripes-3.6.x" to
+ continue supporting magnolia 3.6.x integration)</action>
</release>
<release version="3.6-b2" date="2008-09-17" description="">
<action type="fix" dev="fgiust">fix handling of stripes locale</action>
@@ -21,8 +28,8 @@
</release>
<release version="3.5" date="2008-04-24" description="3.5">
<action type="update" dev="fgiust">update deps to magnolia 3.5.4</action>
- <action type="update" dev="fgiust">the stripes filter is now added by the module automatically, and it should not
- be added anymore in web.xml</action>
+ <action type="update" dev="fgiust">the stripes filter is now added by the module automatically, and it should not be
+ added anymore in web.xml</action>
<action type="update" dev="fgiust">multipart forms are now handled properly</action>
</release>
<release version="0.2" date="2007-08-14" description="">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
