[Openutils-svn] SF.net SVN: openutils:[3191] trunk/openutils-mgnltagcloud

[<fg...@us...>]

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.