Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2010-02-22 20:05:07
|
Revision: 2024
http://openutils.svn.sourceforge.net/openutils/?rev=2024&view=rev
Author: fgiust
Date: 2010-02-22 20:05:00 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
license headers
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Property Changed:
----------------
trunk/openutils-mgnltagcloud/
Property changes on: trunk/openutils-mgnltagcloud
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.checkstyle
.classpath
.project
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-02-22 20:05:00 UTC (rev 2024)
@@ -23,6 +23,7 @@
<system>jira</system>
<url>http://jira.openmindlab.com/browse/TAGCLOUD</url>
</issueManagement>
+ <inceptionYear>2010</inceptionYear>
<build>
<plugins>
<plugin>
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-02-22 18:30:38 UTC (rev 2023)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-02-22 20:05:00 UTC (rev 2024)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2010, 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-04-03 15:47:45
|
Revision: 2257
http://openutils.svn.sourceforge.net/openutils/?rev=2257&view=rev
Author: fgiust
Date: 2010-04-03 15:47:39 +0000 (Sat, 03 Apr 2010)
Log Message:
-----------
remove useless dependency from the cache module
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-04-03 15:42:34 UTC (rev 2256)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-04-03 15:47:39 UTC (rev 2257)
@@ -1,9 +1,10 @@
<?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>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -72,20 +73,6 @@
</resource>
</resources>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <failOnError>false</failOnError>
- <excludePackageNames>net.*</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
<dependencies>
<dependency>
<groupId>info.magnolia</groupId>
@@ -117,11 +104,6 @@
<version>${magnolia.version}</version>
</dependency>
<dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-cache</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
<version>2.0.7</version>
@@ -129,7 +111,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.0.4</version>
+ <version>4.0.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -164,6 +146,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.3</magnolia.version>
+ <magnolia.version>4.3.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2010-04-03 15:42:34 UTC (rev 2256)
+++ trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2010-04-03 15:47:39 UTC (rev 2257)
@@ -13,10 +13,6 @@
<version>4.0/*</version>
</dependency>
<dependency>
- <name>cache</name>
- <version>4.0/*</version>
- </dependency>
- <dependency>
<name>templating</name>
<version>4.0/*</version>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-30 16:50:40
|
Revision: 2590
http://openutils.svn.sourceforge.net/openutils/?rev=2590&view=rev
Author: fgiust
Date: 2010-05-30 16:50:28 +0000 (Sun, 30 May 2010)
Log Message:
-----------
cleaning up before the final release
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Property Changed:
----------------
trunk/openutils-mgnltagcloud/
Property changes on: trunk/openutils-mgnltagcloud
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.checkstyle
.classpath
.project
+ target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-05-30 16:50:28 UTC (rev 2590)
@@ -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>
@@ -110,7 +111,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.0.6</version>
+ <version>4.0.7</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -25,6 +25,7 @@
import java.util.Map;
import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
/**
@@ -188,19 +189,6 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj == null || !(obj instanceof TagCloud))
- {
- return false;
- }
- return EqualsBuilder.reflectionEquals(this, obj, new String[]{"tags", "enabled", "name" });
- }
-
- /**
* Returns the cacheAndObserve.
* @return the cacheAndObserve
*/
@@ -218,4 +206,42 @@
this.cacheAndObserve = cacheAndObserve;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object object)
+ {
+ if (!(object instanceof TagCloud))
+ {
+ return false;
+ }
+ TagCloud rhs = (TagCloud) object;
+ return new EqualsBuilder() //
+ .append(this.propertyName, rhs.propertyName)
+ .append(this.count, rhs.count)
+ .append(this.repository, rhs.repository)
+ .append(this.name, rhs.name)
+ .append(this.path, rhs.path)
+ .append(this.cacheAndObserve, rhs.cacheAndObserve)
+ .isEquals();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder(609434781, 862593375)
+ .append(this.propertyName)
+ .append(this.enabled)
+ .append(this.count)
+ .append(this.repository)
+ .append(this.name)
+ .append(this.path)
+ .append(this.cacheAndObserve)
+ .toHashCode();
+ }
+
}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -87,9 +87,11 @@
return null;
}
- @SuppressWarnings("unchecked")
+ /**
+ * {@inheritDoc}
+ */
@Override
- protected void addToParameters(Map parameters)
+ protected void addToParameters(Map<String, Object> parameters)
{
super.addToParameters(parameters);
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -45,6 +45,9 @@
public class TagCloudDialogSafeMultivalueSaveHandler extends SaveHandlerImpl implements FieldSaveHandler
{
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void processMultiple(Content node, String name, int type, String[] values) throws RepositoryException,
PathNotFoundException, AccessDeniedException
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -28,10 +28,7 @@
import net.sourceforge.openutils.mgnltagcloud.bean.TagCloud;
import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* El functions on tagClouds
* @author molaschi
@@ -47,11 +44,6 @@
private static final String PROP_COUNT = "count";
/**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(TagCloudElFunctions.class);
-
- /**
* Get tagCloud by name
* @param name of the tagCloud
* @return map of tags
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -41,29 +41,32 @@
/**
* Build wrapped Bobo index reader instance
- * @param reader jackrabbit index reader
+ * @param indexReader jackrabbit index reader
* @param facetHandlers facet handlers
- * @return wrapped Bobo index reader instance
- * @throws IOException i/o exception reading indicies
+ * @param workArea work area
+ * @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
- throws IOException
+ protected HierarchyBoboIndexReader(
+ IndexReader indexReader,
+ Collection<FacetHandler> facetHandlers,
+ WorkArea workArea) throws IOException
{
- return HierarchyBoboIndexReader.getInstance(reader, facetHandlers, new WorkArea());
+ super(indexReader, facetHandlers, workArea);
+ resolver = (HierarchyResolver) indexReader;
}
/**
* Build wrapped Bobo index reader instance
* @param reader jackrabbit index reader
* @param facetHandlers facet handlers
- * @param workArea work area
* @return wrapped Bobo index reader instance
- * @throws IOException i/o exception reading indicies
+ * @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers,
- WorkArea workArea) throws IOException
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
+ throws IOException
{
- HierarchyBoboIndexReader boboReader = new HierarchyBoboIndexReader(reader, facetHandlers, workArea);
+
+ HierarchyBoboIndexReader boboReader = new HierarchyBoboIndexReader(reader, facetHandlers, new WorkArea());
boboReader.facetInit();
return boboReader;
}
@@ -76,20 +79,4 @@
return resolver.getParents(n, docNumbers);
}
- /**
- * Build wrapped Bobo index reader instance
- * @param indexReader jackrabbit index reader
- * @param facetHandlers facet handlers
- * @param workArea work area
- * @throws IOException i/o exception reading indicies
- */
- protected HierarchyBoboIndexReader(
- IndexReader indexReader,
- Collection<FacetHandler> facetHandlers,
- WorkArea workArea) throws IOException
- {
- super(indexReader, facetHandlers, workArea);
- resolver = (HierarchyResolver) indexReader;
- }
-
}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -29,7 +29,6 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -104,11 +103,11 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
protected void onRegister(Content node)
{
- for (Content tagCloudNode : (Collection<Content>) ContentUtil.collectAllChildren(node))
+ List<Content> allChildren = ContentUtil.collectAllChildren(node);
+ for (Content tagCloudNode : allChildren)
{
try
{
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnltagcloud.manager;
-import info.magnolia.context.MgnlContext;
-
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Modified: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -26,6 +26,7 @@
import info.magnolia.cms.core.Path;
import info.magnolia.cms.util.ClasspathResourcesUtil;
import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.test.RepositoryTestCase;
@@ -122,11 +123,7 @@
{
log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getCachedTagCloud");
long time = System.currentTimeMillis();
- Map<String, Integer> tags = TagCloudElFunctions.cached(
- ContentRepository.WEBSITE,
- pathList[1],
- "tags",
- 2);
+ Map<String, Integer> tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 2);
log.info("Time: " + (System.currentTimeMillis() - time));
log.info("tagCloud freq: {}", tags);
assertEquals(nodesNumber, tags.get("tag2"));
@@ -159,11 +156,7 @@
public void testSortByCount()
{
log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.sortByCount");
- Map<String, Integer> tags = TagCloudElFunctions.cached(
- ContentRepository.WEBSITE,
- "/site",
- "tags",
- 10);
+ Map<String, Integer> tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, "/site", "tags", 10);
log.info("Tags: {}", tags);
Map<String, Integer> countedTags = TagCloudElFunctions.sortbycount(tags, false);
log.info("Tags: {}", countedTags);
@@ -240,6 +233,7 @@
hm.getContent("/"),
Path.getValidatedLabel("site"),
ItemType.CONTENT);
+
contentRoot.createNodeData("tags", new Value[]{ValueFactoryImpl.getInstance().createValue("tag32") });
for (String path : pathList)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2010-06-18 15:26:05
|
Revision: 2684
http://openutils.svn.sourceforge.net/openutils/?rev=2684&view=rev
Author: molaschi
Date: 2010-06-18 15:25:59 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
TAGCLOUD-8 added mgnltasks 4.1.2 and remove SamplesExtractionTasks
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
Removed Paths:
-------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-06-18 15:05:48 UTC (rev 2683)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-06-18 15:25:59 UTC (rev 2684)
@@ -123,6 +123,11 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
<version>4.0.7</version>
</dependency>
Deleted: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java 2010-06-18 15:05:48 UTC (rev 2683)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java 2010-06-18 15:25:59 UTC (rev 2684)
@@ -1,91 +0,0 @@
-/**
- *
- * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnltagcloud.setup;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.Path;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.module.files.FileExtractionLogger;
-import info.magnolia.module.files.FileExtractor;
-import info.magnolia.module.files.MD5CheckingFileExtractor;
-
-import java.io.IOException;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * Extract samples files to webapp root.
- * @author cstrappazzon
- * @version $Id$
- */
-public class SamplesExtractionTask extends AbstractTask
-{
-
- public SamplesExtractionTask()
- {
- super("Samples extraction", "Extracts jsp files for samples.");
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(final InstallContext ctx) throws TaskExecutionException
- {
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
- final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
- {
-
- public void error(String message)
- {
- ctx.warn(message);
- }
- }, hm);
- try
- {
- extractor.extractFiles(new FileExtractor.Transformer()
- {
-
- public String accept(String resourcePath)
- {
- final boolean thisIsAFileWeWant = resourcePath.startsWith("/mgnl-files/")
- && StringUtils.contains(resourcePath, "/samples-tagcloud/");
- if (!thisIsAFileWeWant)
- {
- return null;
- }
- final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
- return Path.getAbsoluteFileSystemPath(relTargetPath);
- }
-
- });
- }
- catch (IOException e)
- {
- throw new TaskExecutionException("Could not extract files for module "
- + ctx.getCurrentModuleDefinition()
- + ": "
- + e.getMessage(), e);
- }
- }
-
-}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2010-06-18 15:05:48 UTC (rev 2683)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2010-06-18 15:25:59 UTC (rev 2684)
@@ -22,6 +22,7 @@
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.SamplesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-12-27 20:12:03
|
Revision: 3191
http://openutils.svn.sourceforge.net/openutils/?rev=3191&view=rev
Author: fgiust
Date: 2010-12-27 20:11:57 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
TAGCLOUD-9 now working with jackrabbit 2.2
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-12-27 15:06:57 UTC (rev 3190)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-12-27 20:11:57 UTC (rev 3191)
@@ -171,19 +171,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia-cms.com</id>
- <name>magnolia repository</name>
- <url>http://nexus.magnolia-cms.com/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<properties>
<magnolia.version>4.4.1</magnolia.version>
<jackrabbit.version>2.2.0</jackrabbit.version>
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-12-27 15:06:57 UTC (rev 3190)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-12-27 20:11:57 UTC (rev 3191)
@@ -44,6 +44,7 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.core.query.lucene.NamespaceMappings;
import org.apache.jackrabbit.core.query.lucene.SearchIndex;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
@@ -178,7 +179,10 @@
SearchIndex si = JackrabbitUtil.getSearchIndex(tagCloud.getRepository(), session);
ir = si.getIndexReader();
- String propertyName = "1:FULL:" + tagCloud.getPropertyName();
+ NamespaceMappings namespaceMappings = si.getNamespaceMappings();
+ String propertyName = namespaceMappings.getPrefix(StringUtils.EMPTY)
+ + ":FULL:"
+ + tagCloud.getPropertyName();
// configure bobo for faceted search
MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
Modified: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-12-27 15:06:57 UTC (rev 3190)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-12-27 20:11:57 UTC (rev 3191)
@@ -238,8 +238,10 @@
{
for (int i = 0; i < nodesNumber; i++)
{
- content = ContentUtil.getOrCreateContent(hm.getContent(pathList[j]), Path.getValidatedLabel("content"
- + i), ItemType.CONTENT);
+ content = ContentUtil.getOrCreateContent(
+ hm.getContent(pathList[j]),
+ Path.getValidatedLabel("content" + i),
+ ItemType.CONTENT);
content.createNodeData("tags", (Value[]) ArrayUtils.subarray(tagList, 0, j + 1));
}
log.debug("Create path {}, tags: {}", pathList[j], ArrayUtils.subarray(tagString, 0, j + 1));
@@ -279,9 +281,12 @@
@Override
protected void startRepository() throws Exception
{
- extractConfigFile("magnolia.indexingConfiguration", ClasspathResourcesUtil.getResource(
- "/indexing_configuration.xml").openStream(), "target/repositories/magnolia/indexing_configuration.xml");
+ extractConfigFile(
+ "magnolia.indexingConfiguration",
+ ClasspathResourcesUtil.getResource("/indexing_configuration.xml").openStream(),
+ "target/repositories/magnolia/indexing_configuration.xml");
super.startRepository();
}
+
}
\ 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...> - 2011-04-10 07:13:59
|
Revision: 3411
http://openutils.svn.sourceforge.net/openutils/?rev=3411&view=rev
Author: fgiust
Date: 2011-04-10 07:13:53 +0000 (Sun, 10 Apr 2011)
Log Message:
-----------
TAGCLOUD-11 jackrabbit 2.2.1 compatibility
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2011-04-10 07:11:47 UTC (rev 3410)
+++ trunk/openutils-mgnltagcloud/pom.xml 2011-04-10 07:13:53 UTC (rev 3411)
@@ -128,7 +128,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.0.7</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -171,7 +171,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
- <jackrabbit.version>2.2.0</jackrabbit.version>
+ <magnolia.version>4.4.2</magnolia.version>
+ <jackrabbit.version>2.2.5</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2011-04-10 07:11:47 UTC (rev 3410)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2011-04-10 07:13:53 UTC (rev 3411)
@@ -23,12 +23,16 @@
import info.magnolia.cms.util.FactoryUtil.InstanceFactory;
import info.magnolia.context.MgnlContext;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
+import org.apache.commons.lang.UnhandledException;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.SearchManager;
import org.apache.jackrabbit.core.SessionImpl;
@@ -147,22 +151,17 @@
LANG_SQL,
(SessionImpl) session,
factory);
- Query queryChild = LuceneQueryBuilder.createQuery(qrn, (SessionImpl) session, si
- .getContext()
- .getItemStateManager(), si.getNamespaceMappings(), si.getTextAnalyzer(), si
- .getContext()
- .getPropertyTypeRegistry(), si.getSynonymProvider(), si.getIndexFormatVersion());
+
+ Query queryChild = createQuery(qrn, session, si);
+
QueryRootNode qrnSelf = QueryParser.parse(
"SELECT * FROM nt:base WHERE jcr:path = '" + path + "'",
LANG_SQL,
(SessionImpl) session,
factory);
- Query querySelf = LuceneQueryBuilder.createQuery(qrnSelf, (SessionImpl) session, si
- .getContext()
- .getItemStateManager(), si.getNamespaceMappings(), si.getTextAnalyzer(), si
- .getContext()
- .getPropertyTypeRegistry(), si.getSynonymProvider(), si.getIndexFormatVersion());
+ Query querySelf = createQuery(qrnSelf, session, si);
+
Query luceneQuery = new BooleanQuery();
return luceneQuery.combine(new Query[]{queryChild, querySelf });
@@ -177,4 +176,76 @@
}
return null;
}
+
+ private static 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
+ // to use reflection here
+
+ Method[] methods = LuceneQueryBuilder.class.getMethods();
+ Method createQuery = null;
+ for (Method method : methods)
+ {
+ if (method.getName().equals("createQuery"))
+ {
+ createQuery = method;
+ break;
+ }
+ }
+
+ if (createQuery == null)
+ {
+ throw new UnhandledException(
+ "Unsupported version of jackrabbit detected (not in the range 1.6 - 2.0.5?)",
+ null);
+ }
+
+ Class< ? >[] params = createQuery.getParameterTypes();
+
+ List<Object> parameters = new ArrayList<Object>();
+ parameters.add(root);
+ parameters.add(session);
+ parameters.add(si.getContext().getItemStateManager());
+ parameters.add(si.getNamespaceMappings());
+ parameters.add(si.getTextAnalyzer());
+ parameters.add(si.getContext().getPropertyTypeRegistry());
+ parameters.add(si.getSynonymProvider());
+ parameters.add(si.getIndexFormatVersion());
+
+ if (params.length > 8)
+ {
+ parameters.add(null);
+ }
+
+ try
+ {
+ return (Query) createQuery.invoke(null, parameters.toArray());
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new RuntimeException(e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException(e);
+ }
+ catch (InvocationTargetException e)
+ {
+ Throwable targetException = e.getTargetException();
+ if (targetException instanceof RepositoryException)
+ {
+ throw (RepositoryException) targetException;
+ }
+ else if (targetException instanceof RuntimeException)
+ {
+ throw (RuntimeException) targetException;
+ }
+ else
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X