From: <fg...@us...> - 2013-05-19 08:28:36
|
Revision: 4235 http://openutils.svn.sourceforge.net/openutils/?rev=4235&view=rev Author: fgiust Date: 2013-05-19 08:28:33 +0000 (Sun, 19 May 2013) Log Message: ----------- update parent Modified Paths: -------------- magnoliamodules/trunk/magnolia-test-webapp/pom.xml magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml magnoliamodules/trunk/openutils-mgnlcache/pom.xml magnoliamodules/trunk/openutils-mgnlcas/pom.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml magnoliamodules/trunk/openutils-mgnlext/pom.xml magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml magnoliamodules/trunk/openutils-mgnllms/pom.xml magnoliamodules/trunk/openutils-mgnlmail/pom.xml magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl magnoliamodules/trunk/openutils-mgnlmedia/pom.xml magnoliamodules/trunk/openutils-mgnlmessages/pom.xml magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml magnoliamodules/trunk/openutils-mgnlrules/pom.xml magnoliamodules/trunk/openutils-mgnlstripes/pom.xml magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml magnoliamodules/trunk/openutils-mgnltasks/pom.xml magnoliamodules/trunk/openutils-mgnltests/pom.xml magnoliamodules/trunk/openutils-mgnlutils/pom.xml magnoliamodules/trunk/pom.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>war</packaging> Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -25,9 +25,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlbootstrapsync</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -25,9 +25,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcache</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcas</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcas</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -26,9 +26,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url> </scm> <build> <plugins> Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontrols</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <artifactId>openutils-mgnlcriteria</artifactId> <name>Criteria API for Magnolia CMS</name> @@ -26,7 +26,7 @@ <scm> <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection> <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</url> </scm> <build> <resources> @@ -129,22 +129,7 @@ <artifactId>commons-lang</artifactId> <version>2.4</version> </dependency> - <!-- - no cycles <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-mgnlutils</artifactId> - <version>5.0.0</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-admininterface</artifactId> - </exclusion> - </exclusions> - </dependency> - --> - <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> <version>${jcr.version}</version> Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -12,9 +12,9 @@ <name>openutils-mgnlext</name> <version>5.0.0-SNAPSHOT</version> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlext</url> </scm> <licenses> <license> Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlgroovy</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -25,9 +25,9 @@ <url>http://jira.openmindlab.com/browse/SCORM</url> </issueManagement> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnllms</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ </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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail </developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmail</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:33 UTC (rev 4235) @@ -54,7 +54,7 @@ { super.prepareTree(tree, browseMode, request); - tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/ico16-mail.png"); + tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/icons/ico16-mail.png"); tree.addItemType(ItemType.NT_FOLDER, Tree.ICONDOCROOT + "folder.gif"); tree.setDrawShifter(true); // for folders } Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="simplemail-text" 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>76d6f1b3-b133-4072-8015-7b1d76fa5a3a</sv:value> - </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>Test paragraph</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/simplemail/simple-paragraph.ftl</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Simplemail paragraph</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>freemarker</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-09-23T16:56:46.344+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2011-06-19T23:36:58.317+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="simplemail-simple" 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>2d0e29fd-dadc-4d20-a1bc-d5649dc3503b</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>it.openutils.mgnlutils.templating.ExtendedTemplate</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="repositories" sv:type="String"> - <sv:value>email</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/simplemail/simple.ftl</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Simple mail template</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>freemarker</sv:value> - </sv:property> - <sv:property sv:name="visible" sv:type="String"> - <sv:value>true</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="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-09-23T16:56:46.344+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2011-06-14T17:42:07.883+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -26,10 +26,10 @@ <sv:value>2011-06-14T17:43:11.781+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2011-06-14T17:43:17.233+02:00</sv:value> + <sv:value>2013-05-01T22:23:03.069+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>simplemail-simple</sv:value> + <sv:value>simplemail:pages/simplemail-simple</sv:value> </sv:property> </sv:node> </sv:node> Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:33 UTC (rev 4235) @@ -1,8 +1,9 @@ -[#assign cms=JspTaglibs["cms-taglib"]] [@cms.mainBar dialog="simplemail-simple" /] +[#assign cms=JspTaglibs["http://magnolia-cms.com/taglib/templating-components/cms"]] <html> <head> <title>${content.title!}</title> +[@cms.init /] </head> <body> <table cellpadding="0" cellspacing="0" border="0" align="center" width="100%" bgcolor="#FFF"> @@ -26,13 +27,7 @@ </td> <td width="620" valign="top" align="left" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff"> <div style="padding: 20px;"> -[@cms.contentNodeIterator contentNodeCollectionName="main"] - [@cms.editBar /] - [@cms.includeTemplate /] -[/@cms.contentNodeIterator] -[@cms.newBar contentNodeCollectionName="main" newLabel="New Content" paragraph="simplemail-text" /] - - +[@cms.area name="main" /] </div> </td> <td width="16" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff"> Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmedia</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ </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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -26,9 +26,9 @@ </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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrepoutils</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrepoutils</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrepoutils</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -26,9 +26,9 @@ </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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrules</url> </scm> <build> <plugins> Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -25,9 +25,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstripes</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlstripes</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <artifactId>openutils-mgnlstruts11</artifactId> <packaging>jar</packaging> @@ -24,9 +24,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstruts11</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstruts11</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstruts11</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlstruts11</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -25,11 +25,11 @@ </issueManagement> <inceptionYear>2010</inceptionYear> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltagcloud </connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltagcloud </developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltagcloud</url> </scm> <build> <plugins> Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -4,7 +4,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -14,9 +14,9 @@ <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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltasks</url> </scm> <licenses> <license> Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -11,7 +11,7 @@ <name>Test utilities for Magnolia CMS</name> <version>5.0.1-SNAPSHOT</version> <inceptionYear>2009</inceptionYear> - <description>A collection testing utilities for Magnolia CMS</description> + <description>A collection of testing utilities for Magnolia CMS</description> <url>http://www.openmindlab.com/lab/products/mgnltests.html</url> <issueManagement> <system>jira</system> @@ -24,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests </developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltests</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests </developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltests</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -3,7 +3,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> <relativePath>../openutils-parent</relativePath> - <version>1.12</version> + <version>1.13</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -24,9 +24,9 @@ </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> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlutils</url> + <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils</connection> + <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils </developerConnection> + <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlutils</url> </scm> <build> <resources> Modified: magnoliamodules/trunk/pom.xml =================================================================== --- magnoliamodules/trunk/pom.xml 2013-05-19 08:28:09 UTC (rev 4234) +++ magnoliamodules/trunk/pom.xml 2013-05-19 08:28:33 UTC (rev 4235) @@ -30,6 +30,7 @@ <module>openutils-mgnlmedia</module> <module>openutils-mgnlcriteria</module> <module>openutils-mgnlrepoutils</module> + <module>openutils-mgnltests</module> <module>openutils-mgnlutils</module> <module>openutils-mgnltagcloud</module> <module>openutils-mgnlrules</module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |