Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3784] magnoliamodules/trunk
|
From: <fg...@us...> - 2012-03-13 08:20:52
|
Revision: 3784
http://openutils.svn.sourceforge.net/openutils/?rev=3784&view=rev
Author: fgiust
Date: 2012-03-13 08:20:41 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
bump all versions to 5.0.0-SNAPSHOT
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -100,122 +100,116 @@
<version>${stk.version}</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlbootstrapsync</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcas</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcache</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlgroovy</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.4.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>4.2.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrepoutils</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
- <version>4.1.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstruts11</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
- <!--
- dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
- <version>4.3-SNAPSHOT</version> </dependency
- -->
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
- <!--
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltagcloud</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
- -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-elfunctions</artifactId>
- <version>1.1.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrules</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnllms</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmobile</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencyManagement>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -12,7 +12,7 @@
<artifactId>openutils-mgnlbootstrapsync</artifactId>
<name>BootstrapSync for Magnolia CMS</name>
<description>Keep your magnolia bootstrap files in sync while developing</description>
- <version>1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -10,7 +11,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -60,7 +61,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlcas</artifactId>
<name>CAS integration module for Magnolia CMS</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2007</inceptionYear>
<licenses>
<license>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -11,7 +12,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -111,12 +112,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.7</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -126,7 +127,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.3.0</version>
+ <version>5.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -10,7 +11,7 @@
<artifactId>openutils-mgnlcontrols</artifactId>
<name>Controls module for Magnolia CMS</name>
<description>Additional controls that can be used in Magnolia dialogs</description>
- <version>4.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -91,7 +92,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -8,7 +9,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -131,7 +132,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.9</version>
+ <version>5.0.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -65,7 +65,7 @@
throws RepositoryException,
AccessDeniedException
{
- super(item, hierarchyManager);
+ super(item);
this.row = row;
}
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -36,7 +36,7 @@
import java.util.Map;
import java.util.Set;
-import javax.jcr.Item;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -64,11 +64,11 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- public MappedDefaultContent(Item elem, HierarchyManager hierarchyManager)
+ public MappedDefaultContent(Node elem, HierarchyManager hierarchyManager)
throws RepositoryException,
AccessDeniedException
{
- super(elem, hierarchyManager);
+ super(elem);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -9,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlext</artifactId>
<name>openutils-mgnlext</name>
- <version>2.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</connection>
<developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -10,7 +11,7 @@
<artifactId>openutils-mgnlgroovy</artifactId>
<name>Groovy Shell for Magnolia CMS</name>
<description>Groovy Shell for Magnolia CMS is a module for running Groovy Scripts from the Magnolia admin interface. </description>
- <version>1.2.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -90,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -10,7 +11,7 @@
<artifactId>openutils-mgnllms</artifactId>
<name>E-learning Module for Magnolia CMS</name>
<description>A module for Magnolia CMS to build a simple Learning Management System.</description>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -102,12 +103,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.0.7</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -152,14 +153,14 @@
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -168,13 +169,11 @@
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>
- <!-- to be released before the final 4.3 version -->
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>2.0-b8</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
- <!-- to be released before the final 4.3 version -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -204,4 +203,4 @@
<properties>
<magnolia.version>4.5</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmail</artifactId>
<name>simplemail module for Magnolia CMS</name>
- <version>0.0.2-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2011</inceptionYear>
<description>An extension to the mail module for Magnolia CMS</description>
<url>http://www.openmindlab.com/lab/products/mgnlmail.html</url>
@@ -98,7 +98,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.5.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -112,12 +112,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -127,7 +127,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.7</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -170,7 +170,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.1</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -79,7 +80,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -89,7 +90,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.3</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -87,15 +87,8 @@
<artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
</dependency>
- <!--
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>info.magnolia</groupId>
<artifactId>magnolia-gui</artifactId>
<version>${magnolia.version}</version>
</dependency>
@@ -113,7 +106,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.wurfl</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -9,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrepoutils</artifactId>
<name>Repository tools for Magnolia CMS</name>
- <version>4.1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<description>A simple GUI for running maintenance operations on jackrabbit repositories from the Magnolia admin
interface</description>
<url>http://www.openmindlab.com/lab/products/repotools.html</url>
@@ -75,7 +76,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.1</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -10,7 +11,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrules</artifactId>
<name>Rules module for Magnolia CMS</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<description>A simple rule engine integrated into Magnolia CMS</description>
<licenses>
<license>
@@ -99,7 +100,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
@@ -148,4 +149,4 @@
<properties>
<magnolia.version>4.5</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -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-parent</artifactId>
@@ -12,7 +13,7 @@
<name>Stripes module for Magnolia CMS</name>
<description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
<inceptionYear>2008</inceptionYear>
- <version>4.1.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -72,7 +73,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<name>Struts 1.1 module for Magnolia CMS</name>
<description>A module for for Magnolia CMS that let you use the Struts 1.1 framework inside Magnolia</description>
- <version>4.0.2-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -96,7 +96,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.0</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>struts</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltagcloud</artifactId>
<name>Tagcloud module for Magnolia CMS</name>
- <version>1.1.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<description>A module for managing tag clouds for Magnolia CMS</description>
<licenses>
<license>
@@ -123,12 +123,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -215,7 +215,7 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -270,7 +270,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
TagCloudManager.getInstance().stopObserving();
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>Tasks for for Magnolia CMS</name>
- <version>4.1.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<inceptionYear>2008</inceptionYear>
<scm>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-13 08:20:41 UTC (rev 3784)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlutils</artifactId>
<name>Generic utilities for Magnolia CMS</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A collection of Magnolia utilities and extensions</description>
<url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -23,6 +23,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.i18n.I18nContentSupportFactory;
@@ -340,7 +341,7 @@
if (content != null)
{
- count = content.getChildren(ItemType.CONTENT).size();
+ count = content.getChildren(MgnlNodeType.NT_CONTENT).size();
}
return count;
@@ -356,7 +357,7 @@
if (content != null)
{
- return content.getChildren(ItemType.CONTENT);
+ return content.getChildren(MgnlNodeType.NT_CONTENT);
}
return null;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -20,6 +20,7 @@
package it.openutils.mgnlutils.templating;
import info.magnolia.cms.core.Content;
+import info.magnolia.rendering.template.configured.ConfiguredTemplateDefinition;
import java.util.HashSet;
import java.util.Set;
@@ -52,7 +53,7 @@
* @author fgiust
* @version $Id$
*/
-public class ExtendedTemplate extends Template
+public class ExtendedTemplate extends ConfiguredTemplateDefinition
{
private String parentPath;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2012-03-13 08:20:41 UTC (rev 3784)
@@ -49,9 +49,9 @@
public class MgnlUtilsElFunctionsTest extends TestNgRepositoryTestcase
{
- LocaleDefinition en = new LocaleDefinition("en", null, true);
+ LocaleDefinition en = LocaleDefinition.make("en", null, true);
- LocaleDefinition it = new LocaleDefinition("it", null, true);
+ LocaleDefinition it = LocaleDefinition.make("it", null, true);
@Test
public void testSplitAndTokenize() throws Exception
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
