You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rw...@apache.org on 2014/02/26 12:44:03 UTC
[14/18] git commit: MARMOTTA-442: updated LDPath bundles
MARMOTTA-442: updated LDPath bundles
* ldpath-api is bundle
* ldpath-core-bundle contains ldpath-core and aloo ldpath-functions-* modules. This is necessary because ServiceLoader is sued to find available functions for the DefaultConfiguration
* ldpath-functions-* are no longer bundles but embedded in the ldpath-core-bundle
* ldpath-nackend-* are OSGI Bundles. Users can include those backends they need
* ldpath-template is also an OSGI Bundle
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f92ecc1b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f92ecc1b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f92ecc1b
Branch: refs/heads/develop
Commit: f92ecc1b906e9f50e8da06a675da53031c0bb2b5
Parents: db61001
Author: Rupert Westenthaler <ru...@gmail.com>
Authored: Wed Feb 26 12:01:59 2014 +0100
Committer: Rupert Westenthaler <ru...@gmail.com>
Committed: Wed Feb 26 12:01:59 2014 +0100
----------------------------------------------------------------------
libraries/ldclient/ldclient-api/pom.xml | 5 --
libraries/ldpath/ldpath-api/pom.xml | 20 +-------
libraries/ldpath/ldpath-backend-file/pom.xml | 24 ++++++++-
libraries/ldpath/ldpath-backend-jena/pom.xml | 25 ++++++++-
.../ldpath/ldpath-backend-linkeddata/pom.xml | 22 +++++++-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 24 ++++++++-
libraries/ldpath/ldpath-core/pom.xml | 42 ---------------
.../ldpath/ldpath-functions-collections/pom.xml | 40 +--------------
libraries/ldpath/ldpath-functions-date/pom.xml | 40 +--------------
libraries/ldpath/ldpath-functions-html/pom.xml | 45 +---------------
libraries/ldpath/ldpath-functions-math/pom.xml | 40 +--------------
libraries/ldpath/ldpath-functions-text/pom.xml | 40 +--------------
libraries/ldpath/ldpath-functions-xml/pom.xml | 45 +---------------
libraries/ldpath/ldpath-template/pom.xml | 54 +++-----------------
libraries/ldpath/pom.xml | 1 +
15 files changed, 112 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index ae8a55e..c309e3e 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -48,11 +48,6 @@
</instructions>
</configuration>
</plugin>
- </plugins>
- </build>
-
- <build>
- <plugins>
<plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index 4aa36fb..4a6c1f8 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -62,30 +62,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
<Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Export-Package>
+ <Export-Package>
org.apache.marmotta.ldpath.api.*;version=${project.version}
</Export-Package>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 1dcbd30..14612f2 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Backend: File</name>
<artifactId>ldpath-backend-file</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<pluginManagement>
@@ -51,6 +51,28 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
+ <Import-Package>
+ org.slf4j.*;version="[1.6,2)",
+ ch.qos.logback.classic;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.marmotta.ldpath.backend.file;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index ecce8d2..a51355f 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Backend: Jena</name>
<artifactId>ldpath-backend-jena</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<pluginManagement>
@@ -51,6 +51,29 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
+ <Import-Package>
+ org.slf4j.*;version="[1.6,2)",
+ ch.qos.logback.classic;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.marmotta.ldpath.backend.jena;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 89f317a..c7a167a 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Backend: Linked Data</name>
<artifactId>ldpath-backend-linkeddata</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<pluginManagement>
@@ -64,6 +64,26 @@
</licenseMapping>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
+ <Import-Package>
+ org.slf4j.*;version="[1.6,2)",
+ ch.qos.logback.classic;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.marmotta.ldpath.backend.linkeddata;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index 412495e..2047d44 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Backend: Sesame</name>
<artifactId>ldpath-backend-sesame</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<pluginManagement>
@@ -51,6 +51,28 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
+ <Import-Package>
+ org.slf4j.*;version="[1.6,2)",
+ ch.qos.logback.classic;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.marmotta.ldpath.backend.sesame;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 9df072a..387ff8b 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -27,7 +27,6 @@
<name>LDPath Core</name>
<artifactId>ldpath-core</artifactId>
- <packaging>bundle</packaging>
<dependencies>
@@ -180,47 +179,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Core</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath;version=${project.version},
- org.apache.marmotta.ldpath.exception;version=${project.version},
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- org.apache.marmotta.ldpath.util;version=${project.version}
- org.apache.marmotta.ldpath.parser;version=${project.version}
- </Export-Package>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index a2968c0..dd5a4fb 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Functions: rdf-Collections</name>
<artifactId>ldpath-functions-collections</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>Collection-Functions for ldpath (rdf:Bag, rdf:Sequence, rdf:Collection)</description>
@@ -95,43 +95,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: Math</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 28f6885..506aa97 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -26,7 +26,7 @@
<name>LDPath Functions: Date</name>
<artifactId>ldpath-functions-date</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>date manipulation and arithmetics in ldpath</description>
<dependencies>
<dependency>
@@ -91,43 +91,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: Date</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index 6e2e4ae..765ac38 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -26,7 +26,7 @@
<name>LDPath Functions: HTML</name>
<artifactId>ldpath-functions-html</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>LDPath Functions for HTML content.</description>
@@ -109,48 +109,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: HTML</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <Import-Package>
- !nu.xom.*,!org.dom4j.*,!org.dom4j.io.*,*
- </Import-Package>
- <Embed-Dependency>jsoup;scope=compile</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 271bfe9..6d6aa67 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -26,7 +26,7 @@
<name>LDPath Functions: Math</name>
<artifactId>ldpath-functions-math</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>Math-Functions for ldpath</description>
@@ -90,43 +90,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: Math</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 35f85cb..ecb70de 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -27,7 +27,7 @@
<name>LDPath Functions: Text</name>
<artifactId>ldpath-functions-text</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>Text-Functions for ldpath</description>
@@ -90,43 +90,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: Math</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index f00c001..c61b3c9 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -26,7 +26,7 @@
<name>LDPath Functions: XML</name>
<artifactId>ldpath-functions-xml</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>LDPath Functions for XML content.</description>
@@ -110,48 +110,7 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>LDPath Functions: XML</Bundle-Name>
- <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.model.*;version=${project.version},
- </Export-Package>
- <Import-Package>
- !nu.xom.*,!org.dom4j.*,!org.dom4j.io.*,*
- </Import-Package>
- <Embed-Dependency>jdom2|jaxen;scope=compile</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index 66bca66..96c25fe 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -78,62 +78,20 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>LDPath Templating</Bundle-Name>
+ <Bundle-Category>Apache Marmotta LDPath</Bundle-Category>
<Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<_versionpolicy>$${version;===;${@}}</_versionpolicy>
- <!-- Enable this for including your enhancement chain configuration -->
- <!-- <Install-Path>config</Install-Path> -->
- <Export-Package>
- org.apache.marmotta.ldpath.template;version=${project.version},
- org.apache.marmotta.ldpath.template.engine;version=${project.version},
- org.apache.marmotta.ldpath.template.model;version=${project.version},
- org.apache.marmotta.ldpath.template.util;version=${project.version}
- </Export-Package>
- <!--
- <_exportcontents>freemarker.*;version="2.3.19"</_exportcontents>
- <Embed-Dependency>freemarker;scope=compile</Embed-Dependency>
+ <!-- NOTE: freemarker API compatibility starts with 2.3.11 -->
<Import-Package>
- !com.sun.org.apache*, javax.el*;resolution:=optional;version="[1,2)",
- javax.servlet*;resolution:=optional;version="[2.5,3)",
- javax.servlet.jsp*;resolution:=optional;version="[2.1,3)",
- javax.swing*;resolution:=optional,
- org.apache.log;resolution:=optional;version="[1.0.1,1.0.1]",
- org.apache.log4j;resolution:=optional;version="[1.2,2)",
- org.apache.tools.ant*;resolution:=optional;version="[1.7,2)",
- org.apache.xml.utils;resolution:=optional;version="[2.7,3)",
- org.apache.xpath*;resolution:=optional;version="[2.7,3)",
- org.dom4j*;resolution:=optional;version="[1.6.1,2)",
- org.jaxen*;resolution:=optional;version="[1.1.1,2)",
- org.jdom*;resolution:=optional;version="[1,2)",
- org.mozilla.javascript;resolution:=optional,
- org.python*;resolution:=optional;version="[2.2.1,2.3)",
- org.zeroturnaround.javarebel;resolution:=optional,
- org.w3c.dom.traversal;resolution:=optional,
+ freemarker.*;version="[2.3.11,3)",
*
</Import-Package>
- -->
+ <Export-Package>
+ org.apache.marmotta.ldpath.template.*;version=${project.version}
+ </Export-Package>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Software Foundation</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f92ecc1b/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 3676590..e84392c 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -76,6 +76,7 @@
<modules>
<module>ldpath-api</module>
<module>ldpath-core</module>
+ <module>ldpath-core-bundle</module>
<module>ldpath-backend-sesame</module>
<module>ldpath-backend-file</module>
<module>ldpath-backend-linkeddata</module>