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:46:04 UTC

svn commit: r1399255 - in /stanbol/trunk/entityhub: generic/core/ generic/servicesapi/ jersey/ ldpath/ model/clerezza/ query/clerezza/ site/linkeddata/ site/managed/ yard/clerezza/ yard/solr/ yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/so...

Author: rwesten
Date: Wed Oct 17 13:46:03 2012
New Revision: 1399255

URL: http://svn.apache.org/viewvc?rev=1399255&view=rev
Log:
STANBOL-774 related POM adaptions for the entityhub modules; Minor: added a logging to the SolrYard

Modified:
    stanbol/trunk/entityhub/generic/core/pom.xml
    stanbol/trunk/entityhub/generic/servicesapi/pom.xml
    stanbol/trunk/entityhub/jersey/pom.xml
    stanbol/trunk/entityhub/ldpath/pom.xml
    stanbol/trunk/entityhub/model/clerezza/pom.xml
    stanbol/trunk/entityhub/query/clerezza/pom.xml
    stanbol/trunk/entityhub/site/linkeddata/pom.xml
    stanbol/trunk/entityhub/site/managed/pom.xml
    stanbol/trunk/entityhub/yard/clerezza/pom.xml
    stanbol/trunk/entityhub/yard/solr/pom.xml
    stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java

Modified: stanbol/trunk/entityhub/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/generic/core/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/generic/core/pom.xml (original)
+++ stanbol/trunk/entityhub/generic/core/pom.xml Wed Oct 17 13:46:03 2012
@@ -65,6 +65,15 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.site; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.yard; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.mapping; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.model; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.query; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.core;version=${project.version},
               org.apache.stanbol.entityhub.core.mapping;version=${project.version},

Modified: stanbol/trunk/entityhub/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/generic/servicesapi/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/entityhub/generic/servicesapi/pom.xml Wed Oct 17 13:46:03 2012
@@ -68,9 +68,9 @@
               org.apache.stanbol.entityhub.servicesapi.model;version=${project.version},
               org.apache.stanbol.entityhub.servicesapi.model.rdf;version=${project.version},
               org.apache.stanbol.entityhub.servicesapi.mapping;version=${project.version},
-              org.apache.stanbol.entityhub.servicesapi.query;version=${project.version},
+              org.apache.stanbol.entityhub.servicesapi.query;version=${project.version}; provide:=true,
               org.apache.stanbol.entityhub.servicesapi.site;version=${project.version},
-              org.apache.stanbol.entityhub.servicesapi.util;version=${project.version},
+              org.apache.stanbol.entityhub.servicesapi.util;version=${project.version}, provide:=true,
               org.apache.stanbol.entityhub.servicesapi.yard;version=${project.version}
             </Export-Package>
             <Private-Package>

Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Wed Oct 17 13:46:03 2012
@@ -64,6 +64,7 @@
             </Embed-Dependency>
             <Import-Package>
               javax.ws.rs.*; version="[0,2)",
+              org.apache.stanbol.commons.web.base; provide:=true,
               *
             </Import-Package>
           </instructions>

Modified: stanbol/trunk/entityhub/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/ldpath/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/ldpath/pom.xml (original)
+++ stanbol/trunk/entityhub/ldpath/pom.xml Wed Oct 17 13:46:03 2012
@@ -56,6 +56,13 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              at.newmedialab.ldpath; provide:=true,
+              at.newmedialab.ldpath.api.backend; provide:=true,
+              at.newmedialab.ldpath.api.transformers; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.query; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.ldpath;version=${project.version},
               org.apache.stanbol.entityhub.ldpath.backend;version=${project.version},

Modified: stanbol/trunk/entityhub/model/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/model/clerezza/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/model/clerezza/pom.xml (original)
+++ stanbol/trunk/entityhub/model/clerezza/pom.xml Wed Oct 17 13:46:03 2012
@@ -64,6 +64,11 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.model; provide:=true,
+              org.apache.stanbol.entityhub.servicesapi.util; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.model.clerezza;version=${project.version},
               org.apache.stanbol.entityhub.model.clerezza.utils;version=${project.version},

