[Openutils-svn] SF.net SVN: openutils:[2409] trunk

[<cs...@us...>]

Revision: 2409
          http://openutils.svn.sourceforge.net/openutils/?rev=2409&view=rev
Author:   cstrap
Date:     2010-05-12 11:04:27 +0000 (Wed, 12 May 2010)

Log Message:
-----------
TAGCLOUD-7 
- Template samples
- Update webapp test to magnolia 4.3.1
- Adding dependencies to jackrabbit 2.1.0
- Tagcloud indexing configuration xml

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp

Added Paths:
-----------
    trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/pom.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -163,8 +163,10 @@
       <artifactId>openutils-mgnltasks</artifactId>
       <version>4.1.1-SNAPSHOT</version>
     </dependency>
-    <!--dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId> <version>4.3-SNAPSHOT</version> 
-      </dependency -->
+    <!--
+      dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
+      <version>4.3-SNAPSHOT</version> </dependency
+    -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
@@ -199,12 +201,30 @@
         <groupId>pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
         <version>0.7.3</version>
-        <scope>provided</scope><!-- exclude from webapp, org.apache.pdfbox:pdfbox 1.0.0 is needed for thumbnail generation -->
+        <scope>provided</scope>
+        <!--
+          exclude from webapp, org.apache.pdfbox:pdfbox 1.0.0 is needed for thumbnail generation
+        -->
       </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-core</artifactId>
+        <version>2.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-api</artifactId>
+        <version>2.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.jcr</groupId>
+        <artifactId>jcr</artifactId>
+        <version>2.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <properties>
-    <magnolia.version>4.3-m2</magnolia.version>
+    <magnolia.version>4.3.1</magnolia.version>
     <stk.version>1.2</stk.version>
   </properties>
   <build>

Modified: trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-  <!--
-  TESTING-ONLY configuration!
-  repositories are in memory only and any change is lost upon restart
--->
+<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
 <Repository>
   <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
   </FileSystem>
@@ -23,6 +20,7 @@
       <param name="persistent" value="false" />
     </PersistenceManager>
     <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+      <param name="indexingConfiguration" value="/tagcloud_indexing_configuration.xml" />
       <param name="path" value="${wsp.home}/index" />
       <param name="useCompoundFile" value="true" />
       <param name="minMergeDocs" value="100" />
@@ -57,6 +55,7 @@
   </Versioning>
   <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
     <param name="path" value="${rep.home}/index" />
+    <param name="indexingConfiguration" value="/tagcloud_indexing_configuration.xml" />
     <param name="useCompoundFile" value="true" />
     <param name="minMergeDocs" value="100" />
     <param name="volatileIdleTime" value="3" />

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 11:04:27 UTC (rev 2409)
@@ -14,7 +14,7 @@
     <body>
       <h1>${actpage.title}</h1>
       <h2>Samples:</h2>
-      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
       <code>
           <![CDATA[
           &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;

Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 11:04:27 UTC (rev 2409)
@@ -14,7 +14,7 @@
     <body>
       <h1>${actpage.title}</h1>
       <h2>Samples:</h2>
-      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
       <code>
           <![CDATA[
           &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;

Added: trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+  <analyzers>
+    <analyzer class="org.apache.lucene.analysis.KeywordAnalyzer">
+      <property>tags</property>
+    </analyzer>
+  </analyzers>
+</configuration>
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
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.