You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2009/04/28 15:22:04 UTC

svn commit: r769386 - in /lucene/tika/trunk: ./ tika-app/ tika-app/src/ tika-app/src/main/ tika-app/src/main/assembly/ tika-app/src/main/java/ tika-app/src/main/java/org/ tika-app/src/main/java/org/apache/ tika-app/src/main/java/org/apache/tika/ tika-a...

Author: jukka
Date: Tue Apr 28 13:22:03 2009
New Revision: 769386

URL: http://svn.apache.org/viewvc?rev=769386&view=rev
Log:
TIKA-219: Split Tika to separate modules

Step 2: Move the CLI and GUI (and the standalone jar settings) to the new tika-app component.

Added:
    lucene/tika/trunk/tika-app/   (with props)
    lucene/tika/trunk/tika-app/pom.xml   (with props)
    lucene/tika/trunk/tika-app/src/
    lucene/tika/trunk/tika-app/src/main/
    lucene/tika/trunk/tika-app/src/main/assembly/   (props changed)
      - copied from r769383, lucene/tika/trunk/tika-core/src/main/assembly/
    lucene/tika/trunk/tika-app/src/main/java/
    lucene/tika/trunk/tika-app/src/main/java/org/
    lucene/tika/trunk/tika-app/src/main/java/org/apache/
    lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/
    lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/   (props changed)
      - copied from r769383, lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/cli/
    lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/   (props changed)
      - copied from r769383, lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/gui/
Removed:
    lucene/tika/trunk/tika-core/src/main/assembly/
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/cli/
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/gui/
Modified:
    lucene/tika/trunk/pom.xml
    lucene/tika/trunk/tika-core/pom.xml

Modified: lucene/tika/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/pom.xml?rev=769386&r1=769385&r2=769386&view=diff
==============================================================================
--- lucene/tika/trunk/pom.xml (original)
+++ lucene/tika/trunk/pom.xml Tue Apr 28 13:22:03 2009
@@ -176,6 +176,7 @@
 
   <modules>
     <module>tika-core</module>
+    <module>tika-app</module>
   </modules>
 
 </project>

Propchange: lucene/tika/trunk/tika-app/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 28 13:22:03 2009
@@ -0,0 +1,2 @@
+target
+.*

Added: lucene/tika/trunk/tika-app/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/pom.xml?rev=769386&view=auto
==============================================================================
--- lucene/tika/trunk/tika-app/pom.xml (added)
+++ lucene/tika/trunk/tika-app/pom.xml Tue Apr 28 13:22:03 2009
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<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>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>4</version>
+  </parent>
+
+  <groupId>org.apache.tika</groupId>
+  <artifactId>tika-app</artifactId>
+  <version>0.4-SNAPSHOT</version>
+
+  <name>Apache Tika application</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>0.4-SNAPSHOT</version>
+      <optional/>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>
+                ${project.build.directory}/classes/META-INF
+              </outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}</directory>
+                  <includes>
+                    <include>README.txt</include>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Specification-Title>${project.name}</Specification-Title>
+              <Specification-Version>${project.version}</Specification-Version>
+              <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+              <Implementation-Title>${project.name}</Implementation-Title>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+            </manifestEntries>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.apache.tika.cli.TikaCLI</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/standalone.xml</descriptor>
+          </descriptors>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.tika.cli.TikaCLI</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
+

Propchange: lucene/tika/trunk/tika-app/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lucene/tika/trunk/tika-app/src/main/assembly/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: lucene/tika/trunk/tika-core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/pom.xml?rev=769386&r1=769385&r2=769386&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/pom.xml (original)
+++ lucene/tika/trunk/tika-core/pom.xml Tue Apr 28 13:22:03 2009
@@ -186,37 +186,10 @@
               <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
             </manifestEntries>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <mainClass>org.apache.tika.cli.TikaCLI</mainClass>
-            </manifest>
           </archive>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/standalone.xml</descriptor>
-          </descriptors>
-          <archive>
-            <manifest>
-              <mainClass>org.apache.tika.cli.TikaCLI</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>retrotranslator-maven-plugin</artifactId>
         <version>1.0-alpha-4</version>