Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2012-03-16 13:36:00
|
Revision: 3814
http://openutils.svn.sourceforge.net/openutils/?rev=3814&view=rev
Author: diego_schivo
Date: 2012-03-16 13:35:49 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
magnolia.version=4.4.6
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-03-16 13:19:31 UTC (rev 3813)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-03-16 13:35:49 UTC (rev 3814)
@@ -277,7 +277,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.4.5</magnolia.version>
+ <magnolia.version>4.4.6</magnolia.version>
<stk.version>1.3.1</stk.version>
<jackrabbit.version>2.2.5</jackrabbit.version>
</properties>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-03-16 13:19:31 UTC (rev 3813)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-03-16 13:35:49 UTC (rev 3814)
@@ -249,6 +249,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.6</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: <fg...@us...> - 2012-04-04 16:11:23
|
Revision: 3897
http://openutils.svn.sourceforge.net/openutils/?rev=3897&view=rev
Author: fgiust
Date: 2012-04-04 16:11:16 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
fix SCM urls
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlext/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/SYNC</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MGNLCAS</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcas</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcas</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcas</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/CONTROLS</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcontrols</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcontrols</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -23,8 +23,8 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlcriteria</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlext/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlext/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -11,8 +11,8 @@
<name>openutils-mgnlext</name>
<version>2.3-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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlext</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlext</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url>
</scm>
<licenses>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/GROOVY</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlgroovy</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlgroovy</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
</license>
</licenses>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmail</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmail </developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmedia</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmessages</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MOBILE</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmobile</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlmobile</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmobile</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
</license>
</licenses>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlrules</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlrules</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlstripes</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlstripes</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRUTS</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlstruts11</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlstruts11</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstruts11</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -25,8 +25,8 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
</scm>
<build>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -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/magnoliamodules/trunk/openutils-mgnltasks</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltasks</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
</scm>
<licenses>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-04-04 16:08:39 UTC (rev 3896)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-04-04 16:11:16 UTC (rev 3897)
@@ -24,8 +24,8 @@
</license>
</licenses>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnlutils</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/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-05-06 14:06:18
|
Revision: 3970
http://openutils.svn.sourceforge.net/openutils/?rev=3970&view=rev
Author: fgiust
Date: 2012-05-06 14:06:11 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -162,7 +162,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<!--
dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
@@ -272,7 +272,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
<stk.version>1.3.1</stk.version>
<jackrabbit.version>2.2.5</jackrabbit.version>
</properties>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -60,7 +60,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -78,6 +78,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -89,6 +89,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -167,6 +167,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -113,6 +113,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -177,7 +177,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
<jackrabbit.version>1.6.2</jackrabbit.version>
<jcr.version>1.0</jcr.version>
</properties>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -90,10 +90,10 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -102,7 +102,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -194,6 +194,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -98,10 +98,10 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -249,6 +249,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -79,7 +79,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -121,6 +121,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -111,7 +111,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.wurfl</groupId>
@@ -130,6 +130,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -72,7 +72,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -100,6 +100,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.0</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>struts</groupId>
@@ -110,6 +110,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -123,7 +123,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -120,7 +120,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -143,6 +143,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</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: <fg...@us...> - 2012-05-06 15:17:51
|
Revision: 3979
http://openutils.svn.sourceforge.net/openutils/?rev=3979&view=rev
Author: fgiust
Date: 2012-05-06 15:17:45 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 15:13:16 UTC (rev 3978)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 15:17:45 UTC (rev 3979)
@@ -171,7 +171,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 15:13:16 UTC (rev 3978)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 15:17:45 UTC (rev 3979)
@@ -114,7 +114,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.7</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 15:13:16 UTC (rev 3978)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 15:17:45 UTC (rev 3979)
@@ -131,7 +131,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.9</version>
+ <version>1.1.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 15:13:16 UTC (rev 3978)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 15:17:45 UTC (rev 3979)
@@ -127,7 +127,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.7</version>
+ <version>1.1.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 15:25:25
|
Revision: 3983
http://openutils.svn.sourceforge.net/openutils/?rev=3983&view=rev
Author: fgiust
Date: 2012-05-06 15:25:18 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -109,7 +109,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -107,7 +107,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -99,7 +99,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 15:20:08 UTC (rev 3982)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 15:25:18 UTC (rev 3983)
@@ -128,7 +128,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.1</version>
+ <version>4.1.3</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: <die...@us...> - 2013-06-26 07:09:56
|
Revision: 4267
http://openutils.svn.sourceforge.net/openutils/?rev=4267&view=rev
Author: diego_schivo
Date: 2013-06-26 07:09:51 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Merged revisions 4264-4266 via svnmerge from
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk
........
r4264 | diego_schivo | 2013-06-25 17:05:03 +0200 (Tue, 25 Jun 2013) | 1 line
CRIT-53 DegreeSignTest.java
........
r4265 | diego_schivo | 2013-06-25 17:05:20 +0200 (Tue, 25 Jun 2013) | 1 line
CRIT-53 DegreeSignTest.java
........
r4266 | diego_schivo | 2013-06-25 17:06:25 +0200 (Tue, 25 Jun 2013) | 1 line
CRIT-53 XPathTextUtils.java
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4264&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4265&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4266&view=rev
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-06-25 15:06:25 UTC (rev 4266)
+++ magnoliamodules/branches/magnolia44 2013-06-26 07:09:51 UTC (rev 4267)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266
\ No newline at end of property
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-06-25 15:06:25 UTC (rev 4266)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-06-26 07:09:51 UTC (rev 4267)
@@ -145,6 +145,11 @@
{
encodedPath.append("_x002c_");
}
+ // CRIT-53
+ else if (inXpathCondition <= 0 && ch == '\u00b0')
+ {
+ encodedPath.append("_x00b0_");
+ }
else
{
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java (from rev 4266, magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java 2013-06-26 07:09:51 UTC (rev 4267)
@@ -0,0 +1,98 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcriteria.jcr.query;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.i18n.DefaultI18nContentSupport;
+import info.magnolia.cms.i18n.I18nContentSupport;
+import info.magnolia.cms.security.MgnlRoleManager;
+import info.magnolia.cms.security.Realm;
+import info.magnolia.cms.security.SecuritySupport;
+import info.magnolia.cms.security.SecuritySupportImpl;
+import info.magnolia.cms.security.SystemUserManager;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.test.ComponentsTestUtil;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * CRIT-53
+ * @author dschivo
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.n°-21.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
+public class DegreeSignTest extends TestNgRepositoryTestcase
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // Nodes in this workspace:
+ // - n°-21 (title=n°-21)
+ // --- foo (title=foo)
+ MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+
+ ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
+
+ // info.magnolia.cms.security.SecurityTest.setUp()
+ final SecuritySupportImpl sec = new SecuritySupportImpl();
+ sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ sec.setRoleManager(new MgnlRoleManager());
+ ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
+ }
+
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testEscape() throws Exception
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .setBasePath("/jcr:root/n°-21/*")
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+ AdvancedResult result = criteria.execute();
+ ResultIterator< ? extends Node> iterator = result.getItems();
+ Assert.assertTrue(iterator.hasNext());
+ Node resultNode = iterator.next();
+ Assert.assertEquals(CriteriaTestUtils.title(resultNode), "foo");
+ }
+
+}
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml (from rev 4266, magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml)
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2013-06-27 09:47:10
|
Revision: 4269
http://openutils.svn.sourceforge.net/openutils/?rev=4269&view=rev
Author: diego_schivo
Date: 2013-06-27 09:47:05 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Merged revisions 4268 via svnmerge from
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk
........
r4268 | diego_schivo | 2013-06-27 11:34:10 +0200 (Thu, 27 Jun 2013) | 1 line
CRIT-54 unit-test + fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4268&view=rev
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml
Removed Paths:
-------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-06-27 09:34:10 UTC (rev 4268)
+++ magnoliamodules/branches/magnolia44 2013-06-27 09:47:05 UTC (rev 4269)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268
\ No newline at end of property
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-06-27 09:34:10 UTC (rev 4268)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-06-27 09:47:05 UTC (rev 4269)
@@ -150,6 +150,11 @@
{
encodedPath.append("_x00b0_");
}
+ // CRIT-54
+ else if (inXpathCondition <= 0 && ch == '$')
+ {
+ encodedPath.append("_x0024_");
+ }
else
{
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java (from rev 4268, magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2013-06-27 09:47:05 UTC (rev 4269)
@@ -0,0 +1,120 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcriteria.jcr.query;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.i18n.DefaultI18nContentSupport;
+import info.magnolia.cms.i18n.I18nContentSupport;
+import info.magnolia.cms.security.MgnlRoleManager;
+import info.magnolia.cms.security.Realm;
+import info.magnolia.cms.security.SecuritySupport;
+import info.magnolia.cms.security.SecuritySupportImpl;
+import info.magnolia.cms.security.SystemUserManager;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.test.ComponentsTestUtil;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author dschivo
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.escape-sign.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
+public class EscapeSignTest extends TestNgRepositoryTestcase
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // Nodes in this workspace:
+ // - escape-sign (title=escape-sign)
+ // --- fo°o (title=fo°o)
+ // ----- bar (title=bar)
+ // --- fo$o (title=fo$o)
+ // ----- baz (title=baz)
+ MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+
+ ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
+
+ // info.magnolia.cms.security.SecurityTest.setUp()
+ final SecuritySupportImpl sec = new SecuritySupportImpl();
+ sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ sec.setRoleManager(new MgnlRoleManager());
+ ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
+ }
+
+ /**
+ * CRIT-53
+ * @throws Exception
+ */
+ @Test
+ public void testDegree() throws Exception
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .setBasePath("/jcr:root/escape-sign/fo°o/*")
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+ AdvancedResult result = criteria.execute();
+ ResultIterator< ? extends Node> iterator = result.getItems();
+ Assert.assertTrue(iterator.hasNext());
+ Node resultNode = iterator.next();
+ Assert.assertEquals(CriteriaTestUtils.title(resultNode), "bar");
+ }
+
+ /**
+ * CRIT-54
+ * @throws Exception
+ */
+ @Test
+ public void testDollar() throws Exception
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .setBasePath("/jcr:root/escape-sign/fo$o/*")
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+ AdvancedResult result = criteria.execute();
+ ResultIterator< ? extends Node> iterator = result.getItems();
+ Assert.assertTrue(iterator.hasNext());
+ Node resultNode = iterator.next();
+ Assert.assertEquals(CriteriaTestUtils.title(resultNode), "baz");
+ }
+
+}
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml (from rev 4268, magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml 2013-06-27 09:47:05 UTC (rev 4269)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="escape-sign" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6097bd5d-db7c-4aad-9c2f-3196f739f4db</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>escape-sign</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>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-06-27T11:19:11.366+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-27T11:20:06.486+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="fo°o">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1abf4df8-c80d-4678-83d6-49d15ff96bd1</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>fo°o</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>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-06-25T16:32:26.039+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-27T11:20:09.940+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="bar">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>9e18493e-206f-470b-a855-c5b40eaf0c11</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>bar</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>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-06-25T16:32:34.955+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-27T11:20:14.028+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="fo$o">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d56d7990-f019-4e4c-a6ee-d9a54749f0e6</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>fo$o</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>2013-06-25T16:32:26.039+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-27T11:20:17.500+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="baz">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>68973b3b-c68a-4746-bbe7-316ec65f6cbf</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>baz</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>2013-06-25T16:32:34.955+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-27T11:20:22.361+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Deleted: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2013-06-27 09:50:55
|
Revision: 4271
http://openutils.svn.sourceforge.net/openutils/?rev=4271&view=rev
Author: diego_schivo
Date: 2013-06-27 09:50:51 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Merged revisions 4270 via svnmerge from
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk
........
r4270 | diego_schivo | 2013-06-27 11:47:50 +0200 (Thu, 27 Jun 2013) | 1 line
CRIT-54 unit-test + fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4270&view=rev
Removed Paths:
-------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-06-27 09:47:50 UTC (rev 4270)
+++ magnoliamodules/branches/magnolia44 2013-06-27 09:50:51 UTC (rev 4271)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270
\ No newline at end of property
Deleted: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java 2013-06-27 09:47:50 UTC (rev 4270)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java 2013-06-27 09:50:51 UTC (rev 4271)
@@ -1,98 +0,0 @@
-/**
- *
- * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlcriteria.jcr.query;
-
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.i18n.DefaultI18nContentSupport;
-import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
-import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
-
-import javax.jcr.Node;
-
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
-import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
-
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-/**
- * CRIT-53
- * @author dschivo
- */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
- "/crit-bootstrap/website.n°-21.xml",
- "/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
-public class DegreeSignTest extends TestNgRepositoryTestcase
-{
-
- /**
- * {@inheritDoc}
- */
- @Override
- @BeforeClass
- public void setUp() throws Exception
- {
- super.setUp();
-
- // Nodes in this workspace:
- // - n°-21 (title=n°-21)
- // --- foo (title=foo)
- MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
- ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
- }
-
- /**
- * @throws Exception
- */
- @Test
- public void testEscape() throws Exception
- {
- Criteria criteria = JCRCriteriaFactory
- .createCriteria()
- .setWorkspace(RepositoryConstants.WEBSITE)
- .setBasePath("/jcr:root/n°-21/*")
- .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
- AdvancedResult result = criteria.execute();
- ResultIterator< ? extends Node> iterator = result.getItems();
- Assert.assertTrue(iterator.hasNext());
- Node resultNode = iterator.next();
- Assert.assertEquals(CriteriaTestUtils.title(resultNode), "foo");
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2013-07-05 14:37:42
|
Revision: 4277
http://openutils.svn.sourceforge.net/openutils/?rev=4277&view=rev
Author: diego_schivo
Date: 2013-07-05 14:37:39 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
Merged revisions 4275-4276 via svnmerge from
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk
........
r4275 | diego_schivo | 2013-06-28 17:32:39 +0200 (Fri, 28 Jun 2013) | 1 line
CONTROLS-54 dependentSelectListAndRadioGroup.ftl
........
r4276 | diego_schivo | 2013-07-05 16:16:58 +0200 (Fri, 05 Jul 2013) | 1 line
CONTROLS-55 Button set control
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4275&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4276&view=rev
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkbox.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkboxSwitch.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-radio.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-buttonSet.jsp
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-07-05 14:16:58 UTC (rev 4276)
+++ magnoliamodules/branches/magnolia44 2013-07-05 14:37:39 UTC (rev 4277)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276
\ No newline at end of property
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,257 @@
+/**
+ *
+ * Controls module for Magnolia CMS (http://www.openmindlab.com/lab/products/controls.html)
+ * Copyright(C) 2008-2012, 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.mgnlcontrols.dialog;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.control.Button;
+import info.magnolia.cms.gui.control.ControlImpl;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+
+
+public class DialogButtonSet extends info.magnolia.cms.gui.dialog.DialogButtonSet
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(DialogButtonSet.class);
+
+ private OptionsProvider optionsProvider = new OptionsProvider.DefaultImpl();;
+
+ private boolean initHack;
+
+ @Override
+ public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+ throws RepositoryException
+ {
+ // super.init(request, response, websiteNode, configNode);
+ // String optionsProviderClass = getConfigValue("optionsProvider");
+ String optionsProviderClass = NodeDataUtil.getString(configNode, "optionsProvider");
+ try
+ {
+ optionsProvider = (OptionsProvider) Class.forName(optionsProviderClass).newInstance();
+ }
+ catch (Throwable e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ initHack = true;
+ super.init(request, response, websiteNode, configNode);
+ initHack = false;
+ }
+
+ @Override
+ public String getConfigValue(String key, String nullValue)
+ {
+ String val = super.getConfigValue(key, nullValue);
+ if (initHack && StringUtils.equals(key, "selectType") && StringUtils.equals(val, nullValue))
+ {
+ val = StringUtils.removeStart(val, "controls-");
+ }
+ return val;
+ }
+
+ @Override
+ public void setOptions(Content configNode, boolean setDefaultSelected)
+ {
+ List options = new ArrayList();
+ try
+ {
+ Iterator<Option> it = optionsProvider.getOptions(this, configNode);
+ while (it.hasNext())
+ {
+ Option o = it.next();
+ Button button = new Button(this.getName(), o.getValue());
+ button.setLabel(o.getLabel());
+ if (StringUtils.isNotEmpty(o.getIconSrc()))
+ {
+ button.setIconSrc(o.getIconSrc());
+ }
+ if (setDefaultSelected && o.isSelected())
+ {
+ button.setState(ControlImpl.BUTTONSTATE_PUSHED);
+ }
+ options.add(button);
+ }
+ }
+ catch (Exception e)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Exception caught: " + e.getMessage(), e);
+ }
+ }
+ this.setOptions(options);
+ }
+
+ public static interface Option
+ {
+
+ String getValue();
+
+ String getLabel();
+
+ String getIconSrc();
+
+ boolean isSelected();
+
+ public static class ContentAdapter implements Option
+ {
+
+ private final Content node;
+
+ private final String valueNodeData;
+
+ private final String labelNodeData;
+
+ public ContentAdapter(Content node, String valueNodeData, String labelNodeData)
+ {
+ this.node = node;
+ this.valueNodeData = valueNodeData;
+ this.labelNodeData = labelNodeData;
+ }
+
+ public String getValue()
+ {
+ return NodeDataUtil.getString(node, valueNodeData);
+ }
+
+ public String getLabel()
+ {
+ return NodeDataUtil.getString(node, labelNodeData);
+ }
+
+ public String getIconSrc()
+ {
+ return node.getNodeData("iconSrc").getString();
+ }
+
+ public boolean isSelected()
+ {
+ return node.getNodeData("selected").getBoolean();
+ }
+ }
+
+ public static class MapAdapter implements Option
+ {
+
+ private final Map map;
+
+ private final String valueNodeData;
+
+ private final String labelNodeData;
+
+ public MapAdapter(Map map, String valueNodeData, String labelNodeData)
+ {
+ this.map = map;
+ this.valueNodeData = valueNodeData;
+ this.labelNodeData = labelNodeData;
+ }
+
+ public String getValue()
+ {
+ return ObjectUtils.toString(map.get(valueNodeData));
+ }
+
+ public String getLabel()
+ {
+ return ObjectUtils.toString(map.get(labelNodeData));
+ }
+
+ public String getIconSrc()
+ {
+ return ObjectUtils.toString(map.get("iconSrc"));
+ }
+
+ public boolean isSelected()
+ {
+ return BooleanUtils.toBoolean(ObjectUtils.toString(map.get("selected")));
+ }
+ }
+ }
+
+ public interface OptionsProvider
+ {
+
+ Iterator<Option> getOptions(DialogButtonSet control, Content configNode) throws Exception;
+
+ public static class DefaultImpl implements OptionsProvider
+ {
+
+ public Iterator<Option> getOptions(final DialogButtonSet control, Content configNode) throws Exception
+ {
+ // info.magnolia.cms.gui.dialog.DialogButtonSet.getOptionNodes(Content)
+ Content optionsNode = null;
+
+ if (configNode.hasContent("options"))
+ {
+ optionsNode = configNode.getContent("options");
+ }
+ else
+ {
+ String repository = control.getConfigValue("repository", ContentRepository.WEBSITE);
+ String path = control.getConfigValue("path");
+ if (StringUtils.isNotEmpty(path))
+ {
+ optionsNode = ContentUtil.getContent(repository, path);
+ }
+ }
+
+ if (optionsNode != null)
+ {
+ return Iterators.transform(
+ ContentUtil.getAllChildren(optionsNode).iterator(),
+ new Function<Content, Option>()
+ {
+
+ public Option apply(Content input)
+ {
+ return new Option.ContentAdapter(input, control
+ .getConfigValue("valueNodeData", "value"), control.getConfigValue(
+ "labelNodeData",
+ "label"));
+ }
+ });
+ }
+ return new ArrayList().iterator();
+ }
+ }
+ }
+}
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkbox.xml (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkbox.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkbox.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkbox.xml 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="controls-checkbox" 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>5bd47675-b1a3-48b4-9867-76d910fa2fbb</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogButtonSet</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:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T10:20:11.784+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkboxSwitch.xml (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkboxSwitch.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkboxSwitch.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-checkboxSwitch.xml 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="controls-checkboxSwitch" 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>a3649f86-0bcd-4129-b569-f7f3c0c76b1b</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogButtonSet</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:42:01.709+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-radio.xml (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-radio.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-radio.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.controls-radio.xml 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="controls-radio" 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>9dba557a-a017-484b-b6c7-9d981f473109</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogButtonSet</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:41:54.814+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-buttonSet" 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>8978824a-20fa-4a92-b6a6-626fa1c40484</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl: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="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:43:15.853+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <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>7361bf6e-9116-4a79-b0e1-7db49c958eaf</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</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>Button set</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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:43:32.975+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="foo">
+ <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>0f3c1fb7-02e1-48b3-bcc2-12b66506ba73</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>controls-radio</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>Foo</sv:value>
+ </sv:property>
+ <sv:property sv:name="optionsProvider" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleButtonSetOptionsProvider</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>2013-06-14T15:54:03.927+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:52:20.890+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="bar">
+ <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>a890c8a7-eb39-46f7-ab7e-b2d7645b95e9</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>controls-checkbox</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>Bar</sv:value>
+ </sv:property>
+ <sv:property sv:name="optionsProvider" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleButtonSetOptionsProvider</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>2013-06-14T15:54:03.927+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:56:11.917+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="baz">
+ <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>92c116a9-4f12-4dee-bd70-d4389115c1ba</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>controls-checkboxSwitch</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>Baz</sv:value>
+ </sv:property>
+ <sv:property sv:name="optionsProvider" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleButtonSetOptionsProvider</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>2013-06-14T15:54:03.927+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-07-05T15:52:57.016+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Copied: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml (from rev 4276, magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml)
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml 2013-07-05 14:37:39 UTC (rev 4277)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-buttonSet" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001...
[truncated message content] |
|
From: <die...@us...> - 2013-11-14 10:41:39
|
Revision: 4452
http://openutils.svn.sourceforge.net/openutils/?rev=4452&view=rev
Author: diego_schivo
Date: 2013-11-14 10:41:35 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Merged revisions 4451 via svnmerge from
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk
........
r4451 | diego_schivo | 2013-11-14 11:33:12 +0100 (Thu, 14 Nov 2013) | 1 line
MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44 2013-11-14 10:41:35 UTC (rev 4452)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276,4451
\ No newline at end of property
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:41:35 UTC (rev 4452)
@@ -272,7 +272,9 @@
AffineTransform at = new AffineTransform();
double delta = ((double) x) / original.getWidth();
- if (x > original.getWidth())
+ // MEDIA-307
+ // if (x > original.getWidth())
+ if (x >= original.getWidth())
{
at.scale(delta, delta);
at.translate((canvasX - x) / (2 * delta), (canvasY - y) / (2 * delta));
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:41:35 UTC (rev 4452)
@@ -60,5 +60,14 @@
src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100;bw')}" />
</div>
</div>
+ <!--
+ <div>
+ <h3>MEDIA-307</h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o1000x600;background=FFFFFF')</pre> <img
+ src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o1000x600;background=FFFFFF')}" />
</div>
+ </div>
+ -->
+ </div>
</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.
|
Thanks for helping keep SourceForge clean.
X