svn commit: r1502625 - in /cocoon/cocoon3/trunk/cocoon-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/tika/ src/main/resources/META-INF/cocoon/spring/

Author: javier
Date: Fri Jul 12 17:24:11 2013
New Revision: 1502625

URL: http://svn.apache.org/r1502625
Log:
COCOON3-128: Add tika samples.

Added:
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/cocoon-logo.jpg   (with props)
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.odt   (with props)
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.pdf   (with props)
Modified:
    cocoon/cocoon3/trunk/cocoon-sample/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml

Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=1502625&r1=1502624&r2=1502625&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Fri Jul 12 17:24:11 2013
@@ -84,6 +84,16 @@
       <artifactId>fop</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.gagravarr</groupId>
+          <artifactId>vorbis-java-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
@@ -96,10 +106,6 @@
       <artifactId>xstream</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     </dependency>

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html?rev=1502625&r1=1502624&r2=1502625&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Fri Jul 12 17:24:11 2013
@@ -201,6 +201,15 @@
           <li><a href="string-template/transformer">StringTemplateTransformer</a>: A transformer using <a href="http://www.stringtemplate.org/">StringTemplate</a> template engine.</li>
         </ul>
       </section>
+      <section id="tika">
+        <h2>Apache Tika metadata generator</h2>
+        <p>See <a href="http://tika.apache.org/1.4/formats.html">Supported Document Formats</a> page.</p>
+        <ul>
+          <li><a href="tika/hello.odt.xml">ODT Metadata</a>: extract metadata from <a href="tika/hello.odt">hello.odt</a>.</li>
+          <li><a href="tika/hello.pdf.xml">PDF Metadata</a>: extract metadata from <a href="tika/hello.pdf">hello.pdf</a>.</li>
+          <li><a href="tika/cocoon-logo.jpg.xml">JPEG Metadata</a>: extract metadata from <a href="tika/cocoon-logo.jpg">cocoon-logo.jpg</a>.</li>
+        </ul>
+      </section>
     </article>
     <nav>
       <ul>
@@ -225,6 +234,7 @@
         <li><a href="#encoding-serializers" target="_self">Encoding Serializers</a></li>
         <li><a href="#cocoon-wicket-integration" target="_self">Cocoon-Wicket integration</a></li>
         <li><a href="#stringtemplate" target="_self">StringTemplate</a></li>
+        <li><a href="#tika" target="_self">Apache Tika metadata generator</a></li>
       </ul>
     </nav>
   </body>

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=1502625&r1=1502624&r2=1502625&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap Fri Jul 12 17:24:11 2013
@@ -610,6 +610,17 @@
       </map:match>
     </map:pipeline>
 
+    <!-- Apache Tika generator -->
+    <map:pipeline type="caching">
+      <map:match wildcard="tika/*.*.xml">
+        <map:generate type="tika" src="tika/{map:1}.{map:2}"/>
+        <map:serialize/>
+      </map:match>
+      <map:match wildcard="tika/*.*">
+        <map:read src="{map:0}"/>
+      </map:match>
+    </map:pipeline>
+
     <!-- Global error handling -->
     <map:handle-errors>
       <map:select value="{jexl:cocoon.exception.class.name}">

Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/cocoon-logo.jpg
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/cocoon-logo.jpg?rev=1502625&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/cocoon-logo.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.odt
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.odt?rev=1502625&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.odt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.pdf
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.pdf?rev=1502625&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/tika/hello.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml?rev=1502625&r1=1502624&r2=1502625&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml Fri Jul 12 17:24:11 2013
@@ -24,8 +24,10 @@
                            http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-fop.xml" />
-  
+
   <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-generators.xml" />
 
   <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-serializers.xml" />
+  
+  <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-tika.xml" />
 </beans>