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...> - 2013-05-19 12:40:41
|
Revision: 4240
http://openutils.svn.sourceforge.net/openutils/?rev=4240&view=rev
Author: fgiust
Date: 2013-05-19 12:40:38 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update scm urls
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-elfunctions/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-bshd5/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-bshd5</url>
</scm>
<build>
<testResources>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-dbmigration/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-dbmigration</artifactId>
<name>openutils dbmigration</name>
@@ -28,9 +28,9 @@
</issueManagement>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-dbmigration</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-dbmigration</url>
</scm>
<dependencies>
<dependency>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-deployment/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
@@ -12,9 +12,9 @@
<description>Openutils deployment tools</description>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-deployment</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-deployment</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-deployment</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-deployment</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-deployment</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-deployment</url>
</scm>
<licenses>
<license>
Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-elfunctions/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,10 +24,10 @@
<url>http://jira.openmindlab.com/browse/ELFUNCTIONS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-elfunctions</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-elfunctions
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-elfunctions</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-elfunctions
</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-elfunctions</url>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-elfunctions</url>
</scm>
<build>
<plugins>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-log4j/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -6,7 +6,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-log4j</artifactId>
<packaging>jar</packaging>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
+++ trunk/openutils-maven-skin/pom.xml 2013-05-19 12:40:38 UTC (rev 4240)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-maven-skin</artifactId>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 12:34:14
|
Revision: 4239
http://openutils.svn.sourceforge.net/openutils/?rev=4239&view=rev
Author: fgiust
Date: 2013-05-19 12:34:11 +0000 (Sun, 19 May 2013)
Log Message:
-----------
upgrade to new criteria release
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -136,7 +136,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -156,12 +156,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -177,7 +177,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -8,10 +8,18 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
<dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ <dependency>
<name>mail</name>
<version>4.5/*</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -170,7 +170,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -24,11 +24,18 @@
</components>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
- <optional>true</optional>
</dependency>
<dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ <dependency>
<name>standard-templating-kit</name>
<version>1.2/*</version>
<optional>true</optional>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -96,7 +96,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -29,9 +29,17 @@
</components>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
</dependencies>
<repositories>
<repository>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -76,7 +76,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -7,8 +7,16 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -118,7 +118,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -5,4 +5,14 @@
<displayName>Magnolia utils module</displayName>
<description>Useful EL functions and generic Magnolia utilities</description>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ </dependencies>
</module>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:34:21
|
Revision: 4238
http://openutils.svn.sourceforge.net/openutils/?rev=4238&view=rev
Author: fgiust
Date: 2013-05-19 08:34:18 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:34:11 UTC (rev 4237)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>5.0.1</version>
+ <version>5.0.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:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.1</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.1</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcriteria-5.0.1</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</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-05-19 08:34:13
|
Revision: 4237
http://openutils.svn.sourceforge.net/openutils/?rev=4237&view=rev
Author: fgiust
Date: 2013-05-19 08:34:11 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-5.0.1
Added Paths:
-----------
tags/openutils-mgnlcriteria-5.0.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:34:06
|
Revision: 4236
http://openutils.svn.sourceforge.net/openutils/?rev=4236&view=rev
Author: fgiust
Date: 2013-05-19 08:34:03 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-5.0.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:34:03 UTC (rev 4236)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.1</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -24,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.1</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.1</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcriteria-5.0.1</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-05-19 08:28:36
|
Revision: 4235
http://openutils.svn.sourceforge.net/openutils/?rev=4235&view=rev
Author: fgiust
Date: 2013-05-19 08:28:33 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update parent
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/SYNC</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlbootstrapsync</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcache</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MGNLCAS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcas</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcas</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,9 +26,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CONTROLS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontrols</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
@@ -26,7 +26,7 @@
<scm>
<connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
<developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
<resources>
@@ -129,22 +129,7 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
- <!--
- no cycles
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>${jcr.version}</version>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -12,9 +12,9 @@
<name>openutils-mgnlext</name>
<version>5.0.0-SNAPSHOT</version>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlext</url>
</scm>
<licenses>
<license>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/GROOVY</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlgroovy</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnllms</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail </developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail </developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmail</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:33 UTC (rev 4235)
@@ -54,7 +54,7 @@
{
super.prepareTree(tree, browseMode, request);
- tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/ico16-mail.png");
+ tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/icons/ico16-mail.png");
tree.addItemType(ItemType.NT_FOLDER, Tree.ICONDOCROOT + "folder.gif");
tree.setDrawShifter(true); // for folders
}
Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="simplemail-text" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>76d6f1b3-b133-4072-8015-7b1d76fa5a3a</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Test paragraph</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/simplemail/simple-paragraph.ftl</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Simplemail paragraph</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>freemarker</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-19T23:36:58.317+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="simplemail-simple" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>2d0e29fd-dadc-4d20-a1bc-d5649dc3503b</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>it.openutils.mgnlutils.templating.ExtendedTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="repositories" sv:type="String">
- <sv:value>email</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/simplemail/simple.ftl</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Simple mail template</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>freemarker</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-14T17:42:07.883+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -26,10 +26,10 @@
<sv:value>2011-06-14T17:43:11.781+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-14T17:43:17.233+02:00</sv:value>
+ <sv:value>2013-05-01T22:23:03.069+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>simplemail-simple</sv:value>
+ <sv:value>simplemail:pages/simplemail-simple</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,8 +1,9 @@
-[#assign cms=JspTaglibs["cms-taglib"]] [@cms.mainBar dialog="simplemail-simple" /]
+[#assign cms=JspTaglibs["http://magnolia-cms.com/taglib/templating-components/cms"]]
<html>
<head>
<title>${content.title!}</title>
+[@cms.init /]
</head>
<body>
<table cellpadding="0" cellspacing="0" border="0" align="center" width="100%" bgcolor="#FFF">
@@ -26,13 +27,7 @@
</td>
<td width="620" valign="top" align="left" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff">
<div style="padding: 20px;">
-[@cms.contentNodeIterator contentNodeCollectionName="main"]
- [@cms.editBar /]
- [@cms.includeTemplate /]
-[/@cms.contentNodeIterator]
-[@cms.newBar contentNodeCollectionName="main" newLabel="New Content" paragraph="simplemail-text" /]
-
-
+[@cms.area name="main" /]
</div>
</td>
<td width="16" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmedia</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,9 +26,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrepoutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrepoutils</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrepoutils</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrepoutils</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrepoutils</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,9 +26,9 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrules</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlrules</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrules</url>
</scm>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstripes</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlstripes</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRUTS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstruts11</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstruts11</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstruts11</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstruts11</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlstruts11</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlstruts11</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,11 +25,11 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltagcloud
</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltagcloud
</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltagcloud</url>
</scm>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -14,9 +14,9 @@
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltasks</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltasks</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltasks</url>
</scm>
<licenses>
<license>
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -11,7 +11,7 @@
<name>Test utilities for Magnolia CMS</name>
<version>5.0.1-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
- <description>A collection testing utilities for Magnolia CMS</description>
+ <description>A collection of testing utilities for Magnolia CMS</description>
<url>http://www.openmindlab.com/lab/products/mgnltests.html</url>
<issueManagement>
<system>jira</system>
@@ -24,9 +24,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests </developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltests</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests </developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltests</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils </developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlutils</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils </developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlutils</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/pom.xml
===================================================================
--- magnoliamodules/trunk/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -30,6 +30,7 @@
<module>openutils-mgnlmedia</module>
<module>openutils-mgnlcriteria</module>
<module>openutils-mgnlrepoutils</module>
+ <module>openutils-mgnltests</module>
<module>openutils-mgnlutils</module>
<module>openutils-mgnltagcloud</module>
<module>openutils-mgnlrules</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:28:12
|
Revision: 4234
http://openutils.svn.sourceforge.net/openutils/?rev=4234&view=rev
Author: fgiust
Date: 2013-05-19 08:28:09 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update parent
Modified Paths:
--------------
trunk/openutils-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-spring/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-spring</artifactId>
<name>openutils spring tools</name>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing</artifactId>
<name>Openutils testing library</name>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing-junit/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>Openutils testing library (JUnit)</name>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing-testng/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>Openutils testing library (TestNG)</name>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing4dwr</artifactId>
<name>openutils dwr test utils</name>
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing4dwr-junit</artifactId>
<name>openutils testing4dwr (junit)</name>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing4dwr-testng</artifactId>
<name>openutils testing4dwr (testng)</name>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4web/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-testing4web</artifactId>
<name>Openutils testing4web</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:23:52
|
Revision: 4233
http://openutils.svn.sourceforge.net/openutils/?rev=4233&view=rev
Author: fgiust
Date: 2013-05-19 08:23:49 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-05-19 08:23:43 UTC (rev 4232)
+++ trunk/openutils-parent/pom.xml 2013-05-19 08:23:49 UTC (rev 4233)
@@ -4,14 +4,14 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.13</version>
+ <version>1.14-SNAPSHOT</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.13</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.13</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.13</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:23:46
|
Revision: 4232
http://openutils.svn.sourceforge.net/openutils/?rev=4232&view=rev
Author: fgiust
Date: 2013-05-19 08:23:43 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-parent-1.13
Added Paths:
-----------
tags/openutils-parent-1.13/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:23:38
|
Revision: 4231
http://openutils.svn.sourceforge.net/openutils/?rev=4231&view=rev
Author: fgiust
Date: 2013-05-19 08:23:35 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-parent-1.13
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-05-19 08:23:06 UTC (rev 4230)
+++ trunk/openutils-parent/pom.xml 2013-05-19 08:23:35 UTC (rev 4231)
@@ -4,14 +4,14 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.13-SNAPSHOT</version>
+ <version>1.13</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.13</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.13</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.13</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:23:10
|
Revision: 4230
http://openutils.svn.sourceforge.net/openutils/?rev=4230&view=rev
Author: fgiust
Date: 2013-05-19 08:23:06 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update copyright year
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
+++ trunk/openutils-parent/pom.xml 2013-05-19 08:23:06 UTC (rev 4230)
@@ -179,7 +179,7 @@
<include>src/**/*.java</include>
</includes>
<properties>
- <year>${project.inceptionYear}-2012</year>
+ <year>${project.inceptionYear}-2013</year>
<name>${project.name}</name>
<description>${project.description}</description>
<url>${project.url}</url>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:19:44
|
Revision: 4229
http://openutils.svn.sourceforge.net/openutils/?rev=4229&view=rev
Author: fgiust
Date: 2013-05-19 08:19:40 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update scm urls
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
trunk/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-parent/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -9,9 +9,9 @@
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-parent</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-parent</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-parent</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -125,7 +125,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>install</preparationGoals>
<remoteTagging>true</remoteTagging>
- <tagBase>https://openutils.svn.sourceforge.net/svnroot/openutils/tags</tagBase>
+ <tagBase>svn+ssh://svn.code.sf.net/p/openutils/code/tags</tagBase>
</configuration>
</plugin>
<plugin>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/TEST</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing</url>
</scm>
<build>
<plugins>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing-junit/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/TEST</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-junit</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-junit</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing-junit</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing-junit</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing-junit</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing-junit</url>
</scm>
<build>
<plugins>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing-testng/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/TEST</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-testng</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-testng</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing-testng</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing-testng</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing-testng</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing-testng</url>
</scm>
<build>
<plugins>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing4dwr/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -12,9 +12,9 @@
<version>2.0-SNAPSHOT</version>
<description>openutils test utils for dwr</description>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing4dwr</url>
</scm>
<dependencies>
<dependency>
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -12,9 +12,9 @@
<version>2.0-SNAPSHOT</version>
<description>openutils testing4dwr (junit)</description>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-junit</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-junit</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr-junit</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr-junit</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr-junit</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing4dwr-junit</url>
</scm>
<dependencies>
<dependency>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -12,9 +12,9 @@
<version>2.0-SNAPSHOT</version>
<description>openutils testing4dwr (testng)</description>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-testng</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-testng</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr-testng</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr-testng</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4dwr-testng</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing4dwr-testng</url>
</scm>
<dependencies>
<dependency>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/openutils-testing4web/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/TESTINGWEB</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4web</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4web</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4web</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4web</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-testing4web</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-testing4web</url>
</scm>
<build>
<plugins>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
+++ trunk/pom.xml 2013-05-19 08:19:40 UTC (rev 4229)
@@ -31,27 +31,5 @@
<module>openutils-testing4dwr-testng</module>
<module>openutils-dbmigration</module>
<module>openutils-elfunctions</module>
- <module>openutils-mgnlspring</module>
- <module>openutils-mgnlstripes</module>
- <module>openutils-mgnltasks</module>
- <module>openutils-mgnlbootstrapsync</module>
- <module>openutils-mgnlext</module>
- <module>openutils-mgnlcontrols</module>
- <module>openutils-mgnlmessages</module>
- <module>openutils-mgnlcache</module>
- <module>openutils-mgnlcas</module>
- <module>openutils-mgnlgroovy</module>
- <module>openutils-mgnlstruts11</module>
- <module>openutils-mgnlmedia</module>
- <module>openutils-mgnlcriteria</module>
- <module>openutils-mgnlrepoutils</module>
- <module>openutils-mgnlutils</module>
- <module>openutils-mgnltagcloud</module>
- <module>openutils-mgnlrules</module>
- <module>openutils-mgnlcontextmenu</module>
- <module>openutils-mgnllms</module>
- <module>openutils-mgnlmobile</module>
- <module>openutils-mgnlmail</module>
- <module>magnolia-test-webapp</module>
</modules>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-19 08:17:41
|
Revision: 4228
http://openutils.svn.sourceforge.net/openutils/?rev=4228&view=rev
Author: fgiust
Date: 2013-05-19 08:17:39 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-mgnlcriteria-5.0.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:41:51 UTC (rev 4227)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:17:39 UTC (rev 4228)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -8,7 +9,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>5.0.1</version>
+ <version>5.0.1-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url>
</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-05-18 16:41:54
|
Revision: 4227
http://openutils.svn.sourceforge.net/openutils/?rev=4227&view=rev
Author: fgiust
Date: 2013-05-18 16:41:51 +0000 (Sat, 18 May 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-5.0.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:34:05 UTC (rev 4226)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:41:51 UTC (rev 4227)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.1</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -24,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-5.0.1</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-05-18 16:34:09
|
Revision: 4226
http://openutils.svn.sourceforge.net/openutils/?rev=4226&view=rev
Author: fgiust
Date: 2013-05-18 16:34:05 +0000 (Sat, 18 May 2013)
Log Message:
-----------
update scm URL
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:31:12 UTC (rev 4225)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:34:05 UTC (rev 4226)
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url>
</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-05-18 16:31:15
|
Revision: 4225
http://openutils.svn.sourceforge.net/openutils/?rev=4225&view=rev
Author: fgiust
Date: 2013-05-18 16:31:12 +0000 (Sat, 18 May 2013)
Log Message:
-----------
added dependency to magnolia 4.5
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml 2013-05-18 16:21:46 UTC (rev 4224)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml 2013-05-18 16:31:12 UTC (rev 4225)
@@ -5,4 +5,10 @@
<displayName>Magnolia Criteria API</displayName>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ </dependencies>
</module>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-18 16:21:49
|
Revision: 4224
http://openutils.svn.sourceforge.net/openutils/?rev=4224&view=rev
Author: fgiust
Date: 2013-05-18 16:21:46 +0000 (Sat, 18 May 2013)
Log Message:
-----------
update license header
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndex.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/JCRMagnoliaCriteriaQueryTranslator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/JcrCompatUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/Latin1Analyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/ConjunctionTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:21:46 UTC (rev 4224)
@@ -73,7 +73,7 @@
<include>src/**/*.java</include>
</includes>
<properties>
- <year>${project.inceptionYear}-2011</year>
+ <year>${project.inceptionYear}-2013</year>
<name>${project.name}</name>
<description>${project.description}</description>
<url>${project.url}</url>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndex.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndex.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndex.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/JCRMagnoliaCriteriaQueryTranslator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/JCRMagnoliaCriteriaQueryTranslator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/JCRMagnoliaCriteriaQueryTranslator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
import info.magnolia.context.MgnlContext;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/JcrCompatUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/JcrCompatUtils.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/JcrCompatUtils.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/Latin1Analyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/Latin1Analyzer.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/Latin1Analyzer.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlcriteria.utils;
import info.magnolia.content2bean.Content2BeanException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrC...
[truncated message content] |
Revision: 4223
http://openutils.svn.sourceforge.net/openutils/?rev=4223&view=rev
Author: fgiust
Date: 2013-05-18 16:19:24 +0000 (Sat, 18 May 2013)
Log Message:
-----------
make get("handle") work
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:07:19 UTC (rev 4222)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
@@ -64,6 +64,8 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1401,4 +1403,39 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object get(Object key)
+ {
+ if (key == null)
+ {
+ return null;
+ }
+
+ String keystr = ObjectUtils.toString(key);
+
+ if (StringUtils.equals(keystr, "handle"))
+ {
+ keystr = "@path";
+ }
+
+ Object result = super.get(keystr);
+
+ if (result == null)
+ {
+ try
+ {
+ return PropertyUtils.getProperty(this, keystr);
+ }
+ catch (Throwable e)
+ {
+ // ignore
+ }
+ }
+
+ return result;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-05-18 16:07:22
|
Revision: 4222
http://openutils.svn.sourceforge.net/openutils/?rev=4222&view=rev
Author: fgiust
Date: 2013-05-18 16:07:19 +0000 (Sat, 18 May 2013)
Log Message:
-----------
removing magnolia 4.5 deprecated APIs and add compatibility with the Node interface + ContentMap
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:07:19 UTC (rev 4222)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -167,6 +168,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltests</artifactId>
+ <version>5.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,11 +19,13 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.PermissionUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import java.util.NoSuchElementException;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.RowIterator;
@@ -53,9 +55,9 @@
/**
*
*/
- public AccessibleResultItemResultIterator(RowIterator rowIterator, HierarchyManager hm)
+ public AccessibleResultItemResultIterator(RowIterator rowIterator)
{
- super(rowIterator, hm);
+ super(rowIterator);
}
/**
@@ -78,10 +80,20 @@
do
{
next = super.next();
- if (!PermissionUtil.isGranted(hm.getWorkspace().getName(), next.getHandle(), Session.ACTION_READ))
+ try
{
- next = null;
+ if (!PermissionUtil.isGranted(
+ next.getSession().getWorkspace().getName(),
+ NodeUtil.getPathIfPossible(next.getJCRNode()),
+ Session.ACTION_READ))
+ {
+ next = null;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
while (next == null && super.hasNext());
// return true if a next result exists and it is accessible
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,9 +19,9 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
@@ -37,6 +37,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIteratorImpl;
import net.sourceforge.openutils.mgnlcriteria.utils.JcrCompatUtils;
+import net.sourceforge.openutils.mgnlcriteria.utils.ToBeanUtils;
import org.apache.jackrabbit.core.query.lucene.QueryResultImpl;
import org.slf4j.Logger;
@@ -58,15 +59,10 @@
private final String statement;
- private HierarchyManager hm;
-
private String spellCheckerSuggestion;
private final Query spellCheckerQuery;
- /**
- * Logger.
- */
private Logger log = LoggerFactory.getLogger(AdvancedResultImpl.class);
private final boolean applyLocalPaging;
@@ -86,10 +82,9 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery)
{
- this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, hm, spellCheckerQuery, false);
+ this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, spellCheckerQuery, false);
}
/**
@@ -106,19 +101,10 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery,
boolean applyLocalPaging)
{
- this(
- jcrQueryResult,
- itemsPerPage,
- pageNumberStartingFromOne,
- statement,
- hm,
- spellCheckerQuery,
- applyLocalPaging,
- 0);
+ this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, spellCheckerQuery, applyLocalPaging, 0);
}
/**
@@ -136,7 +122,6 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery,
boolean applyLocalPaging,
int offset)
@@ -144,7 +129,6 @@
this.jcrQueryResult = jcrQueryResult;
this.itemsPerPage = itemsPerPage;
this.statement = statement;
- this.hm = hm;
this.spellCheckerQuery = spellCheckerQuery;
this.pageNumberStartingFromOne = pageNumberStartingFromOne;
this.applyLocalPaging = applyLocalPaging;
@@ -223,7 +207,7 @@
rows.skip(offset);
// removing folllowing records and alter getSize()
- return new AccessibleResultItemResultIterator(rows, this.hm)
+ return new AccessibleResultItemResultIterator(rows)
{
/**
@@ -246,7 +230,7 @@
};
}
- return new AccessibleResultItemResultIterator(rows, this.hm);
+ return new AccessibleResultItemResultIterator(rows);
}
/**
@@ -327,7 +311,7 @@
rows.skip(offset);
// removing folllowing records and alter getSize()
- return new ResultIteratorImpl<K>(rows, this.hm)
+ return new ResultIteratorImpl<K>(rows)
{
/**
@@ -360,24 +344,17 @@
return null;
}
- return (K) Content2BeanUtil.toBean(
- new AdvancedResultItemImpl(row, jcrNode, this.hm),
- true,
- theclass);
+ return (K) ToBeanUtils.toBean(new AdvancedResultItemImpl(row, jcrNode), true, theclass);
}
catch (RepositoryException e)
{
- throw new RuntimeException(e);
+ throw new RuntimeRepositoryException(e);
}
- catch (Content2BeanException e)
- {
- throw new RuntimeException(e);
- }
}
};
}
- return new ResultIteratorImpl<K>(rows, hm)
+ return new ResultIteratorImpl<K>(rows)
{
@SuppressWarnings("unchecked")
@@ -392,19 +369,12 @@
return null;
}
- return (K) Content2BeanUtil.toBean(
- new AdvancedResultItemImpl(row, jcrNode, this.hm),
- true,
- theclass);
+ return (K) ToBeanUtils.toBean(new AdvancedResultItemImpl(row, jcrNode), true, theclass);
}
catch (RepositoryException e)
{
- throw new RuntimeException(e);
+ throw new RuntimeRepositoryException(e);
}
- catch (Content2BeanException e)
- {
- throw new RuntimeException(e);
- }
}
};
}
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,17 +19,47 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.jcr.Binary;
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.InvalidLifecycleTransitionException;
import javax.jcr.Item;
+import javax.jcr.ItemExistsException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.ItemVisitor;
+import javax.jcr.MergeException;
+import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.ReferentialIntegrityException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
+import javax.jcr.lock.Lock;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.query.Row;
+import javax.jcr.version.ActivityViolationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionException;
+import javax.jcr.version.VersionHistory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
@@ -42,11 +72,13 @@
* @author fgiust
* @version $Id$
*/
-public class AdvancedResultItemImpl extends MappedDefaultContent implements AdvancedResultItem
+public class AdvancedResultItemImpl extends ContentMap implements AdvancedResultItem
{
private final Row row;
+ private final Node node;
+
/**
* Logger.
*/
@@ -62,11 +94,10 @@
* @throws IllegalStateException
* @throws IllegalArgumentException
*/
- public AdvancedResultItemImpl(Row row, Item item, HierarchyManager hierarchyManager)
- throws RepositoryException,
- AccessDeniedException
+ public AdvancedResultItemImpl(Row row, Item item) throws RepositoryException, AccessDeniedException
{
- super((Node) item, hierarchyManager);
+ super(new I18nNodeWrapper((Node) item));
+ this.node = new I18nNodeWrapper((Node) item);
this.row = row;
}
@@ -143,53 +174,1231 @@
*/
public double getScore(String selector)
{
-
- Method jcrRowGetScore = null;
+ if (selector == null)
+ {
+ try
+ {
+ return row.getScore();
+ }
+ catch (RepositoryException e)
+ {
+ log.warn("unable to extract score from {}", row);
+ }
+ }
try
{
- jcrRowGetScore = row.getClass().getDeclaredMethod("getScore", new Class[]{String.class });
- jcrRowGetScore.setAccessible(true);
+ return row.getScore(selector);
}
- catch (SecurityException e)
+ catch (RepositoryException e)
{
+ log.warn("unable to extract score from {} using selector {}", row, selector);
}
- catch (NoSuchMethodException e)
+
+ return 0;
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getPath()
+ */
+ public String getPath() throws RepositoryException
+ {
+ return node.getPath();
+ }
+
+ /**
+ * @ * @see javax.jcr.Item#getName()
+ */
+ public String getName()
+ {
+ try
{
+ return node.getName();
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
- if (jcrRowGetScore != null)
+ /**
+ * @param depth
+ * @return
+ * @throws ItemNotFoundException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getAncestor(int)
+ */
+ public Item getAncestor(int depth) throws ItemNotFoundException, javax.jcr.AccessDeniedException,
+ RepositoryException
+ {
+ return node.getAncestor(depth);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws ItemExistsException
+ * @throws PathNotFoundException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#addNode(java.lang.String)
+ */
+ public Node addNode(String relPath) throws ItemExistsException, PathNotFoundException, VersionException,
+ ConstraintViolationException, LockException, RepositoryException
+ {
+ return node.addNode(relPath);
+ }
+
+ /**
+ * @return
+ * @throws ItemNotFoundException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getParent()
+ */
+ public Node getParent() throws ItemNotFoundException, javax.jcr.AccessDeniedException, RepositoryException
+ {
+ return node.getParent();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getDepth()
+ */
+ public int getDepth() throws RepositoryException
+ {
+ return node.getDepth();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getSession()
+ */
+ public Session getSession() throws RepositoryException
+ {
+ return node.getSession();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isNode()
+ */
+ public boolean isNode()
+ {
+ return node.isNode();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isNew()
+ */
+ public boolean isNew()
+ {
+ return node.isNew();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isModified()
+ */
+ public boolean isModified()
+ {
+ return node.isModified();
+ }
+
+ /**
+ * @param otherItem
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#isSame(javax.jcr.Item)
+ */
+ public boolean isSame(Item otherItem) throws RepositoryException
+ {
+ return node.isSame(otherItem);
+ }
+
+ /**
+ * @param relPath
+ * @param primaryNodeTypeName
+ * @return
+ * @throws ItemExistsException
+ * @throws PathNotFoundException
+ * @throws NoSuchNodeTypeException
+ * @throws LockException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#addNode(java.lang.String, java.lang.String)
+ */
+ public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException,
+ NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException
+ {
+ return node.addNode(relPath, primaryNodeTypeName);
+ }
+
+ /**
+ * @param visitor
+ * @throws RepositoryException
+ * @see javax.jcr.Item#accept(javax.jcr.ItemVisitor)
+ */
+ public void accept(ItemVisitor visitor) throws RepositoryException
+ {
+ node.accept(visitor);
+ }
+
+ /**
+ * @throws AccessDeniedException
+ * @throws ItemExistsException
+ * @throws ConstraintViolationException
+ * @throws InvalidItemStateException
+ * @throws ReferentialIntegrityException
+ * @throws VersionException
+ * @throws LockException
+ * @throws NoSuchNodeTypeException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Item#save()
+ */
+ @Deprecated
+ public void save() throws javax.jcr.AccessDeniedException, ItemExistsException, ConstraintViolationException,
+ InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException,
+ NoSuchNodeTypeException, RepositoryException
+ {
+ node.save();
+ }
+
+ /**
+ * @param srcChildRelPath
+ * @param destChildRelPath
+ * @throws UnsupportedRepositoryOperationException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws ItemNotFoundException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#orderBefore(java.lang.String, java.lang.String)
+ */
+ public void orderBefore(String srcChildRelPath, String destChildRelPath)
+ throws UnsupportedRepositoryOperationException, VersionException, ConstraintViolationException,
+ ItemNotFoundException, LockException, RepositoryException
+ {
+ node.orderBefore(srcChildRelPath, destChildRelPath);
+ }
+
+ /**
+ * @param keepChanges
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#refresh(boolean)
+ */
+ public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException
+ {
+ node.refresh(keepChanges);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value)
+ */
+ public Property setProperty(String name, Value value) throws ValueFormatException, VersionException, LockException,
+ ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#remove()
+ */
+ public void remove() throws VersionException, LockException, ConstraintViolationException,
+ javax.jcr.AccessDeniedException, RepositoryException
+ {
+ node.remove();
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value, int)
+ */
+ public Property setProperty(String name, Value value, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value, type);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[])
+ */
+ public Property setProperty(String name, Value[] values) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[], int)
+ */
+ public Property setProperty(String name, Value[] values, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values, type);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[])
+ */
+ public Property setProperty(String name, String[] values) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[], int)
+ */
+ public Property setProperty(String name, String[] values, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values, type);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String)
+ */
+ public Property setProperty(String name, String value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String, int)
+ */
+ public Property setProperty(String name, String value, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value, type);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.io.InputStream)
+ */
+ @Deprecated
+ public Property setProperty(String name, InputStream value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Binary)
+ */
+ public Property setProperty(String name, Binary value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, boolean)
+ */
+ public Property setProperty(String name, boolean value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, double)
+ */
+ public Property setProperty(String name, double value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.math.BigDecimal)
+ */
+ public Property setProperty(String name, BigDecimal value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, long)
+ */
+ public Property setProperty(String name, long value) throws ValueFormatException, VersionException, LockException,
+ ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.util.Calendar)
+ */
+ public Property setProperty(String name, Calendar value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Node)
+ */
+ public Property setProperty(String name, Node value) throws ValueFormatException, VersionException, LockException,
+ ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws PathNotFoundException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getNode(java.lang.String)
+ */
+ public Node getNode(String relPath) throws PathNotFoundException, RepositoryException
+ {
+ return node.getNode(relPath);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getNodes()
+ */
+ public NodeIterator getNodes() throws RepositoryException
+ {
+ return node.getNodes();
+ }
+
+ /**
+ * @param namePattern
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getNodes(java.lang.String)
+ */
+ public NodeIterator getNodes(String namePattern) throws RepositoryException
+ {
+ return node.getNodes(namePattern);
+ }
+
+ /**
+ * @param nameGlobs
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getNodes(java.lang.String[])
+ */
+ public NodeIterator getNodes(String[] nameGlobs) throws RepositoryException
+ {
+ return node.getNodes(nameGlobs);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws PathNotFoundException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getProperty(java.lang.String)
+ */
+ public Property getProperty(String relPath) throws PathNotFoundException, RepositoryException
+ {
+ return node.getProperty(relPath);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getProperties()
+ */
+ public PropertyIterator getProperties() throws RepositoryException
+ {
+ return node.getProperties();
+ }
+
+ /**
+ * @param namePattern
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getProperties(java.lang.String)
+ */
+ public PropertyIterator getProperties(String namePattern) throws RepositoryException
+ {
+ return node.getProperties(namePattern);
+ }
+
+ /**
+ * @param nameGlobs
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getProperties(java.lang.String[])
+ */
+ public PropertyIterator getProperties(String[] nameGlobs) throws RepositoryException
+ {
+ return node.getProperties(nameGlobs);
+ }
+
+ /**
+ * @return
+ * @throws ItemNotFoundException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getPrimaryItem()
+ */
+ public Item getPrimaryItem() throws ItemNotFoundException, RepositoryException
+ {
+ return node.getPrimaryItem();
+ }
+
+ /**
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#getUUID()
+ */
+ @Deprecated
+ public String getUUID() throws UnsupportedRepositoryOperationException, RepositoryException
+ {
+ return node.getUUID();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getIdentifier()
+ */
+ public String getIdentifier() throws RepositoryException
+ {
+ return node.getIdentifier();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getIndex()
+ */
+ public int getIndex() throws RepositoryException
+ {
+ return node.getIndex();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getReferences()
+ */
+ public PropertyIterator getReferences() throws RepositoryException
+ {
+ return node.getReferences();
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getReferences(java.lang.String)
+ */
+ public PropertyIterator getReferences(String name) throws RepositoryException
+ {
+ return node.getReferences(name);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getWeakReferences()
+ */
+ public PropertyIterator getWeakReferences() throws RepositoryException
+ {
+ return node.getWeakReferences();
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getWeakReferences(java.lang.String)
+ */
+ public PropertyIterator getWeakReferences(String name) throws RepositoryException
+ {
+ return node.getWeakReferences(name);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#hasNode(java.lang.String)
+ */
+ public boolean hasNode(String relPath) throws RepositoryException
+ {
+ return node.hasNode(relPath);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#hasProperty(java.lang.String)
+ */
+ public boolean hasProperty(String relPath) throws RepositoryException
+ {
+ return node.hasProperty(relPath);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#hasNodes()
+ */
+ public boolean hasNodes() throws RepositoryException
+ {
+ return node.hasNodes();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#hasProperties()
+ */
+ public boolean hasProperties() throws RepositoryException
+ {
+ return node.hasProperties();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getPrimaryNodeType()
+ */
+ public NodeType getPrimaryNodeType() throws RepositoryException
+ {
+ return node.getPrimaryNodeType();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getMixinNodeTypes()
+ */
+ public NodeType[] getMixinNodeTypes() throws RepositoryException
+ {
+ return node.getMixinNodeTypes();
+ }
+
+ /**
+ * @param nodeTypeName
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#isNodeType(java.lang.String)
+ */
+ public boolean isNodeType(String nodeTypeName) throws RepositoryException
+ {
+ return node.isNodeType(nodeTypeName);
+ }
+
+ /**
+ * @param nodeTypeName
+ * @throws NoSuchNodeTypeException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setPrimaryType(java.lang.String)
+ */
+ public void setPrimaryType(String nodeTypeName) throws NoSuchNodeTypeException, VersionException,
+ ConstraintViolationException, LockException, RepositoryException
+ {
+ node.setPrimaryType(nodeTypeName);
+ }
+
+ /**
+ * @param mixinName
+ * @throws NoSuchNodeTypeException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#addMixin(java.lang.String)
+ */
+ public void addMixin(String mixinName) throws NoSuchNodeTypeException, VersionException,
+ ConstraintViolationException, LockException, RepositoryException
+ {
+ node.addMixin(mixinName);
+ }
+
+ /**
+ * @param mixinName
+ * @throws NoSuchNodeTypeException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#removeMixin(java.lang.String)
+ */
+ public void removeMixin(String mixinName) throws NoSuchNodeTypeException, VersionException,
+ ConstraintViolationException, LockException, RepositoryException
+ {
+ node.removeMixin(mixinName);
+ }
+
+ /**
+ * @param mixinName
+ * @return
+ * @throws NoSuchNodeTypeException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#canAddMixin(java.lang.String)
+ */
+ public boolean canAddMixin(String mixinName) throws NoSuchNodeTypeException, RepositoryException
+ {
+ return node.canAddMixin(mixinName);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getDefinition()
+ */
+ public NodeDefinition getDefinition() throws RepositoryException
+ {
+ return node.getDefinition();
+ }
+
+ /**
+ * @return
+ * @throws VersionException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws InvalidItemStateException
+ * @throws LockException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#checkin()
+ */
+ @Deprecated
+ public Version checkin() throws VersionException, UnsupportedRepositoryOperationException,
+ InvalidItemStateException, LockException, RepositoryException
+ {
+ return node.checkin();
+ }
+
+ /**
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws ActivityViolationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#checkout()
+ */
+ @Deprecated
+ public void checkout() throws UnsupportedRepositoryOperationException, LockException, ActivityViolationException,
+ RepositoryException
+ {
+ node.checkout();
+ }
+
+ /**
+ * @param version
+ * @throws VersionException
+ * @throws InvalidItemStateException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#doneMerge(javax.jcr.version.Version)
+ */
+ @Deprecated
+ public void doneMerge(Version version) throws VersionException, InvalidItemStateException,
+ UnsupportedRepositoryOperationException, RepositoryException
+ {
+ node.doneMerge(version);
+ }
+
+ /**
+ * @param version
+ * @throws VersionException
+ * @throws InvalidItemStateException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#cancelMerge(javax.jcr.version.Version)
+ */
+ @Deprecated
+ public void cancelMerge(Version version) throws VersionException, InvalidItemStateException,
+ UnsupportedRepositoryOperationException, RepositoryException
+ {
+ node.cancelMerge(version);
+ }
+
+ /**
+ * @param srcWorkspace
+ * @throws NoSuchWorkspaceException
+ * @throws AccessDeniedException
+ * @throws LockException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#update(java.lang.String)
+ */
+ public void update(String srcWorkspace) throws NoSuchWorkspaceException, javax.jcr.AccessDeniedException,
+ LockException, InvalidItemStateException, RepositoryException
+ {
+ node.update(srcWorkspace);
+ }
+
+ /**
+ * @param srcWorkspace
+ * @param bestEffort
+ * @return
+ * @throws NoSuchWorkspaceException
+ * @throws AccessDeniedException
+ * @throws MergeException
+ * @throws LockException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#merge(java.lang.String, boolean)
+ */
+ @Deprecated
+ public NodeIterator merge(String srcWorkspace, boolean bestEffort) throws NoSuchWorkspaceException,
+ javax.jcr.AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException
+ {
+ return node.merge(srcWorkspace, bestEffort);
+ }
+
+ /**
+ * @param workspaceName
+ * @return
+ * @throws ItemNotFoundException
+ * @throws NoSuchWorkspaceException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getCorrespondingNodePath(java.lang.String)
+ */
+ public String getCorrespondingNodePath(String workspaceName) throws ItemNotFoundException,
+ NoSuchWorkspaceException, javax.jcr.AccessDeniedException, RepositoryException
+ {
+ return node.getCorrespondingNodePath(workspaceName);
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getSharedSet()
+ */
+ public NodeIterator getSharedSet() throws RepositoryException
+ {
+ return node.getSharedSet();
+ }
+
+ /**
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#removeSharedSet()
+ */
+ public void removeSharedSet() throws VersionException, LockException, ConstraintViolationException,
+ RepositoryException
+ {
+ node.removeSharedSet();
+ }
+
+ /**
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#removeShare()
+ */
+ public void removeShare() throws VersionException, LockException, ConstraintViolationException, RepositoryException
+ {
+ node.removeShare();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#isCheckedOut()
+ */
+ public boolean isCheckedOut() throws RepositoryException
+ {
+ return node.isCheckedOut();
+ }
+
+ /**
+ * @param versionName
+ * @param removeExisting
+ * @throws VersionException
+ * @throws ItemExistsException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#restore(java.lang.String, boolean)
+ */
+ @Deprecated
+ public void restore(String versionName, boolean removeExisting) throws VersionException, ItemExistsException,
+ UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException
+ {
+ node.restore(versionName, removeExisting);
+ }
+
+ /**
+ * @param version
+ * @param removeExisting
+ * @throws VersionException
+ * @throws ItemExistsException
+ * @throws InvalidItemStateException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#restore(javax.jcr.version.Version, boolean)
+ */
+ @Deprecated
+ public void restore(Version version, boolean removeExisting) throws VersionException, ItemExistsException,
+ InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException
+ {
+ node.restore(version, removeExisting);
+ }
+
+ /**
+ * @param version
+ * @param relPath
+ * @param removeExisting
+ * @throws PathNotFoundException
+ * @throws ItemExistsException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#restore(javax.jcr.version.Version, java.lang.String, boolean)
+ */
+ @Deprecated
+ public void restore(Version version, String relPath, boolean removeExisting) throws PathNotFoundException,
+ ItemExistsException, VersionException, ConstraintViolationException, UnsupportedRepositoryOperationException,
+ LockException, InvalidItemStateException, RepositoryException
+ {
+ node.restore(version, relPath, removeExisting);
+ }
+
+ /**
+ * @param versionLabel
+ * @param removeExisting
+ * @throws VersionException
+ * @throws ItemExistsException
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#restoreByLabel(java.lang.String, boolean)
+ */
+ @Deprecated
+ public void restoreByLabel(String versionLabel, boolean removeExisting) throws VersionException,
+ ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException,
+ RepositoryException
+ {
+ node.restoreByLabel(versionLabel, removeExisting);
+ }
+
+ /**
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#getVersionHistory()
+ */
+ @Deprecated
+ public VersionHistory getVersionHistory() throws UnsupportedRepositoryOperationException, RepositoryException
+ {
+ return node.getVersionHistory();
+ }
+
+ /**
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#getBaseVersion()
+ */
+ @Deprecated
+ public Version getBaseVersion() throws UnsupportedRepositoryOperationException, RepositoryException
+ {
+ return node.getBaseVersion();
+ }
+
+ /**
+ * @param isDeep
+ * @param isSessionScoped
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws AccessDeniedException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#lock(boolean, boolean)
+ */
+ @Deprecated
+ public Lock lock(boolean isDeep, boolean isSessionScoped) throws UnsupportedRepositoryOperationException,
+ LockException, javax.jcr.AccessDeniedException, InvalidItemStateException, RepositoryException
+ {
+ return node.lock(isDeep, isSessionScoped);
+ }
+
+ /**
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#getLock()
+ */
+ @Deprecated
+ public Lock getLock() throws UnsupportedRepositoryOperationException, LockException,
+ javax.jcr.AccessDeniedException, RepositoryException
+ {
+ return node.getLock();
+ }
+
+ /**
+ * @throws UnsupportedRepositoryOperationException
+ * @throws LockException
+ * @throws AccessDeniedException
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#unlock()
+ */
+ @Deprecated
+ public void unlock() throws UnsupportedRepositoryOperationException, LockException,
+ javax.jcr.AccessDeniedException, InvalidItemStateException, RepositoryException
+ {
+ node.unlock();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#holdsLock()
+ */
+ @Deprecated
+ public boolean holdsLock() throws RepositoryException
+ {
+ return node.holdsLock();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Node#isLocked()
+ */
+ public boolean isLocked() throws RepositoryException
+ {
+ return node.isLocked();
+ }
+
+ /**
+ * @param transition
+ * @throws UnsupportedRepositoryOperationException
+ * @throws InvalidLifecycleTransitionException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#followLifecycleTransition(java.lang.String)
+ */
+ public void followLifecycleTransition(String transition) throws UnsupportedRepositoryOperationException,
+ InvalidLifecycleTransitionException, RepositoryException
+ {
+ node.followLifecycleTransition(transition);
+ }
+
+ /**
+ * @return
+ * @throws UnsupportedRepositoryOperationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#getAllowedLifecycleTransistions()
+ */
+ public String[] getAllowedLifecycleTransistions() throws UnsupportedRepositoryOperationException,
+ RepositoryException
+ {
+ return node.getAllowedLifecycleTransistions();
+ }
+
+ public String getTitle()
+ {
+ try
{
- try
+ if (node.hasProperty("title"))
{
- if (selector == null)
- {
- return (Double) PropertyUtils.getSimpleProperty(row, "score");
- }
- return (Double) jcrRowGetScore.invoke(row, new Object[]{selector });
+ return node.getProperty("title").getString();
}
- catch (IllegalArgumentException e)
- {
- log.warn("Error getting score for " + this.getHandle(), e);
- }
- catch (IllegalAccessException e)
- {
- log.warn("Error getting score for " + this.getHandle(), e);
- }
- catch (InvocationTargetException e)
- {
- log.warn("Error getting score for " + this.getHandle(), e.getTargetException());
- }
- catch (NoSuchMethodException e)
- {
- log.warn("Error getting score for " + this.getHandle(), e);
- }
}
- else
+ catch (RepositoryException e)
{
- log
- .error("Unsupported version of jackrabbit detected, you need at least 1.6.x or a jcr 2.0 compliant version");
+ throw new RuntimeRepositoryException(e);
}
- return 0;
+
+ return null;
}
+ public String getHandle()
+ {
+ try
+ {
+ return node.getPath();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
}
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
import javax.jcr.Item;
@@ -44,9 +43,9 @@
* @param rowIterator
* @param hm
*/
- public AdvancedResultItemResultIterator(RowIterator rowIterator, HierarchyManager hm)
+ public AdvancedResultItemResultIterator(RowIterator rowIterator)
{
- super(rowIterator, hm);
+ super(rowIterator);
}
/**
@@ -63,7 +62,7 @@
return null;
}
- return new AdvancedResultItemImpl(row, jcrNode, this.hm);
+ return new AdvancedResultItemImpl(row, jcrNode);
}
catch (AccessDeniedException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.DefaultContent;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
@@ -50,6 +49,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class MappedDefaultContent extends DefaultContent implements Map<String, Object>
{
@@ -64,7 +64,7 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- public MappedDefaultContent(Node elem, HierarchyManager hierarchyManager)
+ public MappedDefaultContent(Node elem)
throws RepositoryException,
AccessDeniedException
{
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
-
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
@@ -69,34 +67,33 @@
* 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 jcrSession the Session
* @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
* @return the execution result
*/
- public static AdvancedResultImpl execute(String stmt, String language, HierarchyManager hm, int maxResults,
+ public static AdvancedResultImpl execute(String stmt, String language, Session jcrSession, int maxResults,
int offset, String spellCheckString)
{
- return execute(stmt, language, hm, maxResults, offset, spellCheckString, false);
+ return execute(stmt, language, jcrSession, 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 jcrSession the Session
* @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,
+ @SuppressWarnings("deprecation")
+ public static AdvancedResultImpl execute(String stmt, String lan...
[truncated message content] |
|
From: <fg...@us...> - 2013-04-05 20:56:13
|
Revision: 4221
http://openutils.svn.sourceforge.net/openutils/?rev=4221&view=rev
Author: fgiust
Date: 2013-04-05 20:56:05 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-05 20:55:53 UTC (rev 4220)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-05 20:56:05 UTC (rev 4221)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltagcloud</artifactId>
<name>Tagcloud module for Magnolia CMS</name>
- <version>5.0.1</version>
+ <version>5.0.2-SNAPSHOT</version>
<description>A module for managing tag clouds for Magnolia CMS</description>
<licenses>
<license>
@@ -25,11 +25,11 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.1
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.1
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.1</url>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</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...> - 2013-04-05 20:56:00
|
Revision: 4220
http://openutils.svn.sourceforge.net/openutils/?rev=4220&view=rev
Author: fgiust
Date: 2013-04-05 20:55:53 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnltagcloud-5.0.1
Added Paths:
-----------
tags/openutils-mgnltagcloud-5.0.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-04-05 20:55:35
|
Revision: 4219
http://openutils.svn.sourceforge.net/openutils/?rev=4219&view=rev
Author: fgiust
Date: 2013-04-05 20:55:25 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltagcloud-5.0.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-05 20:53:53 UTC (rev 4218)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-05 20:55:25 UTC (rev 4219)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -11,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltagcloud</artifactId>
<name>Tagcloud module for Magnolia CMS</name>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.1</version>
<description>A module for managing tag clouds for Magnolia CMS</description>
<licenses>
<license>
@@ -26,11 +25,11 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.1
</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.1
</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.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...> - 2013-04-05 20:54:01
|
Revision: 4218
http://openutils.svn.sourceforge.net/openutils/?rev=4218&view=rev
Author: fgiust
Date: 2013-04-05 20:53:53 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
license header (to avoid build failure)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java 2013-04-05 20:50:34 UTC (rev 4217)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java 2013-04-05 20:53:53 UTC (rev 4218)
@@ -1,3 +1,22 @@
+/**
+ *
+ * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
/**
* Bobo Browse Engine - High performance faceted/parametric search implementation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-04-05 20:50:48
|
Revision: 4217
http://openutils.svn.sourceforge.net/openutils/?rev=4217&view=rev
Author: fgiust
Date: 2013-04-05 20:50:34 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
TAGCLOUD-20 fix component instantiations on magnolia 4.5 + update samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/
magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.pages.sampleTagcloud.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-05 20:50:34 UTC (rev 4217)
@@ -145,7 +145,7 @@
<dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
- <version>3.2.0</version>
+ <version>2.5.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -201,11 +201,13 @@
</exclusion>
</exclusions>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>3.6.0</version><!-- forces version 3.6, used in jackrabbit 2.6 (bobo-browse 3.2.0 actually depends on lucene 3.5) -->
+ <version>3.6.0</version>
</dependency>
+ -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -227,6 +229,6 @@
</dependencies>
<properties>
<magnolia.version>4.5.6</magnolia.version>
- <jackrabbit.version>2.6.0</jackrabbit.version>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Copied: magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java (from rev 4216, magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/lucene36-patch/BoboIndexReader.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -0,0 +1,895 @@
+// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
+/**
+ * Bobo Browse Engine - High performance faceted/parametric search implementation
+ * that handles various types of semi-structured data. Written in Java.
+ *
+ * Copyright (C) 2005-2006 John Wang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * To contact the project administrators for the bobo-browse project,
+ * please go to https://sourceforge.net/projects/bobo-browse/, or
+ * send mail to ow...@br....
+ */
+
+package com.browseengine.bobo.api;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.SegmentReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.ReaderUtil;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
+
+
+/**
+ * bobo browse index reader
+ */
+public class BoboIndexReader extends FilterIndexReader
+{
+
+ private static final String SPRING_CONFIG = "bobo.spring";
+
+ private static Logger logger = Logger.getLogger(BoboIndexReader.class);
+
+ protected Map<String, FacetHandler< ? >> _facetHandlerMap;
+
+ protected Collection<FacetHandler< ? >> _facetHandlers;
+
+ protected Collection<RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactories;
+
+ protected Map<String, RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactoryMap;
+
+ protected WorkArea _workArea;
+
+ protected IndexReader _srcReader;
+
+ protected BoboIndexReader[] _subReaders = null;
+
+ protected int[] _starts = null;
+
+ private Directory _dir = null;
+
+ private final Map<String, Object> _facetDataMap = new HashMap<String, Object>();
+
+ private final ThreadLocal<Map<String, Object>> _runtimeFacetDataMap = new ThreadLocal<Map<String, Object>>()
+ {
+
+ protected Map<String, Object> initialValue()
+ {
+ return new HashMap<String, Object>();
+ }
+ };
+
+ private final ThreadLocal<Map<String, RuntimeFacetHandler< ? >>> _runtimeFacetHandlerMap = new ThreadLocal<Map<String, RuntimeFacetHandler< ? >>>()
+ {
+
+ protected Map<String, RuntimeFacetHandler< ? >> initialValue()
+ {
+ return new HashMap<String, RuntimeFacetHandler< ? >>();
+ }
+ };
+
+ /**
+ * Constructor
+ * @param reader Index reader
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, workArea);
+ }
+
+ /**
+ * Constructor.
+ * @param reader index reader
+ * @param facetHandlers List of facet handlers
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
+ throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, Collections.EMPTY_LIST, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader) throws IOException
+ {
+ return getInstanceAsSubReader(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return getInstanceAsSubReader(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea, false);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ @Override
+ public long getVersion()
+ {
+ try
+ {
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ return sinfos.getVersion();
+ }
+ catch (Exception e)
+ {
+ return 0L;
+ }
+ }
+
+ public IndexReader getInnerReader()
+ {
+ return in;
+ }
+
+ @Override
+ public synchronized IndexReader reopen() throws CorruptIndexException, IOException
+ {
+ IndexReader newInner = null;
+
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ int size = sinfos.size();
+
+ if (in instanceof MultiReader)
+ {
+ // setup current reader list
+ List<IndexReader> boboReaderList = new LinkedList<IndexReader>();
+ ReaderUtil.gatherSubReaders((List<IndexReader>) boboReaderList, in);
+ Map<String, BoboIndexReader> readerMap = new HashMap<String, BoboIndexReader>();
+ for (IndexReader reader : boboReaderList)
+ {
+ BoboIndexReader boboReader = (BoboIndexReader) reader;
+ SegmentReader sreader = (SegmentReader) (boboReader.in);
+ readerMap.put(sreader.getSegmentName(), boboReader);
+ }
+
+ ArrayList<BoboIndexReader> currentReaders = new ArrayList<BoboIndexReader>(size);
+ boolean isNewReader = false;
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfo = (SegmentInfo) sinfos.info(i);
+ BoboIndexReader breader = readerMap.remove(sinfo.name);
+ if (breader != null)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+ BoboIndexReader newReader = (BoboIndexReader) breader.reopen(true);
+ if (newReader != breader)
+ {
+ isNewReader = true;
+ }
+ if (newReader != null)
+ {
+ currentReaders.add(newReader);
+ }
+ }
+ else
+ {
+ isNewReader = true;
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ breader = BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ breader._dir = _dir;
+ currentReaders.add(breader);
+ }
+ }
+ isNewReader = isNewReader || (readerMap.size() != 0);
+ if (!isNewReader)
+ {
+ return this;
+ }
+ else
+ {
+ MultiReader newMreader = new MultiReader(currentReaders.toArray(new BoboIndexReader[currentReaders
+ .size()]), false);
+ BoboIndexReader newReader = BoboIndexReader.getInstanceAsSubReader(
+ newMreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ newReader._dir = _dir;
+ return newReader;
+ }
+ }
+ else if (in instanceof SegmentReader)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+
+ SegmentReader sreader = (SegmentReader) in;
+ int numDels = sreader.numDeletedDocs();
+
+ SegmentInfo sinfo = null;
+ boolean sameSeg = false;
+ // get SegmentInfo instance
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfoTmp = (SegmentInfo) sinfos.info(i);
+ if (sinfoTmp.name.equals(sreader.getSegmentName()))
+ {
+ int numDels2 = sinfoTmp.getDelCount();
+ sameSeg = numDels == numDels2;
+ sinfo = sinfoTmp;
+ break;
+ }
+ }
+
+ if (sinfo == null)
+ {
+ // segment no longer exists
+ return null;
+ }
+ if (sameSeg)
+ {
+ return this;
+ }
+ else
+ {
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ return BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ }
+ }
+ else
+ {
+ // should not reach here, a catch-all default case
+ IndexReader reader = in.reopen(true);
+ if (in != reader)
+ {
+ return BoboIndexReader.getInstance(newInner, _facetHandlers, _runtimeFacetHandlerFactories, _workArea);
+ }
+ else
+ {
+ return this;
+ }
+ }
+ }
+
+ @Override
+ public synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException
+ {
+
+ // bobo readers are always readonly
+ return reopen();
+ }
+
+ public Object getFacetData(String name)
+ {
+ return _facetDataMap.get(name);
+ }
+
+ public Object putFacetData(String name, Object data)
+ {
+ return _facetDataMap.put(name, data);
+ }
+
+ public Object getRuntimeFacetData(String name)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public Object putRuntimeFacetData(String name, Object data)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, Object>();
+ _runtimeFacetDataMap.set(map);
+ }
+ return map.put(name, data);
+ }
+
+ public void clearRuntimeFacetData()
+ {
+ _runtimeFacetDataMap.set(null);
+ }
+
+ public RuntimeFacetHandler< ? > getRuntimeFacetHandler(String name)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public void putRuntimeFacetHandler(String name, RuntimeFacetHandler< ? > data)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, RuntimeFacetHandler< ? >>();
+ _runtimeFacetHandlerMap.set(map);
+ }
+ map.put(name, data);
+ }
+
+ public void clearRuntimeFacetHandler()
+ {
+ _runtimeFacetHandlerMap.set(null);
+ }
+
+ @Override
+ protected void doClose() throws IOException
+ {
+ _facetDataMap.clear();
+ if (_srcReader != null)
+ _srcReader.close();
+ super.doClose();
+ }
+
+ @Override
+ protected void doCommit(Map commitUserData) throws IOException
+ {
+ if (_srcReader != null)
+ _srcReader.flush(commitUserData);
+ }
+
+ @Override
+ protected void doDelete(int n) throws CorruptIndexException, IOException
+ {
+ if (_srcReader != null)
+ _srcReader.deleteDocument(n);
+ }
+
+ private void loadFacetHandler(String name, Set<String> loaded, Set<String> visited, WorkArea workArea)
+ throws IOException
+ {
+ FacetHandler< ? > facetHandler = _facetHandlerMap.get(name);
+ if (facetHandler != null && !loaded.contains(name))
+ {
+ visited.add(name);
+ Set<String> dependsOn = facetHandler.getDependsOn();
+ if (dependsOn.size() > 0)
+ {
+ Iterator<String> iter = dependsOn.iterator();
+ while (iter.hasNext())
+ {
+ String f = iter.next();
+ if (name.equals(f))
+ continue;
+ if (!loaded.contains(f))
+ {
+ if (visited.contains(f))
+ {
+ throw new IOException("Facet handler dependency cycle detected, facet handler: "
+ + name
+ + " not loaded");
+ }
+ loadFacetHandler(f, loaded, visited, workArea);
+ }
+ if (!loaded.contains(f))
+ {
+ throw new IOException("unable to load facet handler: " + f);
+ }
+ facetHandler.putDependedFacetHandler(_facetHandlerMap.get(f));
+ }
+ }
+
+ long start = System.currentTimeMillis();
+ facetHandler.loadFacetData(this, workArea);
+ long end = System.currentTimeMillis();
+ if (logger.isDebugEnabled())
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("facetHandler loaded: ").append(name).append(", took: ").append(end - start).append(" ms");
+ logger.debug(buf.toString());
+ }
+ loaded.add(name);
+ }
+ }
+
+ private void loadFacetHandlers(WorkArea workArea, Set<String> toBeRemoved) throws IOException
+ {
+ Set<String> loaded = new HashSet<String>();
+ Set<String> visited = new HashSet<String>();
+
+ for (String name : _facetHandlerMap.keySet())
+ {
+ loadFacetHandler(name, loaded, visited, workArea);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+
+ /**
+ * Find all the leaf sub-readers and wrap each in BoboIndexReader.
+ * @param reader
+ * @param workArea
+ * @return
+ * @throws IOException
+ */
+ private static IndexReader[] createSubReaders(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ List<IndexReader> readerList = new ArrayList<IndexReader>();
+ ReaderUtil.gatherSubReaders(readerList, reader);
+ IndexReader[] subReaders = (IndexReader[]) readerList.toArray(new IndexReader[readerList.size()]);
+ BoboIndexReader[] boboReaders;
+
+ if (subReaders != null && subReaders.length > 0)
+ {
+ boboReaders = new BoboIndexReader[subReaders.length];
+ for (int i = 0; i < subReaders.length; i++)
+ {
+ boboReaders[i] = new BoboIndexReader(subReaders[i], null, null, workArea, false);
+ }
+ }
+ else
+ {
+ boboReaders = new BoboIndexReader[]{new BoboIndexReader(reader, null, null, workArea, false) };
+ }
+ return boboReaders;
+ }
+
+ @Override
+ public Directory directory()
+ {
+ return (_subReaders != null ? _subReaders[0].directory() : super.directory());
+ }
+
+ private static Collection<FacetHandler< ? >> loadFromIndex(File file, WorkArea workArea) throws IOException
+ {
+ // File springFile = new File(file, SPRING_CONFIG);
+ // FileSystemXmlApplicationContext appCtx =
+ // new FileSystemXmlApplicationContext("file:" + springFile.getAbsolutePath());
+ // return (Collection<FacetHandler<?>>) appCtx.getBean("handlers");
+
+ Set<Entry<Class< ? >, Object>> entries = workArea.map.entrySet();
+ FileSystemXmlApplicationContext appCtx = new FileSystemXmlApplicationContext();
+ for (Entry<Class< ? >, Object> entry : entries)
+ {
+ Object obj = entry.getValue();
+ if (obj instanceof ClassLoader)
+ {
+ appCtx.setClassLoader((ClassLoader) obj);
+ break;
+ }
+ }
+
+ String absolutePath = file.getAbsolutePath();
+ String partOne = absolutePath.substring(0, absolutePath.lastIndexOf(File.separator));
+ String partTwo = URLEncoder.encode(
+ absolutePath.substring(absolutePath.lastIndexOf(File.separator) + 1),
+ "UTF-8");
+ absolutePath = partOne + File.separator + partTwo;
+
+ File springFile = new File(new File(absolutePath), SPRING_CONFIG);
+ appCtx.setConfigLocation("file:" + springFile.getAbsolutePath());
+ appCtx.refresh();
+
+ return (Collection<FacetHandler< ? >>) appCtx.getBean("handlers");
+
+ }
+
+ protected void initialize(Collection<FacetHandler< ? >> facetHandlers) throws IOException
+ {
+ if (facetHandlers == null) // try to load from index
+ {
+ Directory idxDir = directory();
+ if (idxDir != null && idxDir instanceof FSDirectory)
+ {
+ FSDirectory fsDir = (FSDirectory) idxDir;
+ File file = fsDir.getFile();
+
+ if (new File(file, SPRING_CONFIG).exists())
+ {
+ facetHandlers = loadFromIndex(file, _workArea);
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+
+ _facetHandlers = facetHandlers;
+ _facetHandlerMap = new HashMap<String, FacetHandler< ? >>();
+ for (FacetHandler< ? > facetHandler : facetHandlers)
+ {
+ _facetHandlerMap.put(facetHandler.getName(), facetHandler);
+ }
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea) throws IOException
+ {
+ this(reader, facetHandlers, facetHandlerFactories, workArea, true);
+ _srcReader = reader;
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @param useSubReaders true => we create a MultiReader of all the leaf sub-readers as the inner reader. false => we
+ * use the given reader as the inner reader.
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea,
+ boolean useSubReaders) throws IOException
+ {
+ super(useSubReaders ? new MultiReader(createSubReaders(reader, workArea), false) : reader);
+ if (useSubReaders)
+ {
+ _dir = reader.directory();
+ BoboIndexReader[] subReaders = (BoboIndexReader[]) in.getSequentialSubReaders();
+ if (subReaders != null && subReaders.length > 0)
+ {
+ _subReaders = subReaders;
+
+ int maxDoc = 0;
+ _starts = new int[_subReaders.length + 1];
+ for (int i = 0; i < _subReaders.length; i++)
+ {
+ _subReaders[i]._dir = _dir;
+ if (facetHandlers != null)
+ _subReaders[i].setFacetHandlers(facetHandlers);
+ _starts[i] = maxDoc;
+ maxDoc += _subReaders[i].maxDoc();
+ }
+ _starts[_subReaders.length] = maxDoc;
+ }
+ }
+ _runtimeFacetHandlerFactories = facetHandlerFactories;
+ _runtimeFacetHandlerFactoryMap = new HashMap<String, RuntimeFacetHandlerFactory< ? , ? >>();
+ if (_runtimeFacetHandlerFactories != null)
+ {
+ for (RuntimeFacetHandlerFactory< ? , ? > factory : _runtimeFacetHandlerFactories)
+ {
+ _runtimeFacetHandlerFactoryMap.put(factory.getName(), factory);
+ }
+ }
+ _facetHandlers = facetHandlers;
+ _workArea = workArea;
+ }
+
+ protected void facetInit() throws IOException
+ {
+ facetInit(new HashSet<String>());
+ }
+
+ protected void facetInit(Set<String> toBeRemoved) throws IOException
+ {
+ initialize(_facetHandlers);
+ if (_subReaders == null)
+ {
+ loadFacetHandlers(_workArea, toBeRemoved);
+ }
+ else
+ {
+ for (BoboIndexReader r : _subReaders)
+ {
+ r.facetInit(toBeRemoved);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+ }
+
+ protected void setFacetHandlers(Collection<FacetHandler< ? >> facetHandlers)
+ {
+ _facetHandlers = facetHandlers;
+ }
+
+ /**
+ * @deprecated use {@link org.apache.lucene.search.MatchAllDocsQuery} instead.
+ * @return query that matches all docs in the index
+ */
+ public Query getFastMatchAllDocsQuery()
+ {
+ return new MatchAllDocsQuery();
+ }
+
+ /**
+ * Utility method to dump out all fields (name and terms) for a given index.
+ * @param outFile File to dump to.
+ * @throws IOException
+ */
+ public void dumpFields(File outFile) throws IOException
+ {
+ FileWriter writer = null;
+ try
+ {
+ writer = new FileWriter(outFile);
+ PrintWriter out = new PrintWriter(writer);
+ Set<String> fieldNames = getFacetNames();
+ for (String fieldName : fieldNames)
+ {
+ TermEnum te = terms(new Term(fieldName, ""));
+ out.write(fieldName + ":\n");
+ while (te.next())
+ {
+ Term term = te.term();
+ if (!fieldName.equals(term.field()))
+ {
+ break;
+ }
+ out.write(term.text() + "\n");
+ }
+ out.write("\n\n");
+ }
+ }
+ finally
+ {
+ if (writer != null)
+ {
+ writer.close();
+ }
+ }
+ }
+
+ /**
+ * Gets all the facet field names
+ * @return Set of facet field names
+ */
+ public Set<String> getFacetNames()
+ {
+ return _facetHandlerMap.keySet();
+ }
+
+ /**
+ * Gets a facet handler
+ * @param fieldname name
+ * @return facet handler
+ */
+ public FacetHandler< ? > getFacetHandler(String fieldname)
+ {
+ FacetHandler< ? > f = _facetHandlerMap.get(fieldname);
+ if (f == null)
+ f = getRuntimeFacetHandler(fieldname);
+ return f;
+ }
+
+ @Override
+ public IndexReader[] getSequentialSubReaders()
+ {
+ return _subReaders;
+ }
+
+ /**
+ * Gets the facet handler map
+ * @return facet handler map
+ */
+ public Map<String, FacetHandler< ? >> getFacetHandlerMap()
+ {
+ return _facetHandlerMap;
+ }
+
+ /**
+ * @return the map of RuntimeFacetHandlerFactories
+ */
+ public Map<String, RuntimeFacetHandlerFactory< ? , ? >> getRuntimeFacetHandlerFactoryMap()
+ {
+ return _runtimeFacetHandlerFactoryMap;
+ }
+
+ public Document fillFacetData(int docid, Document doc) throws IOException
+ {
+ if (_subReaders != null)
+ {
+ int readerIndex = readerIndex(docid, _starts, _subReaders.length);
+ BoboIndexReader subReader = _subReaders[readerIndex];
+ int subid = docid - _starts[readerIndex];
+ return subReader.fillFacetData(subid, doc);
+ }
+ else
+ {
+ if (doc == null)
+ {
+ doc = new Document();
+ }
+ Collection<FacetHandler< ? >> facetHandlers = _facetHandlerMap.values();
+ for (FacetHandler< ? > facetHandler : facetHandlers)
+ {
+ String[] vals = facetHandler.getFieldValues(this, docid);
+ if (vals != null)
+ {
+ String[] values = doc.getValues(facetHandler.getName());
+ Set<String> storedVals = new HashSet<String>(Arrays.asList(values));
+
+ for (String val : vals)
+ {
+ storedVals.add(val);
+ }
+ doc.removeField(facetHandler.getName());
+
+ for (String val : storedVals)
+ {
+ doc.add(new Field(facetHandler.getName(), val, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ }
+ }
+ }
+ return doc;
+ }
+ }
+
+ private static int readerIndex(int n, int[] starts, int numSubReaders)
+ {
+ int lo = 0;
+ int hi = numSubReaders - 1;
+
+ while (hi >= lo)
+ {
+ int mid = (lo + hi) >>> 1;
+ int midValue = starts[mid];
+ if (n < midValue)
+ hi = mid - 1;
+ else if (n > midValue)
+ lo = mid + 1;
+ else
+ {
+ while (mid + 1 < numSubReaders && starts[mid + 1] == midValue)
+ {
+ mid++;
+ }
+ return mid;
+ }
+ }
+ return hi;
+ }
+
+ /**
+ * Work area for loading
+ */
+ public static class WorkArea
+ {
+
+ HashMap<Class< ? >, Object> map = new HashMap<Class< ? >, Object>();
+
+ @SuppressWarnings("unchecked")
+ public <T> T get(Class<T> cls)
+ {
+ T obj = (T) map.get(cls);
+ return obj;
+ }
+
+ public void put(Object obj)
+ {
+ map.put(obj.getClass(), obj);
+ }
+
+ public void clear()
+ {
+ map.clear();
+ }
+
+ @Override
+ public String toString()
+ {
+ return map.toString();
+ }
+ }
+
+ private BoboIndexReader(IndexReader in)
+ {
+ super(in);
+ }
+
+ public BoboIndexReader copy(IndexReader in)
+ {
+ if (_subReaders != null)
+ {
+ throw new IllegalStateException("this BoboIndexReader has subreaders");
+ }
+ BoboIndexReader copy = new BoboIndexReader(in);
+ copy._facetHandlerMap = this._facetHandlerMap;
+ copy._facetHandlers = this._facetHandlers;
+ copy._runtimeFacetHandlerFactories = this._runtimeFacetHandlerFactories;
+ copy._runtimeFacetHandlerFactoryMap = this._runtimeFacetHandlerFactoryMap;
+ copy._workArea = this._workArea;
+ copy._facetDataMap.putAll(this._facetDataMap);
+ copy._srcReader = in;
+ copy._starts = this._starts;
+ return copy;
+ }
+}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+import info.magnolia.objectfactory.Components;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -210,7 +211,7 @@
if (StringUtils.isNotBlank(tagCloudName))
{
- TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName);
+ TagCloud tagCloudOriginal = Components.getComponent(TagCloudManager.class).getTagCloud(tagCloudName);
if (tagCloudOriginal != null)
{
try
@@ -264,9 +265,8 @@
}
tagCloud.setCount(10000);
- TagCloudManager.getInstance().calculateTagCloud(tagCloud);
+ Components.getComponent(TagCloudManager.class).calculateTagCloud(tagCloud);
}
return tagCloud;
}
}
-
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnltagcloud.el;
+import info.magnolia.objectfactory.Components;
+
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
@@ -50,7 +52,7 @@
*/
public static Map<String, Integer> named(String name)
{
- TagCloud tagCloud = TagCloudManager.getInstance().getTagCloud(name);
+ TagCloud tagCloud = Components.getComponent(TagCloudManager.class).getTagCloud(name);
return tagCloud != null ? tagCloud.getTags() : new HashMap<String, Integer>();
}
@@ -102,11 +104,11 @@
if (cacheAndObserve)
{
- tagCloud = TagCloudManager.getInstance().checkForTagCloud(tagCloud);
+ tagCloud = Components.getComponent(TagCloudManager.class).checkForTagCloud(tagCloud);
}
else
{
- TagCloudManager.getInstance().calculateTagCloud(tagCloud);
+ Components.getComponent(TagCloudManager.class).calculateTagCloud(tagCloud);
}
return tagCloud != null ? sortbyname(tagCloud.getTags(), true) : new HashMap<String, Integer>();
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -22,10 +22,10 @@
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.cms.util.ObservationUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.util.Arrays;
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
import javax.inject.Singleton;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -87,13 +88,8 @@
*/
private Map<String, EventListener> repositoryListeners = new HashMap<String, EventListener>();
- /**
- * @return tagcloud manager singleton instance
- */
- public static TagCloudManager getInstance()
- {
- return (TagCloudManager) FactoryUtil.getSingleton(TagCloudManager.class);
- }
+ @Inject
+ protected JackrabbitUtil jackrabbitUtil;
/**
* {@inheritDoc}
@@ -178,8 +174,8 @@
try
{
// get index reader
- Session session = JackrabbitUtil.getSession(tagCloud.getRepository());
- SearchIndex si = JackrabbitUtil.getSearchIndex(tagCloud.getRepository(), session);
+ Session session = jackrabbitUtil.getSession(tagCloud.getRepository());
+ SearchIndex si = jackrabbitUtil.getSearchIndex(tagCloud.getRepository(), session);
ir = si.getIndexReader();
NamespaceMappings namespaceMappings = si.getNamespaceMappings();
@@ -189,14 +185,14 @@
// configure bobo for faceted search
MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
- List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[]{tagsHandler });
+ List<FacetHandler< ? >> handlerList = Arrays.asList(new FacetHandler< ? >[]{tagsHandler });
BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList);
// get query
Query q = boboReader.getFastMatchAllDocsQuery();
if (StringUtils.isNotBlank(tagCloud.getPath()) && !"/".equals(tagCloud.getPath()))
{
- q = JackrabbitUtil.getQuery(tagCloud.getPath(), session, si);
+ q = jackrabbitUtil.getQuery(tagCloud.getPath(), session, si);
}
// build request for bobo
@@ -236,7 +232,6 @@
{
browser.close();
}
-
}
catch (RepositoryException ex)
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnltagcloud.manager;
+import info.magnolia.objectfactory.Components;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -84,8 +86,8 @@
List<TagCloud> tagCloudsToRefresh = new ArrayList<TagCloud>();
for (String path : paths)
{
- for (Map.Entry<String, TagCloud> entry : TagCloudManager
- .getInstance()
+ for (Map.Entry<String, TagCloud> entry : Components
+ .getComponent(TagCloudManager.class)
.getTagClouds(this.repository)
.entrySet())
{
@@ -102,7 +104,7 @@
// refresh tagClouds
for (TagCloud tc : tagCloudsToRefresh)
{
- TagCloudManager.getInstance().calculateTagCloud(tc);
+ Components.getComponent(TagCloudManager.class).calculateTagCloud(tc);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -21,6 +21,7 @@
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.objectfactory.Components;
import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager;
import org.slf4j.Logger;
@@ -46,7 +47,9 @@
{
log.info("Starting module tagcloud");
- moduleLifecycleContext.registerModuleObservingComponent("clouds", TagCloudManager.getInstance());
+ moduleLifecycleContext.registerModuleObservingComponent(
+ "clouds",
+ Components.getComponent(TagCloudManager.class));
}
/**
@@ -55,7 +58,7 @@
public void stop(ModuleLifecycleContext moduleLifecycleContext)
{
log.info("Stopping module tagcloud");
- TagCloudManager.getInstance().stopObserving();
+ Components.getComponent(TagCloudManager.class).stopObserving();
}
}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -19,9 +19,10 @@
package net.sourceforge.openutils.mgnltagcloud.util;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.FactoryUtil.InstanceFactory;
import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.ComponentFactory;
+import info.magnolia.objectfactory.ComponentProvider;
+import info.magnolia.objectfactory.Components;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -32,6 +33,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
+import javax.jws.Oneway;
import org.apache.commons.lang.UnhandledException;
import org.apache.jackrabbit.core.RepositoryImpl;
@@ -54,7 +56,7 @@
* @version $Id$
*/
@Singleton
-public class JackrabbitUtil implements InstanceFactory
+public class JackrabbitUtil
{
private static final String LANG_SQL = "sql";
@@ -71,16 +73,15 @@
/**
* {@inheritDoc}
*/
- public Object newInstance()
+ public JackrabbitUtil()
{
- JackrabbitUtil util = new JackrabbitUtil();
try
{
- util.getSearchManager = RepositoryImpl.class.getDeclaredMethod("getSearchManager", String.class);
- util.getQueryNodeFactory = SearchIndex.class.getDeclaredMethod("getQueryNodeFactory");
+ getSearchManager = RepositoryImpl.class.getDeclaredMethod("getSearchManager", String.class);
+ getQueryNodeFactory = SearchIndex.class.getDeclaredMethod("getQueryNodeFactory");
- util.getSearchManager.setAccessible(true);
- util.getQueryNodeFactory.setAccessible(true);
+ getSearchManager.setAccessible(true);
+ getQueryNodeFactory.setAccessible(true);
}
catch (SecurityException e)
{
@@ -90,7 +91,6 @@
{
log.error("Exception getting SearchManager", e);
}
- return util;
}
/**
@@ -98,7 +98,7 @@
* @param repository repository
* @return jcr session
*/
- public static Session getSession(String repository)
+ public Session getSession(String repository)
{
return MgnlContext.getSystemContext().getHierarchyManager(repository).getWorkspace().getSession();
}
@@ -110,18 +110,18 @@
* @return {@link SearchIndex}
* @throws RepositoryException exception getting searchindex
*/
- public static SearchIndex getSearchIndex(String repository, Session session) throws RepositoryException
+ public SearchIndex getSearchIndex(String repository, Session session) throws RepositoryException
{
RepositoryImpl repImpl = (RepositoryImpl) session.getRepository();
- JackrabbitUtil util = (JackrabbitUtil) FactoryUtil.getSingleton(JackrabbitUtil.class);
+
try
{
- SearchManager searchManager = (SearchManager) util.getSearchManager.invoke(repImpl, repository);
+ SearchManager searchManager = (SearchManager) getSearchManager.invoke(repImpl, repository);
return (SearchIndex) searchManager.getQueryHandler();
}
catch (Throwable e)
{
- util.log.error("Error retrieving SearchIndex", e);
+ log.error("Error retrieving SearchIndex", e);
}
return null;
}
@@ -133,17 +133,16 @@
* @param si jackr search index
* @return lucene query
*/
- public static Query getQuery(String path, Session session, SearchIndex si)
+ public Query getQuery(String path, Session session, SearchIndex si)
{
- JackrabbitUtil util = (JackrabbitUtil) FactoryUtil.getSingleton(JackrabbitUtil.class);
QueryNodeFactory factory;
try
{
- factory = (QueryNodeFactory) util.getQueryNodeFactory.invoke(si);
+ factory = (QueryNodeFactory) getQueryNodeFactory.invoke(si);
}
catch (Throwable e)
{
- util.log.error("Error qetting query node factory", e);
+ log.error("Error qetting query node factory", e);
return null;
}
try
@@ -170,16 +169,16 @@
}
catch (InvalidQueryException e)
{
- util.log.error("Invalid query", e);
+ log.error("Invalid query", e);
}
catch (RepositoryException e)
{
- util.log.error("Repository Exception", e);
+ log.error("Repository Exception", e);
}
return null;
}
- private static Query createQuery(QueryRootNode root, Session session, SearchIndex si) throws RepositoryException
+ private Query createQuery(QueryRootNode root, Session session, SearchIndex si) throws RepositoryException
{
// LuceneQueryBuilder.createQuery() signature has changed in 2.2.1 (one more parameter added) so we are forced
@@ -199,7 +198,7 @@
if (createQuery == null)
{
throw new UnhandledException(
- "Unsupported version of jackrabbit detected (not in the range 1.6 - 2.0.5?)",
+ "Unsupported version of jackrabbit detected (not in the range 1.6 - 2.6.?)",
null);
}
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.pages.sampleTagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.pages.sampleTagcloud.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.pages.sampleTagcloud.xml 2013-04-05 20:50:34 UTC (rev 4217)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sampleTagcloud" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>754da397-37d2-4c01-9c14-7402a388517b</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>tagcloud:sample-tagcloud</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-tagcloud/template.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Tagcloud sample template</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-04-05T22:45:26.578+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.pages.sampleTagcloud.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml 2013-04-05 20:50:34 UTC (rev 4217)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="templates" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>72d57f56-7ace-4202-9dea-0d342c08723b</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-03-09T16:26:39.077+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:32:13.932+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="sampleTagcloud">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>35e87ec7-0f73-4d3c-a723-b3821936996e</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-tagcloud/template.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Tagcloud sample template</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:32:49.373+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml 2013-04-05 20:50:34 UTC (rev 4217)
@@ -31,7 +31,7 @@
<sv:value>2010-05-11T17:25:11.508+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleTagcloud</sv:value>
+ <sv:value>tagcloud:pages/sampleTagcloud</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="sample-inner-tagcloud-page">
@@ -68,7 +68,7 @@
<sv:value>2010-05-11T17:36:17.548+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleTagcloud</sv:value>
+ <sv:value>tagcloud:pages/sampleTagcloud</sv:value>
</sv:property>
</sv:node>
</sv:node>
@@ -107,7 +107,7 @@
<sv:value>2010-05-11T17:36:35.895+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleTagcloud</sv:value>
+ <sv:value>tagcloud:pages/sampleTagcloud</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-04-05 20:50:34 UTC (rev 4217)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+ xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
@@ -8,9 +8,9 @@
</jsp:text>
<html>
<head>
+ <cms:init />
<title>${actpage.title}</title>
</head>
- <cms:mainBar paragraph="sample-tagcloud" />
<body>
<h1>${actpage.title}</h1>
<h2>Samples:</h2>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-04-02 21:52:23 UTC (rev 4216)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-04-05 20:50:34 UTC (rev 4217)
@@ -27,8 +27,10 @@
import info.magnolia.cms.util.ClasspathResourcesUtil;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.RepositoryTestCase;
+import info.magnolia.test.mock.MockSimpleComponentProvider;
import java.util.Map;
import java.util.Set;
@@ -38,6 +40,7 @@
import net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions;
import net.sourceforge.openutils.mgnltagcloud.module.TagCloudModule;
+import net.sourceforge.openutils.mgnltagcloud.util.JackrabbitUtil;
import org.apache.commons.lang.ArrayUtils;
import org.apache.jackrabbit.value.ValueFactoryImpl;
@@ -269,14 +272,17 @@
hmConfig.save();
- TagCloudManager.getInstance().onRegister(contentTagcloud);
+ TagCloudManager manager = Components.getComponent(TagCloudManager.class);
+ manager.jackrabbitUtil = new JackrabbitUtil();
+
+ manager.onRegister(contentTagcloud);
}
@Override
public void tearDown() throws Exception
{
super.tearDown();
- TagCloudManager.getInstance().stopObserving();
+ Components.getComponent(TagCloudManager.class).stopObserving();
...
[truncated message content] |
|
From: <fg...@us...> - 2013-04-02 21:52:31
|
Revision: 4216
http://openutils.svn.sourceforge.net/openutils/?rev=4216&view=rev
Author: fgiust
Date: 2013-04-02 21:52:23 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
jackrabbit 2.4/lucene 3.6 compatibility - actually requires a patch to bobo-browse since an updated jar is not available
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-02 21:24:15 UTC (rev 4215)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-04-02 21:52:23 UTC (rev 4216)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -25,8 +26,10 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ </connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud
+ </developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
</scm>
<build>
@@ -142,7 +145,13 @@
<dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
- <version>2.5.1</version>
+ <version>3.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>fastutil</groupId>
@@ -150,6 +159,18 @@
<version>5.0.5</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
<version>5.0.0</version>
@@ -181,6 +202,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.6.0</version><!-- forces version 3.6, used in jackrabbit 2.6 (bobo-browse 3.2.0 actually depends on lucene 3.5) -->
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -201,6 +227,6 @@
</dependencies>
<properties>
<magnolia.version>4.5.6</magnolia.version>
- <jackrabbit.version>2.4.1</jackrabbit.version>
+ <jackrabbit.version>2.6.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-04-02 21:52:23 UTC (rev 4216)
@@ -0,0 +1,895 @@
+// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
+/**
+ * Bobo Browse Engine - High performance faceted/parametric search implementation
+ * that handles various types of semi-structured data. Written in Java.
+ *
+ * Copyright (C) 2005-2006 John Wang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * To contact the project administrators for the bobo-browse project,
+ * please go to https://sourceforge.net/projects/bobo-browse/, or
+ * send mail to ow...@br....
+ */
+
+package com.browseengine.bobo.api;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.SegmentReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.ReaderUtil;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
+
+
+/**
+ * bobo browse index reader
+ */
+public class BoboIndexReader extends FilterIndexReader
+{
+
+ private static final String SPRING_CONFIG = "bobo.spring";
+
+ private static Logger logger = Logger.getLogger(BoboIndexReader.class);
+
+ protected Map<String, FacetHandler< ? >> _facetHandlerMap;
+
+ protected Collection<FacetHandler< ? >> _facetHandlers;
+
+ protected Collection<RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactories;
+
+ protected Map<String, RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactoryMap;
+
+ protected WorkArea _workArea;
+
+ protected IndexReader _srcReader;
+
+ protected BoboIndexReader[] _subReaders = null;
+
+ protected int[] _starts = null;
+
+ private Directory _dir = null;
+
+ private final Map<String, Object> _facetDataMap = new HashMap<String, Object>();
+
+ private final ThreadLocal<Map<String, Object>> _runtimeFacetDataMap = new ThreadLocal<Map<String, Object>>()
+ {
+
+ protected Map<String, Object> initialValue()
+ {
+ return new HashMap<String, Object>();
+ }
+ };
+
+ private final ThreadLocal<Map<String, RuntimeFacetHandler< ? >>> _runtimeFacetHandlerMap = new ThreadLocal<Map<String, RuntimeFacetHandler< ? >>>()
+ {
+
+ protected Map<String, RuntimeFacetHandler< ? >> initialValue()
+ {
+ return new HashMap<String, RuntimeFacetHandler< ? >>();
+ }
+ };
+
+ /**
+ * Constructor
+ * @param reader Index reader
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, workArea);
+ }
+
+ /**
+ * Constructor.
+ * @param reader index reader
+ * @param facetHandlers List of facet handlers
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
+ throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, Collections.EMPTY_LIST, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader) throws IOException
+ {
+ return getInstanceAsSubReader(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return getInstanceAsSubReader(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea, false);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ @Override
+ public long getVersion()
+ {
+ try
+ {
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ return sinfos.getVersion();
+ }
+ catch (Exception e)
+ {
+ return 0L;
+ }
+ }
+
+ public IndexReader getInnerReader()
+ {
+ return in;
+ }
+
+ @Override
+ public synchronized IndexReader reopen() throws CorruptIndexException, IOException
+ {
+ IndexReader newInner = null;
+
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ int size = sinfos.size();
+
+ if (in instanceof MultiReader)
+ {
+ // setup current reader list
+ List<IndexReader> boboReaderList = new LinkedList<IndexReader>();
+ ReaderUtil.gatherSubReaders((List<IndexReader>) boboReaderList, in);
+ Map<String, BoboIndexReader> readerMap = new HashMap<String, BoboIndexReader>();
+ for (IndexReader reader : boboReaderList)
+ {
+ BoboIndexReader boboReader = (BoboIndexReader) reader;
+ SegmentReader sreader = (SegmentReader) (boboReader.in);
+ readerMap.put(sreader.getSegmentName(), boboReader);
+ }
+
+ ArrayList<BoboIndexReader> currentReaders = new ArrayList<BoboIndexReader>(size);
+ boolean isNewReader = false;
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfo = (SegmentInfo) sinfos.info(i);
+ BoboIndexReader breader = readerMap.remove(sinfo.name);
+ if (breader != null)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+ BoboIndexReader newReader = (BoboIndexReader) breader.reopen(true);
+ if (newReader != breader)
+ {
+ isNewReader = true;
+ }
+ if (newReader != null)
+ {
+ currentReaders.add(newReader);
+ }
+ }
+ else
+ {
+ isNewReader = true;
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ breader = BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ breader._dir = _dir;
+ currentReaders.add(breader);
+ }
+ }
+ isNewReader = isNewReader || (readerMap.size() != 0);
+ if (!isNewReader)
+ {
+ return this;
+ }
+ else
+ {
+ MultiReader newMreader = new MultiReader(currentReaders.toArray(new BoboIndexReader[currentReaders
+ .size()]), false);
+ BoboIndexReader newReader = BoboIndexReader.getInstanceAsSubReader(
+ newMreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ newReader._dir = _dir;
+ return newReader;
+ }
+ }
+ else if (in instanceof SegmentReader)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+
+ SegmentReader sreader = (SegmentReader) in;
+ int numDels = sreader.numDeletedDocs();
+
+ SegmentInfo sinfo = null;
+ boolean sameSeg = false;
+ // get SegmentInfo instance
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfoTmp = (SegmentInfo) sinfos.info(i);
+ if (sinfoTmp.name.equals(sreader.getSegmentName()))
+ {
+ int numDels2 = sinfoTmp.getDelCount();
+ sameSeg = numDels == numDels2;
+ sinfo = sinfoTmp;
+ break;
+ }
+ }
+
+ if (sinfo == null)
+ {
+ // segment no longer exists
+ return null;
+ }
+ if (sameSeg)
+ {
+ return this;
+ }
+ else
+ {
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ return BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ }
+ }
+ else
+ {
+ // should not reach here, a catch-all default case
+ IndexReader reader = in.reopen(true);
+ if (in != reader)
+ {
+ return BoboIndexReader.getInstance(newInner, _facetHandlers, _runtimeFacetHandlerFactories, _workArea);
+ }
+ else
+ {
+ return this;
+ }
+ }
+ }
+
+ @Override
+ public synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException
+ {
+
+ // bobo readers are always readonly
+ return reopen();
+ }
+
+ public Object getFacetData(String name)
+ {
+ return _facetDataMap.get(name);
+ }
+
+ public Object putFacetData(String name, Object data)
+ {
+ return _facetDataMap.put(name, data);
+ }
+
+ public Object getRuntimeFacetData(String name)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public Object putRuntimeFacetData(String name, Object data)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, Object>();
+ _runtimeFacetDataMap.set(map);
+ }
+ return map.put(name, data);
+ }
+
+ public void clearRuntimeFacetData()
+ {
+ _runtimeFacetDataMap.set(null);
+ }
+
+ public RuntimeFacetHandler< ? > getRuntimeFacetHandler(String name)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public void putRuntimeFacetHandler(String name, RuntimeFacetHandler< ? > data)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, RuntimeFacetHandler< ? >>();
+ _runtimeFacetHandlerMap.set(map);
+ }
+ map.put(name, data);
+ }
+
+ public void clearRuntimeFacetHandler()
+ {
+ _runtimeFacetHandlerMap.set(null);
+ }
+
+ @Override
+ protected void doClose() throws IOException
+ {
+ _facetDataMap.clear();
+ if (_srcReader != null)
+ _srcReader.close();
+ super.doClose();
+ }
+
+ @Override
+ protected void doCommit(Map commitUserData) throws IOException
+ {
+ if (_srcReader != null)
+ _srcReader.flush(commitUserData);
+ }
+
+ @Override
+ protected void doDelete(int n) throws CorruptIndexException, IOException
+ {
+ if (_srcReader != null)
+ _srcReader.deleteDocument(n);
+ }
+
+ private void loadFacetHandler(String name, Set<String> loaded, Set<String> visited, WorkArea workArea)
+ throws IOException
+ {
+ FacetHandler< ? > facetHandler = _facetHandlerMap.get(name);
+ if (facetHandler != null && !loaded.contains(name))
+ {
+ visited.add(name);
+ Set<String> dependsOn = facetHandler.getDependsOn();
+ if (dependsOn.size() > 0)
+ {
+ Iterator<String> iter = dependsOn.iterator();
+ while (iter.hasNext())
+ {
+ String f = iter.next();
+ if (name.equals(f))
+ continue;
+ if (!loaded.contains(f))
+ {
+ if (visited.contains(f))
+ {
+ throw new IOException("Facet handler dependency cycle detected, facet handler: "
+ + name
+ + " not loaded");
+ }
+ loadFacetHandler(f, loaded, visited, workArea);
+ }
+ if (!loaded.contains(f))
+ {
+ throw new IOException("unable to load facet handler: " + f);
+ }
+ facetHandler.putDependedFacetHandler(_facetHandlerMap.get(f));
+ }
+ }
+
+ long start = System.currentTimeMillis();
+ facetHandler.loadFacetData(this, workArea);
+ long end = System.currentTimeMillis();
+ if (logger.isDebugEnabled())
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("facetHandler loaded: ").append(name).append(", took: ").append(end - start).append(" ms");
+ logger.debug(buf.toString());
+ }
+ loaded.add(name);
+ }
+ }
+
+ private void loadFacetHandlers(WorkArea workArea, Set<String> toBeRemoved) throws IOException
+ {
+ Set<String> loaded = new HashSet<String>();
+ Set<String> visited = new HashSet<String>();
+
+ for (String name : _facetHandlerMap.keySet())
+ {
+ loadFacetHandler(name, loaded, visited, workArea);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+
+ /**
+ * Find all the leaf sub-readers and wrap each in BoboIndexReader.
+ * @param reader
+ * @param workArea
+ * @return
+ * @throws IOException
+ */
+ private static IndexReader[] createSubReaders(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ List<IndexReader> readerList = new ArrayList<IndexReader>();
+ ReaderUtil.gatherSubReaders(readerList, reader);
+ IndexReader[] subReaders = (IndexReader[]) readerList.toArray(new IndexReader[readerList.size()]);
+ BoboIndexReader[] boboReaders;
+
+ if (subReaders != null && subReaders.length > 0)
+ {
+ boboReaders = new BoboIndexReader[subReaders.length];
+ for (int i = 0; i < subReaders.length; i++)
+ {
+ boboReaders[i] = new BoboIndexReader(subReaders[i], null, null, workArea, false);
+ }
+ }
+ else
+ {
+ boboReaders = new BoboIndexReader[]{new BoboIndexReader(reader, null, null, workArea, false) };
+ }
+ return boboReaders;
+ }
+
+ @Override
+ public Directory directory()
+ {
+ return (_subReaders != null ? _subReaders[0].directory() : super.directory());
+ }
+
+ private static Collection<FacetHandler< ? >> loadFromIndex(File file, WorkArea workArea) throws IOException
+ {
+ // File springFile = new File(file, SPRING_CONFIG);
+ // FileSystemXmlApplicationContext appCtx =
+ // new FileSystemXmlApplicationContext("file:" + springFile.getAbsolutePath());
+ // return (Collection<FacetHandler<?>>) appCtx.getBean("handlers");
+
+ Set<Entry<Class< ? >, Object>> entries = workArea.map.entrySet();
+ FileSystemXmlApplicationContext appCtx = new FileSystemXmlApplicationContext();
+ for (Entry<Class< ? >, Object> entry : entries)
+ {
+ Object obj = entry.getValue();
+ if (obj instanceof ClassLoader)
+ {
+ appCtx.setClassLoader((ClassLoader) obj);
+ break;
+ }
+ }
+
+ String absolutePath = file.getAbsolutePath();
+ String partOne = absolutePath.substring(0, absolutePath.lastIndexOf(File.separator));
+ String partTwo = URLEncoder.encode(
+ absolutePath.substring(absolutePath.lastIndexOf(File.separator) + 1),
+ "UTF-8");
+ absolutePath = partOne + File.separator + partTwo;
+
+ File springFile = new File(new File(absolutePath), SPRING_CONFIG);
+ appCtx.setConfigLocation("file:" + springFile.getAbsolutePath());
+ appCtx.refresh();
+
+ return (Collection<FacetHandler< ? >>) appCtx.getBean("handlers");
+
+ }
+
+ protected void initialize(Collection<FacetHandler< ? >> facetHandlers) throws IOException
+ {
+ if (facetHandlers == null) // try to load from index
+ {
+ Directory idxDir = directory();
+ if (idxDir != null && idxDir instanceof FSDirectory)
+ {
+ FSDirectory fsDir = (FSDirectory) idxDir;
+ File file = fsDir.getFile();
+
+ if (new File(file, SPRING_CONFIG).exists())
+ {
+ facetHandlers = loadFromIndex(file, _workArea);
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+
+ _facetHandlers = facetHandlers;
+ _facetHandlerMap = new HashMap<String, FacetHandler< ? >>();
+ for (FacetHandler< ? > facetHandler : facetHandlers)
+ {
+ _facetHandlerMap.put(facetHandler.getName(), facetHandler);
+ }
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea) throws IOException
+ {
+ this(reader, facetHandlers, facetHandlerFactories, workArea, true);
+ _srcReader = reader;
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @param useSubReaders true => we create a MultiReader of all the leaf sub-readers as the inner reader. false => we
+ * use the given reader as the inner reader.
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea,
+ boolean useSubReaders) throws IOException
+ {
+ super(useSubReaders ? new MultiReader(createSubReaders(reader, workArea), false) : reader);
+ if (useSubReaders)
+ {
+ _dir = reader.directory();
+ BoboIndexReader[] subReaders = (BoboIndexReader[]) in.getSequentialSubReaders();
+ if (subReaders != null && subReaders.length > 0)
+ {
+ _subReaders = subReaders;
+
+ int maxDoc = 0;
+ _starts = new int[_subReaders.length + 1];
+ for (int i = 0; i < _subReaders.length; i++)
+ {
+ _subReaders[i]._dir = _dir;
+ if (facetHandlers != null)
+ _subReaders[i].setFacetHandlers(facetHandlers);
+ _starts[i] = maxDoc;
+ maxDoc += _subReaders[i].maxDoc();
+ }
+ _starts[_subReaders.length] = maxDoc;
+ }
+ }
+ _runtimeFacetHandlerFactories = facetHandlerFactories;
+ _runtimeFacetHandlerFactoryMap = new HashMap<String, RuntimeFacetHandlerFactory< ? , ? >>();
+ if (_runtimeFacetHandlerFactories != null)
+ {
+ for (RuntimeFacetHandlerFactory< ? , ? > factory : _runtimeFacetHandlerFactories)
+ {
+ _runtimeFacetHandlerFactoryMap.put(factory.getName(), factory);
+ }
+ }
+ _facetHandlers = facetHandlers;
+ _workArea = workArea;
+ }
+
+ protected void facetInit() throws IOException
+ {
+ facetInit(new HashSet<String>());
+ }
+
+ protected void facetInit(Set<String> toBeRemoved) throws IOException
+ {
+ initialize(_facetHandlers);
+ if (_subReaders == null)
+ {
+ loadFacetHandlers(_workArea, toBeRemoved);
+ }
+ else
+ {
+ for (BoboIndexReader r : _subReaders)
+ {
+ r.facetInit(toBeRemoved);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+ }
+
+ protected void setFacetHandlers(Collection<FacetHandler< ? >> facetHandlers)
+ {
+ _facetHandlers = facetHandlers;
+ }
+
+ /**
+ * @deprecated use {@link org.apache.lucene.search.MatchAllDocsQuery} instead.
+ * @return query that matches all docs in the index
+ */
+ public Query getFastMatchAllDocsQuery()
+ {
+ return new MatchAllDocsQuery();
+ }
+
+ /**
+ * Utility method to dump out all fields (name and terms) for a given index.
+ * @param outFile File to dump to.
+ * @throws IOException
+ */
+ public void dumpFields(File outFile) throws IOException
+ {
+ FileWriter writer = null;
+ try
+ {
+ writer = new FileWriter(outFile);
+ PrintWriter out = new PrintWriter(writer);
+ Set<String> fieldNames = getFacetNames();
+ for (String fieldName : fieldNames)
+ {
+ TermEnum te = terms(new Term(fieldName, ""));
+ out.write(fieldName + ":\n");
+ while (te.next())
+ {
+ Term term = te.term();
+ if (!fieldName.equals(term.field()))
+ {
+ break;
+ }
+ out.write(term.text() + "\n");
+ }
+ out.write("\n\n");
+ }
+ }
+ finally
+ {
+ if (writer != null)
+ {
+ writer.close();
+ }
+ }
+ }
+
+ /**
+ * Gets all the facet field names
+ * @return Set of facet field names
+ */
+ public Set<String> getFacetNames()
+ {
+ return _facetHandlerMap.keySet();
+ }
+
+ /**
+ * Gets a facet handler
+ * @param fieldname name
+ * @return facet handler
+ */
+ public FacetHandler< ? > getFacetHandler(String fieldname)
+ {
+ FacetHandler< ? > f = _facetHandlerMap.get(fieldname);
+ if (f == null)
+ f = getRuntimeFacetHandler(fieldname);
+ return f;
+ }
+
+ @Override
+ public IndexReader[] getSequentialSubReaders()
+ {
+ return _subReaders;
+ }
+
+ /**
+ * Gets the facet handler map
+ * @return facet handler map
+ */
+ public Map<String, FacetHandler< ? >> getFacetHandlerMap()
+ {
+ return _facetHandlerMap;
+ }
+
+ /**
+ * @return the map of RuntimeFacetHandlerFactories
+ */
+ public Map<String, RuntimeFacetHandlerFactory< ? , ? >> getRuntimeFacetHandlerFactoryMap()
+ {
+ return _runtimeFacetHandlerFactoryMap;
+ }
+
+ public Document fillFacetData(int docid, Document doc) throws IOException
+ {
+ if (_subReaders != null)
+ {
+ int readerIndex = readerIndex(docid, _starts, _subReaders.length);
+ BoboIndexReader subReader = _subReaders[readerIndex];
+ int subid = docid - _starts[readerIndex];
+ return subReader.fillFacetData(subid, doc);
+ }
+ else
+ {
+ if (doc == null)
+ {
+ doc = new Document();
+ }
+ Collection<FacetHandler< ? >> facetHandlers = _facetHandlerMap.values();
+ for (FacetHandler< ? > facetHandler : facetHandlers)
+ {
+ String[] vals = facetHandler.getFieldValues(this, docid);
+ if (vals != null)
+ {
+ String[] values = doc.getValues(facetHandler.getName());
+ Set<String> storedVals = new HashSet<String>(Arrays.asList(values));
+
+ for (String val : vals)
+ {
+ storedVals.add(val);
+ }
+ doc.removeField(facetHandler.getName());
+
+ for (String val : storedVals)
+ {
+ doc.add(new Field(facetHandler.getName(), val, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ }
+ }
+ }
+ return doc;
+ }
+ }
+
+ private static int readerIndex(int n, int[] starts, int numSubReaders)
+ {
+ int lo = 0;
+ int hi = numSubReaders - 1;
+
+ while (hi >= lo)
+ {
+ int mid = (lo + hi) >>> 1;
+ int midValue = starts[mid];
+ if (n < midValue)
+ hi = mid - 1;
+ else if (n > midValue)
+ lo = mid + 1;
+ else
+ {
+ while (mid + 1 < numSubReaders && starts[mid + 1] == midValue)
+ {
+ mid++;
+ }
+ return mid;
+ }
+ }
+ return hi;
+ }
+
+ /**
+ * Work area for loading
+ */
+ public static class WorkArea
+ {
+
+ HashMap<Class< ? >, Object> map = new HashMap<Class< ? >, Object>();
+
+ @SuppressWarnings("unchecked")
+ public <T> T get(Class<T> cls)
+ {
+ T obj = (T) map.get(cls);
+ return obj;
+ }
+
+ public void put(Object obj)
+ {
+ map.put(obj.getClass(), obj);
+ }
+
+ public void clear()
+ {
+ map.clear();
+ }
+
+ @Override
+ public String toString()
+ {
+ return map.toString();
+ }
+ }
+
+ private BoboIndexReader(IndexReader in)
+ {
+ super(in);
+ }
+
+ public BoboIndexReader copy(IndexReader in)
+ {
+ if (_subReaders != null)
+ {
+ throw new IllegalStateException("this BoboIndexReader has subreaders");
+ }
+ BoboIndexReader copy = new BoboIndexReader(in);
+ copy._facetHandlerMap = this._facetHandlerMap;
+ copy._facetHandlers = this._facetHandlers;
+ copy._runtimeFacetHandlerFactories = this._runtimeFacetHandlerFactories;
+ copy._runtimeFacetHandlerFactoryMap = this._runtimeFacetHandlerFactoryMap;
+ copy._workArea = this._workArea;
+ copy._facetDataMap.putAll(this._facetDataMap);
+ copy._srcReader = in;
+ copy._starts = this._starts;
+ return copy;
+ }
+}
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
