[Openutils-svn] SF.net SVN: openutils:[2924] trunk/openutils-mgnlcriteria

[<fg...@us...>]

Revision: 2924
          http://openutils.svn.sourceforge.net/openutils/?rev=2924&view=rev
Author:   fgiust
Date:     2010-08-29 15:11:35 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
magnolia 4.0 compatibility

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
    trunk/openutils-mgnlcriteria/src/test/resources/test-magnolia.properties

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-08-29 08:58:29 UTC (rev 2923)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-08-29 15:11:35 UTC (rev 2924)
@@ -89,6 +89,11 @@
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>1.5.8</version>

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java	2010-08-29 08:58:29 UTC (rev 2923)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java	2010-08-29 15:11:35 UTC (rev 2924)
@@ -160,7 +160,8 @@
             FileProperties props = new FileProperties(this, (String) key);
             value = props.getProperty(FileProperties.PATH);
         }
-        else if (nodeData.isMultiValue() == NodeData.MULTIVALUE_TRUE)
+        else if (nodeData.isMultiValue() == 1)
+        // not using NodeData.MULTIVALUE_TRUE since the constant is not defined in magnolia 4.0
         {
 
             Value[] values = nodeData.getValues();

Modified: trunk/openutils-mgnlcriteria/src/test/resources/test-magnolia.properties
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/resources/test-magnolia.properties	2010-08-29 08:58:29 UTC (rev 2923)
+++ trunk/openutils-mgnlcriteria/src/test/resources/test-magnolia.properties	2010-08-29 15:11:35 UTC (rev 2924)
@@ -31,6 +31,7 @@
 
 ####### solo per test #####
 info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
 #######
 
 info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.