You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2007/11/18 23:16:28 UTC
svn commit: r596144 - in /incubator/tika/trunk: CHANGES.txt bin.xml pom.xml
src.xml
Author: mattmann
Date: Sun Nov 18 14:16:19 2007
New Revision: 596144
URL: http://svn.apache.org/viewvc?rev=596144&view=rev
Log:
- fix for TIKA-101 (contributed by Niall Pemberton)
Added:
incubator/tika/trunk/bin.xml
incubator/tika/trunk/src.xml
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/pom.xml
Modified: incubator/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=596144&r1=596143&r2=596144&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Sun Nov 18 14:16:19 2007
@@ -127,3 +127,6 @@
57. TIKA-85 - Add glob patterns from the ASF svn:eol-style documentation (jukka)
58. TIKA-100 - Structured PDF parsing (jukka)
+
+59. TIKA-101 - Improve site and build (mattmann)
+
Added: incubator/tika/trunk/bin.xml
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/bin.xml?rev=596144&view=auto
==============================================================================
--- incubator/tika/trunk/bin.xml (added)
+++ incubator/tika/trunk/bin.xml Sun Nov 18 14:16:19 2007
@@ -0,0 +1,45 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>CHANGES.txt</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory/>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: incubator/tika/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/pom.xml?rev=596144&r1=596143&r2=596144&view=diff
==============================================================================
--- incubator/tika/trunk/pom.xml (original)
+++ incubator/tika/trunk/pom.xml Sun Nov 18 14:16:19 2007
@@ -25,6 +25,12 @@
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</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -34,19 +40,6 @@
<!-- Keep on a single line, see http://jira.codehaus.org/browse/MJAR-39 -->
<description>Tika is a toolkit for detecting and extracting metadata and structured text content from various documents using existing parser libraries.</description>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
<url>http://incubator.apache.org/tika/</url>
<issueManagement>
@@ -60,12 +53,23 @@
<subscribe>tika-dev-subscribe@incubator.apache.org</subscribe>
<unsubscribe>tika-dev-unsubscribe@incubator.apache.org</unsubscribe>
<post>tika-dev@incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-tika-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/tika-dev@incubator.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/Apache-Tika---Development-f20913.html</otherArchive>
+ <otherArchive>http://news.gmane.org/gmane.comp.apache.tika.devel</otherArchive>
+ <otherArchive>http://tika.markmail.org/</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>Commit mailing list</name>
<subscribe>tika-commits-subscribe@incubator.apache.org</subscribe>
<unsubscribe>tika-commits-unsubscribe@incubator.apache.org</unsubscribe>
<post>tika-commits@incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-tika-commits/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/tika-commits@incubator.apache.org/</otherArchive>
+ </otherArchives>
</mailingList>
</mailingLists>
@@ -226,7 +230,25 @@
<targetPath>org/apache/tika</targetPath>
<directory>${basedir}/src/main/resources</directory>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>README.txt</include>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -247,32 +269,97 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- Include the project metadata files in META-INF -->
- <execution>
- <id>add-project-files</id>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.outputDirectory}/META-INF">
- <fileset dir="${basedir}">
- <include name="README.txt"/>
- <include name="NOTICE.txt"/>
- <include name="LICENSE.txt"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <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>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+
+ <!-- Produce JavaDoc -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+
+ <!-- Produce Source cross references -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+
+ <!-- Unit tests report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <!-- "Release Audit" report (checks license headers etc.) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ </plugin>
+
+ <!-- FindBugs Report -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ </configuration>
+ </plugin>
+
+ <!-- Checkstyle report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <!--configLocation>checkstyle.xml</configLocation-->
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </reporting>
</project>
Added: incubator/tika/trunk/src.xml
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/src.xml?rev=596144&view=auto
==============================================================================
--- incubator/tika/trunk/src.xml (added)
+++ incubator/tika/trunk/src.xml Sun Nov 18 14:16:19 2007
@@ -0,0 +1,38 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>CHANGES.txt</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>pom.xml</include>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file