Author: rwesten
Date: Wed Feb 13 14:04:38 2013
New Revision: 1445611
URL: http://svn.apache.org/r1445611
Log:
STANBOL-927: All stanbol.**.web and stanbol.**.jersey modules do no longer
export their packages
Modified:
stanbol/trunk/commons/jobs/web/pom.xml
stanbol/trunk/commons/web/base.jersey/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/commons/web/home/pom.xml
stanbol/trunk/commons/web/resources/pom.xml
stanbol/trunk/commons/web/sparql/pom.xml
stanbol/trunk/commons/web/viewable-ldpath/pom.xml
stanbol/trunk/commons/web/viewable/pom.xml
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/enhancement-engines/topic/web/pom.xml
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/rules/web/pom.xml
Modified: stanbol/trunk/commons/jobs/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/pom.xml (original)
+++ stanbol/trunk/commons/jobs/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -48,6 +48,8 @@
<instructions>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
+ javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/commons/web/base.jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base.jersey/pom.xml (original)
+++ stanbol/trunk/commons/web/base.jersey/pom.xml Wed Feb 13 14:04:38 2013
@@ -64,9 +64,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.commons.web.base.jersey;version=${project.version}
- </Export-Package>
+ </Private-Package>
<Import-Package>
!javax.servlet.jsp.*,
!org.apache.tools.*,
Modified: stanbol/trunk/commons/web/base/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Wed Feb 13 14:04:38 2013
@@ -69,7 +69,7 @@
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.cache;version=${freemarker-version},
freemarker.template.*;version=${freemarker-version},
freemarker.core;version=${freemarker-version}
</_exportcontents>
@@ -98,9 +98,14 @@
javax.ws.rs.ext;version="[0,2)",
javax.ws.rs.core;version="[0,2)",
org.apache.stanbol.commons.web.base,
- org.apache.stanbol.commons.web.base.*,
- freemarker.cache.*,
- freemarker.template.*,
+ org.apache.stanbol.commons.web.base.format,
+ org.apache.stanbol.commons.web.base.readers,
+ org.apache.stanbol.commons.web.base.resource,
+ org.apache.stanbol.commons.web.base.utils,
+ org.apache.stanbol.commons.web.base.writers,
+ freemarker.cache,
+ freemarker.template,
+ freemarker.template.utility,
freemarker.core,
*
</Import-Package>
Modified: stanbol/trunk/commons/web/home/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Wed Feb 13 14:04:38 2013
@@ -56,13 +56,15 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*; version="[2.5.0,4.0.0)",
+ javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*;
</Import-Package>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.commons.web.home;version=${project.version},
org.apache.stanbol.commons.web.home.*;version=${project.version}
- </Export-Package>
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/web/resources/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/resources/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/resources/pom.xml (original)
+++ stanbol/trunk/commons/web/resources/pom.xml Wed Feb 13 14:04:38 2013
@@ -64,9 +64,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Private-Package>
+ org.apache.stanbol.commons.web.resources
+ </Private-Package>
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- *
+ javax.servlet.*; version="[2.5.0,4.0.0)",
+ *
</Import-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/web/sparql/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/pom.xml (original)
+++ stanbol/trunk/commons/web/sparql/pom.xml Wed Feb 13 14:04:38 2013
@@ -56,13 +56,15 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.commons.web.base; provide:=true,
+ javax.servlet.*; version="[2.5.0,4.0.0)",
+ javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*;
</Import-Package>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.commons.web.sparql;version=${project.version},
org.apache.stanbol.commons.web.sparql.*;version=${project.version}
- </Export-Package>
+ </Private-Package>
<Import-Package>*</Import-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/web/viewable-ldpath/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable-ldpath/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/viewable-ldpath/pom.xml (original)
+++ stanbol/trunk/commons/web/viewable-ldpath/pom.xml Wed Feb 13 14:04:38 2013
@@ -58,18 +58,15 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
-
org.apache.stanbol.commons.web.viewable.ldpath;version=${project.version},
-
org.apache.stanbol.commons.web.viewable.ldpath.writer;version=${project.version}
- </Export-Package>
<Private-Package>
org.apache.stanbol.commons.web.viewable.ldpath.webfragment;version=${project.version},
+
org.apache.stanbol.commons.web.viewable.ldpath.writer;version=${project.version}
</Private-Package>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/commons/web/viewable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/commons/web/viewable/pom.xml (original)
+++ stanbol/trunk/commons/web/viewable/pom.xml Wed Feb 13 14:04:38 2013
@@ -68,7 +68,7 @@
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/contenthub/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -58,13 +58,20 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
- <Export-Package>
+ <!-- Export-Package>
org.apache.stanbol.contenthub.web.*;version=${project.version},
- </Export-Package>
+ </Export-Package -->
+ <Private-Package>
+ org.apache.stanbol.contenthub.web.fragment;
version=${project.version},
+ org.apache.stanbol.contenthub.web.resources;
version=${project.version},
+ org.apache.stanbol.contenthub.web.util;
version=${project.version},
+ org.apache.stanbol.contenthub.web.writers;
version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancement-engines/topic/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/topic/web/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?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
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Wed Feb 13 14:04:38 2013
@@ -55,9 +55,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <!-- Export-Package>
org.apache.stanbol.enhancer.jersey.*
- </Export-Package>
+ </Export-Package -->
<!-- Embed-Dependency>
*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
</Embed-Dependency>
@@ -65,9 +65,16 @@
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.jersey.fragment;
version=${project.version},
+ org.apache.stanbol.enhancer.jersey.reader;
version=${project.version},
+ org.apache.stanbol.enhancer.jersey.resource;
version=${project.version},
+ org.apache.stanbol.enhancer.jersey.util;
version=${project.version},
+ org.apache.stanbol.enhancer.jersey.writers;
version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Wed Feb 13 14:04:38 2013
@@ -54,17 +54,23 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <!-- Export-Package>
org.apache.stanbol.entityhub.jersey.*
- </Export-Package>
- <Embed-Dependency>
- mail
- </Embed-Dependency>
+ </Export-Package -->
<Import-Package>
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.entityhub.jersey.fragment;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.grefine;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.parsers;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.resource;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.resource.reconcile;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.utils;
version=${project.version},
+ org.apache.stanbol.entityhub.jersey.writers;
version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -140,10 +146,9 @@
<!-- jersey-multipart now uses an other lib to read multipart/mime
however the MessagebodyReaderUtils still use this lib -->
- <dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
</dependency>
<!-- Servlet API for handling ServletContext -->
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -61,9 +61,14 @@
org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
- <Export-Package>
+ <!-- Export-Package>
org.apache.stanbol.ontologymanager.web.*
- </Export-Package>
+ </Export-Package -->
+ <Private-Package>
+ org.apache.stanbol.ontologymanager.web;
version=${project.version},
+ org.apache.stanbol.ontologymanager.web.resources;
version=${project.version},
+ org.apache.stanbol.ontologymanager.web.util;
version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/reasoners/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -39,36 +39,24 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <!-- use defaults for now <configuration>
+ <configuration>
<instructions>
<Import-Package>
- javax.servlet.*,
+ javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.slf4j.*,
- org.osgi.framework.*,
- org.osgi.service.*,
- freemarker.cache.*,
- com.sun.jersey.api.*,
- com.sun.jersey.multipart.*,
- org.apache.clerezza.rdf.core.*,
- com.hp.hpl.jena.*,
- org.semanticweb.owlapi.*,
- org.coode.owlapi.*,
- uk.ac.manchester.cs.owl.owlapi.*,
- org.apache.commons.io.*,
- org.apache.stanbol.commons.web.base.*; provide:=true,
- org.apache.stanbol.commons.jobs.api.*,
- org.apache.stanbol.commons.jobs.impl.*,
- org.apache.stanbol.commons.owl.*,
- org.apache.stanbol.rules.base.api.*,
- org.apache.stanbol.ontologymanager.ontonet.api.*,
- org.apache.stanbol.ontologymanager.servicesapi.*,
- org.apache.stanbol.reasoners.servicesapi.*,
- org.apache.stanbol.reasoners.jena.*,
- org.apache.stanbol.reasoners.owlapi.*
+ org.apache.stanbol.commons.web.base; provide:=true,
+ *
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.reasoners.web; version=${project.version},
+ org.apache.stanbol.reasoners.web.input.impl;
version=${project.version},
+ org.apache.stanbol.reasoners.web.input.provider.impl;
version=${project.version},
+ org.apache.stanbol.reasoners.web.resources;
version=${project.version},
+ org.apache.stanbol.reasoners.web.utils;
version=${project.version},
+ org.apache.stanbol.reasoners.web.writers;
version=${project.version}
+ </Private-Package>
</instructions>
- </configuration> -->
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: stanbol/trunk/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1445611&r1=1445610&r2=1445611&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Wed Feb 13 14:04:38 2013
@@ -56,16 +56,22 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <!-- Export-Package>
org.apache.stanbol.rules.web.*
- </Export-Package>
+ </Export-Package -->
<Import-Package>
!org.apache.felix.http.jetty,
!org.mortbay.jetty.*,
+ javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.rules.web; version=${project.version},
+ org.apache.stanbol.rules.web.resources;
version=${project.version},
+ org.apache.stanbol.rules.web.writers; version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
