You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/10/17 15:33:40 UTC
svn commit: r1399239 - in /stanbol/trunk/commons: indexedgraph/
installer/bundleprovider/
installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/
jobs/api/ ldpath/clerezza/ opennlp/ security/authentication.basi...
Author: rwesten
Date: Wed Oct 17 13:33:39 2012
New Revision: 1399239
URL: http://svn.apache.org/viewvc?rev=1399239&view=rev
Log:
remaining STANBOL-774 related POM adaptions for the commons modules;
Modified:
stanbol/trunk/commons/indexedgraph/pom.xml
stanbol/trunk/commons/installer/bundleprovider/pom.xml
stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java
stanbol/trunk/commons/jobs/api/pom.xml
stanbol/trunk/commons/ldpath/clerezza/pom.xml
stanbol/trunk/commons/opennlp/pom.xml
stanbol/trunk/commons/security/authentication.basic/pom.xml
stanbol/trunk/commons/security/authentication.basic/src/main/java/org/apache/stanbol/commons/authentication/basic/BasicAuthentication.java
stanbol/trunk/commons/security/core/pom.xml
stanbol/trunk/commons/security/felixwebconsole/pom.xml
stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
stanbol/trunk/commons/stanboltools/offline/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/commons/web/home/pom.xml
Modified: stanbol/trunk/commons/indexedgraph/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/indexedgraph/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/indexedgraph/pom.xml (original)
+++ stanbol/trunk/commons/indexedgraph/pom.xml Wed Oct 17 13:33:39 2012
@@ -57,8 +57,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.indexedgraph,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.indexedgraph.*;version=${project.version}
+ org.apache.stanbol.commons.indexedgraph;version=${project.version},
+ org.apache.clerezza.rdf.core; provide:=true
</Export-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/installer/bundleprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/installer/bundleprovider/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/installer/bundleprovider/pom.xml (original)
+++ stanbol/trunk/commons/installer/bundleprovider/pom.xml Wed Oct 17 13:33:39 2012
@@ -53,9 +53,15 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.stanbol.commons.installer.provider.bundle.impl.Activator</Bundle-Activator>
+ org.apache.stanbol.commons.installer.provider.bundle.impl.Activator
+ </Bundle-Activator>
+ <Import-Package>
+ org.osgi.framework,
+ org.apache.stanbol.commons.installer.provider.bundle,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.installer.provider.bundle
+ org.apache.stanbol.commons.installer.provider.bundle;version=${project.version}; provide:=true,
</Export-Package>
<Private-Package>
org.apache.stanbol.commons.installer.provider.bundle.impl
Modified: stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java (original)
+++ stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java Wed Oct 17 13:33:39 2012
@@ -38,14 +38,10 @@ import org.apache.sling.installer.api.In
import org.apache.sling.installer.api.OsgiInstaller;
import org.apache.sling.installer.api.tasks.ResourceTransformer;
import org.apache.stanbol.commons.installer.provider.bundle.BundleInstallerConstants;
-import org.osgi.application.Framework;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
-import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.SynchronousBundleListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/commons/jobs/api/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/api/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/api/pom.xml (original)
+++ stanbol/trunk/commons/jobs/api/pom.xml Wed Oct 17 13:33:39 2012
@@ -50,12 +50,13 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.commons.codec.*,
- org.slf4j.*
+ org.apache.stanbol.commons.jobs.api,
+ org.apache.stanbol.commons.jobs.impl,
+ *
</Import-Package>
<Export-Package>
- org.apache.stanbol.commons.jobs.api.*,
- org.apache.stanbol.commons.jobs.impl.*
+ org.apache.stanbol.commons.jobs.api;version=${project.version}; provide:=true,
+ org.apache.stanbol.commons.jobs.impl;version=${project.version}; provide:=true
</Export-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/ldpath/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpath/clerezza/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpath/clerezza/pom.xml (original)
+++ stanbol/trunk/commons/ldpath/clerezza/pom.xml Wed Oct 17 13:33:39 2012
@@ -57,6 +57,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ at.newmedialab.ldpath.api.backend; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.commons.ldpath.clerezza.*;version=${project.version}
</Export-Package>
Modified: stanbol/trunk/commons/opennlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/opennlp/pom.xml (original)
+++ stanbol/trunk/commons/opennlp/pom.xml Wed Oct 17 13:33:39 2012
@@ -63,14 +63,10 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.commons.opennlp
+ org.apache.stanbol.commons.opennlp;version=${project.version}
</Export-Package>
- <Private-Package>
- org.apache.stanbol.commons.opennlp.impl.*
- </Private-Package>
- <Embed-Dependency></Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
<Import-Package>
+ org.apache.stanbol.commons.opennlp;version=${project.version},
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/commons/security/authentication.basic/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/authentication.basic/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/security/authentication.basic/pom.xml (original)
+++ stanbol/trunk/commons/security/authentication.basic/pom.xml Wed Oct 17 13:33:39 2012
@@ -47,6 +47,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package><!-- export packages of implemented Interfaces -->
+ org.apache.stanbol.commons.security.auth; provide:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: stanbol/trunk/commons/security/authentication.basic/src/main/java/org/apache/stanbol/commons/authentication/basic/BasicAuthentication.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/authentication.basic/src/main/java/org/apache/stanbol/commons/authentication/basic/BasicAuthentication.java?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/security/authentication.basic/src/main/java/org/apache/stanbol/commons/authentication/basic/BasicAuthentication.java (original)
+++ stanbol/trunk/commons/security/authentication.basic/src/main/java/org/apache/stanbol/commons/authentication/basic/BasicAuthentication.java Wed Oct 17 13:33:39 2012
@@ -20,14 +20,10 @@ package org.apache.stanbol.commons.authe
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
import java.security.AccessControlException;
import javax.security.auth.Subject;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: stanbol/trunk/commons/security/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/core/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/security/core/pom.xml (original)
+++ stanbol/trunk/commons/security/core/pom.xml Wed Oct 17 13:33:39 2012
@@ -51,7 +51,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.stanbol.commons.security,org.apache.stanbol.commons.security.auth</Export-Package>
+ <Export-Package>
+ org.apache.stanbol.commons.security;version=${project.version},
+ org.apache.stanbol.commons.security.auth;version=${project.version}</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/security/felixwebconsole/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/felixwebconsole/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/security/felixwebconsole/pom.xml (original)
+++ stanbol/trunk/commons/security/felixwebconsole/pom.xml Wed Oct 17 13:33:39 2012
@@ -49,7 +49,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.stanbol.commons.security,org.apache.stanbol.commons.security.auth</Export-Package>
+ <Import-Package>
+ org.apache.felix.webconsole; provide:=true,
+ *
+ </Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml Wed Oct 17 13:33:39 2012
@@ -62,7 +62,8 @@
org.apache.stanbol.commons.stanboltools.datafileprovider.bundle.impl.Activator
</Bundle-Activator>
<Export-Package>
- org.apache.stanbol.commons.stanboltools.datafileprovider.bundle,
+ org.apache.stanbol.commons.stanboltools.datafileprovider; provide:=true,
+ org.apache.stanbol.commons.stanboltools.datafileprovider.bundle;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.stanbol.commons.stanboltools.datafileprovider.bundle.impl.*
@@ -86,7 +87,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml Wed Oct 17 13:33:39 2012
@@ -57,10 +57,11 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.commons.stanboltools.datafileprovider,
- org.apache.stanbol.commons.stanboltools.datafileprovider.bundle,
+ org.apache.stanbol.commons.stanboltools.datafileprovider;version=${project.version}; provide:=true
</Export-Package>
- <Private-Package>org.apache.stanbol.commons.stanboltools.datafileprovider.impl.*</Private-Package>
+ <Private-Package>
+ org.apache.stanbol.commons.stanboltools.datafileprovider.impl.*
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/stanboltools/offline/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/offline/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/offline/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/offline/pom.xml Wed Oct 17 13:33:39 2012
@@ -56,7 +56,13 @@
<configuration>
<instructions>
<Bundle-Activator>org.apache.stanbol.commons.stanboltools.offline.Activator</Bundle-Activator>
- <Export-Package>org.apache.stanbol.commons.stanboltools.offline</Export-Package>
+ <Import-Package>
+ org.apache.stanbol.commons.stanboltools.offline,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.stanbol.commons.stanboltools.offline;version=${project.version}
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/web/base/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Wed Oct 17 13:33:39 2012
@@ -65,8 +65,14 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.commons.web.*,freemarker.cache.*,freemarker.template.*,freemarker.core
+ org.apache.stanbol.commons.web.base;version=${project.version},
+ org.apache.stanbol.commons.web.base.*;version=${project.version}
</Export-Package>
+ <_exportcontents> <!-- used instead of Export-Package to preserve the embedded jar -->
+ freemarker.cache.*;version=${freemarker-version},
+ freemarker.template.*;version=${freemarker-version},
+ freemarker.core;version=${freemarker-version}
+ </_exportcontents>
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl
</Embed-Dependency>
<Embed-Dependency>freemarker</Embed-Dependency>
@@ -87,6 +93,11 @@
!javax.el,
!org.slf4j.spi,
!org.zeroturnaround.javarebel,
+ org.apache.stanbol.commons.web.base,
+ org.apache.stanbol.commons.web.base.*,
+ freemarker.cache.*,
+ freemarker.template.*,
+ freemarker.core,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/commons/web/home/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1399239&r1=1399238&r2=1399239&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Wed Oct 17 13:33:39 2012
@@ -56,10 +56,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.web.base; provide:=true,
+ *;
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.web.home.*
+ org.apache.stanbol.commons.web.home;version=${project.version},
+ org.apache.stanbol.commons.web.home.*;version=${project.version}
</Export-Package>
- <Import-Package>*</Import-Package>
</instructions>
</configuration>
</plugin>