Modified: stanbol/trunk/entityhub/query/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/query/clerezza/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/query/clerezza/pom.xml (original)
+++ stanbol/trunk/entityhub/query/clerezza/pom.xml Wed Oct 17 13:46:03 2012
@@ -63,12 +63,13 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.query; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.query.clerezza;version=${project.version},
             </Export-Package>
-           <Private-Package>
-              org.apache.stanbol.entityhub.query.clerezza.impl;version=${project.version},
-            </Private-Package>
            </instructions>
         </configuration>
       </plugin>

Modified: stanbol/trunk/entityhub/site/linkeddata/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/site/linkeddata/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/site/linkeddata/pom.xml (original)
+++ stanbol/trunk/entityhub/site/linkeddata/pom.xml Wed Oct 17 13:46:03 2012
@@ -64,9 +64,10 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>
-              org.apache.stanbol.entityhub.site.linkeddata;version=${project.version}
-            </Export-Package>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.site; provide:=true,
+              *
+            </Import-Package>
             <Private-Package>
               org.apache.stanbol.entityhub.site.linkeddata.impl;version=${project.version}
             </Private-Package>

Modified: stanbol/trunk/entityhub/site/managed/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/site/managed/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/site/managed/pom.xml (original)
+++ stanbol/trunk/entityhub/site/managed/pom.xml Wed Oct 17 13:46:03 2012
@@ -62,6 +62,10 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.site; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.site.managed;version=${project.version}
             </Export-Package>

Modified: stanbol/trunk/entityhub/yard/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/yard/clerezza/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/yard/clerezza/pom.xml (original)
+++ stanbol/trunk/entityhub/yard/clerezza/pom.xml Wed Oct 17 13:46:03 2012
@@ -64,12 +64,12 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>
-              org.apache.stanbol.entityhub.yard.clerezza;version=${project.version},
-            </Export-Package>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.yard; provide:=true,
+              *
+            </Import-Package>
             <Private-Package>
-              org.apache.stanbol.entityhub.yard.clerezza.impl;version=${project.version},
-              org.apache.stanbol.entityhub.yard.clerezza.impl.adapter;version=${project.version}
+              org.apache.stanbol.entityhub.yard.clerezza.impl;version=${project.version}
             </Private-Package>
           </instructions>
         </configuration>

Modified: stanbol/trunk/entityhub/yard/solr/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/yard/solr/pom.xml?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/yard/solr/pom.xml (original)
+++ stanbol/trunk/entityhub/yard/solr/pom.xml Wed Oct 17 13:46:03 2012
@@ -64,23 +64,19 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Import-Package>
+              org.apache.stanbol.entityhub.servicesapi.site; provide:=true,
+              *
+            </Import-Package>
             <Export-Package>
               org.apache.stanbol.entityhub.yard.solr.defaults;version=${project.version},
               org.apache.stanbol.entityhub.yard.solr.model;version=${project.version},
               org.apache.stanbol.entityhub.yard.solr.query;version=${project.version}
             </Export-Package>
-            <!-- NOTE: The exclusion of javax.xml.stream assumes that only serialised
-                 java objects are used as serialisation to and from the SolrServer
-                 and therefore no XML API is needed -->
-            <Import-Package>
-              *
-            </Import-Package>
             <Private-Package>
               org.apache.stanbol.entityhub.yard.solr.impl;version=${project.version},
               org.apache.stanbol.entityhub.yard.solr.impl.queryencoders;version=${project.version}
             </Private-Package>
-            <Embed-Dependency>
-            </Embed-Dependency>
             <!-- 
               We need to provide the default SolrYard indexConfigurations to
               the DataFileProvider infrastructure

Modified: stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java?rev=1399255&r1=1399254&r2=1399255&view=diff
==============================================================================
--- stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java (original)
+++ stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java Wed Oct 17 13:46:03 2012
@@ -605,6 +605,7 @@ public class SolrYard extends AbstractYa
                     try {
                         _registeredServerTracker = new RegisteredSolrServerTracker(
                             context.getBundleContext(), indexReference, null);
+                        log.info(" ... start tracking for SolrCore based on {}",indexReference);
                         _registeredServerTracker.open(); //start tracking
                     } catch (InvalidSyntaxException e) {
                         throw new YardException("Unable to track configured SolrServer'"+