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 2011/10/31 16:01:43 UTC
svn commit: r1195501 - in /tika/trunk: tika-bundle/pom.xml
tika-parsers/pom.xml
Author: jukka
Date: Mon Oct 31 15:01:43 2011
New Revision: 1195501
URL: http://svn.apache.org/viewvc?rev=1195501&view=rev
Log:
TIKA-565: Improved OSGi bundling
Move tika-core out of tika-bundle to simplify deployments where tika-bundle is just one of multiple providers of Tika parsers and detectors
Modified:
tika/trunk/tika-bundle/pom.xml
tika/trunk/tika-parsers/pom.xml
Modified: tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1195501&r1=1195500&r2=1195501&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Mon Oct 31 15:01:43 2011
@@ -32,6 +32,12 @@
<artifactId>tika-bundle</artifactId>
<packaging>bundle</packaging>
<name>Apache Tika OSGi bundle</name>
+ <description>
+ OSGi bundle that contains the tika-parsers component and all its
+ upstream dependencies that aren't OSGI bundles by themselves. This
+ bundle exports no packages, only the Parser and Detector services
+ from the tika-parsers component.
+ </description>
<url>http://tika.apache.org/</url>
<dependencies>
@@ -39,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -57,11 +62,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <_exportcontents>
- org.apache.tika.*;version=${project.version}
- </_exportcontents>
<Embed-Dependency>
- tika-core;inline=true,
tika-parsers;inline=true,
netcdf,
commons-compress, commons-codec,
@@ -76,11 +77,14 @@
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Bundle-Activator>org.apache.tika.config.TikaActivator</Bundle-Activator>
<Import-Package>
org.w3c.dom,
+ org.apache.tika.*,
*;resolution:=optional
</Import-Package>
+ <Service-Component>
+ OSGI-INF/serviceComponents.xml
+ </Service-Component>
</instructions>
</configuration>
</plugin>
Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1195501&r1=1195500&r2=1195501&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Mon Oct 31 15:01:43 2011
@@ -179,6 +179,11 @@
<configuration>
<instructions>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Import-Package>
+ org.w3c.dom,
+ org.apache.tika.*,
+ *;resolution:=optional
+ </Import-Package>
</instructions>
</configuration>
</plugin>