Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2012-03-10 21:28:02
|
Revision: 3778
http://openutils.svn.sourceforge.net/openutils/?rev=3778&view=rev
Author: fgiust
Date: 2012-03-10 21:27:54 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
update scm url
Modified Paths:
--------------
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-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-mgnlspring/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/SYNC</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlbootstrapsync</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlbootstrapsync</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcache</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MGNLCAS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcas</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcas</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcas</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/CONTROLS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontrols</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontrols</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -23,8 +23,8 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -11,8 +11,8 @@
<name>openutils-mgnlext</name>
<version>2.3-SNAPSHOT</version>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlext</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlext</developerConnection>
+ <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>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url>
</scm>
<licenses>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/GROOVY</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlgroovy</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlgroovy</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmail</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmail </developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail </developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MOBILE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmobile</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmobile</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmobile</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmobile</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmobile</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrepoutils</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrepoutils</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrules</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrules</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlspring/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlspring/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlspring/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -19,8 +19,8 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlspring</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlspring</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlspring</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlspring</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlspring</url>
</scm>
<dependencies>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstripes</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstripes</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRUTS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstruts11</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstruts11</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstruts11</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstruts11</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstruts11</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -25,8 +25,8 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltagcloud</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltagcloud</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -14,8 +14,8 @@
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltasks</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltasks</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltasks</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltasks</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
</scm>
<licenses>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-10 09:28:30 UTC (rev 3777)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-10 21:27:54 UTC (rev 3778)
@@ -24,8 +24,8 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlutils </developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils </developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlutils</url>
</scm>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-03-10 21:55:39
|
Revision: 3780
http://openutils.svn.sourceforge.net/openutils/?rev=3780&view=rev
Author: fgiust
Date: 2012-03-10 21:55:32 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
update dependencies to magnolia 4.5
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-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-mgnlspring/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Added Paths:
-----------
magnoliamodules/trunk/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -16,31 +16,36 @@
<dependencies>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-templating</artifactId>
+ <artifactId>magnolia-core</artifactId>
<version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
+ <artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
+ <artifactId>magnolia-templating-samples</artifactId>
<version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-utility</artifactId>
+ <artifactId>magnolia-templating-compatibility</artifactId>
<version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
+ <artifactId>magnolia-templating-compatibility-taglib-utility</artifactId>
<version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
+ <artifactId>magnolia-templating-compatibility-taglib-cms</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-cache</artifactId>
<version>${magnolia.version}</version>
</dependency>
@@ -70,11 +75,6 @@
<version>${magnolia.version}</version>
</dependency>
<dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-samples</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-log4j</artifactId>
<version>2.0.5</version>
@@ -277,15 +277,15 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.4.5</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
<stk.version>1.3.1</stk.version>
- <jackrabbit.version>2.3.3</jackrabbit.version>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<wtpContextName>open</wtpContextName>
<classpathContainers>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -63,6 +63,12 @@
<version>4.1.2</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.10</version>
@@ -78,6 +84,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -63,12 +63,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<repositories>
<repository>
- <id>repository.magnolia.info</id>
+ <id>repository.magnolia-cms.com</id>
<name>magnolia repository</name>
- <url>http://svn.magnolia.info/maven/m2</url>
+ <url>http://nexus.magnolia-cms.com/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -89,6 +95,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -96,11 +96,13 @@
</exclusion>
</exclusions>
</dependency>
+ <!--
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-taglib-cms</artifactId>
<version>${magnolia.version}</version>
</dependency>
+ -->
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-fckeditor</artifactId>
@@ -167,6 +169,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -99,6 +99,12 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -113,6 +119,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -164,6 +164,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.0.1</version>
@@ -177,9 +183,9 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
- <jackrabbit.version>1.6.2</jackrabbit.version>
- <jcr.version>1.0</jcr.version>
+ <magnolia.version>4.5</magnolia.version>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
+ <jcr.version>2.0</jcr.version>
</properties>
<!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -92,8 +92,14 @@
<artifactId>openutils-mgnltasks</artifactId>
<version>4.1.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -177,6 +177,12 @@
<!-- to be released before the final 4.3 version -->
<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>
@@ -195,20 +201,7 @@
</exclusions>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.openmindonline.it</id>
- <name>openmindonline repository</name>
- <url>http://repository.openmindonline.it</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -100,8 +100,14 @@
<artifactId>openutils-mgnltasks</artifactId>
<version>4.1.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -247,8 +247,14 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -108,6 +108,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.0.1</version>
@@ -121,6 +127,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -87,11 +87,13 @@
<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>
@@ -128,8 +130,14 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -78,6 +78,12 @@
<version>3.3.1</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -92,6 +98,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/trunk/openutils-mgnlspring/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlspring/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlspring/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -153,6 +153,6 @@
</repositories>
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -100,6 +100,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -110,6 +110,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -171,7 +171,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.2</magnolia.version>
- <jackrabbit.version>2.2.5</jackrabbit.version>
+ <magnolia.version>4.5</magnolia.version>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -116,6 +116,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -101,6 +101,11 @@
<dependencies>
<dependency>
<groupId>info.magnolia</groupId>
+ <artifactId>magnolia-rendering</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
<optional>true</optional>
@@ -123,6 +128,12 @@
<version>4.1.2</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing4web</artifactId>
<version>1.2.1</version>
@@ -143,6 +154,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.5</magnolia.version>
</properties>
</project>
\ No newline at end of file
Added: magnoliamodules/trunk/pom.xml
===================================================================
--- magnoliamodules/trunk/pom.xml (rev 0)
+++ magnoliamodules/trunk/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
@@ -0,0 +1,43 @@
+<?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 ">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <packaging>pom</packaging>
+ <version>12-SNAPSHOT</version>
+ <name>openutils</name>
+ <description>Reactor pom, only to do an eclipse:eclipse for all the projects. Not to be released</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>openutils-mgnlspring</module>
+ <module>openutils-mgnlstripes</module>
+ <module>openutils-mgnltasks</module>
+ <module>openutils-mgnlbootstrapsync</module>
+ <module>openutils-mgnlext</module>
+ <module>openutils-mgnlcontrols</module>
+ <module>openutils-mgnlmessages</module>
+ <module>openutils-mgnlcache</module>
+ <module>openutils-mgnlcas</module>
+ <module>openutils-mgnlgroovy</module>
+ <module>openutils-mgnlstruts11</module>
+ <module>openutils-mgnlmedia</module>
+ <module>openutils-mgnlcriteria</module>
+ <module>openutils-mgnlrepoutils</module>
+ <module>openutils-mgnlutils</module>
+ <module>openutils-mgnltagcloud</module>
+ <module>openutils-mgnlrules</module>
+ <module>openutils-mgnlcontextmenu</module>
+ <module>openutils-mgnllms</module>
+ <module>openutils-mgnlmobile</module>
+ <module>openutils-mgnlmail</module>
+ <module>magnolia-test-webapp</module>
+ </modules>
+</project>
Property changes on: magnoliamodules/trunk/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
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...> - 2012-03-10 22:22:47
|
Revision: 3781
http://openutils.svn.sourceforge.net/openutils/?rev=3781&view=rev
Author: fgiust
Date: 2012-03-10 22:22:36 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
initial cleanup
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/ConjunctionTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcImageProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/magnolia/MobileModule.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/tags/MobilePreviewButtonTag.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileParagraphDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileTemplateDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileParagraphDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplate.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplateDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraph.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraphManager.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplate.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplateManager.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesAwareParagraphManager.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/groovyscripts/testCreatingPageTag.groovy
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
magnoliamodules/trunk/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
magnoliamodules/trunk/openutils-mgnlspring/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 22:22:36 UTC (rev 3781)
@@ -151,11 +151,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlspring</artifactId>
- <version>3.5.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
<version>4.1.4-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2012-03-10 22:22:36 UTC (rev 3781)
@@ -40,7 +40,7 @@
<jsp:scriptlet><![CDATA[
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(ContentRepository.WEBSITE)
+ .setWorkspace(RepositoryConstants.WEBSITE)
.setBasePath("/Criteria/pets")
.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
.addOrder(Order.asc("@birthDate"));
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,10 +19,10 @@
package net.sourceforge.openutils.mgnlsimplecache.filesystem;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.util.MBeanUtil;
import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.repository.RepositoryConstants;
import info.magnolia.voting.Voter;
import java.io.File;
@@ -410,7 +410,7 @@
// start observing repositories
if (repositoryUrls.size() == 0)
{
- repositoryUrls.add(ContentRepository.WEBSITE);
+ repositoryUrls.add(RepositoryConstants.WEBSITE);
}
for (String repositoryUrl : repositoryUrls)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,13 +19,13 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.List;
@@ -86,7 +86,7 @@
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
- ContentRepository.WEBSITE);
+ RepositoryConstants.WEBSITE);
for (int index = 0; index < column.length; index++)
{
@@ -111,7 +111,7 @@
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
- ContentRepository.WEBSITE);
+ RepositoryConstants.WEBSITE);
for (int index = 0; index < column.length; index++)
{
if (!StringUtils.isEmpty(column[index]))
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -36,7 +36,7 @@
* Calendar end = Calendar.getInstance();
* end.set(2001, Calendar.DECEMBER, 31);
*
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.contains("@title", "Lucky"))
* .add(Restrictions.eq("@petType", "dog"))
@@ -60,7 +60,7 @@
* <pre>
* Criteria criteria = JCRCriteriaFactory
* .createCriteria()
- * .setWorkspace(ContentRepository.WEBSITE)
+ * .setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.betweenDates("@birthDate", begin, end))
* .addOrder(Order.asc("@birthDate"))
@@ -75,7 +75,7 @@
* Another way to paginate results is by using the <code>setPaging</code> method:
*
* <pre>
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.betweenDates("@birthDate", begin, end))
* .addOrder(Order.asc("@birthDate"))
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -39,8 +39,8 @@
import org.apache.jackrabbit.core.query.lucene.MatchAllDocsQuery;
import org.apache.jackrabbit.core.query.lucene.QueryDecoratorSupport;
import org.apache.jackrabbit.core.query.lucene.SearchIndex;
+import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.BooleanClause.Occur;
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,8 +19,8 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -66,7 +66,7 @@
protected String spellCheckString;
- protected String workspace = ContentRepository.WEBSITE;
+ protected String workspace = RepositoryConstants.WEBSITE;
protected boolean forcePagingWithDocumentOrder;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlcriteria.utils;
+import org.apache.lucene.analysis.ASCIIFoldingFilter;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardFilter;
Deleted: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -1,2017 +0,0 @@
-/**
- *
- * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlcriteria.utils;
-
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.analysis.TokenStream;
-
-
-/**
- * A filter backported da lucene 2.9.1 which converts any character variation into its ASCII equivalent.
- * @author fgiust
- * @version $Id$
- */
-
-public class ASCIIFoldingFilter extends TokenFilter
-{
-
- public ASCIIFoldingFilter(TokenStream input)
- {
- super(input);
- }
-
- private char[] output = new char[256];
-
- private int outputPos;
-
- @Override
- public final Token next(final Token reusableToken) throws java.io.IOException
- {
- assert reusableToken != null;
- Token nextToken = input.next(reusableToken);
- if (nextToken != null)
- {
- final char[] buffer = nextToken.termBuffer();
- final int length = nextToken.termLength();
- // If no characters actually require rewriting then we
- // just return token as-is:
- for (int i = 0; i < length; i++)
- {
- final char c = buffer[i];
- if (c >= '\u0080')
- {
- removeAccents(buffer, length);
- nextToken.setTermBuffer(output, 0, outputPos);
- break;
- }
- }
- return nextToken;
- }
- else
- return null;
- }
-
- /**
- * To replace accented characters in a String by unaccented equivalents.
- */
- public final void removeAccents(char[] input, int length)
- {
-
- // Worst-case length required:
- final int maxSizeNeeded = 2 * length;
-
- int size = output.length;
- while (size < maxSizeNeeded)
- size *= 2;
-
- if (size != output.length)
- output = new char[size];
-
- outputPos = 0;
-
- for (int pos = 0; pos < length; ++pos)
- {
- final char c = input[pos];
-
- // Quick test: if it's not in range then just keep current character
- if (c < '\u0080')
- {
- output[outputPos++] = c;
- }
- else
- {
- switch (c)
- {
- case '\u00C0' : // À [LATIN CAPITAL LETTER A WITH GRAVE]
- case '\u00C1' : // Á [LATIN CAPITAL LETTER A WITH ACUTE]
- case '\u00C2' : // Â [LATIN CAPITAL LETTER A WITH CIRCUMFLEX]
- case '\u00C3' : // Ã [LATIN CAPITAL LETTER A WITH TILDE]
- case '\u00C4' : // Ä [LATIN CAPITAL LETTER A WITH DIAERESIS]
- case '\u00C5' : // Å [LATIN CAPITAL LETTER A WITH RING ABOVE]
- case '\u0100' : // Ā [LATIN CAPITAL LETTER A WITH MACRON]
- case '\u0102' : // Ă [LATIN CAPITAL LETTER A WITH BREVE]
- case '\u0104' : // Ą [LATIN CAPITAL LETTER A WITH OGONEK]
- case '\u018F' : // Ə http://en.wikipedia.org/wiki/Schwa [LATIN CAPITAL LETTER SCHWA]
- case '\u01CD' : // Ǎ [LATIN CAPITAL LETTER A WITH CARON]
- case '\u01DE' : // Ǟ [LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON]
- case '\u01E0' : // Ǡ [LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON]
- case '\u01FA' : // Ǻ [LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE]
- case '\u0200' : // Ȁ [LATIN CAPITAL LETTER A WITH DOUBLE GRAVE]
- case '\u0202' : // Ȃ [LATIN CAPITAL LETTER A WITH INVERTED BREVE]
- case '\u0226' : // Ȧ [LATIN CAPITAL LETTER A WITH DOT ABOVE]
- case '\u023A' : // Ⱥ [LATIN CAPITAL LETTER A WITH STROKE]
- case '\u1D00' : // ᴀ [LATIN LETTER SMALL CAPITAL A]
- case '\u1E00' : // Ḁ [LATIN CAPITAL LETTER A WITH RING BELOW]
- case '\u1EA0' : // Ạ [LATIN CAPITAL LETTER A WITH DOT BELOW]
- case '\u1EA2' : // Ả [LATIN CAPITAL LETTER A WITH HOOK ABOVE]
- case '\u1EA4' : // Ấ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE]
- case '\u1EA6' : // Ầ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE]
- case '\u1EA8' : // Ẩ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EAA' : // Ẫ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE]
- case '\u1EAC' : // Ậ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
- case '\u1EAE' : // Ắ [LATIN CAPITAL LETTER A WITH BREVE AND ACUTE]
- case '\u1EB0' : // Ằ [LATIN CAPITAL LETTER A WITH BREVE AND GRAVE]
- case '\u1EB2' : // Ẳ [LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE]
- case '\u1EB4' : // Ẵ [LATIN CAPITAL LETTER A WITH BREVE AND TILDE]
- case '\u1EB6' : // Ặ [LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW]
- case '\u24B6' : // Ⓐ [CIRCLED LATIN CAPITAL LETTER A]
- case '\uFF21' : // Ａ [FULLWIDTH LATIN CAPITAL LETTER A]
- output[outputPos++] = 'A';
- break;
- case '\u00E0' : // à [LATIN SMALL LETTER A WITH GRAVE]
- case '\u00E1' : // á [LATIN SMALL LETTER A WITH ACUTE]
- case '\u00E2' : // â [LATIN SMALL LETTER A WITH CIRCUMFLEX]
- case '\u00E3' : // ã [LATIN SMALL LETTER A WITH TILDE]
- case '\u00E4' : // ä [LATIN SMALL LETTER A WITH DIAERESIS]
- case '\u00E5' : // å [LATIN SMALL LETTER A WITH RING ABOVE]
- case '\u0101' : // ā [LATIN SMALL LETTER A WITH MACRON]
- case '\u0103' : // ă [LATIN SMALL LETTER A WITH BREVE]
- case '\u0105' : // ą [LATIN SMALL LETTER A WITH OGONEK]
- case '\u01CE' : // ǎ [LATIN SMALL LETTER A WITH CARON]
- case '\u01DF' : // ǟ [LATIN SMALL LETTER A WITH DIAERESIS AND MACRON]
- case '\u01E1' : // ǡ [LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON]
- case '\u01FB' : // ǻ [LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE]
- case '\u0201' : // ȁ [LATIN SMALL LETTER A WITH DOUBLE GRAVE]
- case '\u0203' : // ȃ [LATIN SMALL LETTER A WITH INVERTED BREVE]
- case '\u0227' : // ȧ [LATIN SMALL LETTER A WITH DOT ABOVE]
- case '\u0250' : // ɐ [LATIN SMALL LETTER TURNED A]
- case '\u0259' : // ə [LATIN SMALL LETTER SCHWA]
- case '\u025A' : // ɚ [LATIN SMALL LETTER SCHWA WITH HOOK]
- case '\u1D8F' : // ᶏ [LATIN SMALL LETTER A WITH RETROFLEX HOOK]
- case '\u1D95' : // ᶕ [LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK]
- case '\u1E01' : // ạ [LATIN SMALL LETTER A WITH RING BELOW]
- case '\u1E9A' : // ả [LATIN SMALL LETTER A WITH RIGHT HALF RING]
- case '\u1EA1' : // ạ [LATIN SMALL LETTER A WITH DOT BELOW]
- case '\u1EA3' : // ả [LATIN SMALL LETTER A WITH HOOK ABOVE]
- case '\u1EA5' : // ấ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE]
- case '\u1EA7' : // ầ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE]
- case '\u1EA9' : // ẩ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EAB' : // ẫ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE]
- case '\u1EAD' : // ậ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
- case '\u1EAF' : // ắ [LATIN SMALL LETTER A WITH BREVE AND ACUTE]
- case '\u1EB1' : // ằ [LATIN SMALL LETTER A WITH BREVE AND GRAVE]
- case '\u1EB3' : // ẳ [LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE]
- case '\u1EB5' : // ẵ [LATIN SMALL LETTER A WITH BREVE AND TILDE]
- case '\u1EB7' : // ặ [LATIN SMALL LETTER A WITH BREVE AND DOT BELOW]
- case '\u2090' : // ₐ [LATIN SUBSCRIPT SMALL LETTER A]
- case '\u2094' : // ₔ [LATIN SUBSCRIPT SMALL LETTER SCHWA]
- case '\u24D0' : // ⓐ [CIRCLED LATIN SMALL LETTER A]
- case '\u2C65' : // ⱥ [LATIN SMALL LETTER A WITH STROKE]
- case '\u2C6F' : // Ɐ [LATIN CAPITAL LETTER TURNED A]
- case '\uFF41' : // ａ [FULLWIDTH LATIN SMALL LETTER A]
- output[outputPos++] = 'a';
- break;
- case '\uA732' : // Ꜳ [LATIN CAPITAL LETTER AA]
- output[outputPos++] = 'A';
- output[outputPos++] = 'A';
- break;
- case '\u00C6' : // Æ [LATIN CAPITAL LETTER AE]
- case '\u01E2' : // Ǣ [LATIN CAPITAL LETTER AE WITH MACRON]
- case '\u01FC' : // Ǽ [LATIN CAPITAL LETTER AE WITH ACUTE]
- case '\u1D01' : // ᴁ [LATIN LETTER SMALL CAPITAL AE]
- output[outputPos++] = 'A';
- output[outputPos++] = 'E';
- break;
- case '\uA734' : // Ꜵ [LATIN CAPITAL LETTER AO]
- output[outputPos++] = 'A';
- output[outputPos++] = 'O';
- break;
- case '\uA736' : // Ꜷ [LATIN CAPITAL LETTER AU]
- output[outputPos++] = 'A';
- output[outputPos++] = 'U';
- break;
- case '\uA738' : // Ꜹ [LATIN CAPITAL LETTER AV]
- case '\uA73A' : // Ꜻ [LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR]
- output[outputPos++] = 'A';
- output[outputPos++] = 'V';
- break;
- case '\uA73C' : // Ꜽ [LATIN CAPITAL LETTER AY]
- output[outputPos++] = 'A';
- output[outputPos++] = 'Y';
- break;
- case '\u249C' : // ⒜ [PARENTHESIZED LATIN SMALL LETTER A]
- output[outputPos++] = '(';
- output[outputPos++] = 'a';
- output[outputPos++] = ')';
- break;
- case '\uA733' : // ꜳ [LATIN SMALL LETTER AA]
- output[outputPos++] = 'a';
- output[outputPos++] = 'a';
- break;
- case '\u00E6' : // æ [LATIN SMALL LETTER AE]
- case '\u01E3' : // ǣ [LATIN SMALL LETTER AE WITH MACRON]
- case '\u01FD' : // ǽ [LATIN SMALL LETTER AE WITH ACUTE]
- case '\u1D02' : // ᴂ [LATIN SMALL LETTER TURNED AE]
- output[outputPos++] = 'a';
- output[outputPos++] = 'e';
- break;
- case '\uA735' : // ꜵ [LATIN SMALL LETTER AO]
- output[outputPos++] = 'a';
- output[outputPos++] = 'o';
- break;
- case '\uA737' : // ꜷ [LATIN SMALL LETTER AU]
- output[outputPos++] = 'a';
- output[outputPos++] = 'u';
- break;
- case '\uA739' : // ꜹ [LATIN SMALL LETTER AV]
- case '\uA73B' : // ꜻ [LATIN SMALL LETTER AV WITH HORIZONTAL BAR]
- output[outputPos++] = 'a';
- output[outputPos++] = 'v';
- break;
- case '\uA73D' : // ꜽ [LATIN SMALL LETTER AY]
- output[outputPos++] = 'a';
- output[outputPos++] = 'y';
- break;
- case '\u0181' : // Ɓ [LATIN CAPITAL LETTER B WITH HOOK]
- case '\u0182' : // Ƃ [LATIN CAPITAL LETTER B WITH TOPBAR]
- case '\u0243' : // Ƀ [LATIN CAPITAL LETTER B WITH STROKE]
- case '\u0299' : // ʙ [LATIN LETTER SMALL CAPITAL B]
- case '\u1D03' : // ᴃ [LATIN LETTER SMALL CAPITAL BARRED B]
- case '\u1E02' : // Ḃ [LATIN CAPITAL LETTER B WITH DOT ABOVE]
- case '\u1E04' : // Ḅ [LATIN CAPITAL LETTER B WITH DOT BELOW]
- case '\u1E06' : // Ḇ [LATIN CAPITAL LETTER B WITH LINE BELOW]
- case '\u24B7' : // Ⓑ [CIRCLED LATIN CAPITAL LETTER B]
- case '\uFF22' : // Ｂ [FULLWIDTH LATIN CAPITAL LETTER B]
- output[outputPos++] = 'B';
- break;
- case '\u0180' : // ƀ [LATIN SMALL LETTER B WITH STROKE]
- case '\u0183' : // ƃ [LATIN SMALL LETTER B WITH TOPBAR]
- case '\u0253' : // ɓ [LATIN SMALL LETTER B WITH HOOK]
- case '\u1D6C' : // ᵬ [LATIN SMALL LETTER B WITH MIDDLE TILDE]
- case '\u1D80' : // ᶀ [LATIN SMALL LETTER B WITH PALATAL HOOK]
- case '\u1E03' : // ḃ [LATIN SMALL LETTER B WITH DOT ABOVE]
- case '\u1E05' : // ḅ [LATIN SMALL LETTER B WITH DOT BELOW]
- case '\u1E07' : // ḇ [LATIN SMALL LETTER B WITH LINE BELOW]
- case '\u24D1' : // ⓑ [CIRCLED LATIN SMALL LETTER B]
- case '\uFF42' : // ｂ [FULLWIDTH LATIN SMALL LETTER B]
- output[outputPos++] = 'b';
- break;
- case '\u249D' : // ⒝ [PARENTHESIZED LATIN SMALL LETTER B]
- output[outputPos++] = '(';
- output[outputPos++] = 'b';
- output[outputPos++] = ')';
- break;
- case '\u00C7' : // Ç [LATIN CAPITAL LETTER C WITH CEDILLA]
- case '\u0106' : // Ć [LATIN CAPITAL LETTER C WITH ACUTE]
- case '\u0108' : // Ĉ [LATIN CAPITAL LETTER C WITH CIRCUMFLEX]
- case '\u010A' : // Ċ [LATIN CAPITAL LETTER C WITH DOT ABOVE]
- case '\u010C' : // Č [LATIN CAPITAL LETTER C WITH CARON]
- case '\u0187' : // Ƈ [LATIN CAPITAL LETTER C WITH HOOK]
- case '\u023B' : // Ȼ [LATIN CAPITAL LETTER C WITH STROKE]
- case '\u0297' : // ʗ [LATIN LETTER STRETCHED C]
- case '\u1D04' : // ᴄ [LATIN LETTER SMALL CAPITAL C]
- case '\u1E08' : // Ḉ [LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE]
- case '\u24B8' : // Ⓒ [CIRCLED LATIN CAPITAL LETTER C]
- case '\uFF23' : // Ｃ [FULLWIDTH LATIN CAPITAL LETTER C]
- output[outputPos++] = 'C';
- break;
- case '\u00E7' : // ç [LATIN SMALL LETTER C WITH CEDILLA]
- case '\u0107' : // ć [LATIN SMALL LETTER C WITH ACUTE]
- case '\u0109' : // ĉ [LATIN SMALL LETTER C WITH CIRCUMFLEX]
- case '\u010B' : // ċ [LATIN SMALL LETTER C WITH DOT ABOVE]
- case '\u010D' : // č [LATIN SMALL LETTER C WITH CARON]
- case '\u0188' : // ƈ [LATIN SMALL LETTER C WITH HOOK]
- case '\u023C' : // ȼ [LATIN SMALL LETTER C WITH STROKE]
- case '\u0255' : // ɕ [LATIN SMALL LETTER C WITH CURL]
- case '\u1E09' : // ḉ [LATIN SMALL LETTER C WITH CEDILLA AND ACUTE]
- case '\u2184' : // ↄ [LATIN SMALL LETTER REVERSED C]
- case '\u24D2' : // ⓒ [CIRCLED LATIN SMALL LETTER C]
- case '\uA73E' : // Ꜿ [LATIN CAPITAL LETTER REVERSED C WITH DOT]
- case '\uA73F' : // ꜿ [LATIN SMALL LETTER REVERSED C WITH DOT]
- case '\uFF43' : // ｃ [FULLWIDTH LATIN SMALL LETTER C]
- output[outputPos++] = 'c';
- break;
- case '\u249E' : // ⒞ [PARENTHESIZED LATIN SMALL LETTER C]
- output[outputPos++] = '(';
- output[outputPos++] = 'c';
- output[outputPos++] = ')';
- break;
- case '\u00D0' : // Ð [LATIN CAPITAL LETTER ETH]
- case '\u010E' : // Ď [LATIN CAPITAL LETTER D WITH CARON]
- case '\u0110' : // Đ [LATIN CAPITAL LETTER D WITH STROKE]
- case '\u0189' : // Ɖ [LATIN CAPITAL LETTER AFRICAN D]
- case '\u018A' : // Ɗ [LATIN CAPITAL LETTER D WITH HOOK]
- case '\u018B' : // Ƌ [LATIN CAPITAL LETTER D WITH TOPBAR]
- case '\u1D05' : // ᴅ [LATIN LETTER SMALL CAPITAL D]
- case '\u1D06' : // ᴆ [LATIN LETTER SMALL CAPITAL ETH]
- case '\u1E0A' : // Ḋ [LATIN CAPITAL LETTER D WITH DOT ABOVE]
- case '\u1E0C' : // Ḍ [LATIN CAPITAL LETTER D WITH DOT BELOW]
- case '\u1E0E' : // Ḏ [LATIN CAPITAL LETTER D WITH LINE BELOW]
- case '\u1E10' : // Ḑ [LATIN CAPITAL LETTER D WITH CEDILLA]
- case '\u1E12' : // Ḓ [LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW]
- case '\u24B9' : // Ⓓ [CIRCLED LATIN CAPITAL LETTER D]
- case '\uA779' : // Ꝺ [LATIN CAPITAL LETTER INSULAR D]
- case '\uFF24' : // Ｄ [FULLWIDTH LATIN CAPITAL LETTER D]
- output[outputPos++] = 'D';
- break;
- case '\u00F0' : // ð [LATIN SMALL LETTER ETH]
- case '\u010F' : // ď [LATIN SMALL LETTER D WITH CARON]
- case '\u0111' : // đ [LATIN SMALL LETTER D WITH STROKE]
- case '\u018C' : // ƌ [LATIN SMALL LETTER D WITH TOPBAR]
- case '\u0221' : // ȡ [LATIN SMALL LETTER D WITH CURL]
- case '\u0256' : // ɖ [LATIN SMALL LETTER D WITH TAIL]
- case '\u0257' : // ɗ [LATIN SMALL LETTER D WITH HOOK]
- case '\u1D6D' : // ᵭ [LATIN SMALL LETTER D WITH MIDDLE TILDE]
- case '\u1D81' : // ᶁ [LATIN SMALL LETTER D WITH PALATAL HOOK]
- case '\u1D91' : // ᶑ [LATIN SMALL LETTER D WITH HOOK AND TAIL]
- case '\u1E0B' : // ḋ [LATIN SMALL LETTER D WITH DOT ABOVE]
- case '\u1E0D' : // ḍ [LATIN SMALL LETTER D WITH DOT BELOW]
- case '\u1E0F' : // ḏ [LATIN SMALL LETTER D WITH LINE BELOW]
- case '\u1E11' : // ḑ [LATIN SMALL LETTER D WITH CEDILLA]
- case '\u1E13' : // ḓ [LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW]
- case '\u24D3' : // ⓓ [CIRCLED LATIN SMALL LETTER D]
- case '\uA77A' : // ꝺ [LATIN SMALL LETTER INSULAR D]
- case '\uFF44' : // ｄ [FULLWIDTH LATIN SMALL LETTER D]
- output[outputPos++] = 'd';
- break;
- case '\u01C4' : // DŽ [LATIN CAPITAL LETTER DZ WITH CARON]
- case '\u01F1' : // DZ [LATIN CAPITAL LETTER DZ]
- output[outputPos++] = 'D';
- output[outputPos++] = 'Z';
- break;
- case '\u01C5' : // Dž [LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON]
- case '\u01F2' : // Dz [LATIN CAPITAL LETTER D WITH SMALL LETTER Z]
- output[outputPos++] = 'D';
- output[outputPos++] = 'z';
- break;
- case '\u249F' : // ⒟ [PARENTHESIZED LATIN SMALL LETTER D]
- output[outputPos++] = '(';
- output[outputPos++] = 'd';
- output[outputPos++] = ')';
- break;
- case '\u0238' : // ȸ [LATIN SMALL LETTER DB DIGRAPH]
- output[outputPos++] = 'd';
- output[outputPos++] = 'b';
- break;
- case '\u01C6' : // dž [LATIN SMALL LETTER DZ WITH CARON]
- case '\u01F3' : // dz [LATIN SMALL LETTER DZ]
- case '\u02A3' : // ʣ [LATIN SMALL LETTER DZ DIGRAPH]
- case '\u02A5' : // ʥ [LATIN SMALL LETTER DZ DIGRAPH WITH CURL]
- output[outputPos++] = 'd';
- output[outputPos++] = 'z';
- break;
- case '\u00C8' : // È [LATIN CAPITAL LETTER E WITH GRAVE]
- case '\u00C9' : // É [LATIN CAPITAL LETTER E WITH ACUTE]
- case '\u00CA' : // Ê [LATIN CAPITAL LETTER E WITH CIRCUMFLEX]
- case '\u00CB' : // Ë [LATIN CAPITAL LETTER E WITH DIAERESIS]
- case '\u0112' : // Ē [LATIN CAPITAL LETTER E WITH MACRON]
- case '\u0114' : // Ĕ [LATIN CAPITAL LETTER E WITH BREVE]
- case '\u0116' : // Ė [LATIN CAPITAL LETTER E WITH DOT ABOVE]
- case '\u0118' : // Ę [LATIN CAPITAL LETTER E WITH OGONEK]
- case '\u011A' : // Ě [LATIN CAPITAL LETTER E WITH CARON]
- case '\u018E' : // Ǝ [LATIN CAPITAL LETTER REVERSED E]
- case '\u0190' : // Ɛ [LATIN CAPITAL LETTER OPEN E]
- case '\u0204' : // Ȅ [LATIN CAPITAL LETTER E WITH DOUBLE GRAVE]
- case '\u0206' : // Ȇ [LATIN CAPITAL LETTER E WITH INVERTED BREVE]
- case '\u0228' : // Ȩ [LATIN CAPITAL LETTER E WITH CEDILLA]
- case '\u0246' : // Ɇ [LATIN CAPITAL LETTER E WITH STROKE]
- case '\u1D07' : // ᴇ [LATIN LETTER SMALL CAPITAL E]
- case '\u1E14' : // Ḕ [LATIN CAPITAL LETTER E WITH MACRON AND GRAVE]
- case '\u1E16' : // Ḗ [LATIN CAPITAL LETTER E WITH MACRON AND ACUTE]
- case '\u1E18' : // Ḙ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW]
- case '\u1E1A' : // Ḛ [LATIN CAPITAL LETTER E WITH TILDE BELOW]
- case '\u1E1C' : // Ḝ [LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE]
- case '\u1EB8' : // Ẹ [LATIN CAPITAL LETTER E WITH DOT BELOW]
- case '\u1EBA' : // Ẻ [LATIN CAPITAL LETTER E WITH HOOK ABOVE]
- case '\u1EBC' : // Ẽ [LATIN CAPITAL LETTER E WITH TILDE]
- case '\u1EBE' : // Ế [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE]
- case '\u1EC0' : // Ề [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE]
- case '\u1EC2' : // Ể [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EC4' : // Ễ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE]
- case '\u1EC6' : // Ệ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
- case '\u24BA' : // Ⓔ [CIRCLED LATIN CAPITAL LETTER E]
- case '\u2C7B' : // ⱻ [LATIN LETTER SMALL CAPITAL TURNED E]
- case '\uFF25' : // Ｅ [FULLWIDTH LATIN CAPITAL LETTER E]
- output[outputPos++] = 'E';
- break;
- case '\u00E8' : // è [LATIN SMALL LETTER E WITH GRAVE]
- case '\u00E9' : // é [LATIN SMALL LETTER E WITH ACUTE]
- case '\u00EA' : // ê [LATIN SMALL LETTER E WITH CIRCUMFLEX]
- case '\u00EB' : // ë [LATIN SMALL LETTER E WITH DIAERESIS]
- case '\u0113' : // ē [LATIN SMALL LETTER E WITH MACRON]
- case '\u0115' : // ĕ [LATIN SMALL LETTER E WITH BREVE]
- case '\u0117' : // ė [LATIN SMALL LETTER E WITH DOT ABOVE]
- case '\u0119' : // ę [LATIN SMALL LETTER E WITH OGONEK]
- case '\u011B' : // ě [LATIN SMALL LETTER E WITH CARON]
- case '\u01DD' : // ǝ [LATIN SMALL LETTER TURNED E]
- case '\u0205' : // ȅ [LATIN SMALL LETTER E WITH DOUBLE GRAVE]
- case '\u0207' : // ȇ [LATIN SMALL LETTER E WITH INVERTED BREVE]
- case '\u0229' : // ȩ [LATIN SMALL LETTER E WITH CEDILLA]
- case '\u0247' : // ɇ [LATIN SMALL LETTER E WITH STROKE]
- case '\u0258' : // ɘ [LATIN SMALL LETTER REVERSED E]
- case '\u025B' : // ɛ [LATIN SMALL LETTER OPEN E]
- case '\u025C' : // ɜ [LATIN SMALL LETTER REVERSED OPEN E]
- case '\u025D' : // ɝ [LATIN SMALL LETTER REVERSED OPEN E WITH HOOK]
- case '\u025E' : // ɞ [LATIN SMALL LETTER CLOSED REVERSED OPEN E]
- case '\u029A' : // ʚ [LATIN SMALL LETTER CLOSED OPEN E]
- case '\u1D08' : // ᴈ [LATIN SMALL LETTER TURNED OPEN E]
- case '\u1D92' : // ᶒ [LATIN SMALL LETTER E WITH RETROFLEX HOOK]
- case '\u1D93' : // ᶓ [LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK]
- case '\u1D94' : // ᶔ [LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK]
- case '\u1E15' : // ḕ [LATIN SMALL LETTER E WITH MACRON AND GRAVE]
- case '\u1E17' : // ḗ [LATIN SMALL LETTER E WITH MACRON AND ACUTE]
- case '\u1E19' : // ḙ [LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW]
- case '\u1E1B' : // ḛ [LATIN SMALL LETTER E WITH TILDE BELOW]
- case '\u1E1D' : // ḝ [LATIN SMALL LETTER E WITH CEDILLA AND BREVE]
- case '\u1EB9' : // ẹ [LATIN SMALL LETTER E WITH DOT BELOW]
- case '\u1EBB' : // ẻ [LATIN SMALL LETTER E WITH HOOK ABOVE]
- case '\u1EBD' : // ẽ [LATIN SMALL LETTER E WITH TILDE]
- case '\u1EBF' : // ế [LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE]
- case '\u1EC1' : // ề [LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE]
- case '\u1EC3' : // ể [LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EC5' : // ễ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE]
- case '\u1EC7' : // ệ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
- case '\u2091' : // ₑ [LATIN SUBSCRIPT SMALL LETTER E]
- case '\u24D4' : // ⓔ [CIRCLED LATIN SMALL LETTER E]
- case '\u2C78' : // ⱸ [LATIN SMALL LETTER E WITH NOTCH]
- case '\uFF45' : // ｅ [FULLWIDTH LATIN SMALL LETTER E]
- output[outputPos++] = 'e';
- break;
- case '\u24A0' : // ⒠ [PARENTHESIZED LATIN SMALL LETTER E]
- output[outputPos++] = '(';
- output[outputPos++] = 'e';
- output[outputPos++] = ')';
- break;
- case '\u0191' : // Ƒ [LATIN CAPITAL LETTER F WITH HOOK]
- case '\u1E1E' : // Ḟ [LATIN CAPITAL LETTER F WITH DOT ABOVE]
- case '\u24BB' : // Ⓕ [CIRCLED LATIN CAPITAL LETTER F]
- case '\uA730' : // ꜰ [LATIN LETTER SMALL CAPITAL F]
- case '\uA77B' : // Ꝼ [LATIN CAPITAL LETTER INSULAR F]
- case '\uA7FB' : // ꟻ [LATIN EPIGRAPHIC LETTER REVERSED F]
- case '\uFF26' : // Ｆ [FULLWIDTH LATIN CAPITAL LETTER F]
- output[outputPos++] = 'F';
- break;
- case '\u0192' : // ƒ [LATIN SMALL LETTER F WITH HOOK]
- case '\u1D6E' : // ᵮ [LATIN SMALL LETTER F WITH MIDDLE TILDE]
- case '\u1D82' : // ᶂ [LATIN SMALL LETTER F WITH PALATAL HOOK]
- case '\u1E1F' : // ḟ [LATIN SMALL LETTER F WITH DOT ABOVE]
- case '\u1E9B' : // ẛ [LATIN SMALL LETTER LONG S WITH DOT ABOVE]
- case '\u24D5' : // ⓕ [CIRCLED LATIN SMALL LETTER F]
- case '\uA77C' : // ꝼ [LATIN SMALL LETTER INSULAR F]
- case '\uFF46' : // ｆ [FULLWIDTH LATIN SMALL LETTER F]
- output[outputPos++] = 'f';
- break;
- case '\u24A1' : // ⒡ [PARENTHESIZED LATIN SMALL LETTER F]
- output[outputPos++] = '(';
- output[outputPos++] = 'f';
- output[outputPos++] = ')';
- break;
- case '\uFB00' : // ff [LATIN SMALL LIGATURE FF]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- break;
- case '\uFB03' : // ffi [LATIN SMALL LIGATURE FFI]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- output[outputPos++] = 'i';
- break;
- case '\uFB04' : // ffl [LATIN SMALL LIGATURE FFL]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- output[outputPos++] = 'l';
- break;
- case '\uFB01' : // fi [LATIN SMALL LIGATURE FI]
- output[outputPos++] = 'f';
- output[outputPos++] = 'i';
- break;
- case '\uFB02' : // fl [LATIN SMALL LIGATURE FL]
- output[outputPos++] = 'f';
- output[outputPos++] = 'l';
- break;
- case '\u011C' : // Ĝ [LATIN CAPITAL LETTER G WITH CIRCUMFLEX]
- case '\u011E' : // Ğ [LATIN CAPITAL LETTER G WITH BREVE]
- case '\u0120' : // Ġ [LATIN CAPITAL LETTER G WITH DOT ABOVE]
- case '\u0122' : // Ģ [LATIN CAPITAL LETTER G WITH CEDILLA]
- case '\u0193' : // Ɠ [LATIN CAPITAL LETTER G WITH HOOK]
- case '\u01E4' : // Ǥ [LATIN CAPITAL LETTER G WITH STROKE]
- case '\u01E5' : // ǥ [LATIN SMALL LETTER G WITH STROKE]
- case '\u01E6' : // Ǧ [LATIN CAPITAL LETTER G WITH CARON]
- case '\u01E7' : // ǧ [LATIN SMALL LETTER G WITH CARON]
- case '\u01F4' : // Ǵ [LATIN CAPITAL LETTER G WITH ACUTE]
- case '\u0262' : // ɢ [LATIN LETTER SMALL CAPITAL G]
- case '\u029B' : // ʛ [LATIN LETTER SMALL CAPITAL G WITH HOOK]
- case '\u1E20' : // Ḡ [LATIN CAPITAL LETTER G WITH MACRON]
- case '\u24BC' : // Ⓖ [CIRCLED LATIN CAPITAL LETTER G]
- case '\uA77D' : // Ᵹ [LATIN CAPITAL LETTER INSULAR G]
- case '\uA77E' : // Ꝿ [LATIN CAPITAL LETTER TURNED INSULAR G]
- case '\uFF27' : // Ｇ [FULLWIDTH LATIN CAPITAL LETTER G]
- output[outputPos++] = 'G';
- break;
- case '\u011D' : // ĝ [LATIN SMALL LETTER G WITH CIRCUMFLEX]
- case '\u011F' : // ğ [LATIN SMALL LETTER G WITH BREVE]
- case '\u0121' : // ġ [LATIN SMALL LETTER G WITH DOT ABOVE]
- case '\u0123' : // ģ [LATIN SMALL LETTER G WITH CEDILLA]
- case '\u01F5' : // ǵ [LATIN SMALL LETTER G WITH ACUTE]
- case '\u0260' : // ɠ [LATIN SMALL LETTER G WITH HOOK]
- case '\u0261' : // ɡ [LATIN SMALL LETTER SCRIPT G]
- case '\u1D77' : // ᵷ [LATIN SMALL LETTER TURNED G]
- case '\u1D79' : // ᵹ [LATIN SMALL LETTER INSULAR G]
- case '\u1D83' : // ᶃ [LATIN SMALL LETTER G WITH PALATAL HOOK]
- case '\u1E21' : // ḡ [LATIN SMALL LETTER G WITH MACRON]
- case '\u24D6' : // ⓖ [CIRCLED LATIN SMALL LETTER G]
- case '\uA77F' : // ꝿ [LATIN SMALL LETTER TURNED INSULAR G]
- case '\uFF47' : // ｇ [FULLWIDTH LATIN SMALL LETTER G]
- output[outputPos++] = 'g';
- break;
- case '\u24A2' : // ⒢ [PARENTHESIZED LATIN SMALL LETTER G]
- output[outputPos++] = '(';
- output[outputPos++] = 'g';
- output[outputPos++] = ')';
- break;
- case '\u0124' : // Ĥ [LATIN CAPITAL LETTER H WITH CIRCUMFLEX]
- case '\u0126' : // Ħ [LATIN CAPITAL LETTER H WITH STROKE]
- case '\u021E' : // Ȟ [LATIN CAPITAL LETTER H WITH CARON]
- case '\u029C' : // ʜ [LATIN LETTER SMALL CAPITAL H]
- case '\u1E22' : // Ḣ [LATIN CAPITAL LETTER H WITH DOT ABOVE]
- case '\u1E24' : // Ḥ [LATIN CAPITAL LETTER H WITH DOT BELOW]
- case '\u1E26' : // Ḧ [LATIN CAPITAL LETTER H WITH DIAERESIS]
- case '\u1E28' : // Ḩ [LATIN CAPITAL LETTER H WITH CEDILLA]
- case '\u1E2A' : // Ḫ [LATIN CAPITAL LETTER H WITH BREVE BELOW]
- case '\u24BD' : // Ⓗ [CIRCLED LATIN CAPITAL LETTER H]
- case '\u2C67' : // Ⱨ [LATIN CAPITAL LETTER H WITH DESCENDER]
- case '\u2C75' : // Ⱶ [LATIN CAPITAL LETTER HALF H]
- case '\uFF28' : // Ｈ [FULLWIDTH LATIN CAPITAL LETTER H]
- output[outputPos++] = 'H';
- break;
- case '\u0125' : // ĥ [LATIN SMALL LETTER H WITH CIRCUMFLEX]
- case '\u0127' : // ħ [LATIN SMALL LETTER H WITH STROKE]
- case '\u021F' : // ȟ [LATIN SMALL LETTER H WITH CARON]
- case '\u0265' : // ɥ [LATIN SMALL LETTER TURNED H]
- case '\u0266' : // ɦ [LATIN SMALL LETTER H WITH HOOK]
- case '\u02AE' : // ʮ [LATIN SMALL LETTER TURNED H WITH FISHHOOK]
- case '\u02AF' : // ʯ [LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL]
- case '\u1E23' : // ḣ [LATIN SMALL LETTER H WITH DOT ABOVE]
- case '\u1E25' : // ḥ [LATIN SMALL LETTER H WITH DOT BELOW]
- case '\u1E27' : // ḧ [LATIN SMALL LETTER H WITH DIAERESIS]
- case '\u1E29' : // ḩ [LATIN SMALL LETTER H WITH CEDILLA]
- case '\u1E2B' : // ḫ [LATIN SMALL LETTER H WITH BREVE BELOW]
- case '\u1E96' : // ẖ [LATIN SMALL LETTER H WITH LINE BELOW]
- case '\u24D7' : // ⓗ [CIRCLED LATIN SMALL LETTER H]
- case '\u2C68' : // ⱨ [LATIN SMALL LETTER H WITH DESCENDER]
- case '\u2C76' : // ⱶ [LATIN SMALL LETTER HALF H]
- case '\uFF48' : // ｈ [FULLWIDTH LATIN SMALL LETTER H]
- output[outputPos++] = 'h';
- break;
- case '\u01F6' : // Ƕ http://en.wikipedia.org/wiki/Hwair [LATIN CAPITAL LETTER HWAIR]
- output[outputPos++] = 'H';
- output[outputPos++] = 'V';
- break;
- case '\u24A3' : // ⒣ [PARENTHESIZED LATIN SMALL LETTER H]
- output[outputPos++] = '(';
- output[outputPos++] = 'h';
- output[outputPos++] = ')';
- break;
- case '\u0195' : // ƕ [LATIN SMALL LETTER HV]
- output[outputPos++] = 'h';
- output[outputPos++] = 'v';
- break;
- case '\u00CC' : // Ì [LATIN CAPITAL LETTER I WITH GRAVE]
- case '\u00CD' : // Í [LATIN CAPITAL LETTER I WITH ACUTE...
[truncated message content] |
|
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.
|
|
From: <die...@us...> - 2012-03-14 13:41:36
|
Revision: 3791
http://openutils.svn.sourceforge.net/openutils/?rev=3791&view=rev
Author: diego_schivo
Date: 2012-03-14 13:41:25 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
5.0.0-SNAPSHOT
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
@@ -164,8 +164,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <!--version>5.0.0-SNAPSHOT</version-->
- <version>4.2.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -215,8 +214,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmobile</artifactId>
- <!--version>5.0.0-SNAPSHOT</version-->
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencyManagement>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>4.2.4-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmobile</artifactId>
<name>Mobile Module for Magnolia CMS</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-14 15:48:13
|
Revision: 3792
http://openutils.svn.sourceforge.net/openutils/?rev=3792&view=rev
Author: diego_schivo
Date: 2012-03-14 15:48:06 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
magnolia.version=4.5.1
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-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-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -271,7 +271,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
<stk.version>1.3.1</stk.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -85,6 +85,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -95,6 +95,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -170,6 +170,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -120,6 +120,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -184,7 +184,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
<jcr.version>2.0</jcr.version>
</properties>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -101,6 +101,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -201,6 +201,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -108,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -255,6 +255,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -128,6 +128,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -131,6 +131,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -99,6 +99,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -147,6 +147,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -106,6 +106,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -115,6 +115,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -171,7 +171,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -116,6 +116,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-03-14 15:48:06 UTC (rev 3792)
@@ -154,6 +154,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5</magnolia.version>
+ <magnolia.version>4.5.1</magnolia.version>
</properties>
</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: <die...@us...> - 2012-03-20 16:22:06
|
Revision: 3847
http://openutils.svn.sourceforge.net/openutils/?rev=3847&view=rev
Author: diego_schivo
Date: 2012-03-20 16:21:55 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
website.samples-stripes.xml
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml
Added: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml 2012-03-20 16:21:55 UTC (rev 3847)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-stripes" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:page</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>33b0769d-7b15-4f7e-80c7-19f936d276d3</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Stripes sample</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-20T17:19:23.972+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-20T17:19:56.971+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>stripes:pages/samplestripes</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:area</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>80877779-bbce-4f43-8fd3-8ffce20a36ab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-20T17:19:56.969+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-20T17:19:56.971+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:component</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6138bf07-0cd3-4456-be9d-acdcd7d4509c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Hello Stripes!</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-20T17:19:56.970+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-20T17:19:56.970+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>samplestripes</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:19:21 UTC (rev 3846)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:21:55 UTC (rev 3847)
@@ -29,7 +29,7 @@
<sv:value>2012-03-20T16:20:13.674+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T17:08:46.653+01:00</sv:value>
+ <sv:value>2012-03-20T17:20:43.005+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>struts11:pages/samplestruts</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2012-03-20T16:20:30.925+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T16:20:30.927+01:00</sv:value>
+ <sv:value>2012-03-20T17:20:43.005+01:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -79,7 +79,7 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="text" sv:type="String">
- <sv:value>Hello world!</sv:value>
+ <sv:value>Hello Struts!</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -95,7 +95,7 @@
<sv:value>2012-03-20T16:20:30.925+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T16:20:30.926+01:00</sv:value>
+ <sv:value>2012-03-20T17:20:43.004+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>samplestruts</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-21 05:34:42
|
Revision: 3871
http://openutils.svn.sourceforge.net/openutils/?rev=3871&view=rev
Author: diego_schivo
Date: 2012-03-21 05:34:36 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
paragraph id
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-20 18:49:33 UTC (rev 3870)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-21 05:34:36 UTC (rev 3871)
@@ -128,6 +128,7 @@
{
final ConfiguredTemplateDefinition paragraph = new ConfiguredTemplateDefinition();
+ paragraph.setId("stripes:" + paragraphName);
paragraph.setName(paragraphName);
paragraph.setTitle("paragraph." + paragraphName + ".title");
paragraph.setDescription("paragraph." + paragraphName + ".description");
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-20 18:49:33 UTC (rev 3870)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-21 05:34:36 UTC (rev 3871)
@@ -105,6 +105,7 @@
{
final StrutsParagraph paragraph = new StrutsParagraph();
+ paragraph.setId("struts:" + name);
paragraph.setName(name);
paragraph.setTitle("paragraph." + name + ".title");
paragraph.setDescription("paragraph." + name + ".description");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-21 14:07:52
|
Revision: 3880
http://openutils.svn.sourceforge.net/openutils/?rev=3880&view=rev
Author: diego_schivo
Date: 2012-03-21 14:07:41 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
openutils-mgnlstruts11: template.jsp, area.jsp, paragraph.jsp
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp 2012-03-21 14:02:52 UTC (rev 3879)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp 2012-03-21 14:07:41 UTC (rev 3880)
@@ -3,6 +3,6 @@
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<c:forEach var="component" items="${components}">
- <cms:component component="${component}" />
+ <cms:component content="${component}" />
</c:forEach>
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml 2012-03-21 14:02:52 UTC (rev 3879)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml 2012-03-21 14:07:41 UTC (rev 3880)
@@ -44,4 +44,149 @@
<sv:value>2012-03-20T17:08:34.909+01:00</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="areas">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2c9e6bf6-8260-42f8-837c-f8fa1356f60d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-21T07:30:29.457+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-21T15:04:00.876+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>44676869-26a1-4edd-960e-72c859e1be80</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-struts11/area.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>list</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-21T07:30:36.643+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-21T15:04:18.425+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="availableComponents">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>53591e0a-79c3-437f-bbcc-9d117aa46029</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-21T07:32:04.848+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-21T15:04:00.883+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="samplestruts">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f534d8d2-26af-4b4d-bd0b-ffeb5ae919a5</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>stripes:samplestruts</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-03-21T15:04:43.207+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp 2012-03-21 14:07:41 UTC (rev 3880)
@@ -0,0 +1,8 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <c:forEach var="component" items="${components}">
+ <cms:component content="${component}" />
+ </c:forEach>
+</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-21 14:02:52 UTC (rev 3879)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-21 14:07:41 UTC (rev 3880)
@@ -1,7 +1,6 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<cms:setNode var="content" />
${content.text}
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp 2012-03-21 14:02:52 UTC (rev 3879)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp 2012-03-21 14:07:41 UTC (rev 3880)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld">
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
@@ -8,19 +8,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
- <cms:links />
+ <title>${content.title}</title>
+ <cms:init />
</head>
<body>
- <cms:mainBar dialog="o-page-home" />
- <h1>${actpage.title}</h1>
- <div>
- <cms:contentNodeIterator contentNodeCollectionName="main">
- <cms:editBar />
- <cms:includeTemplate />
- </cms:contentNodeIterator>
- <cms:newBar contentNodeCollectionName="main" paragraph="samplestruts" />
- </div>
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
</body>
</html>
</jsp:root>
\ 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: <die...@us...> - 2012-03-21 14:24:57
|
Revision: 3881
http://openutils.svn.sourceforge.net/openutils/?rev=3881&view=rev
Author: diego_schivo
Date: 2012-03-21 14:24:48 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
fix paragraph id
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-21 14:07:41 UTC (rev 3880)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-21 14:24:48 UTC (rev 3881)
@@ -150,7 +150,7 @@
public String getId()
{
- return paragraph.getName();
+ return paragraph.getId();
}
});
}
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-21 14:07:41 UTC (rev 3880)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-21 14:24:48 UTC (rev 3881)
@@ -105,7 +105,7 @@
{
final StrutsParagraph paragraph = new StrutsParagraph();
- paragraph.setId("struts:" + name);
+ paragraph.setId("struts11:" + name);
paragraph.setName(name);
paragraph.setTitle("paragraph." + name + ".title");
paragraph.setDescription("paragraph." + name + ".description");
@@ -128,7 +128,7 @@
public String getId()
{
- return paragraph.getName();
+ return paragraph.getId();
}
});
}
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml 2012-03-21 14:07:41 UTC (rev 3880)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml 2012-03-21 14:24:48 UTC (rev 3881)
@@ -160,7 +160,7 @@
<sv:value>f534d8d2-26af-4b4d-bd0b-ffeb5ae919a5</sv:value>
</sv:property>
<sv:property sv:name="id" sv:type="String">
- <sv:value>stripes:samplestruts</sv:value>
+ <sv:value>struts11:samplestruts</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>superuser</sv:value>
@@ -182,7 +182,7 @@
<sv:value>2012-03-21T07:32:14.200+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-21T15:04:43.207+01:00</sv:value>
+ <sv:value>2012-03-21T15:10:53.888+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-21 15:01:09
|
Revision: 3882
http://openutils.svn.sourceforge.net/openutils/?rev=3882&view=rev
Author: diego_schivo
Date: 2012-03-21 15:01:02 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
paragraph.jsp: content.text
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml 2012-03-21 14:24:48 UTC (rev 3881)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml 2012-03-21 15:01:02 UTC (rev 3882)
@@ -10,7 +10,7 @@
<sv:value>33b0769d-7b15-4f7e-80c7-19f936d276d3</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Stripes sample</sv:value>
@@ -20,7 +20,7 @@
<sv:value>mgnl:metaData</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -29,7 +29,7 @@
<sv:value>2012-03-20T17:19:23.972+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T17:19:56.971+01:00</sv:value>
+ <sv:value>2012-03-21T15:58:51.696+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>stripes:pages/samplestripes</sv:value>
@@ -46,14 +46,14 @@
<sv:value>80877779-bbce-4f43-8fd3-8ffce20a36ab</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2012-03-20T17:19:56.969+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T17:19:56.971+01:00</sv:value>
+ <sv:value>2012-03-21T15:58:51.696+01:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -73,13 +73,13 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>6138bf07-0cd3-4456-be9d-acdcd7d4509c</sv:value>
+ <sv:value>7acc82be-44e0-408a-a7de-503f18592527</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="text" sv:type="String">
- <sv:value>Hello Stripes!</sv:value>
+ <sv:value>Hello world!</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -92,13 +92,13 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2012-03-20T17:19:56.970+01:00</sv:value>
+ <sv:value>2012-03-21T15:58:51.695+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-03-20T17:19:56.970+01:00</sv:value>
+ <sv:value>2012-03-21T15:58:51.696+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplestripes</sv:value>
+ <sv:value>stripes:samplestripes</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp 2012-03-21 14:24:48 UTC (rev 3881)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp 2012-03-21 15:01:02 UTC (rev 3882)
@@ -2,5 +2,5 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- ${actionBean.text}
+ ${content.text}
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-21 14:24:48 UTC (rev 3881)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-21 15:01:02 UTC (rev 3882)
@@ -2,6 +2,5 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <cms:setNode var="content" />
${content.text}
</jsp:root>
\ 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: <die...@us...> - 2012-04-06 09:14:04
|
Revision: 3914
http://openutils.svn.sourceforge.net/openutils/?rev=3914&view=rev
Author: diego_schivo
Date: 2012-04-06 09:13:57 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
magnolia.version=4.5.2
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-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-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -265,7 +265,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
<stk.version>2.0</stk.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -85,6 +85,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -95,6 +95,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -170,6 +170,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -120,6 +120,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -184,7 +184,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
<jcr.version>2.0</jcr.version>
</properties>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -101,6 +101,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -206,6 +206,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -108,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -255,6 +255,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -128,6 +128,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -131,6 +131,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -99,6 +99,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -147,6 +147,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -106,6 +106,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -115,6 +115,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -171,7 +171,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
<jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -116,6 +116,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-04-04 16:36:17 UTC (rev 3913)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-04-06 09:13:57 UTC (rev 3914)
@@ -154,6 +154,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.1</magnolia.version>
+ <magnolia.version>4.5.2</magnolia.version>
</properties>
</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: <die...@us...> - 2012-04-06 15:46:22
|
Revision: 3930
http://openutils.svn.sourceforge.net/openutils/?rev=3930&view=rev
Author: diego_schivo
Date: 2012-04-06 15:46:15 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
jackrabbit.version=2.4.1 (https://issues.apache.org/jira/browse/JCR-3236 Can not instantiate lucene Analyzer in SearchIndex)
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-06 15:27:43 UTC (rev 3929)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-06 15:46:15 UTC (rev 3930)
@@ -267,7 +267,7 @@
<properties>
<magnolia.version>4.5.2</magnolia.version>
<stk.version>2.0</stk.version>
- <jackrabbit.version>2.4.0</jackrabbit.version>
+ <jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-06 15:27:43 UTC (rev 3929)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-06 15:46:15 UTC (rev 3930)
@@ -185,7 +185,7 @@
</dependencies>
<properties>
<magnolia.version>4.5.2</magnolia.version>
- <jackrabbit.version>2.4.0</jackrabbit.version>
+ <jackrabbit.version>2.4.1</jackrabbit.version>
<jcr.version>2.0</jcr.version>
</properties>
<!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 15:27:43 UTC (rev 3929)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 15:46:15 UTC (rev 3930)
@@ -172,6 +172,6 @@
</dependencies>
<properties>
<magnolia.version>4.5.2</magnolia.version>
- <jackrabbit.version>2.4.0</jackrabbit.version>
+ <jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
</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...> - 2012-05-06 09:06:05
|
Revision: 3956
http://openutils.svn.sourceforge.net/openutils/?rev=3956&view=rev
Author: fgiust
Date: 2012-05-06 09:05:58 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-3779" from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Added: svnmerge-integrated
+ /magnoliamodules/branches/magnolia44:1-3779
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-05 17:14:37 UTC (rev 3955)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN" "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any
+ change is lost upon restart -->
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
@@ -10,38 +11,29 @@
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
+ <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
+ <Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
+ <param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
+ <param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
- <param name="forceConsistencyCheck" value="false" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
</SearchIndex>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
@@ -49,28 +41,19 @@
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Versioning>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <param name="path" value="${rep.home}/indexes/jcrsystem" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-05 17:14:37 UTC (rev 3955)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN" "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any
+ change is lost upon restart -->
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
@@ -10,38 +11,29 @@
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
+ <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
+ <Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
+ <param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
- <param name="forceConsistencyCheck" value="false" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
</SearchIndex>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
@@ -49,32 +41,21 @@
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Versioning>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <param name="path" value="${rep.home}/indexes/jcrsystem" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
</SearchIndex>
- <!-- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"> <param name="minRecordLength" value="100000000"
- /> </DataStore> -->
</Repository>
\ 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...> - 2012-05-06 13:05:39
|
Revision: 3961
http://openutils.svn.sourceforge.net/openutils/?rev=3961&view=rev
Author: fgiust
Date: 2012-05-06 13:05:28 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Merged revisions 3809-3812,3815-3816,3875-3877,3889-3890,3892,3952-3954,3958 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r3809 | diego_schivo | 2012-03-16 11:58:18 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 LockUtils
........
r3810 | diego_schivo | 2012-03-16 12:10:27 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 ImageUtils
........
r3811 | diego_schivo | 2012-03-16 12:19:32 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaModule: maxConcurrentThreads
........
r3812 | diego_schivo | 2012-03-16 12:21:07 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaEl.module().getLocks().nextLock()
........
r3815 | diego_schivo | 2012-03-16 15:19:26 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3816 | diego_schivo | 2012-03-16 15:31:29 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3875 | carlocolombo | 2012-03-21 11:19:59 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnllms, path and references
........
r3876 | carlocolombo | 2012-03-21 11:29:16 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3877 | carlocolombo | 2012-03-21 11:32:50 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3889 | carlocolombo | 2012-03-21 17:47:52 +0100 (Wed, 21 Mar 2012) | 1 line
removed lms folders
........
r3890 | diego_schivo | 2012-03-27 09:57:02 +0200 (Tue, 27 Mar 2012) | 1 line
MESSAGES-17 Dropdown options may not contain the selected language
........
r3892 | fgiust | 2012-04-04 18:02:23 +0200 (Wed, 04 Apr 2012) | 1 line
CRIT-48 fix regression similar to CRIT-40
........
r3952 | carlocolombo | 2012-04-16 16:24:24 +0200 (Mon, 16 Apr 2012) | 3 lines
Mapped url starting with /scorm to lms repository (previously lms -> lms)
updated scormPlayerPage to use url2repositoryMapping to retrieve correct repository
update js to open page with mgnlRepository=scorm
........
r3953 | carlocolombo | 2012-04-19 16:31:49 +0200 (Thu, 19 Apr 2012) | 1 line
lms -> scorm
........
r3954 | diego_schivo | 2012-05-04 15:38:43 +0200 (Fri, 04 May 2012) | 1 line
CONTROLS-46 Grid control: combo column type showing labels instead of values
........
r3958 | fgiust | 2012-05-06 14:20:23 +0200 (Sun, 06 May 2012) | 1 line
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3809&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3810&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3811&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3812&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3815&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3816&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3875&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3876&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3877&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3889&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3890&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3892&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3952&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3953&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3954&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3958&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/TrackingModel.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/UserReport.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/CommonDataItemOrganization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Dependency.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/File.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Item.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Manifest.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Metadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organizations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/CompletionThreshold.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Data.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Map.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/TimeLimitAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ChildActivity.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionCombination.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionOperator.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ControlMode.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/DeliveryControls.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/LimitConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveBase.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PrimaryObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RandomTiming.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Randomization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupActionEnum.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionExitCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPostCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPreCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Sequencing.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingCollection.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/HideLMSUI.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/NavigationInterface.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/Presentation.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ConstrainChoiceConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsideration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/utils/JaxbUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.html
magnoliamodules/trunk/openutils-mgnllms/src/test/java/net/sourceforge/openutils/mgnllms/TestJaxb.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/LockUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/lms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/lms/
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3779
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3960
Added: svn:mergeinfo
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -84,10 +84,29 @@
options.add("lazyRender: true");
options.add("listClass: 'x-combo-list-small'");
- column.put("editor", "new Ed(new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
- + "({"
- + StringUtils.join(options, ",")
- + "}))");
+ if ("true".equals(String.valueOf(colMap.get("showLabel"))))
+ {
+ column.put(
+ "editor",
+ "(function() { window.gridComboColumnTypeTmp = new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}); return new Ed(gridComboColumnTypeTmp); })()");
+ column.put("renderer", "(function(combo){"
+ + " return function(value){"
+ + " var record = combo.findRecord(combo.valueField, value);"
+ + " return record ? record.get(combo.displayField) : combo.valueNotFoundText;"
+ + " }"
+ + "})(window.gridComboColumnTypeTmp)");
+ }
+ else
+ {
+ column.put("editor", "new Ed(new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}))");
+ }
}
}
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 13:05:28 UTC (rev 3961)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
ContextMenuItem menuNewPage = new ContextMenuItem("newFolder");
menuNewPage.setLabel(msgs.get("tree.config.menu.newFolder")); //$NON-NLS-1$
- menuNewPage.setIcon(request.getContextPath() + "/.resources/lms/icons/folder16.gif"); //$NON-NLS-1$
+ menuNewPage.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/folder16.gif"); //$NON-NLS-1$
menuNewPage.setOnclick(tree.getJavascriptTree()
+ ".createNode('" + LmsTypesManager.FOLDER.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotScormNode("
@@ -101,7 +101,7 @@
ContextMenuItem menuSimulate = new ContextMenuItem("simulate");
menuSimulate.setLabel(msgs.get("lms.menu.simulate")); //$NON-NLS-1$
- menuSimulate.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuSimulate.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuSimulate.setOnclick("mgnl.lms.simulate(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuSimulate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -121,7 +121,7 @@
// ContextMenuItem menuUserReport = new ContextMenuItem("userReport");
// menuUserReport.setLabel(msgs.get("lms.menu.userreport")); //$NON-NLS-1$
- // menuUserReport.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ // menuUserReport.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
// menuUserReport.setOnclick("mgnl.lms.userreport(" + tree.getJavascriptTree() + ".selectedNode.id);");
// menuUserReport.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
// + tree.getJavascriptTree()
@@ -138,7 +138,7 @@
ContextMenuItem menuUserReportAdmin = new ContextMenuItem("userReportAdmin");
menuUserReportAdmin.setLabel(msgs.get("lms.menu.userreportadmin")); //$NON-NLS-1$
- menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuUserReportAdmin.setOnclick("mgnl.lms.userreportadmin(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuUserReportAdmin.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -304,8 +304,8 @@
{
final Messages msgs = getMessages();
- tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/lms/icons/folder16.gif");
- tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/lms/icons/course.gif");
+ tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/mgnllms/icons/folder16.gif");
+ tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/mgnllms/icons/course.gif");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.lms.folders"), true);
column0.setWidth(4);
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,13 +52,13 @@
super.renderHeaderIncludes(html);
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/lms.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/lms.js\"><!-- --></script>");
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/conditions.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/conditions.js\"><!-- --></script>");
html.append("<link rel=\"stylesheet\" href=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/css/override.css\"><!-- --></script>");
+ + "/.resources/mgnllms/css/override.css\"><!-- --></script>");
}
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,10 +19,14 @@
package net.sourceforge.openutils.mgnllms.pages.lms;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2Reposi...
[truncated message content] |
|
From: <fg...@us...> - 2012-05-06 16:59:00
|
Revision: 4002
http://openutils.svn.sourceforge.net/openutils/?rev=4002&view=rev
Author: fgiust
Date: 2012-05-06 16:58:51 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Merged revisions 3962,3964-3965,3972-3975,3989-3991,3996 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r3962 | fgiust | 2012-05-06 15:15:55 +0200 (Sun, 06 May 2012) | 1 line
avoid NPEs
........
r3964 | fgiust | 2012-05-06 15:39:32 +0200 (Sun, 06 May 2012) | 1 line
TASKS-13 Conditional bootstrap of -dev folders for multiple modules
........
r3965 | fgiust | 2012-05-06 15:54:05 +0200 (Sun, 06 May 2012) | 1 line
TASKS-14 Alternative DevelopmentUtilsPage for exporting to multiple folders
........
r3972 | fgiust | 2012-05-06 16:21:17 +0200 (Sun, 06 May 2012) | 1 line
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
........
r3973 | fgiust | 2012-05-06 16:35:22 +0200 (Sun, 06 May 2012) | 1 line
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
........
r3974 | fgiust | 2012-05-06 16:42:42 +0200 (Sun, 06 May 2012) | 1 line
MGNLUTILS-33 new contentByUUID() EL function
........
r3975 | fgiust | 2012-05-06 17:11:04 +0200 (Sun, 06 May 2012) | 1 line
MGNLUTILS-34 Add methods from info.magnolia.cms.taglibs.CmsFunctions
........
r3989 | fgiust | 2012-05-06 18:02:06 +0200 (Sun, 06 May 2012) | 1 line
GROOVY-7 brand new console - menu config
........
r3990 | fgiust | 2012-05-06 18:05:47 +0200 (Sun, 06 May 2012) | 1 line
update groovy version
........
r3991 | fgiust | 2012-05-06 18:12:41 +0200 (Sun, 06 May 2012) | 1 line
GROOVY-7 new icon
........
r3996 | fgiust | 2012-05-06 18:20:26 +0200 (Sun, 06 May 2012) | 1 line
compilation fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3962&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3964&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3965&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3972&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3973&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3974&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3975&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3989&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3990&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3991&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3996&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/lifecycle/GroovyShellModule.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/setup/GroovyShellModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-resources/groovyshell/icons/groovy-small.png
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.html
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
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/resources/META-INF/tld/mgnlutils.tld
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/ModuleConfiguration.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShellScript.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-resources/groovyshell/js/jquery/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/it/
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/mgnl-resources/
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java.bk
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShell.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.groovyshell.pages.groovyShell.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html.bk
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3960
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-05-06 16:58:51 UTC (rev 4002)
@@ -129,6 +129,8 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
+ <!--
+ no cycles
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
@@ -141,6 +143,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -0,0 +1,429 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+// TEMPORARY COPIED HERE TO AVOID CIRCULAR DEPENDENCY - MuST SPLIT mgnlutils to FIX
+
+package it.openutils.mgnlutils.test;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.cms.util.ClasspathResourcesUtil;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanProcessor;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.content2bean.TypeMapping;
+import info.magnolia.content2bean.impl.Content2BeanProcessorImpl;
+import info.magnolia.content2bean.impl.TypeMappingImpl;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.context.SystemRepositoryStrategy;
+import info.magnolia.importexport.BootstrapUtil;
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.init.properties.ClasspathPropertySource;
+import info.magnolia.init.properties.InitPathsPropertySource;
+import info.magnolia.init.properties.ModulePropertiesSource;
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleManagementException;
+import info.magnolia.module.ModuleManager;
+import info.magnolia.module.ModuleManagerImpl;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.ModuleRegistryImpl;
+import info.magnolia.module.model.ModuleDefinition;
+import info.magnolia.module.model.reader.BetwixtModuleDefinitionReader;
+import info.magnolia.module.model.reader.DependencyCheckerImpl;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.objectfactory.configuration.ComponentConfiguration;
+import info.magnolia.objectfactory.configuration.ComponentProviderConfiguration;
+import info.magnolia.objectfactory.configuration.ComponentProviderConfigurationBuilder;
+import info.magnolia.objectfactory.configuration.ConfiguredComponentConfiguration;
+import info.magnolia.objectfactory.configuration.ImplementationConfiguration;
+import info.magnolia.objectfactory.configuration.InstanceConfiguration;
+import info.magnolia.objectfactory.configuration.ProviderConfiguration;
+import info.magnolia.repository.DefaultRepositoryManager;
+import info.magnolia.repository.RepositoryManager;
+import info.magnolia.test.ComponentsTestUtil;
+import info.magnolia.test.FixedModuleDefinitionReader;
+import info.magnolia.test.TestMagnoliaConfigurationProperties;
+import info.magnolia.test.TestMagnoliaInitPaths;
+import info.magnolia.test.mock.MockContext;
+import info.magnolia.test.mock.MockUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.core.jndi.BindableRepositoryFactory;
+import org.apache.log4j.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Generic version of Magnolia RepositoryTestcase, as found in magnolia-core test jar.
+ * @author fgiust
+ * @version $Id$
+ */
+@RepositoryTestConfiguration
+public abstract class AbstractRepositoryTestcase
+{
+
+ /**
+ * Logger.
+ */
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
+ /**
+ * Setup and start the repository
+ * @throws Exception any exception thrown during the test setup
+ */
+ public void setUp() throws Exception
+ {
+ // ignore mapping warnings
+ org.apache.log4j.Logger.getLogger(ContentRepository.class).setLevel(Level.ERROR);
+
+ if (!this.getClass().isAnnotationPresent(RepositoryTestConfiguration.class))
+ {
+ throw new IllegalArgumentException("You should annotate your test with @RepositoryTestConfiguration");
+ }
+
+ // retrieve configuration from annotation
+ RepositoryTestConfiguration repositoryTestConfiguration = this.getClass().getAnnotation(
+ RepositoryTestConfiguration.class);
+
+ String repositoryConfigFileName = repositoryTestConfiguration.repositoryConfig();
+
+ String jackrabbitRepositoryConfigFileName = repositoryTestConfiguration.jackrabbitRepositoryConfig();
+ String magnoliaProperties = repositoryTestConfiguration.magnoliaProperties();
+
+ boolean autoStart = repositoryTestConfiguration.autostart();
+ boolean quiet = repositoryTestConfiguration.quiet();
+
+ initDefaultImplementations();
+ SystemProperty.getProperties().load(this.getClass().getResourceAsStream(magnoliaProperties));
+ MockUtil.initMockContext();
+ workaroundJCR1778();
+
+ if (autoStart)
+ {
+ cleanUp();
+ startRepository(repositoryConfigFileName, jackrabbitRepositoryConfigFileName, quiet);
+ }
+
+ if (repositoryTestConfiguration != null)
+ {
+ // bootstrap files list
+ bootstrapFile(repositoryTestConfiguration.bootstrapFiles());
+
+ // bootstrap files from directory
+ if (StringUtils.isNotBlank(repositoryTestConfiguration.bootstrapDirectory()))
+ {
+ bootstrapDirectory(repositoryTestConfiguration.bootstrapDirectory());
+ }
+
+ for (ModuleConfiguration module : repositoryTestConfiguration.startModules())
+ {
+ startModule(module.name(), module.moduleclass());
+ }
+
+ }
+
+ }
+
+ /**
+ * Shutdown the repository, optionally deleting the containing folder.
+ * @throws Exception any exception thrown during the shutdown.
+ */
+ public void tearDown() throws Exception
+ {
+ RepositoryTestConfiguration repositoryTestConfiguration = this.getClass().getAnnotation(
+ RepositoryTestConfiguration.class);
+
+ // if module is set it is stopped on tearDown
+ for (ModuleConfiguration module : repositoryTestConfiguration.startModules())
+ {
+ ((ModuleLifecycle) ModuleRegistry.Factory.getInstance().getModuleInstance(module.name())).stop(null);
+ }
+
+ if (repositoryTestConfiguration.autostart())
+ {
+
+ final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger("info.magnolia");
+ final Level originalLogLevel = logger.getLevel();
+ if (repositoryTestConfiguration.quiet())
+ {
+ logger.setLevel(Level.WARN);
+ }
+ MgnlContext.release();
+ MgnlContext.getSystemContext().release();
+ ContentRepository.shutdown();
+ if (true)
+ {
+ cleanUp();
+ }
+ logger.setLevel(originalLogLevel);
+ }
+ SystemProperty.getProperties().clear();
+
+ // ComponentsTestUtil.clear();
+ SystemProperty.getProperties().clear();
+ MgnlContext.setInstance(null);
+ }
+
+ // info.magnolia.test.MgnlTestCase.initDefaultImplementations()
+ private void initDefaultImplementations() throws IOException, ModuleManagementException
+ {
+ final List<ModuleDefinition> modules = getModuleDefinitionsForTests();
+ final ModuleRegistry mr = new ModuleRegistryImpl();
+ ModuleManagerImpl mm = new ModuleManagerImpl(
+ null,
+ new FixedModuleDefinitionReader(modules),
+ mr,
+ new DependencyCheckerImpl());
+ mm.loadDefinitions();
+
+ final TestMagnoliaConfigurationProperties configurationProperties = new TestMagnoliaConfigurationProperties(
+ new ModulePropertiesSource(mr),
+ new ClasspathPropertySource("/test-magnolia.properties"),
+ new InitPathsPropertySource(new TestMagnoliaInitPaths()));
+ SystemProperty.setMagnoliaConfigurationProperties(configurationProperties);
+
+ ComponentsTestUtil.setInstance(ModuleManager.class, mm);
+ ComponentsTestUtil.setInstance(ModuleRegistry.class, mr);
+ ComponentsTestUtil.setInstance(MagnoliaConfigurationProperties.class, configurationProperties);
+
+ ComponentsTestUtil.setImplementation(RepositoryManager.class, DefaultRepositoryManager.class);
+
+ ComponentProviderConfigurationBuilder configurationBuilder = new ComponentProviderConfigurationBuilder();
+ ComponentProviderConfiguration configuration = configurationBuilder.getComponentsFromModules(
+ "system",
+ mr.getModuleDefinitions());
+ configuration.combine(configurationBuilder.getComponentsFromModules("main", mr.getModuleDefinitions()));
+
+ // Content2BeanProcessorImpl uses dependency injection and since we don't have that with MockComponentProvider
+ // we
+ // need to manually create this object and replace the component configuration read from core.xml
+ final TypeMappingImpl typeMapping = new TypeMappingImpl();
+ configuration.registerInstance(TypeMapping.class, typeMapping);
+ configuration.registerInstance(Content2BeanProcessor.class, new Content2BeanProcessorImpl(typeMapping));
+
+ for (Map.Entry<Class, ComponentConfiguration> entry : configuration.getComponents().entrySet())
+ {
+ ComponentConfiguration value = entry.getValue();
+ if (value instanceof ImplementationConfiguration)
+ {
+ ImplementationConfiguration config = (ImplementationConfiguration) value;
+ ComponentsTestUtil.setImplementation(config.getType(), config.getImplementation());
+ }
+ else if (value instanceof InstanceConfiguration)
+ {
+ InstanceConfiguration config = (InstanceConfiguration) value;
+ ComponentsTestUtil.setInstance(config.getType(), config.getInstance());
+ }
+ else if (value instanceof ProviderConfiguration)
+ {
+ ProviderConfiguration config = (ProviderConfiguration) value;
+ ComponentsTestUtil.setImplementation(config.getType(), config.getProviderClass());
+ }
+ else if (value instanceof ConfiguredComponentConfiguration)
+ {
+ ConfiguredComponentConfiguration config = (ConfiguredComponentConfiguration) value;
+ ComponentsTestUtil.setConfigured(
+ config.getType(),
+ config.getWorkspace(),
+ config.getPath(),
+ config.isObserved());
+ }
+ }
+
+ for (Map.Entry<Class< ? >, Class< ? >> entry : configuration.getTypeMapping().entrySet())
+ {
+ ComponentsTestUtil.setImplementation((Class) entry.getKey(), (Class) entry.getValue());
+ }
+ }
+
+ // info.magnolia.test.MgnlTestCase.getModuleDefinitionsForTests()
+ /**
+ * Override this method to provide the appropriate list of modules your tests need.
+ */
+ protected List<ModuleDefinition> getModuleDefinitionsForTests() throws ModuleManagementException
+ {
+ final ModuleDefinition core = new BetwixtModuleDefinitionReader()
+ .readFromResource("/META-INF/magnolia/core.xml");
+ return Collections.singletonList(core);
+ }
+
+ /**
+ * Workaround for JCR-1778.
+ */
+ @SuppressWarnings("unchecked")
+ static void workaroundJCR1778()
+ {
+ try
+ {
+ Field cacheField = BindableRepositoryFactory.class.getDeclaredField("cache");
+ cacheField.setAccessible(true);
+ final Map<String, String> cache = (Map<String, String>) cacheField.get(null);
+ cache.clear();
+ }
+ catch (SecurityException e)
+ {
+ // ignore
+ }
+ catch (NoSuchFieldException e)
+ {
+ // ignore
+ }
+ catch (IllegalArgumentException e)
+ {
+ // ignore
+ }
+ catch (IllegalAccessException e)
+ {
+ // ignore
+ }
+ }
+
+ protected void modifyContextesToUseRealRepository()
+ {
+ SystemContext systemContext = MgnlContext.getSystemContext();
+ RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
+ SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(repositoryManager);
+
+ ((MockContext) systemContext).setRepositoryStrategy(repositoryStrategy);
+ ((MockContext) MgnlContext.getInstance()).setRepositoryStrategy(repositoryStrategy);
+ }
+
+ protected void startRepository(String repositoryConfigFileName, String jackrabbitRepositoryConfigFileName,
+ boolean quiet) throws Exception
+ {
+ final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger("info.magnolia");
+ final Level originalLogLevel = logger.getLevel();
+ if (quiet)
+ {
+ logger.setLevel(Level.WARN);
+ }
+
+ ContentRepository.REPOSITORY_USER = SystemProperty.getProperty("magnolia.connection.jcr.userId");
+ ContentRepository.REPOSITORY_PSWD = SystemProperty.getProperty("magnolia.connection.jcr.password");
+
+ InputStream repositoryConfigFileStream = ClasspathResourcesUtil
+ .getResource(repositoryConfigFileName)
+ .openStream();
+
+ extractConfigFile("magnolia.repositories.config", repositoryConfigFileStream, "target/repositories.xml");
+
+ IOUtils.closeQuietly(repositoryConfigFileStream);
+
+ InputStream jackrabbitRepositoryConfigFileStream = ClasspathResourcesUtil.getResource(
+ jackrabbitRepositoryConfigFileName).openStream();
+
+ extractConfigFile(
+ "magnolia.repositories.jackrabbit.config",
+ jackrabbitRepositoryConfigFileStream,
+ "target/repo-conf/extracted.xml");
+
+ IOUtils.closeQuietly(jackrabbitRepositoryConfigFileStream);
+
+ ContentRepository.init();
+
+ modifyContextesToUseRealRepository();
+
+ logger.setLevel(originalLogLevel);
+ }
+
+ private void extractConfigFile(String propertyName, InputStream configFileStream, String extractToPath)
+ throws Exception
+ {
+ String targetFilename = Path.getAbsoluteFileSystemPath(extractToPath);
+ File targetFile = new File(targetFilename);
+ // extract resource to the filesystem (jackrabbit can't use a stream)
+ new File(targetFile.getParent()).mkdirs();
+ IOUtils.copy(configFileStream, new FileOutputStream(targetFile));
+ SystemProperty.setProperty(propertyName, extractToPath);
+ }
+
+ private void cleanUp() throws IOException
+ {
+ FileUtils.deleteDirectory(new File(SystemProperty.getProperty("magnolia.repositories.home")));
+ }
+
+ /**
+ * Bootstrap one or more xml files.
+ * @param resources one or more xml files (classpath path)
+ * @throws RepositoryException thrown during import
+ * @throws IOException if there are errors while loading the files
+ */
+ protected void bootstrapFile(String... resources) throws IOException, RepositoryException
+ {
+ BootstrapUtil.bootstrap(resources, ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW);
+ }
+
+ /**
+ * Loads all the bootstrap files in a specified path under the classpath
+ * @param path classpath path
+ * @throws RepositoryException thrown during import
+ * @throws IOException if there are errors while loading the files
+ */
+ protected void bootstrapDirectory(String path) throws IOException, RepositoryException
+ {
+ List<String> resourcesToBootstrap = new ArrayList<String>();
+
+ for (File file : new File(path).listFiles())
+ {
+ resourcesToBootstrap.add(file.getAbsolutePath());
+ }
+
+ BootstrapUtil.bootstrap(
+ resourcesToBootstrap.toArray(new String[resourcesToBootstrap.size()]),
+ ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW);
+ }
+
+ /**
+ * Register and starts a module
+ * @param modulename modulename
+ * @param moduleClass ModuleClass
+ * @throws Content2BeanException if the module configuration can't be successfully parsed.
+ * @return module instance
+ */
+ protected ModuleLifecycle startModule(String modulename, Class< ? extends ModuleLifecycle> moduleClass)
+ throws Content2BeanException
+ {
+ // register and start module
+ Content content = ContentUtil.getContent("config", "/modules/" + modulename + "/config");
+ ModuleLifecycle module = (ModuleLifecycle) Content2BeanUtil.toBean(content, true, moduleClass);
+ module.start(null);
+ ModuleRegistry.Factory.getInstance().registerModuleInstance(modulename, module);
+
+ return module;
+ }
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/ModuleConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/ModuleConfiguration.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/ModuleConfiguration.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -0,0 +1,52 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+// TEMPORARY COPIED HERE TO AVOID CIRCULAR DEPENDENCY - MuST SPLIT mgnlutils to FIX
+
+package it.openutils.mgnlutils.test;
+
+import info.magnolia.module.ModuleLifecycle;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+public @interface ModuleConfiguration {
+
+ /**
+ * Module name.
+ */
+ String name() default "";
+
+ /**
+ * Module name.
+ */
+ Class< ? extends ModuleLifecycle> moduleclass();
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/ModuleConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -0,0 +1,82 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+// TEMPORARY COPIED HERE TO AVOID CIRCULAR DEPENDENCY - MuST SPLIT mgnlutils to FIX
+
+package it.openutils.mgnlutils.test;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Annotation for configuring a Repository test case.
+ * @author carlo
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+public @interface RepositoryTestConfiguration {
+
+ /**
+ * Path for magnolia repository config file. Defaults to "/test-repositories.xml".
+ */
+ String repositoryConfig() default "/test-repositories.xml";
+
+ /**
+ * Path for jackrabbit configuration file. Defaults to "/repo-conf/jackrabbit-memory-search.xml"
+ */
+ String jackrabbitRepositoryConfig() default "/repo-conf/jackrabbit-memory-search.xml";
+
+ /**
+ * A list of files to bootstrap.
+ */
+ String[] bootstrapFiles() default {};
+
+ /**
+ * A list of directory (classpath paths) to bootstrap.
+ */
+ String bootstrapDirectory() default "";
+
+ /**
+ * magnolia.properties location. Defaults to "/test-magnolia.properties".
+ */
+ String magnoliaProperties() default "/test-magnolia.properties";
+
+ /**
+ * Autostart repositories. Defaults to true.
+ */
+ boolean autostart() default true;
+
+ /**
+ * Quiet (shut up logging during startup). Defaults to true.
+ */
+ boolean quiet() default true;
+
+ /**
+ * Name of modules that should be registered and started. Configuration should exist in the repository for these
+ * modules.
+ */
+ ModuleConfiguration[] startModules() default {};
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -0,0 +1,49 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+// TEMPORARY COPIED HERE TO AVOID CIRCULAR DEPENDENCY - MuST SPLIT mgnlutils to FIX
+package it.openutils.mgnlutils.test;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+
+/**
+ * TestNG version of Magnolia RepositoryTestcase. Extend this class and configure it by adding a @RepositoryTestConfiguration
+ * annotation.
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class TestNgRepositoryTestcase extends AbstractRepositoryTestcase
+{
+
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ @Override
+ @AfterClass
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-05-06 16:58:51 UTC (rev 4002)
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.7.5</version>
+ <version>1.8.6</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/lifecycle/GroovyShellModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/lifecycle/GroovyShellModule.java 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/lifecycle/GroovyShellModule.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -19,10 +19,10 @@
package net.sourceforge.openutils.mgnlgroovy.lifecycle;
+import groovy.lang.GroovySystem;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-import org.codehaus.groovy.runtime.InvokerHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@
public void start(ModuleLifecycleContext moduleLifecycleContext)
{
- log.info("starting GroovyShellModule. Groovy version is " + InvokerHelper.getVersion());
+ log.info("starting GroovyShellModule. Groovy version is " + GroovySystem.getVersion());
}
Deleted: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java.bk
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java.bk 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java.bk 2012-05-06 16:58:51 UTC (rev 4002)
@@ -1,193 +0,0 @@
-/**
- *
- * Groovy Shell for Magnolia CMS (http://www.openmindlab.com/lab/products/groovy.html)
- * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlgroovy.pages;
-
-import groovy.lang.GroovyShell;
-import groovy.lang.Script;
-import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.util.AlertUtil;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.codehaus.groovy.control.CompilationFailedException;
-import org.codehaus.groovy.runtime.InvokerHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A basic Groovy shell to be embedded in Magnolia.
- * @author fgrilli
- * @version $Id: GroovyShellPage.java 5074 2008-10-21 13:16:36Z federico.grilli $
- */
-public class GroovyShellPage extends TemplatedMVCHandler
-{
-
- private static final String LINE_SEP = System.getProperty("line.separator");
-
- private static final String GROOVY_VERSION = InvokerHelper.getVersion();
-
- private static final long serialVersionUID = 222L;
-
- private static Logger log = LoggerFactory.getLogger(GroovyShellPage.class);
-
- private String groovyScript;
-
- private Document groovyScriptFile;
-
- public GroovyShellPage(String name, HttpServletRequest request, HttpServletResponse response)
- {
- super(name, request, response);
-
- }
-
- public String executeGroovyScript()
- {
- if (StringUtils.isBlank(groovyScript))
- {
- String msg = "No script to execute";
- log.warn(msg);
- AlertUtil.setMessage(msg);
- return this.show();
- }
-
- log.debug("executing script {}", groovyScript);
-
- Object retVal;
-
- try
- {
- GroovyShell shell = new GroovyShell();
- Script script = shell.parse(getGroovyScript());
- retVal = script.run();
- AlertUtil.setMessage("Script executed successfully. Return value is " + retVal);
- }
-
- catch (CompilationFailedException e)
- {
- log.error("An error occurred while parsing the script. Error message is {}", e.getMessage());
- AlertUtil.setMessage("An error occurred while parsing the script. Error message is " + e.getMessage());
- }
- catch (Throwable e)
- {
- log.error("An error occurred while executing the script. Error message is " + e.getMessage(), e);
- AlertUtil.setMessage("An error occurred while executing the script. Error message is "
- + e.getMessage()
- + "\n"
- + ExceptionUtils.getFullStackTrace(e));
- }
-
- return this.show();
- }
-
- public String getGroovyScript()
- {
- return groovyScript;
- }
-
- public void setGroovyScript(String groovyScript)
- {
- this.groovyScript = groovyScript;
- }
-
- public String getGroovyVersion()
- {
- return GROOVY_VERSION;
- }
-
- public Document getGroovyScriptFile()
- {
- return groovyScriptFile;
- }
-
- public void setGroovyScriptFile(Document groovyScriptFile)
- {
- this.groovyScriptFile = groovyScriptFile;
- }
-
- public String loadGroovyScript()
- {
- if (groovyScriptFile == null)
- {
- String msg = "Please, select a file";
- log.warn(msg);
- AlertUtil.setMessage(msg);
- return this.show();
- }
- if (!groovyScriptFile.getExtension().equalsIgnoreCase("groovy"))
- {
- String msg = groovyScriptFile.getFileNameWithExtension() + " doesn't seem to be a valid groovy file";
- log.warn(msg);
- AlertUtil.setMessage(msg);
- return this.show();
- }
- groovyScript = readFile(groovyScriptFile.getFile());
-
- String msg = groovyScriptFile.getFileNameWithExtension() + " loaded";
- log.info(msg);
- AlertUtil.setMessage(msg);
- return this.show();
-
- }
-
- private String readFile(File file)
- {
- StringBuilder contents = new StringBuilder();
-
- try
- {
- // use buffering, reading one line at a time
- // FileReader always assumes default encoding is OK!
- BufferedReader input = new BufferedReader(new FileReader(file));
- try
- {
- String line = null; // not declared within while loop
- /*
- * readLine is a bit quirky : it returns the content of a line MINUS the newline. it returns null only
- * for the END of the stream. it returns an empty String if two newlines appear in a row.
- */
- while ((line = input.readLine()) != null)
- {
- contents.append(line);
- contents.append(LINE_SEP);
- }
- }
- finally
- {
- IOUtils.closeQuietly(input);
- }
- }
- catch (IOException ex)
- {
- log.error(ex.getMessage());
- }
- return contents.toString();
- }
-}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.java 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -45,8 +45,7 @@
/**
- * A basic Groovy shell to be embedded in Magnolia.
- * @author fgrilli
+ * @author Manuel Molaschi
* @version $Id$
*/
public class GroovyShellScript extends TemplatedMVCHandler
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/setup/GroovyShellModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/setup/GroovyShellModuleVersionHandler.java 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/setup/GroovyShellModuleVersionHandler.java 2012-05-06 16:58:51 UTC (rev 4002)
@@ -19,14 +19,31 @@
package net.sourceforge.openutils.mgnlgroovy.setup;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.DeleteNodeTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
+import java.util.ArrayList;
+import java.util.List;
+
/**
- * @author fgrilli
- * @version $Id: GroovyShellModuleVersionHandler.java 5308 2008-10-31 14:59:23Z federico.grilli $
+ * @author fgiust
+ * @version $Id: $
*/
public class GroovyShellModuleVersionHandler extends SimpleModuleVersionHandler
{
+ @Override
+ public List<Task> getStartupTasks(InstallContext installContext)
+ {
+
+ List<Task> tasks = new ArrayList<Task>();
+
+ tasks.add(new DeleteNodeTask("config", "/modules/adminIterface/config/menu/tools/groovyShell"));
+ tasks.add(new DeleteNodeTask("config", "/modules/groovyshell/pages/groovyShell"));
+
+ return tasks;
+ }
}
Deleted: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShell.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShell.xml 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShell.xml 2012-05-06 16:58:51 UTC (rev 4002)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="groovyShell" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>15ee1ea1-90f6-4555-9473-2e02c52a4016</sv:value>
- </sv:property>
- <sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/groovyshell/icons/groovy-small.png</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Groovy Shell</sv:value>
- </sv:property>
- <sv:property sv:name="onclick" sv:type="String">
- <sv:value>window.open('/.magnolia/pages/groovyShell.html');</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2005-05-16T20:46:43.549+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-05-04T12:02:10.817+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-02-17T17:53:37.468+01:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Copied: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShellScript.xml (from rev 3991, magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShellScript.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShellScript.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.adminInterface.config.menu.tools.groovyShellScript.xml 2012-05-06 16:58:51 UTC (rev 4002)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="groovyShellScript" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>15ee1ea1-90f6-4555-9473-2e02c52a4017</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/groovyshell/icons/groovy-small.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Groovy Shell</sv:value>
+ </sv:property>
+ <sv:property sv:name="onclick" sv:type="String">
+ <sv:value>window.open(contextPath + '/.magnolia/pages/groovyShellScript.html');</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2005-05-16T20:46:43.549+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-04T12:02:10.817+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-02-17T17:53:37.468+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.groovyshell.pages.groovyShell.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.groovyshell.pages.groovyShell.xml 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-bootstrap/groovyshell/config.modules.groovyshell.pages.groovyShell.xml 2012-05-06 16:58:51 UTC (rev 4002)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="groovyShell" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>3eb70ebe-824c-4eeb-9595-494d39d20bdc</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlgroovy.pages.GroovyShellPage</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2006-06-10T17:40:37.578+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-07-11T21:37:16.259+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-10-30T14:22:28.193+01:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/mgnl-resources/groovyshell/icons/groovy-small.png
===================================================================
(Binary files differ)
Deleted: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html.bk
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html.bk 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html.bk 2012-05-06 16:58:51 UTC (rev 4002)
@@ -1,90 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>Groovy Shell Page</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link href="${this.request.contextPath}/.resources/groovyshell/css/mgnladmin.css" type="text/css" rel="stylesheet" />
- <link href="${this.request.contextPath}/.resources/groovyshell/css/styles.css" type="text/css" rel="stylesheet" />
- <script src="${this.request.contextPath}/.resources/groovyshell/js/codemirror/codemirror.js" type="text/javascript"></script>
- <script type="text/javascript">
- // <![[
- function uploadFile(){
- document.getElementById('command').value='loadGroovyScript'
- document.forms[0].submit()
- }
- function warnBeforeSubmit(){
- if(confirm('Are you sure you want to run this script?')){
- document.getElementById('groovyScript').value = editor.getCode()
- document.getElementById('runBtn').disabled=true
- document.forms[0].submit()
- }
- else
- return false
- }
-
-
- // ]]>
- </script>
- </head>
- <body class="ma">
- <div class="ma-frame">
- <form method="post" action="" enctype="multipart/form-data">
- <h2>
- Groovy Shell
- <a target="_blank" href="http://www.openmindonline.it" style="position:absolute;right:45px;">
- <img class="omlogo" alt="openmind" src="${this.request.contextPath}/.resources/groovyshell/img/openmind-logo.png" />
- </a>
- </h2>
- <div class="ma-framecenter">
- <div class="ma-warning">
- <strong>Warning</strong>
- : the Groovy Shell potentially makes at your disposal the entire Magnolia API. If not used properly and
- judiciously, this means that
- <strong>you could make permanent damages to your repository</strong>
- , such as delete all your data.
- <strong>Use it at your own risk.</strong>
- </div>
- <div class="ma-formel-container">
- <div class="ma-formel-left">
- <label for="groovyScriptFile">Upload groovy script</label>
- </div>
- <div class="ma-formel-right">
- <input type="file" name="groovyScriptFile" />
- <input type="submit" value="Upload" onclick="uploadFile()" class="mgnlControlButton" />
- </div>
- </div>
- <div class="ma-formel-container">
- <div class="ma-formel-right" id="textarecontainer">
- <textarea id="groovyScriptTxtArea" name="groovyScriptTxtArea" rows="30" cols="120" style="width:100%"
- class="codepress groovy readonly-off">${this.groovyScript!''}</textarea>
- <input type="hidden" name="groovyScript" id="groovyScript" value="" />
- </div>
- </div>
- <input type="hidden" id="command" name="command" value="executeGroovyScript" />
- [#if message?exists]
- <pre class="ma-info">${message}</pre>
- [/#if]
- </div>
- <div class="ma-framefooter">
- <div class="ma-framefooterinner">
- <div class="ma-buttons">
- <input type="submit" id="runBtn" value="Run" onclick="warnBeforeSubmit(); return false" class="mgnlControlButton" />
- </div>
- </div>
- </div>
- </form>
- </div>
- <script type="text/javascript">
- // <![CDATA[
- var editor = CodeMirror.fromTextArea('groovyScriptTxtArea', {
- height: "dynamic",
- minHeight: 405,
- basefiles: ["${this.request.contextPath}/.resources/groovyshell/js/codemirror/codemirror_groovy.js"],
- stylesheet: "${this.request.contextPath}/.resources/groovyshell/js/codemirror/groovycolors.css",
- textWrapping: false,
- lineNumbers: true
- });
- // ]]>
-</script>
- </body>
-</html>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.html 2012-05-06 16:35:53 UTC (rev 4001)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.html 2012-05-06 16:58:51 UTC (rev 4002)
@@ -41,9 +41,9 @@
Cannot execute action, the script is empty.
</p>
</div>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"><!-- --></script>
- <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"><!-- --></script>
- <script src="http://layout.jquery-dev.net/lib/js/jquery.layout-latest.js" type="text/javascript"><!-- --></script>
+ <script src="${this.request.contextPath}/.resources/groovyshell/js/jquery/jquery.min.js" type="text/javascript"><!-- --></script>
+ <script src="${this.request.contextPath}/.resources/groovyshell/js/jquery/jquery-ui.min.js" type="text/javascript"><!-- --></script>
+ <script src="${this.request.contextPath}/.resources/groovyshell/js/jquery/jquery.layout-latest.js" type="text/javascript"><!-- --></script>
<script src="${this.request.contextPath}/.resources/groovyshell/js/ace/ace.js" type="text/javascript"><!-- --></script>
<script src="${this.request.contextPath}/.resources/groovyshell/js/ace/mode-groovy.js" type="text/javascript" charset="utf-8"><!-- --></script>
<script src="${this.request.contextPath}/.resources/groovyshell/js/ace/theme-eclipse.js" type="text/javascript" charset="utf-8"><!-- --></script>
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958
+ /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958,3972-3975,3996
Modified: magnoliamodules/trunk/openutils-mgn...
[truncated message content] |
|
From: <fg...@us...> - 2012-05-06 17:07:35
|
Revision: 4004
http://openutils.svn.sourceforge.net/openutils/?rev=4004&view=rev
Author: fgiust
Date: 2012-05-06 17:07:28 +0000 (Sun, 06 May 2012)
Log Message:
-----------
add "for magnolia 4.5" in bundle names
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlcas/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlext/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlmobile/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/assembly/assembly-bundle.xml
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,6 +1,6 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1">
- <id>-for-magnolia-4.5-bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlext/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlext/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlmobile/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,6 +1,6 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1">
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/assembly/assembly-bundle.xml 2012-05-06 17:05:25 UTC (rev 4003)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/assembly/assembly-bundle.xml 2012-05-06 17:07:28 UTC (rev 4004)
@@ -1,5 +1,5 @@
<assembly>
- <id>bundle</id>
+ <id>for-magnolia-4.5-bundle</id>
<formats>
<format>zip</format>
</formats>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 17:14:47
|
Revision: 4008
http://openutils.svn.sourceforge.net/openutils/?rev=4008&view=rev
Author: fgiust
Date: 2012-05-06 17:14:40 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -131,7 +131,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -177,7 +177,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -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>
@@ -127,7 +128,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -170,7 +171,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -90,7 +90,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -76,7 +76,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-05-06 17:09:15 UTC (rev 4007)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-05-06 17:14:40 UTC (rev 4008)
@@ -131,7 +131,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 17:21:14
|
Revision: 4013
http://openutils.svn.sourceforge.net/openutils/?rev=4013&view=rev
Author: fgiust
Date: 2012-05-06 17:21:07 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/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-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -176,7 +176,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -61,7 +61,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -92,7 +92,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -108,7 +108,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -98,7 +98,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -113,7 +113,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -80,7 +80,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -106,7 +106,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.wurfl</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -73,7 +73,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -96,7 +96,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>struts</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -128,7 +128,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-05-06 17:16:45 UTC (rev 4012)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-05-06 17:21:07 UTC (rev 4013)
@@ -126,7 +126,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</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...> - 2012-05-06 17:26:47
|
Revision: 4017
http://openutils.svn.sourceforge.net/openutils/?rev=4017&view=rev
Author: fgiust
Date: 2012-05-06 17:26:41 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:23:39 UTC (rev 4016)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:26:41 UTC (rev 4017)
@@ -181,7 +181,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-05-06 17:23:39 UTC (rev 4016)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-05-06 17:26:41 UTC (rev 4017)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-05-06 17:23:39 UTC (rev 4016)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-05-06 17:26:41 UTC (rev 4017)
@@ -133,7 +133,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:23:39 UTC (rev 4016)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:26:41 UTC (rev 4017)
@@ -128,7 +128,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</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...> - 2012-05-06 17:31:37
|
Revision: 4021
http://openutils.svn.sourceforge.net/openutils/?rev=4021&view=rev
Author: fgiust
Date: 2012-05-06 17:31:31 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -126,7 +126,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -113,7 +113,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -118,7 +118,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -100,7 +100,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-05-06 17:28:18 UTC (rev 4020)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-05-06 17:31:31 UTC (rev 4021)
@@ -133,7 +133,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 17:36:49
|
Revision: 4022
http://openutils.svn.sourceforge.net/openutils/?rev=4022&view=rev
Author: fgiust
Date: 2012-05-06 17:36:42 +0000 (Sun, 06 May 2012)
Log Message:
-----------
upgrade module dependencies
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml
magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
magnoliamodules/trunk/openutils-mgnlmobile/src/main/resources/META-INF/magnolia/mgnlmobile.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/META-INF/magnolia/mgnltest.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -8,7 +8,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>1.0/*</version>
+ <version>4.5/*</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -9,7 +9,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -9,7 +9,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>3.1/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>3.5/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -10,7 +10,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>3.1/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -9,11 +9,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
<dependency>
<name>mail</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
<repositories>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -33,46 +33,7 @@
<dependencies>
<dependency>
<name>core</name>
- <version>4.4/*</version>
+ <version>4.5/*</version>
</dependency>
- <!--
- <dependency>
- <name>adminInterface</name>
- <version>4.4/*</version>
- </dependency>
- <dependency>
- <name>cache</name>
- <version>4.4/*</version>
- </dependency>
- <dependency>
- <name>fckEditor</name>
- <version>4.4/*</version>
- </dependency>
- <dependency>
- <name>resources</name>
- <version>1.3/*</version>
- </dependency>
- <dependency>
- <name>inplace-templating</name>
- <version>1.2/*</version>
- </dependency>
- <dependency>
- <name>dms</name>
- <version>1.5/*</version>
- </dependency>
- <dependency>
- <name>data</name>
- <version>1.6/*</version>
- </dependency>
- <dependency>
- <name>rssaggregator</name>
- <version>1.1/*</version>
- </dependency>
- <dependency>
- <name>public-user-registration</name>
- <version>1.2/*</version>
- <optional>true</optional>
- </dependency>
- -->
</dependencies>
</module>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
<repositories>
Modified: magnoliamodules/trunk/openutils-mgnlmobile/src/main/resources/META-INF/magnolia/mgnlmobile.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/src/main/resources/META-INF/magnolia/mgnlmobile.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlmobile/src/main/resources/META-INF/magnolia/mgnlmobile.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
<dependency>
<name>templating</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -8,7 +8,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>3.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -10,7 +10,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -9,11 +9,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
<dependency>
<name>templating</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -21,11 +21,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
<dependency>
<name>templating</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/META-INF/magnolia/mgnltest.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/META-INF/magnolia/mgnltest.xml 2012-05-06 17:31:31 UTC (rev 4021)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/META-INF/magnolia/mgnltest.xml 2012-05-06 17:36:42 UTC (rev 4022)
@@ -10,11 +10,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
<dependency>
<name>templating</name>
- <version>4.0/*</version>
+ <version>4.5/*</version>
</dependency>
</dependencies>
</module>
\ 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...> - 2012-10-31 15:05:11
|
Revision: 4126
http://openutils.svn.sourceforge.net/openutils/?rev=4126&view=rev
Author: fgiust
Date: 2012-10-31 15:04:57 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Merged revisions 4055,4064-4065 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r4055 | diego_schivo | 2012-05-28 15:52:12 +0200 (Mon, 28 May 2012) | 1 line
CONTROLS-49 Paste from spreadsheet: javascript error
........
r4064 | fgiust | 2012-06-12 10:50:52 +0200 (Tue, 12 Jun 2012) | 1 line
MEDIA-281 Support wildcards in search
........
r4065 | fgiust | 2012-06-12 14:52:53 +0200 (Tue, 12 Jun 2012) | 1 line
update pdfbox version
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4055&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4064&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4065&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001,4055-4065
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html 2012-10-31 15:04:57 UTC (rev 4126)
@@ -22,7 +22,7 @@
<textarea id="clipboard" name="clipboard" rows="4" cols="20" style="width: 100%;border: 1px solid #999"></textarea>
</p>
<div class="mgnlDialogTabsetSaveBar">
- <span class="mgnlControlButton" onclick="opener.window.gridPaste(urlParams['name'], urlParams['expand'] == 'true'), document.getElementById('clipboard').value); mgnlShiftPushButtonClick(this); window.top.close();" onmouseout="mgnlShiftPushButtonOut(this);"
+ <span class="mgnlControlButton" onclick="opener.window.gridPaste(urlParams['name'], document.getElementById('clipboard').value, (urlParams['expand'] == 'true')); mgnlShiftPushButtonClick(this); window.top.close();" onmouseout="mgnlShiftPushButtonOut(this);"
onmousedown="mgnlShiftPushButtonDown(this);">
OK
</span>
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958,3972-3975,3996
+ /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958,3972-3975,3996,4055-4065
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -196,7 +196,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -245,6 +245,10 @@
<groupId>org.freehep</groupId>
<artifactId>freehep-graphicsio-tests</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -29,6 +29,8 @@
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
/**
@@ -140,4 +142,20 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE)
+ .append("reference", this.reference)
+ .append("addempty", this.addempty)
+ .append("options", this.options)
+ .append("control", this.getControl())
+ .append("subfilters", this.getSubfilters())
+ .append("label", this.getLabel())
+ .toString();
+ }
+
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -38,6 +38,8 @@
public class SearchFilterText extends SearchFilterAbstract
{
+ private boolean wildcards;
+
/**
* {@inheritDoc}
*/
@@ -52,16 +54,50 @@
if (values != null && values.length > 0)
{
fullTextSearch = values[0];
+
+ if (wildcards)
+ {
+ fullTextSearch = StringUtils.replace(fullTextSearch, "*", "%");
+
+ fullTextSearch = StringUtils.stripStart(StringUtils.stripEnd(fullTextSearch, "%"), "%");
+ }
+
if (MapUtils.isNotEmpty(getSubfilters()) && StringUtils.isNotBlank(fullTextSearch))
{
+
for (String key : getSubfilters().keySet())
{
values = request.getParameterValues(key);
- if (values != null)
+
+ if (wildcards && (values == null || values.length == 0))
{
+
+ SearchFilterOptionProvider infilter = (SearchFilterOptionProvider) getSubfilters().get(key);
+
+ if (infilter != null)
+ {
+ List<Option> options = infilter.getOptions();
+ List<String> optionparams = new ArrayList<String>();
+ for (Option option : options)
+ {
+ optionparams.add(option.getValue());
+ }
+ values = optionparams.toArray(new String[optionparams.size()]);
+ }
+ }
+
+ if (values != null && values.length != 0)
+ {
for (String name : values)
{
- criterionList.add(Restrictions.contains("@" + name, fullTextSearch));
+ if (wildcards)
+ {
+ criterionList.add(Restrictions.like("@" + name, fullTextSearch));
+ }
+ else
+ {
+ criterionList.add(Restrictions.contains("@" + name, fullTextSearch));
+ }
}
if (criterionList.size() > 1)
{
@@ -80,9 +116,28 @@
if (StringUtils.isNotBlank(fullTextSearch))
{
- criterionList.add(Restrictions.contains(".", fullTextSearch));
+ if (wildcards && criterionList.size() > 0)
+ {
+ // jcr:like doesn't work on fulltext, but put criterionList on or
+ Criterion c = Restrictions.or(criterionList.get(0), Restrictions.contains(".", fullTextSearch));
+ criterionList.remove(0);
+ criterionList.add(0, c);
+ }
+ else
+ {
+ criterionList.add(Restrictions.contains(".", fullTextSearch));
+ }
}
}
return criterionList;
}
+
+ /**
+ * Sets the wildcards.
+ * @param wildcards the wildcards to set
+ */
+ public void setWildcards(boolean wildcards)
+ {
+ this.wildcards = wildcards;
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -169,13 +169,22 @@
c.setPaging(itemsPerPage, pageNumberStartingFromOne);
}
- AdvancedResult result = c.execute();
- if (log.isDebugEnabled())
+ try
{
- log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ AdvancedResult result = c.execute();
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ }
+ return result;
}
+ catch (Throwable e)
+ {
+ log.error("Error running query " + c.toXpathExpression(), e);
+ }
- return result;
+ return AdvancedResult.EMPTY_RESULT;
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -130,8 +130,8 @@
// change "external video" handler
tasks.add(new ChangeExistingPropertyTask(
ContentRepository.CONFIG,
- "/modules/media/mediatypes/youtube",
- "menuIcon",
+ "/modules/media/mediatypes/youtube/handler",
+ "class",
"net.sourceforge.openutils.mgnlmedia.media.types.impl.YouTubeVideoTypeHandler",
ExternalVideoTypeHandler.class.getName()));
@@ -231,6 +231,12 @@
"Playlists",
"media.menu.playlists"));
+ tasks.add(new CreateMissingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/config/search/filters/query",
+ "wildcards",
+ Boolean.TRUE));
+
return tasks;
}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml (from rev 4065, magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="filename" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>65cc5316-dca7-43ba-901c-c705a39eccd9</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.filename</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>media_name</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-06-11T22:06:52.791+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,7 +3,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -13,7 +13,7 @@
<sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration</sv:value>
</sv:property>
<sv:property sv:name="defaultBasePath" sv:type="String">
- <sv:value>/mediagallery</sv:value>
+ <sv:value>/</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
@@ -42,7 +42,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -72,7 +72,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -90,6 +90,9 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>config.search.filters.text</sv:value>
</sv:property>
+ <sv:property sv:name="wildcards" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -104,14 +107,14 @@
<sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-22T10:21:19.449+01:00</sv:value>
+ <sv:value>2012-06-11T21:58:59.300+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="subfilters">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -141,7 +144,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -180,7 +183,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -210,7 +213,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -247,7 +250,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -291,7 +294,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -333,7 +336,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -365,7 +368,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -407,7 +410,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -440,7 +443,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -483,7 +486,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -523,7 +526,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -565,7 +568,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -607,7 +610,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -640,7 +643,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -685,7 +688,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -728,7 +731,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -771,7 +774,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -814,7 +817,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -856,7 +859,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -889,7 +892,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -929,7 +932,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -969,7 +972,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -1009,7 +1012,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -1049,7 +1052,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,19 +3,28 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>9ab64dfc-9f0d-44a6-83ff-5fc1a6adf634</sv:value>
</sv:property>
<sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.YouTubeVideoTypeHandler</sv:value>
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.ExternalVideoTypeHandler</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="parseremotefiles" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -30,16 +39,22 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>72c87fc6-7506-405e-b396-1e6090fc993a</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -57,7 +72,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -69,10 +84,16 @@
<sv:property sv:name="enabled" sv:type="String">
<sv:value>true</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,7 +3,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -18,6 +18,9 @@
<sv:property sv:name="i18nBasename" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.types.youtube</sv:value>
</sv:property>
@@ -31,6 +34,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -50,97 +56,4 @@
<sv:value>2010-03-11T16:13:12.672+01:00</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="handler">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9ab64dfc-9f0d-44a6-83ff-5fc1a6adf634</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.ExternalVideoTypeHandler</sv:value>
- </sv:property>
- <sv:property sv:name="parseremotefiles" sv:type="Boolean">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T21:25:50.277+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:04.623+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="videoSupportHandlers">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>72c87fc6-7506-405e-b396-1e6090fc993a</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T20:45:51.843+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:08.988+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="youtube">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9d7010da-0448-477e-952e-4433cba91661</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.externals.YoutubeSupport</sv:value>
- </sv:property>
- <sv:property sv:name="enabled" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T20:46:10.804+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:08.989+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2012-10-31 15:04:57 UTC (rev 4126)
@@ -158,6 +158,7 @@
config.search.filters.date.from=Created from
config.search.filters.date.until=Until
config.search.filters.options.title=Title
+config.search.filters.options.filename=Filename
config.search.filters.options.description=Description
config.search.filters.options.all=All
config.search.filters.options.published=Published
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2012-10-31 15:04:57 UTC (rev 4126)
@@ -161,6 +161,7 @@
config.search.filters.date.from=Creazione da
config.search.filters.date.until=Fino a
config.search.filters.options.title=Titolo
+config.search.filters.options.filename=Nome file
config.search.filters.options.description=Descrizione
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 16:04:26
|
Revision: 4128
http://openutils.svn.sourceforge.net/openutils/?rev=4128&view=rev
Author: fgiust
Date: 2012-10-31 16:04:15 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Merged revisions 4104-4110,4112-4116,4121-4123 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r4104 | diego_schivo | 2012-07-17 18:11:00 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-18 Add unit-test for RepositoryMessagesImpl
........
r4105 | diego_schivo | 2012-07-17 18:55:29 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImplTest.testFixIllegalArgumentExceptionOnJackrabbit2_4_1()
........
r4106 | diego_schivo | 2012-07-17 18:56:01 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImpl fix
........
r4107 | diego_schivo | 2012-07-18 15:38:26 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 Grid: add the possibility to store editcode columns into binary properties
........
r4108 | diego_schivo | 2012-07-18 16:34:39 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 fileNodeName
........
r4109 | diego_schivo | 2012-07-18 17:17:12 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 EditCodeGridColumnType: escapeEditCodeGridColumnValue, unescapeEditCodeGridColumnValue
........
r4110 | diego_schivo | 2012-07-18 17:28:52 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 grid-editcode.html: '
........
r4112 | diego_schivo | 2012-08-20 11:41:28 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-52: UUIDLinkField.js
........
r4113 | diego_schivo | 2012-08-20 12:21:41 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4114 | diego_schivo | 2012-08-23 17:55:12 +0200 (Thu, 23 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4115 | diego_schivo | 2012-09-28 18:16:33 +0200 (Fri, 28 Sep 2012) | 1 line
TAGCLOUD-19 tagcloud.tld: java.util.Map
........
r4116 | fgiust | 2012-10-05 17:37:55 +0200 (Fri, 05 Oct 2012) | 1 line
upgrade to lucene 3
........
r4121 | fgiust | 2012-10-31 15:04:49 +0100 (Wed, 31 Oct 2012) | 1 line
fix "repositories" property
........
r4122 | fgiust | 2012-10-31 15:15:59 +0100 (Wed, 31 Oct 2012) | 1 line
fix logo using new media APIs
........
r4123 | fgiust | 2012-10-31 15:19:51 +0100 (Wed, 31 Oct 2012) | 1 line
compile fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4104&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4105&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4106&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4107&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4108&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4109&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4110&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4112&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4113&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4114&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4115&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4116&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4121&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4122&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4123&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-bootstrap/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-repository/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001,4055-4065
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001-4035,4037-4050,4053,4055-4065,4067,4069-4127
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065,4104-4123
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
}
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -47,7 +48,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/CheckColumn.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/CheckColumn.js\"></script>";
}
/**
@@ -83,7 +86,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
// TODO Auto-generated method stub
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/ColorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/ColorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -46,9 +47,12 @@
StringBuilder result = new StringBuilder(super.getHeadSnippet());
result.append("<script type=\"text/javascript\" src=\"");
result.append(MgnlContext.getContextPath());
- result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ result.append("/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ result.append("<script type=\"text/javascript\">");
result.append("var PatchedComboBox = Ext.extend(Ext.form.ComboBox, {");
result.append(" setValue: function(v) {");
result.append(" this.store.clearFilter();");
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -19,12 +19,36 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
+import info.magnolia.cms.beans.runtime.Document;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.admininterface.SaveHandlerImpl;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
+import javax.jcr.RepositoryException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.safehaus.uuid.UUIDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* @author diego
* @version $Id: $
@@ -32,6 +56,18 @@
public class EditCodeGridColumnType extends AbstractGridColumnType
{
+ public static String escapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.escapeJava(StringEscapeUtils.escapeXml(value));
+ }
+
+ public static String unescapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.unescapeXml(StringEscapeUtils.unescapeJava(value));
+ }
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
/**
* {@inheritDoc}
*/
@@ -40,13 +76,122 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/EditCodeField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/EditCodeField.js\"></script>";
}
/**
* {@inheritDoc}
*/
@Override
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ HierarchyManager hm = storageNode.getHierarchyManager();
+ for (int index = 0; index < column.length; index++)
+ {
+ String value = StringUtils.EMPTY;
+ String link = StringUtils.trim(column[index]);
+ if (StringUtils.isNotBlank(link))
+ {
+ NodeData nodeData = null;
+ try
+ {
+ nodeData = hm.getNodeData(storageNode.getHandle()
+ + "/"
+ + StringUtils.substringBeforeLast(link, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ if (nodeData != null)
+ {
+ try
+ {
+ value = escapeEditCodeGridColumnValue(StringUtils.join(
+ IOUtils.readLines(nodeData.getStream(), "UTF-8"),
+ '\n'));
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ column[index] = value;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ throws RepositoryException, AccessDeniedException
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ String filename = NodeDataUtil.getString(colConfig, "binaryFilename", "file.txt");
+ String type = NodeDataUtil.getString(colConfig, "binaryType", "text/plain");
+ HierarchyManager hm = parentNode.getHierarchyManager();
+ Content filesNode = ContentUtil.getOrCreateContent(parentNode, propertyName
+ + "_"
+ + colConfig.getName()
+ + "_files", ItemType.CONTENTNODE);
+
+ for (Iterator<NodeData> iter = filesNode.getNodeDataCollection().iterator(); iter.hasNext();)
+ {
+ NodeData fileNodeData = iter.next();
+ fileNodeData.delete();
+ }
+
+ String uuid = UUIDGenerator.getInstance().generateTimeBasedUUID().toString();
+ File tmpDir = new File(Path.getTempDirectoryPath() + "/fckeditor/" + uuid);
+ for (int index = 0; index < column.length; index++)
+ {
+ if (StringUtils.isEmpty(column[index]))
+ {
+ continue;
+ }
+ File tmpFile = new File(tmpDir, filename);
+ try
+ {
+ FileUtils.writeStringToFile(tmpFile, unescapeEditCodeGridColumnValue(column[index]), "UTF-8");
+ }
+ catch (IOException e)
+ {
+ log.error("can't write to tmp file [" + tmpFile + "]");
+ }
+ Document doc = new Document(tmpFile, type);
+ String fileNodeName = Path.getUniqueLabel(
+ hm,
+ filesNode.getHandle(),
+ String.valueOf(System.currentTimeMillis()));
+ SaveHandlerImpl.saveDocument(filesNode, doc, fileNodeName, "", "");
+ String link = filesNode.getName() + "/" + fileNodeName + "/" + doc.getFileNameWithExtension();
+ column[index] = link;
+ doc.delete();
+ }
+ try
+ {
+ FileUtils.deleteDirectory(new java.io.File(Path.getTempDirectory() + "/fckeditor/" + uuid));
+ }
+ catch (IOException e)
+ {
+ log.error("can't delete tmp file [" + Path.getTempDirectory() + "/fckeditor/" + uuid + "]");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FckEditorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FckEditorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -30,6 +30,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.IOException;
@@ -64,7 +65,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FileField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FileField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -67,8 +67,10 @@
* Possibly transforms the column values on grid load.
* @param column
* @param colConfig
+ * @param propertyName
+ * @param storageNode
*/
- public void processColumnOnLoad(String[] column, Content colConfig);
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode);
/**
* Possibly transforms the column values on grid save.
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/LinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/LinkField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -25,6 +25,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -52,7 +53,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/UUIDLinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/UUIDLinkField.js\"></script>";
}
/**
@@ -82,7 +85,7 @@
* {@inheritDoc}
*/
@Override
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -105,7 +105,7 @@
GridColumnType colType = colTypeMap.get(colTypeName);
if (colType != null)
{
- colType.processColumnOnLoad(column, colConfig);
+ colType.processColumnOnLoad(column, colConfig, getName(), getStorageNode());
}
}
colIndex++;
Copied: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="jsversion" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e17ff712-3a80-425e-aa30-c3f90975385c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/\.resources/controls/[^/]+/js/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>/.resources/controls/js/$1</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-08-20T12:16:53.943+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,7 +23,7 @@
<script type="text/javascript">
var editor;
MgnlDHTMLUtil.addOnLoad(function(){
- document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
+ document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/'/g, "\'").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
switch(c){
case "\\":
return "\\";
@@ -52,7 +52,7 @@
});
});
function getValue() {
- return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+ return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
}
</script>
</head>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 16:04:15 UTC (rev 4128)
@@ -1,2 +1,14 @@
-var UUIDLinkField = Ext.extend(LinkField, {
+var UUIDLinkField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass : 'x-form-link-trigger',
+
+ repository: 'website',
+
+ // extension: undefined,
+
+ onTriggerClick : function() {
+ if (this.disabled) return;
+ mgnlDialogLinkOpenBrowser(this.el.id, this.repository, this.extension);
+ }
+
});
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
* @param handle
* @return
*/
- private String cleanHandle(String handle)
+ protected String cleanHandle(String handle)
{
if (!handle.startsWith("/"))
{
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -15,7 +15,7 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
+ <sv:property sv:name="repositories" sv:type="String">
<sv:value>email</sv:value>
</sv:property>
<sv:property sv:name="templatePath" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 16:04:15 UTC (rev 4128)
@@ -13,7 +13,7 @@
<tbody>
<tr>
<td height="101" align="center" bgcolor="#102942" style="color: #fff">
- <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(media.node(content.logo))} [/#if]</a>
+ <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(content.logo)} [/#if]</a>
${content.title!}
</td>
</tr>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -112,6 +112,12 @@
{
return "???" + key + "???";
}
+ catch (IllegalArgumentException e)
+ {
+ // MESSAGES-19 Uncaught IllegalArgumentException using jackrabbit 2.4.1
+ // at org.apache.jackrabbit.core.id.NodeId.<init>(NodeId.java:129)
+ return "???" + key + "???";
+ }
}
/**
Copied: magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,41 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+magnolia.defaultpage = /sapere.html
+
+####### 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
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
+
+info.magnolia.cms.i18n.MessagesManager=net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -48,7 +48,7 @@
*/
protected HierarchyBoboIndexReader(
IndexReader indexReader,
- Collection<FacetHandler<?>> facetHandlers,
+ Collection<FacetHandler< ? >> facetHandlers,
WorkArea workArea) throws IOException
{
super(indexReader, facetHandlers, null, workArea, false);
@@ -62,7 +62,7 @@
* @return wrapped Bobo index reader instance
* @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler<?>> facetHandlers)
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
throws IOException
{
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 16:04:15 UTC (rev 4128)
@@ -174,7 +174,7 @@
<description>Get a tag cloud configured in adminCentral (which caches values and updates on repository operations)</description>
<name>named</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map named(java.lang.String)</function-signature>
+ <function-signature>java.util.Map named(java.lang.String)</function-signature>
<example>
<
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X