Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Revision: 4565
http://openutils.svn.sourceforge.net/openutils/?rev=4565&view=rev
Author: diego_schivo
Date: 2014-03-04 09:18:57 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
EscapeSignTest testChars, isPrintableChar
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
Modified: magnoliamodules/branches/magnolia44/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 2014-03-03 17:19:35 UTC (rev 4564)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2014-03-04 09:18:57 UTC (rev 4565)
@@ -130,4 +130,40 @@
Assert.assertFalse(iterator.hasNext());
}
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testChars() throws Exception
+ {
+ for (int i = 0; i < 0x100; i++)
+ {
+ char c = (char) i;
+ if (!isPrintableChar(c))
+ {
+ log.warn("Skipping \\u{}", String.format("%04x", i));
+ }
+ else
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(ContentRepository.WEBSITE)
+ .setBasePath("/jcr:root/escape-sign/ba" + Character.toString(c) + "r/*")
+ .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT));
+ AdvancedResult result = criteria.execute();
+ ResultIterator< ? extends Content> iterator = result.getItems();
+ Assert.assertFalse(iterator.hasNext());
+ }
+ }
+ }
+
+ // http://stackoverflow.com/questions/220547/printable-char-in-java#answer-418560
+ private static boolean isPrintableChar(char c)
+ {
+ Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
+ return (!Character.isISOControl(c)) && c != 65535 && // KeyEvent.CHAR_UNDEFINED
+ block != null
+ && block != Character.UnicodeBlock.SPECIALS;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2014-03-03 17:19:38
|
Revision: 4564
http://openutils.svn.sourceforge.net/openutils/?rev=4564&view=rev
Author: diego_schivo
Date: 2014-03-03 17:19:35 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
XPathTextUtils encodeDigitsInPath ?\194?\169
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
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 2014-03-03 16:50:52 UTC (rev 4563)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2014-03-03 17:19:35 UTC (rev 4564)
@@ -155,6 +155,10 @@
{
encodedPath.append("_x0024_");
}
+ else if (inXpathCondition <= 0 && ch == '©')
+ {
+ encodedPath.append("_x00a9_");
+ }
else
{
Modified: magnoliamodules/branches/magnolia44/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 2014-03-03 16:50:52 UTC (rev 4563)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2014-03-03 17:19:35 UTC (rev 4564)
@@ -114,4 +114,20 @@
Assert.assertEquals(resultNode.getTitle(), "baz");
}
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testCopyright() throws Exception
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(ContentRepository.WEBSITE)
+ .setBasePath("/jcr:root/escape-sign/fo©o/*")
+ .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT));
+ AdvancedResult result = criteria.execute();
+ ResultIterator< ? extends Content> iterator = result.getItems();
+ Assert.assertFalse(iterator.hasNext());
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2014-03-03 16:50:56
|
Revision: 4563
http://openutils.svn.sourceforge.net/openutils/?rev=4563&view=rev
Author: diego_schivo
Date: 2014-03-03 16:50:52 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
EscapeSignTest
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2014-02-13 08:06:07 UTC (rev 4562)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2014-03-03 16:50:52 UTC (rev 4563)
@@ -157,6 +157,38 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-betwixt</groupId>
+ <artifactId>commons-betwixt</artifactId>
+ <version>0.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<classifier>tests</classifier>
Modified: magnoliamodules/branches/magnolia44/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 2014-02-13 08:06:07 UTC (rev 4562)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2014-03-03 16:50:52 UTC (rev 4563)
@@ -19,7 +19,9 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query;
-import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
import info.magnolia.cms.security.MgnlRoleManager;
@@ -28,15 +30,10 @@
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;
@@ -68,13 +65,13 @@
// ----- bar (title=bar)
// --- fo$o (title=fo$o)
// ----- baz (title=baz)
- MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+ MgnlContext.getHierarchyManager(ContentRepository.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.addUserManager(Realm.REALM_SYSTEM, new SystemUserManager());
sec.setRoleManager(new MgnlRoleManager());
ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@@ -88,14 +85,14 @@
{
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(RepositoryConstants.WEBSITE)
+ .setWorkspace(ContentRepository.WEBSITE)
.setBasePath("/jcr:root/escape-sign/fo°o/*")
- .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+ .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT));
AdvancedResult result = criteria.execute();
- ResultIterator< ? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Content> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
- Node resultNode = iterator.next();
- Assert.assertEquals(CriteriaTestUtils.title(resultNode), "bar");
+ Content resultNode = iterator.next();
+ Assert.assertEquals(resultNode.getTitle(), "bar");
}
/**
@@ -107,14 +104,14 @@
{
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(RepositoryConstants.WEBSITE)
+ .setWorkspace(ContentRepository.WEBSITE)
.setBasePath("/jcr:root/escape-sign/fo$o/*")
- .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+ .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT));
AdvancedResult result = criteria.execute();
- ResultIterator< ? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Content> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
- Node resultNode = iterator.next();
- Assert.assertEquals(CriteriaTestUtils.title(resultNode), "baz");
+ Content resultNode = iterator.next();
+ Assert.assertEquals(resultNode.getTitle(), "baz");
}
}
Added: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml 2014-03-03 16:50:52 UTC (rev 4563)
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" sv:name="anonymous">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:role</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</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:activationStatus" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2006-05-04T17:05:39.645+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastModified" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.003+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastModifiedBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ <sv:node sv:name="acl_Store">
+ <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>f1c63218-b05d-41c4-a699-5a15b0f68317</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:created" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.283+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>6c1b4e6f-179a-498f-ab89-81fea9207b04</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:created" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.284+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_Expressions">
+ <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>fc6d875a-13d8-4551-b667-86db6cd486e8</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:created" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.543+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>1c8ca47b-5112-445a-b7b8-4aacdebfc59c</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:created" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.544+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_uri">
+ <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>d888a667-2b90-4040-9f9d-6f322f0664fc</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.009+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>df4f0cee-01c7-4869-be8d-c63b43d5cd48</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.010+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="00">
+ <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>e11cc36b-190b-41f1-badb-3fba28ddb0f1</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.012+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/.magnolia*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_imaging">
+ <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>85557ec5-c2f0-47e9-ab37-2b6110cd0e5d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.013+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_website">
+ <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>705a827c-639d-41fb-8e02-1ebe02812664</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.015+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>a5db2d45-7854-4a35-bae1-45fa9021bfdb</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.015+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_users">
+ <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>5823bedf-49ad-4121-81b8-e4fc86489f12</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.017+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_media">
+ <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>3ed47dd1-c076-4962-87b6-54d7089b4e51</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.018+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_mgnlVersion">
+ <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>412438c8-0401-4c75-b9d1-329f862a066c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.019+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_resources">
+ <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>e6305fc5-6b49-4b55-a2eb-cf6106bee53c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.021+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>babded40-2e91-4eb5-8703-c5da59c51963</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.021+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_config">
+ <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>1d251269-986e-4b59-942e-490c387dc322</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.023+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_userroles">
+ <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>8b1bbe83-1e9c-43fe-ab6d-5d3d9391c9bf</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.024+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_messages">
+ <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>9bd3cf2c-1fe4-4dba-9459-119b9a34ec3d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.025+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_data">
+ <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>85710131-1c71-4a5c-818e-9cd91b83ca56</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.026+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_mgnlSystem">
+ <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>356eec7b-5418-4a09-bc79-9b059e67de31</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.028+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_lms">
+ <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>56364942-3db9-4ab8-99df-00ec7cad4cfa</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.029+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_playlists">
+ <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>7eaf5d7e-62a6-4301-bf59-f051394159bf</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.030+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_templates">
+ <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>14ae319a-add2-4fdf-819a-cd8e92506bcf</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.031+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_dms">
+ <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>60583cde-0a0e-4b74-b0bb-a31c39de8e05</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.033+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>54ff16e9-b523-447e-a659-9313b3a24fb9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.033+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_usergroups">
+ <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>60c6a1ef-8ab2-4365-b5d2-183def11b950</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2012-04-06T16:06:24.034+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml 2014-03-03 16:50:52 UTC (rev 4563)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" sv:name="anonymous">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:user</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2d78094b-8f7e-4c95-8b1d-22e3dc417c34</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:activationStatus" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:created" sv:type="Date">
+ <sv:value>2006-05-04T17:05:03.710+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastModified" sv:type="Date">
+ <sv:value>2007-04-19T10:20:08.554+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastModifiedBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ <sv:property sv:name="language" sv:type="String">
+ <sv:value>en</sv:value>
+ </sv:property>
+ <sv:property sv:name="pswd" sv:type="String">
+ <sv:value>$2a$12$V19uaB7NAJbXpZMzNjkvZ.l1zwoTOpVe7V7loHz1LMjBnD80Py2DK</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>anonymous</sv:value>
+ </sv:property>
+ <sv:node sv:name="groups">
+ <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>f0a15b82-9f33-406b-ad22-f3a88324954b</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:08.561+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="roles">
+ <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>0ea2a469-5f64-49e4-a4ab-ef453ca88247</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:08.566+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="0" sv:type="String">
+ <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_users">
+ <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>2d10e6b9-26aa-4426-af16-ba64b9baed69</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:09.090+02:00</sv:value>
+ </sv:property>
+ <sv:node sv:name="0">
+ <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>66835e50-b16a-4c55-bff8-8ee07321b35f</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:09.095+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/system/anonymous/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>63</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="00">
+ <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>0c099b4a-c6e4-46ea-a5a0-26f8066ad2dc</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:created" sv:type="Date">
+ <sv:value>2009-03-30T11:03:43.025+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/system/anonymous</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_userroles">
+ <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>fa99e1a0-05b5-49a7-9f33-5ca724364a67</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:09.091+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_config">
+ <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>78a74eef-5fba-4080-b824-0ea63196ad28</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:created" sv:type="Date">
+ <sv:value>2007-04-19T10:20:09.093+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4562
http://openutils.svn.sourceforge.net/openutils/?rev=4562&view=rev
Author: diego_schivo
Date: 2014-02-13 08:06:07 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
MEDIA-313 - Possibility to automatically rename files imported from zip archive
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2014-02-07 11:54:48 UTC (rev 4561)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2014-02-13 08:06:07 UTC (rev 4562)
@@ -366,15 +366,15 @@
<div style="margin: 10px;">
<input type="hidden" name="command" value="saveZip" />
<input id="parentPath" type="hidden" name="parentPath" value="{parentPath}" />
- <input type="file" name="zipFile" />
+ <input type="file" name="zipFile" onchange="this.form.baseFilename.value = this.value.match(/([^\.\/\\\\]+)\.?[^\.]*$/)[1];" />
</div>
<div id="renameDiv" style="margin: 10px;">
- <input id="rename" type="checkbox" name="rename" style="float: left; margin-right: 5px;" onclick="this.parentNode.style.display = 'none'; this.form.baseFilename.parentNode.style.display = '';" />
+ <input id="rename" type="checkbox" name="rename" style="float: left; margin-right: 5px;" onclick="this.parentNode.style.display = 'none'; this.form.baseFilename.parentNode.style.display = ''; this.form.baseFilename.disabled = false;" />
<label for="rename" onclick="this.parentNode.style.display = 'none'; this.form.baseFilename.parentNode.style.display = '';">Rename files</label>
</div>
<div id="baseFilenameDiv" style="display: none; margin: 10px;">
<label for="baseFilename" style="float: left; line-height: 20px; width: 70px;">Name</label>
- <input id="baseFilename" type="text" name="baseFilename" style="width: 180px;" />
+ <input id="baseFilename" type="text" name="baseFilename" disabled="disabled" style="width: 180px;" />
</div>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4561
http://openutils.svn.sourceforge.net/openutils/?rev=4561&view=rev
Author: diego_schivo
Date: 2014-02-07 11:54:48 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
MEDIA-313 - Possibility to automatically rename files imported from zip archive
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2014-02-07 11:44:47 UTC (rev 4560)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2014-02-07 11:54:48 UTC (rev 4561)
@@ -84,10 +84,17 @@
parent = StringUtils.substringBeforeLast(parent, "/");
- String baseName = StringUtils.defaultIfEmpty(baseFilename, FilenameUtils.getBaseName(filename));
+ String baseName;
+ if (!StringUtils.isEmpty(baseFilename))
+ {
+ baseName = baseFilename + (i + 1);
+ }
+ else
+ {
+ baseName = FilenameUtils.getBaseName(filename);
+ }
String extension = FilenameUtils.getExtension(filename);
filename = baseName
- + (i + 1)
+ (!StringUtils.isEmpty(extension) ? FilenameUtils.EXTENSION_SEPARATOR : StringUtils.EMPTY)
+ StringUtils.defaultString(extension);
MediaLoadUtils.loadEntry(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2014-02-07 11:44:51
|
Revision: 4560
http://openutils.svn.sourceforge.net/openutils/?rev=4560&view=rev
Author: diego_schivo
Date: 2014-02-07 11:44:47 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
MEDIA-313 - Possibility to automatically rename files imported from zip archive
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2014-01-30 16:58:35 UTC (rev 4559)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2014-02-07 11:44:47 UTC (rev 4560)
@@ -89,6 +89,8 @@
private Document zipFile;
+ private String baseFilename;
+
private String playlistHandle;
private String playlistSearch;
@@ -190,7 +192,7 @@
{ // Fallback to the default if nothing is set.
importer = new DefaultZipImporter();
}
- importer.importFromZip(zip, parentPath);
+ importer.importFromZip(zip, parentPath, baseFilename);
zip.close();
AlertUtil.setMessage(getMsgs().get("media.loadzip.success"));
}
@@ -378,6 +380,24 @@
}
/**
+ * Returns the baseFilename.
+ * @return the baseFilename
+ */
+ public String getBaseFilename()
+ {
+ return baseFilename;
+ }
+
+ /**
+ * Sets the baseFilename.
+ * @param baseFilename the baseFilename to set
+ */
+ public void setBaseFilename(String baseFilename)
+ {
+ this.baseFilename = baseFilename;
+ }
+
+ /**
* Returns the playlistHandle.
* @return the playlistHandle
*/
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2014-01-30 16:58:35 UTC (rev 4559)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2014-02-07 11:44:47 UTC (rev 4560)
@@ -26,6 +26,7 @@
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
@@ -41,9 +42,18 @@
*/
public void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException
{
+ importFromZip(zip, parentPath, null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void importFromZip(ZipFile zip, String parentPath, String baseFilename) throws ZipImporterException
+ {
try
{
Enumeration< ? extends ZipEntry> entries = zip.entries();
+ int i = 0;
while (entries.hasMoreElements())
{
ZipEntry entry = entries.nextElement();
@@ -74,11 +84,18 @@
parent = StringUtils.substringBeforeLast(parent, "/");
+ String baseName = StringUtils.defaultIfEmpty(baseFilename, FilenameUtils.getBaseName(filename));
+ String extension = FilenameUtils.getExtension(filename);
+ filename = baseName
+ + (i + 1)
+ + (!StringUtils.isEmpty(extension) ? FilenameUtils.EXTENSION_SEPARATOR : StringUtils.EMPTY)
+ + StringUtils.defaultString(extension);
MediaLoadUtils.loadEntry(
inputStream,
StringUtils.defaultIfEmpty(parent, "/fromzip"),
filename,
false);
+ i++;
}
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java 2014-01-30 16:58:35 UTC (rev 4559)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java 2014-02-07 11:44:47 UTC (rev 4560)
@@ -40,4 +40,6 @@
* @throws ZipImporterException
*/
void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException;
+
+ void importFromZip(ZipFile zip, String parentPath, String baseFilename) throws ZipImporterException;
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2014-01-30 16:58:35 UTC (rev 4559)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2014-02-07 11:44:47 UTC (rev 4560)
@@ -294,8 +294,10 @@
function uploadzip(tree)
{
var width = 290;
- var height = 100;
+ var height = 140;
var uploadDlg;
+ document.getElementById('renameDiv').style.display = '';
+ document.getElementById('baseFilenameDiv').style.display = 'none';
var tpl = Ext.XTemplate.from("formDiv");
var html = tpl.apply({
parentPath: tree.selectedNode.path
@@ -361,9 +363,19 @@
style="width:100%; height:100%; border:0 none; overflow:hidden;" frameborder="0" scrolling="no"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
- <input type="hidden" name="command" value="saveZip" />
- <input id="parentPath" type="hidden" name="parentPath" value="{parentPath}" />
- <input type="file" name="zipFile" />
+ <div style="margin: 10px;">
+ <input type="hidden" name="command" value="saveZip" />
+ <input id="parentPath" type="hidden" name="parentPath" value="{parentPath}" />
+ <input type="file" name="zipFile" />
+ </div>
+ <div id="renameDiv" style="margin: 10px;">
+ <input id="rename" type="checkbox" name="rename" style="float: left; margin-right: 5px;" onclick="this.parentNode.style.display = 'none'; this.form.baseFilename.parentNode.style.display = '';" />
+ <label for="rename" onclick="this.parentNode.style.display = 'none'; this.form.baseFilename.parentNode.style.display = '';">Rename files</label>
+ </div>
+ <div id="baseFilenameDiv" style="display: none; margin: 10px;">
+ <label for="baseFilename" style="float: left; line-height: 20px; width: 70px;">Name</label>
+ <input id="baseFilename" type="text" name="baseFilename" style="width: 180px;" />
+ </div>
</form>
</div>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4559
http://openutils.svn.sourceforge.net/openutils/?rev=4559&view=rev
Author: diego_schivo
Date: 2014-01-30 16:58:35 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
MEDIA-312 - Possibility for MediaTypeHandler to do something on media deletion
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2014-01-30 16:19:49 UTC (rev 4558)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2014-01-30 16:58:35 UTC (rev 4559)
@@ -309,7 +309,7 @@
Content content = hm.getContent(this.node);
if (MediaConfigurationManager.MEDIA.equals(content.getItemType()))
{
- String type = NodeDataUtil.getString(node, "type");
+ String type = NodeDataUtil.getString(content, "type");
MediaTypeHandler typeHandler = type != null ? MediaConfigurationManager
.getInstance()
.getTypes()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2014-01-30 16:19:53
|
Revision: 4558
http://openutils.svn.sourceforge.net/openutils/?rev=4558&view=rev
Author: diego_schivo
Date: 2014-01-30 16:19:49 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
MEDIA-312 - Possibility for MediaTypeHandler to do something on media deletion
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -1,5 +1,7 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
+import info.magnolia.cms.core.Content;
+
/**
* @author molaschi
* @version $Id: $
@@ -26,4 +28,12 @@
this.name = name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public boolean onPreDelete(Content media)
+ {
+ return true;
+ }
+
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -36,4 +36,6 @@
String getPreviewUrl(Content media);
String getFilename(Content media);
+
+ boolean onPreDelete(Content media);
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -34,13 +34,21 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/*
*
*/
public class ExternalVideoTypeHandler extends BaseVideoTypeHandler
{
+ /**
+ * Logger.
+ */
+ private static final Logger log = LoggerFactory.getLogger(ExternalVideoTypeHandler.class);
+
public static final String ND_PROVIDER = "provider";
public static ExternalVideoProvider getExternalVideoProvider(Content media)
@@ -157,7 +165,15 @@
ExternalVideoProvider provider = getVideoProvider(media);
if (provider != null)
{
- provider.processVideo(media);
+ try
+ {
+ provider.processVideo(media);
+ }
+ catch (Throwable e)
+ {
+ log.error(e.getMessage(), e);
+ return false;
+ }
}
return super.onPostSave(media);
@@ -166,6 +182,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getFilename(Content media)
{
ExternalVideoProvider provider = getVideoProvider(media);
@@ -230,4 +247,22 @@
{
return "/.resources/media/icons/thumb-video.png";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean onPreDelete(Content media)
+ {
+ if (!super.onPreDelete(media))
+ {
+ return false;
+ }
+ ExternalVideoProvider provider = getVideoProvider(media);
+ if (provider == null)
+ {
+ return true;
+ }
+ return provider.onPreDelete(media);
+ }
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -29,6 +29,7 @@
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
@@ -56,6 +57,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -304,8 +306,26 @@
try
{
- hm.delete(this.node);
- hm.save();
+ Content content = hm.getContent(this.node);
+ if (MediaConfigurationManager.MEDIA.equals(content.getItemType()))
+ {
+ String type = NodeDataUtil.getString(node, "type");
+ MediaTypeHandler typeHandler = type != null ? MediaConfigurationManager
+ .getInstance()
+ .getTypes()
+ .get(type)
+ .getHandler() : null;
+ // MEDIA-312
+ if (typeHandler == null || typeHandler.onPreDelete(content))
+ {
+ hm.delete(this.node);
+ hm.save();
+ }
+ }
+ else if (ItemType.CONTENT.equals(content.getItemType()))
+ {
+ // TODO recursion?
+ }
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -208,4 +208,6 @@
* Notify module stopping to handler
*/
void stop();
+
+ boolean onPreDelete(Content media);
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2014-01-28 15:49:36 UTC (rev 4557)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2014-01-30 16:19:49 UTC (rev 4558)
@@ -384,6 +384,14 @@
{
// Do nothing
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean onPreDelete(Content media)
+ {
+ return true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4557
http://openutils.svn.sourceforge.net/openutils/?rev=4557&view=rev
Author: diego_schivo
Date: 2014-01-28 15:49:36 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
LayerDialogMVC onSaveFailed log.debug
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-28 15:45:34 UTC (rev 4556)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-28 15:49:36 UTC (rev 4557)
@@ -201,6 +201,7 @@
Content node = getStorageNode();
if (node != null)
{
+ log.debug("Deleting node because it was created but save failed");
try
{
Content parent = node.getParent();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4556
http://openutils.svn.sourceforge.net/openutils/?rev=4556&view=rev
Author: diego_schivo
Date: 2014-01-28 15:45:34 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
MEDIA-311 LayerDialogMVC onSaveFailed
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-28 15:40:36 UTC (rev 4555)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-28 15:45:34 UTC (rev 4556)
@@ -151,22 +151,7 @@
// TODO rename dei nodi in base al filename?
- boolean result = MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
- // MEDIA-311
- if (!result && newNode)
- {
- try
- {
- Content parent = node.getParent();
- node.delete();
- parent.save();
- }
- catch (RepositoryException e)
- {
- log.error(e.getMessage(), e);
- }
- }
- return result;
+ return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
}
/**
@@ -203,4 +188,31 @@
return super.onPreSave(control);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected String onSaveFailed()
+ {
+ // MEDIA-311
+ if (newNode)
+ {
+ Content node = getStorageNode();
+ if (node != null)
+ {
+ try
+ {
+ Content parent = node.getParent();
+ node.delete();
+ parent.save();
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ }
+ }
+ return super.onSaveFailed();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4555
http://openutils.svn.sourceforge.net/openutils/?rev=4555&view=rev
Author: diego_schivo
Date: 2014-01-28 15:40:36 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
MEDIA-311 Duplicate media nodes when MediaTypeHandler.onPostSave returns false
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-02 10:33:20 UTC (rev 4554)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2014-01-28 15:40:36 UTC (rev 4555)
@@ -57,6 +57,8 @@
*/
private Logger log = LoggerFactory.getLogger(LayerDialogMVC.class);
+ private boolean newNode;
+
/**
* @param name
* @param request
@@ -149,7 +151,22 @@
// TODO rename dei nodi in base al filename?
- return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
+ boolean result = MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
+ // MEDIA-311
+ if (!result && newNode)
+ {
+ try
+ {
+ Content parent = node.getParent();
+ node.delete();
+ parent.save();
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ }
+ return result;
}
/**
@@ -160,7 +177,8 @@
{
String type = this.request.getParameter("type");
- if (control.getNodeName().equals("mgnlNew"))
+ newNode = control.getNodeName().equals("mgnlNew");
+ if (newNode)
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content c = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2014-01-02 10:33:22
|
Revision: 4554
http://openutils.svn.sourceforge.net/openutils/?rev=4554&view=rev
Author: fgiust
Date: 2014-01-02 10:33:20 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
remove m5 webapp form this branch
Removed Paths:
-------------
magnoliamodules/trunk/magnolia5-test-webapp/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-30 17:46:31
|
Revision: 4553
http://openutils.svn.sourceforge.net/openutils/?rev=4553&view=rev
Author: fgiust
Date: 2013-12-30 17:46:28 +0000 (Mon, 30 Dec 2013)
Log Message:
-----------
add missing mail module
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-30 10:59:12 UTC (rev 4552)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-30 17:46:28 UTC (rev 4553)
@@ -129,6 +129,7 @@
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.2</version>
</dependency>
+<!--
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlbootstrapsync</artifactId>
@@ -139,6 +140,7 @@
<artifactId>openutils-mgnlcas</artifactId>
<version>5.0.11-SNAPSHOT</version>
</dependency>
+-->
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
@@ -186,17 +188,17 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlstruts11</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlutils</artifactId>
+ <artifactId>openutils-mgnltagcloud</artifactId>
<version>5.0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltagcloud</artifactId>
+ <artifactId>openutils-mgnlmail</artifactId>
<version>5.0.11-SNAPSHOT</version>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-30 10:59:15
|
Revision: 4552
http://openutils.svn.sourceforge.net/openutils/?rev=4552&view=rev
Author: fgiust
Date: 2013-12-30 10:59:12 +0000 (Mon, 30 Dec 2013)
Log Message:
-----------
fix log4j.xml
Modified Paths:
--------------
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-12-10 17:15:37 UTC (rev 4551)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-12-30 10:59:12 UTC (rev 4552)
@@ -1,353 +1,61 @@
-<!--
- | This is the configuration file for Maven. It can be specified at two levels:
- |
- | 1. User Level. This settings.xml file provides configuration for a single user,
- | and is normally provided in $HOME/.m2/settings.xml.
- |
- | NOTE: This location can be overridden with the system property:
- |
- | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
- |
- | 2. Global Level. This settings.xml file provides configuration for all maven
- | users on a machine (assuming they're all using the same maven
- | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
- |
- | NOTE: This location can be overridden with the system property:
- |
- | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
- |
- | The sections in this sample file are intended to give you a running start at
- | getting the most out of your Maven installation. Where appropriate, the default
- | values (values used when the setting is not specified) are provided.
- |
- |-->
-<settings>
- <!-- localRepository
- | The path to the local repository maven will use to store artifacts.
- |
- | Default: ~/.m2/repository-->
- <localRepository>/Users/luca/.m2/repository</localRepository>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <!-- set <log4j:configuration debug="true"> for log4j initialization messages -->
+ <!-- debug appender, write to stdout -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p %c %F(%M:%L) %m%n" />
+ <!-- this pattern can be used for debugging - has a performance impact.
+ <param name="ConversionPattern" value="%-5p %c %F(%M:%L) %t %d %m (uri:%X{requesturi} userid:%X{userid})%n" />
+ -->
+ </layout>
+ </appender>
- <!-- interactiveMode
- | This will determine whether maven prompts you when it needs input. If set to false,
- | maven will use a sensible default value, perhaps based on some other setting, for
- | the parameter in question.
- |
- | Default: true
- <interactiveMode>true</interactiveMode>
- -->
+ <!-- Magnolia categories -->
+ <category name="info.magnolia">
+ <priority value="INFO" />
+ </category>
- <!-- offline
- | Determines whether maven should attempt to connect to the network when executing a build.
- | This will have an effect on artifact downloads, artifact deployment, and others.
- |
- | Default: false
- <offline>false</offline>
- -->
-
- <!-- proxies
- | This is a list of proxies which can be used on this machine to connect to the network.
- | Unless otherwise specified (by system property or command-line switch), the first proxy
- | specification in this list marked as active will be used.
- |-->
- <proxies>
- <!-- proxy
- | Specification for one proxy, to be used in connecting to the network.
- |
- <proxy>
- <id>optional</id>
- <active>true</active>
- <protocol>http</protocol>
- <username>proxyuser</username>
- <password>proxypass</password>
- <host>proxy.host.net</host>
- <port>80</port>
- <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
- </proxy>
- -->
-
- <!--proxy>
- <id>manual</id>
- <active>true</active>
- <protocol>http</protocol>
- <host>62.173.161.48</host>
- <port>3128</port>
- <nonProxyHosts>localhost, 127.0.0.1,repository.openmindonline.it</nonProxyHosts>
- </proxy-->
-
- <!--
- <proxy>
- <active/>
- <protocol>http</protocol>
- <port>3128</port>
- <host>62.173.161.48</host>
- <nonProxyHosts>10.*|*.openmindonline.it</nonProxyHosts>
- <id/>
- </proxy>
- -->
-
-
- </proxies>
-
- <!-- servers
- | This is a list of authentication profiles, keyed by the server-id used within the system.
- | Authentication profiles can be used whenever maven must make a connection to a remote server.
- |-->
- <servers>
- <!-- server
- | Specifies the authentication information to use when connecting to a particular server, identified by
- | a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
- | used together.
- |
- <server>
- <id>deploymentRepo</id>
- <username>repouser</username>
- <password>repopwd</password>
- </server>
- -->
- <!-- secured repo -->
- <server>
- <id>releases.openmindonline.it</id>
- <username>deployment</username>
- <password>deploymind</password>
- </server>
- <server>
- <id>snapshots.openmindonline.it</id>
- <username>deployment</username>
- <password>deploymind</password>
- </server>
- <server>
- <id>thirdparty.openmindonline.it</id>
- <username>deployment</username>
- <password>deploymind</password>
- </server>
- <server>
- <id>magnolia.nexus.enterprise</id>
- <username>magnolia_ee</username>
- <password>enterpris3!</password>
- </server>
- <server>
-<id>willie-releases</id>
-<username>deployment</username>
-<password>p1relli8</password>
-</server>
-<server>
-<id>oplboati</id>
-<username>oplboati</username>
-<password>oplboati</password>
-</server>
-
-
-<!--
-
- <server>
- <id>repository.openmindonline.it</id>
- <username>luca</username>
- <privateKey>/home/luca/.ssh/id_rsa</privateKey>
- <passphrase>luc4.b04t1</passphrase>
- <filePermissions>664</filePermissions>
- <directoryPermissions>775</directoryPermissions>
- </server>
- <server>
- <id>projects.openmindonline.it</id>
- <username>luca</username>
- <privateKey>/home/luca/.ssh/id_rsa</privateKey>
- <passphrase>luc4.b04t1</passphrase>
- <filePermissions>664</filePermissions>
- <directoryPermissions>775</directoryPermissions>
- </server> -->
-
-
- </servers>
-
- <!-- mirrors
- | This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
- | It works like this: a POM may declare a repository to use in resolving certain artifacts.
- | However, this repository may have problems with heavy traffic at times, so people have mirrored
- | it to several places.
- |
- | That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
- | server for that repository.
- |-->
- <mirrors>
- <!-- mirror
- | Specifies a repository mirror site to use instead of a given repository. The repository that
- | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
- | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
- |
- <mirror>
- <id>mirrorId</id>
- <mirrorOf>repositoryId</mirrorOf>
- <name>Human Readable Name for this Mirror.</name>
- <url>http://my.repository.com/repo/path</url>
- </mirror>
- -->
- <!--This is used to direct the public snapshots repo in the
- profile below over to a different nexus group -->
- <!-- <mirror>
- <id>nexus-public-snapshots</id>
- <mirrorOf>public-snapshots</mirrorOf>
- <url>http://mil-gl-repo-01:8081/nexus/content/groups/public-snapshots</url>
- </mirror>
- <mirror>
- <id>nexus</id>
- <mirrorOf>*</mirrorOf>
- <url>http://mil-gl-repo-01:8081/nexus/content/groups/public</url>
- </mirror> <mirror>
- <id>openmind</id>
- <mirrorOf>*</mirrorOf>
- <url>http://repository.openmindonline.it</url>
- </mirror>-->
-
-
- <mirror>
- <id>openmind</id>
- <mirrorOf>central,openutils,java.net,glassfish-repository,java.net2,jboss,neonetwork,repository.neonetwork.it,repository.magnolia.info,magnolia.public.releases,magnolia.nexus,jaspersoft</mirrorOf>
- <name>openmind nexus repo</name>
- <url>http://repository.openmindonline.it</url>
- </mirror>
- <mirror>
- <id>geotoolsold</id>
- <mirrorOf>geotools</mirrorOf>
- <name>geotools old packages</name>
- <url>http://download.osgeo.org/webdav/geotools</url>
-</mirror>
-
- </mirrors>
-
- <!-- profiles
- | This is a list of profiles which can be activated in a variety of ways, and which can modify
- | the build process. Profiles provided in the settings.xml are intended to provide local machine-
- | specific paths and repository locations which allow the build to work in the local environment.
- |
- | For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
- | dereferenced during the build process to configure the cactus plugin.
- |
- | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
- | section of this document (settings.xml) - will be discussed later. Another way essentially
- | relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
- | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
- | Finally, the list of active profiles can be specified directly from the command line.
- |
- | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
- | repositories, plugin repositories, and free-form properties to be used as configuration
- | variables for plugins in the POM.
- |
- |-->
- <profiles>
- <!-- profile
- | Specifies a set of introductions to the build process, to be activated using one or more of the
- | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
- | or the command line, profiles have to have an ID that is unique.
- |
- | An encouraged best practice for profile identification is to use a consistent naming convention
- | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
- | This will make it more intuitive to understand what the set of introduced profiles is attempting
- | to accomplish, particularly when you only have a list of profile id's for debug.
- |
- | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
- <profile>
- <id>jdk-1.4</id>
-
- <activation>
- <jdk>1.4</jdk>
- </activation>
-
- <repositories>
- <repository>
- <id>jdk14</id>
- <name>Repository for JDK 1.4 builds</name>
- <url>http://www.myhost.com/maven/jdk14</url>
- <layout>default</layout>
- <snapshotPolicy>always</snapshotPolicy>
- </repository>
- </repositories>
- </profile>
- -->
-
- <!--
- | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
- | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
- | might hypothetically look like:
- |
- | ...
- | <plugin>
- | <groupId>org.myco.myplugins</groupId>
- | <artifactId>myplugin</artifactId>
- |
- | <configuration>
- | <tomcatLocation>${tomcatPath}</tomcatLocation>
- | </configuration>
- | </plugin>
- | ...
- |
- | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
- | anything, you could just leave off the <value/> inside the activation-property.
- |
- <profile>
- <id>env-dev</id>
-
- <activation>
- <property>
- <name>target-env</name>
- <value>dev</value>
- </property>
- </activation>
-
- <properties>
- <tomcatPath>/path/to/tomcat/instance</tomcatPath>
- </properties>
- </profile>
- -->
- <profile>
- <id>magnolia-repositories</id>
- <repositories>
- <repository>
- <id>jahia</id>
- <url>http://maven.jahia.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>magnolia.nexus.enterprise</id>
- <url>http://nexus.magnolia-cms.com/content/repositories/magnolia.enterprise.releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
-
-
- </repositories>
- </profile>
- </profiles>
-
- <!-- activeProfiles
- | List of profiles that are active for all builds.
- |
- <activeProfiles>
- <activeProfile>alwaysActiveProfile</activeProfile>
- <activeProfile>anotherAlwaysActiveProfile</activeProfile>
- </activeProfiles>
- -->
- <activeProfiles>
- <activeProfile>magnolia-repositories</activeProfile>
- </activeProfiles>
-</settings>
-
+ <!-- External libraries -->
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="org.apache.jackrabbit">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="freemarker">
+ <priority value="WARN" />
+ </category>
+ <category name="httpclient">
+ <priority value="WARN" />
+ </category>
+ <category name="openwfe">
+ <priority value="WARN" />
+ </category>
+ <category name="info.magnolia.module.samples.filters.SampleFilter">
+ <priority value="WARN" />
+ </category>
+ <category name="net.sourceforge.openutils">
+ <priority value="INFO" />
+ </category>
+ <category name="info.magnolia.module.admininterface.commands.ActivationCommand">
+ <priority value="INFO" />
+ </category>
+ <category name="info.magnolia.cms.i18n.AbstractMessagesImpl">
+ <priority value="INFO" />
+ </category>
+ <category name="it.openutils.mgnlutils.el">
+ <priority value="INFO" />
+ </category>
+ <root>
+ <priority value="ALL" />
+ <appender-ref ref="console" />
+ </root>
+</log4j:configuration>
\ 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...> - 2013-12-10 17:15:40
|
Revision: 4551
http://openutils.svn.sourceforge.net/openutils/?rev=4551&view=rev
Author: fgiust
Date: 2013-12-10 17:15:37 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 17:15:30 UTC (rev 4550)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 17:15:37 UTC (rev 4551)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3</version>
+ <version>1.1.4-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcache-1.1.3</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcache-1.1.3</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcache-1.1.3</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 17:15:33
|
Revision: 4550
http://openutils.svn.sourceforge.net/openutils/?rev=4550&view=rev
Author: fgiust
Date: 2013-12-10 17:15:30 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcache-1.1.3
Added Paths:
-----------
tags/openutils-mgnlcache-1.1.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 17:15:21
|
Revision: 4549
http://openutils.svn.sourceforge.net/openutils/?rev=4549&view=rev
Author: fgiust
Date: 2013-12-10 17:15:18 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:42:12 UTC (rev 4548)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 17:15:18 UTC (rev 4549)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.3</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcache-1.1.3</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcache-1.1.3</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcache-1.1.3</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:42:15
|
Revision: 4548
http://openutils.svn.sourceforge.net/openutils/?rev=4548&view=rev
Author: fgiust
Date: 2013-12-10 16:42:12 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
release config
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:26:14 UTC (rev 4547)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:42:12 UTC (rev 4548)
@@ -45,6 +45,18 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <preparationGoals>install</preparationGoals>
+ <remoteTagging>true</remoteTagging>
+ <tagBase>svn+ssh://svn.code.sf.net/p/openutils/code/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:26:16
|
Revision: 4547
http://openutils.svn.sourceforge.net/openutils/?rev=4547&view=rev
Author: fgiust
Date: 2013-12-10 16:26:14 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:21:36 UTC (rev 4546)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:26:14 UTC (rev 4547)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3</version>
+ <version>1.1.3-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:21:40
|
Revision: 4546
http://openutils.svn.sourceforge.net/openutils/?rev=4546&view=rev
Author: fgiust
Date: 2013-12-10 16:21:36 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:17:56 UTC (rev 4545)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:21:36 UTC (rev 4546)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.3</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:17:59
|
Revision: 4545
http://openutils.svn.sourceforge.net/openutils/?rev=4545&view=rev
Author: fgiust
Date: 2013-12-10 16:17:56 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:17:02 UTC (rev 4544)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:17:56 UTC (rev 4545)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3</version>
+ <version>1.1.3-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:17:05
|
Revision: 4544
http://openutils.svn.sourceforge.net/openutils/?rev=4544&view=rev
Author: fgiust
Date: 2013-12-10 16:17:02 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:16:31 UTC (rev 4543)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:17:02 UTC (rev 4544)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.3</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:16:33
|
Revision: 4543
http://openutils.svn.sourceforge.net/openutils/?rev=4543&view=rev
Author: fgiust
Date: 2013-12-10 16:16:31 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
fix scm url
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:15:08 UTC (rev 4542)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:16:31 UTC (rev 4543)
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/branches/magnolia44/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/branches/magnolia44/openutils-mgnlcache</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:15:11
|
Revision: 4542
http://openutils.svn.sourceforge.net/openutils/?rev=4542&view=rev
Author: fgiust
Date: 2013-12-10 16:15:08 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:13:23 UTC (rev 4541)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:15:08 UTC (rev 4542)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3</version>
+ <version>1.1.3-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
+ <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>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-10 16:13:27
|
Revision: 4541
http://openutils.svn.sourceforge.net/openutils/?rev=4541&view=rev
Author: fgiust
Date: 2013-12-10 16:13:23 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcache-1.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:12:43 UTC (rev 4540)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2013-12-10 16:13:23 UTC (rev 4541)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.3</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcache-1.1.3</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
