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
|
|
From: <fg...@us...> - 2011-03-13 09:32:57
|
Revision: 3380
http://openutils.svn.sourceforge.net/openutils/?rev=3380&view=rev
Author: fgiust
Date: 2011-03-13 09:32:51 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
update deps
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2011-03-13 09:10:56 UTC (rev 3379)
+++ trunk/magnolia-test-webapp/pom.xml 2011-03-13 09:32:51 UTC (rev 3380)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.4-b2-SNAPSHOT</version>
+ <version>4.4-b3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 09:11:02
|
Revision: 3379
http://openutils.svn.sourceforge.net/openutils/?rev=3379&view=rev
Author: fgiust
Date: 2011-03-13 09:10:56 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-03-13 09:10:48 UTC (rev 3378)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-03-13 09:10:56 UTC (rev 3379)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.1</version>
+ <version>3.3.2-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.1</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 09:10:55
|
Revision: 3378
http://openutils.svn.sourceforge.net/openutils/?rev=3378&view=rev
Author: fgiust
Date: 2011-03-13 09:10:48 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-3.3.1
Added Paths:
-----------
tags/openutils-mgnlcriteria-3.3.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 09:10:33
|
Revision: 3377
http://openutils.svn.sourceforge.net/openutils/?rev=3377&view=rev
Author: fgiust
Date: 2011-03-13 09:10:26 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.1
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-03-13 09:09:06 UTC (rev 3376)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-03-13 09:10:26 UTC (rev 3377)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.1</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.1</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 09:09:13
|
Revision: 3376
http://openutils.svn.sourceforge.net/openutils/?rev=3376&view=rev
Author: fgiust
Date: 2011-03-13 09:09:06 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
extends CRIT-34 also to getItems(class) which uses content2bean
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 10:07:11 UTC (rev 3375)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-13 09:09:06 UTC (rev 3376)
@@ -281,6 +281,64 @@
throw new JCRQueryException(statement, e);
}
+ if (applyLocalPaging && itemsPerPage > 0)
+ {
+ final int offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
+
+ // removing preceding records
+ rows.skip(offset);
+
+ // removing folllowing records and alter getSize()
+ return new ResultIteratorImpl<K>(rows, this.hm)
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasNext()
+ {
+ return super.getPosition() - offset < getSize() && super.hasNext();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public long getSize()
+ {
+ return Math.min(super.getSize() - offset, itemsPerPage);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected K wrap(Row row)
+ {
+ try
+ {
+ Item jcrNode = JcrCompatUtils.getJCRNode(row);
+ if (jcrNode == null)
+ {
+ return null;
+ }
+
+ return (K) Content2BeanUtil.toBean(
+ new AdvancedResultItemImpl(row, jcrNode, this.hm),
+ true,
+ theclass);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeException(e);
+ }
+ catch (Content2BeanException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+ }
+
return new ResultIteratorImpl<K>(rows, hm)
{
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-08 10:07:11 UTC (rev 3375)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-13 09:09:06 UTC (rev 3376)
@@ -178,4 +178,42 @@
PAGINATION_LENGTH,
"Wrong number of results returned by the iterator when calling hasNext() more than once.");
}
+
+ /**
+ * Retrieves all letters.
+ * @throws Exception
+ */
+ @Test
+ public void testWithBeans() throws Exception
+ {
+
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
+ criteria.setBasePath("/letters");
+ criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+ criteria.setPaging(PAGINATION_LENGTH, 1);
+ criteria.setForcePagingWithDocumentOrder(true);
+
+ log.debug(criteria.toXpathExpression());
+
+ AdvancedResult advResult = criteria.execute();
+
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
+
+ ResultIterator<Content2BeanTest.Page> resultIterator = advResult.getItems(Content2BeanTest.Page.class);
+ Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
+
+ int i = 0;
+ for (Content2BeanTest.Page currentResult : resultIterator)
+ {
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i], "Position "
+ + i
+ + ": found "
+ + currentResult.getTitle()
+ + " instead of "
+ + LETTERS_ARRAY[i]);
+ i++;
+ }
+ Assert.assertEquals(i, PAGINATION_LENGTH, "Wrong number of results returned by the iterator.");
+
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fn...@us...> - 2011-03-08 10:07:18
|
Revision: 3375
http://openutils.svn.sourceforge.net/openutils/?rev=3375&view=rev
Author: fnecci
Date: 2011-03-08 10:07:11 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
CRIT-35 Little refactor
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 09:48:50 UTC (rev 3374)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 10:07:11 UTC (rev 3375)
@@ -194,8 +194,7 @@
@Override
public boolean hasNext()
{
- return super.getPosition() - offset < Math.min(super.getSize() - offset, itemsPerPage)
- && super.hasNext();
+ return super.getPosition() - offset < getSize() && super.hasNext();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-08 09:48:56
|
Revision: 3374
http://openutils.svn.sourceforge.net/openutils/?rev=3374&view=rev
Author: fgiust
Date: 2011-03-08 09:48:50 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
CRIT-36 AccessibleResultItemResultIterator.getPosition() may return an invalid value
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2011-03-05 20:34:54 UTC (rev 3373)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2011-03-08 09:48:50 UTC (rev 3374)
@@ -120,4 +120,13 @@
next = null;
return result;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public long getPosition()
+ {
+ return next == null ? super.getPosition() : super.getPosition() - 1;
+ }
}
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 20:34:54 UTC (rev 3373)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 09:48:50 UTC (rev 3374)
@@ -157,8 +157,7 @@
*/
public int getNumberOfPages()
{
- return itemsPerPage > 0 ? (int) Math
- .round(Math.ceil(((float) jcrQueryResult.getTotalSize() / (float) itemsPerPage))) : 1;
+ return itemsPerPage > 0 ? (int) Math.round(Math.ceil(((float) getTotalSize() / (float) itemsPerPage))) : 1;
}
/**
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 20:34:54 UTC (rev 3373)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-08 09:48:50 UTC (rev 3374)
@@ -155,7 +155,27 @@
+ LETTERS_ARRAY[i]);
i++;
}
+ Assert.assertEquals(i, PAGINATION_LENGTH, "Wrong number of results returned by the iterator.");
- Assert.assertEquals(i, PAGINATION_LENGTH, "Wrong number of results returned by the iterator.");
+ resultIterator = advResult.getItems();
+ i = 0;
+
+ // check that hasNext doesn't change the result of getPosition()
+ while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
+ {
+ AdvancedResultItem currentResult = resultIterator.next();
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i], "Position "
+ + i
+ + ": found "
+ + currentResult.getTitle()
+ + " instead of "
+ + LETTERS_ARRAY[i]);
+ i++;
+ }
+
+ Assert.assertEquals(
+ i,
+ PAGINATION_LENGTH,
+ "Wrong number of results returned by the iterator when calling hasNext() more than once.");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-03-05 20:43:38
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/146/changes> |
|
From: <hu...@op...> - 2011-03-05 20:43:35
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/146/changes> |
|
From: <fg...@us...> - 2011-03-05 20:35:00
|
Revision: 3373
http://openutils.svn.sourceforge.net/openutils/?rev=3373&view=rev
Author: fgiust
Date: 2011-03-05 20:34:54 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
jcr jar is not needed anymore
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
Modified: trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml 2011-03-05 20:18:09 UTC (rev 3372)
+++ trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml 2011-03-05 20:34:54 UTC (rev 3373)
@@ -30,7 +30,6 @@
<includes>
<include>net.sourceforge.openutils:*</include>
<include>cglib:*</include>
- <include>javax.jcr:*</include>
</includes>
</dependencySet>
</dependencySets>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 20:18:16
|
Revision: 3372
http://openutils.svn.sourceforge.net/openutils/?rev=3372&view=rev
Author: fgiust
Date: 2011-03-05 20:18:09 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-03-05 20:18:01 UTC (rev 3371)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-03-05 20:18:09 UTC (rev 3372)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.0</version>
+ <version>3.3.1-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 20:18:07
|
Revision: 3371
http://openutils.svn.sourceforge.net/openutils/?rev=3371&view=rev
Author: fgiust
Date: 2011-03-05 20:18:01 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-3.3.0
Added Paths:
-----------
tags/openutils-mgnlcriteria-3.3.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 20:17:46
|
Revision: 3370
http://openutils.svn.sourceforge.net/openutils/?rev=3370&view=rev
Author: fgiust
Date: 2011-03-05 20:17:40 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.0
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-03-05 20:08:02 UTC (rev 3369)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-03-05 20:17:40 UTC (rev 3370)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3.0</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.0</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 20:08:12
|
Revision: 3369
http://openutils.svn.sourceforge.net/openutils/?rev=3369&view=rev
Author: fgiust
Date: 2011-03-05 20:08:02 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -69,6 +69,8 @@
*/
private Logger log = LoggerFactory.getLogger(AdvancedResultImpl.class);
+ private final boolean applyLocalPaging;
+
/**
* @param jcrQueryResult
* @param itemsPerPage
@@ -85,13 +87,34 @@
HierarchyManager hm,
Query spellCheckerQuery)
{
+ this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, hm, spellCheckerQuery, false);
+ }
+
+ /**
+ * @param jcrQueryResult
+ * @param itemsPerPage
+ * @param pageNumberStartingFromOne
+ * @param statement
+ * @param hm
+ * @param spellCheckerQuery
+ * @param applyLocalPaging don't assume the result iterator is already paginated, do it "manually"
+ */
+ public AdvancedResultImpl(
+ QueryResultImpl jcrQueryResult,
+ int itemsPerPage,
+ int pageNumberStartingFromOne,
+ String statement,
+ HierarchyManager hm,
+ Query spellCheckerQuery,
+ boolean applyLocalPaging)
+ {
this.jcrQueryResult = jcrQueryResult;
this.itemsPerPage = itemsPerPage;
this.statement = statement;
this.hm = hm;
this.spellCheckerQuery = spellCheckerQuery;
-
this.pageNumberStartingFromOne = pageNumberStartingFromOne;
+ this.applyLocalPaging = applyLocalPaging;
}
/**
@@ -115,7 +138,7 @@
*/
public int getTotalSize()
{
- if (jcrQueryResult.getTotalSize() == -1 && itemsPerPage == 0)
+ if (jcrQueryResult.getTotalSize() == -1 && (itemsPerPage == 0 || applyLocalPaging))
{
try
{
@@ -155,6 +178,38 @@
throw jqe;
}
+ if (applyLocalPaging && itemsPerPage > 0)
+ {
+ final int offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
+
+ // removing preceding records
+ rows.skip(offset);
+
+ // removing folllowing records and alter getSize()
+ return new AccessibleResultItemResultIterator(rows, this.hm)
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasNext()
+ {
+ return super.getPosition() - offset < Math.min(super.getSize() - offset, itemsPerPage)
+ && super.hasNext();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public long getSize()
+ {
+ return Math.min(super.getSize() - offset, itemsPerPage);
+ }
+ };
+ }
+
return new AccessibleResultItemResultIterator(rows, this.hm);
}
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -26,6 +26,7 @@
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.Query;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils.XPathTextUtils;
@@ -77,7 +78,24 @@
public static AdvancedResultImpl execute(String stmt, String language, HierarchyManager hm, int maxResults,
int offset, String spellCheckString)
{
+ return execute(stmt, language, hm, maxResults, offset, spellCheckString, false);
+ }
+ /**
+ * Executes a jcr query.
+ * @param stmt the statement of the jcr query
+ * @param language the language of the jcr query
+ * @param hm the HirarchyManager for obtaining the QueryManager
+ * @param maxResults maximun number of results to retrieve
+ * @param offset the index of the first result to retrieve (0, 1, 2, ...)
+ * @param spellCheckString the input string used for spell checking
+ * @param forcePagingWithDocumentOrder see {@link Criteria#setForcePagingWithDocumentOrder(boolean)}
+ * @return the execution result
+ */
+ public static AdvancedResultImpl execute(String stmt, String language, HierarchyManager hm, int maxResults,
+ int offset, String spellCheckString, boolean forcePagingWithDocumentOrder)
+ {
+
Session jcrSession = hm.getWorkspace().getSession();
javax.jcr.query.QueryManager jcrQueryManager;
@@ -87,14 +105,17 @@
QueryImpl query = (QueryImpl) jcrQueryManager.createQuery(stmt, language);
- if (maxResults > 0)
+ if (!forcePagingWithDocumentOrder)
{
- query.setLimit(maxResults);
- }
+ if (maxResults > 0)
+ {
+ query.setLimit(maxResults);
+ }
- if (offset > 0)
- {
- query.setOffset(offset);
+ if (offset > 0)
+ {
+ query.setOffset(offset);
+ }
}
int pageNumberStartingFromOne = 1;
@@ -123,7 +144,8 @@
pageNumberStartingFromOne,
stmt,
hm,
- spellCheckerQuery);
+ spellCheckerQuery,
+ forcePagingWithDocumentOrder);
}
finally
{
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -161,4 +161,26 @@
* @return the generated xpath expression
*/
String toXpathExpression();
+
+ /**
+ * <p>
+ * Enable paging while keeping results sorted in document order.
+ * </p>
+ * <p>
+ * Document order is only applied by jackrabbit after the paginated result has been retrieved.
+ * </p>
+ * <p>
+ * This means that if you have 20 nodes and you want to retrieve them in 2 pages containing 10 elements, only the
+ * order of elements in a single page is kept (but the "first" 10 noted in the first page will not be the nodes you
+ * are expecting in document order). Setting this flag to true forces the retrieval of the full list of nodes and a
+ * post-pagination which will mimic the behaviour you get when an "order by" is specified.
+ * </p>
+ * <p>
+ * Warning: this has surely a performance hit, since jackrabbit applied document ordering by retrieving any single
+ * node (while normally pagination is applied directly on the luce index).
+ * </p>
+ * @param force true to force paging while keeping results sorted in document order
+ * @return this (for method chaining)
+ */
+ Criteria setForcePagingWithDocumentOrder(boolean force);
}
\ No newline at end of file
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -108,7 +108,7 @@
public AdvancedResult execute()
{
- return QueryExecutorHelper.execute(query, language, hm, maxResults, offset, spellCheckString);
+ return QueryExecutorHelper.execute(query, language, hm, maxResults, offset, spellCheckString, false);
}
}
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -68,6 +68,8 @@
protected String workspace = ContentRepository.WEBSITE;
+ protected boolean forcePagingWithDocumentOrder;
+
protected AbstractCriteriaImpl()
{
@@ -201,6 +203,15 @@
/**
* {@inheritDoc}
*/
+ public Criteria setForcePagingWithDocumentOrder(boolean force)
+ {
+ this.forcePagingWithDocumentOrder = force;
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public String toXpathExpression()
{
JCRMagnoliaCriteriaQueryTranslator translator = new JCRMagnoliaCriteriaQueryTranslator(this);
@@ -227,7 +238,8 @@
MgnlContext.getHierarchyManager(workspace),
maxResults,
offset,
- spellCheckString);
+ spellCheckString,
+ forcePagingWithDocumentOrder && this.orderEntries.isEmpty());
}
}
\ No newline at end of file
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -29,7 +29,6 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import org.testng.Assert;
@@ -84,10 +83,11 @@
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
criteria.setBasePath("//*[prop1='A' and prop2='B']/Lorem ipsum dolor sit amet");
criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
- criteria.addOrder(Order.desc("@jcr:score"));
+ // criteria.addOrder(Order.desc("@jcr:score"));
AdvancedResult advResult = criteria.execute();
// if not escaped properly it will crash
+ Assert.assertEquals(advResult.getItems().getSize(), 0);
Assert.assertEquals(advResult.getTotalSize(), 0);
}
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -77,7 +77,7 @@
try
{
String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test?')))] order by @jcr:score";
- advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, 10, 0, null);
+ advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, 10, 0, null, false);
}
catch (JCRQueryException e)
{
@@ -99,7 +99,7 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(ContentRepository.WEBSITE);
String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test\\?')))] order by @jcr:score";
- AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null);
+ AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 1);
Assert.assertEquals(advResult.getItems().next().getTitle(), "hello test? world");
@@ -114,11 +114,11 @@
AdvancedResultImpl advResult;
stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te?st')))] order by @jcr:score";
- advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null);
+ advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 0);
stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te\\?st')))] order by @jcr:score";
- advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null);
+ advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 1);
Assert.assertEquals(advResult.getItems().next().getTitle(), "hello te?st world");
}
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -108,7 +108,7 @@
AdvancedResult advResult = criteria.execute();
- // Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
@@ -133,20 +133,20 @@
criteria.setBasePath("/letters");
criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
criteria.setPaging(PAGINATION_LENGTH, 1);
+ criteria.setForcePagingWithDocumentOrder(true);
log.debug(criteria.toXpathExpression());
AdvancedResult advResult = criteria.execute();
- // Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
- Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH);
+ Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
int i = 0;
for (AdvancedResultItem currentResult : resultIterator)
{
- // log.warn("found " + currentResult.getTitle());
Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i], "Position "
+ i
+ ": found "
@@ -155,5 +155,7 @@
+ LETTERS_ARRAY[i]);
i++;
}
+
+ Assert.assertEquals(i, PAGINATION_LENGTH, "Wrong number of results returned by the iterator.");
}
}
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2011-03-05 18:41:17 UTC (rev 3368)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2011-03-05 20:08:02 UTC (rev 3369)
@@ -131,9 +131,9 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
- Assert.assertEquals(resultIterator.getSize(), 17);
Assert.assertEquals(resultIterator.next().getTitle(), "J");
+ Assert.assertEquals(resultIterator.getSize(), 17);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-03-05 19:43:13
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/changes> |
|
From: <hu...@op...> - 2011-03-05 19:43:09
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/changes> |
|
From: <hu...@op...> - 2011-03-05 18:43:07
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/changes> |
|
From: <hu...@op...> - 2011-03-05 18:43:03
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/changes> |
|
From: <fg...@us...> - 2011-03-05 18:41:26
|
Revision: 3368
http://openutils.svn.sourceforge.net/openutils/?rev=3368&view=rev
Author: fgiust
Date: 2011-03-05 18:41:17 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
CRIT-35 Returning the total number of elements with getTotalSize() also when jackrabbit doesn't, when no paging is used
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 17:10:36 UTC (rev 3367)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 18:41:17 UTC (rev 3368)
@@ -115,6 +115,17 @@
*/
public int getTotalSize()
{
+ if (jcrQueryResult.getTotalSize() == -1 && itemsPerPage == 0)
+ {
+ try
+ {
+ return (int) jcrQueryResult.getNodes().getSize();
+ }
+ catch (RepositoryException e)
+ {
+ // ignore, the standard total size will be returned
+ }
+ }
return jcrQueryResult.getTotalSize();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-03-05 17:43:45
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/changes> |
|
From: <hu...@op...> - 2011-03-05 17:43:43
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/changes> |
|
From: <fg...@us...> - 2011-03-05 17:10:42
|
Revision: 3367
http://openutils.svn.sourceforge.net/openutils/?rev=3367&view=rev
Author: fgiust
Date: 2011-03-05 17:10:36 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
don't expect a total size when no order is specified
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 17:06:30 UTC (rev 3366)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 17:10:36 UTC (rev 3367)
@@ -105,9 +105,10 @@
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
criteria.setBasePath("/letters");
criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+
AdvancedResult advResult = criteria.execute();
- Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+ // Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
@@ -137,7 +138,7 @@
AdvancedResult advResult = criteria.execute();
- Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+ // Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 17:06:37
|
Revision: 3366
http://openutils.svn.sourceforge.net/openutils/?rev=3366&view=rev
Author: fgiust
Date: 2011-03-05 17:06:30 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
add ordering (needed with jackrabbit 2.x)
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2011-03-05 17:01:30 UTC (rev 3365)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2011-03-05 17:06:30 UTC (rev 3366)
@@ -29,6 +29,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import org.testng.Assert;
@@ -83,6 +84,7 @@
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
criteria.setBasePath("//*[prop1='A' and prop2='B']/Lorem ipsum dolor sit amet");
criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
+ criteria.addOrder(Order.desc("@jcr:score"));
AdvancedResult advResult = criteria.execute();
// if not escaped properly it will crash
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 17:01:36
|
Revision: 3365
http://openutils.svn.sourceforge.net/openutils/?rev=3365&view=rev
Author: fgiust
Date: 2011-03-05 17:01:30 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
CRIT-34 document ordering
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-04 18:00:42 UTC (rev 3364)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-05 17:01:30 UTC (rev 3365)
@@ -132,6 +132,9 @@
criteria.setBasePath("/letters");
criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
criteria.setPaging(PAGINATION_LENGTH, 1);
+
+ log.debug(criteria.toXpathExpression());
+
AdvancedResult advResult = criteria.execute();
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
@@ -142,7 +145,13 @@
int i = 0;
for (AdvancedResultItem currentResult : resultIterator)
{
- Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i]);
+ // log.warn("found " + currentResult.getTitle());
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i], "Position "
+ + i
+ + ": found "
+ + currentResult.getTitle()
+ + " instead of "
+ + LETTERS_ARRAY[i]);
i++;
}
}
Modified: trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2011-03-04 18:00:42 UTC (rev 3364)
+++ trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2011-03-05 17:01:30 UTC (rev 3365)
@@ -30,7 +30,7 @@
<param name="cacheSize" value="1000" />
<param name="autoRepair" value="true" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
+ <param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
<param name="extractorPoolSize" value="3" />
<param name="extractorTimeout" value="100" />
@@ -65,7 +65,7 @@
<param name="autoRepair" value="true" />
<param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
+ <param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
<param name="extractorPoolSize" value="3" />
<param name="extractorTimeout" value="100" />
Modified: trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2011-03-04 18:00:42 UTC (rev 3364)
+++ trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2011-03-05 17:01:30 UTC (rev 3365)
@@ -30,7 +30,7 @@
<param name="cacheSize" value="1000" />
<param name="autoRepair" value="true" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
+ <param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
<param name="extractorPoolSize" value="3" />
<param name="extractorTimeout" value="100" />
@@ -65,7 +65,7 @@
<param name="autoRepair" value="true" />
<param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
+ <param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
<param name="extractorPoolSize" value="3" />
<param name="extractorTimeout" value="100" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-03-04 18:43:27
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/142/changes> |
