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 2011/03/25 06:20:31 UTC

svn commit: r1085256 [1/2] - in /incubator/stanbol/trunk: enhancer/ enhancer/SemiAutomaticContentEnhancer/ enhancer/autotagging/ enhancer/clerezza/clerezza-sparql/ enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/ enhancer/engines/autotagging/ en...

Author: rwesten
Date: Fri Mar 25 05:20:29 2011
New Revision: 1085256

URL: http://svn.apache.org/viewvc?rev=1085256&view=rev
Log:
Stanbol-119: The Entityhub now uses the Stanbol stanbol parent pom

Entityhub:
 - Changed the Version 0.1-SNAPSHOT to ${stanbol-version} (currently 0.9-SNAPSHOT)
 - Linked the parent POM of the Entityhub with the stanbol-parent
 - Added several dependencies used by the Entityhub to the stanbol-parent POM
 - Changed the version numbers in the sling launcher of the Entityhub
 - The sling launcher of the Entityhub now also supports and uses a default configuration
 - The "indexing" utilities where not adapted because they will be changed heavily in the near future

Enhancer:
 - had to add the commons-httpclient dependency for the Metaxa Engine. No Idea why it now needs this dependency but is needed.
 - the <parent> links used still <version>0.9-SNAPSHOT</version>. Changed that to ${stanbol-version} for all pom.
 - also changed the bundle version to ${stanbol-version} for some bundles that still used 0.9-SNAPSHOT
 - Changed Entityhub version in the Enhancer Full Launcher

Apache Lucene/Solr:
 - The Autotagger and the Autotagging Engine used Lucene 3.0. However this version is not compatible with the latest Solr Release. 
 - To avoid incompatible version of Solr and Lucene in the dependencies defined by the parent pom I changed the Lucene version to 2.9.4 as used by Solr 1.4
 - The Autotagger and Autotagging Engine now define the Lucene version in there own POM

mvn plugin version Upgrades:
 - maven-scr-plugin from 1.4.2 to 1.4.4
 - maven-enforcer-plugin from beta to 1.0
 - maven-site-plugin from 2.1.1 to 2.2
 - maven-surefire-plugin from 2.5 to 2.7.1
 - maven-launchpad-plugin from 2.0.6 to 2.0.10

Dependency Upgrates
 - org.apache.felix.scr.annotations to 1.4.0: Required to use ManagedServiceFactories
 - org.apache.felix.http.jetty from 2.0.4 to 2.2.0

Other:
 - It was mention in a documentation of an exclusion that "jsr311-api" (as part of jaxb) is part of Java 6 and it is no longer needed as an dependency. However without that lib the Woodstox StAX Parser (used by Solr/Lucene) encountered a lot of ClassNotFound exceptions.
 - Removed the "SpringSource Enterprise Bundle Repository - External Bundle Releases" because it was only needed for jDom a dependency that is no longer needed.
 - The frameworkfragment used the version 0.9.0-SNAPSHOT. Changed that also to ${stanbol-version}- So the "new" version is 0.9-SNAPSHOT.

Added:
    incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg
      - copied, changed from r1082932, incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.embedded.EmbeddedSolrPorovider.cfg
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhubYard.config
Removed:
    incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.embedded.EmbeddedSolrPorovider.cfg
    incubator/stanbol/trunk/entityhub/lifting/
Modified:
    incubator/stanbol/trunk/enhancer/SemiAutomaticContentEnhancer/pom.xml
    incubator/stanbol/trunk/enhancer/autotagging/pom.xml
    incubator/stanbol/trunk/enhancer/clerezza/clerezza-sparql/pom.xml
    incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/pom.xml
    incubator/stanbol/trunk/enhancer/engines/autotagging/pom.xml
    incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
    incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
    incubator/stanbol/trunk/enhancer/engines/langid/pom.xml
    incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml
    incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml
    incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
    incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml
    incubator/stanbol/trunk/enhancer/generic/jobmanager/pom.xml
    incubator/stanbol/trunk/enhancer/generic/jsonld/pom.xml
    incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml
    incubator/stanbol/trunk/enhancer/generic/standalone/pom.xml
    incubator/stanbol/trunk/enhancer/integration-tests/pom.xml
    incubator/stanbol/trunk/enhancer/jersey/pom.xml
    incubator/stanbol/trunk/enhancer/launchers/full/pom.xml
    incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml
    incubator/stanbol/trunk/enhancer/launchers/lite/pom.xml
    incubator/stanbol/trunk/enhancer/launchers/lite/src/main/bundles/list.xml
    incubator/stanbol/trunk/enhancer/parent/pom.xml
    incubator/stanbol/trunk/enhancer/pom.xml
    incubator/stanbol/trunk/enhancer/stores/jcrstore/pom.xml
    incubator/stanbol/trunk/entityhub/generic/core/pom.xml
    incubator/stanbol/trunk/entityhub/generic/servicesapi/pom.xml
    incubator/stanbol/trunk/entityhub/generic/test/pom.xml
    incubator/stanbol/trunk/entityhub/indexing/dbPedia/pom.xml
    incubator/stanbol/trunk/entityhub/indexing/dblp/pom.xml
    incubator/stanbol/trunk/entityhub/indexing/genericRdf/pom.xml
    incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml
    incubator/stanbol/trunk/entityhub/jersey/pom.xml
    incubator/stanbol/trunk/entityhub/launchers/sling/pom.xml
    incubator/stanbol/trunk/entityhub/launchers/sling/src/main/bundles/list.xml
    incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml
    incubator/stanbol/trunk/entityhub/parent/pom.xml
    incubator/stanbol/trunk/entityhub/pom.xml
    incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml
    incubator/stanbol/trunk/entityhub/site/linkedData/pom.xml
    incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml
    incubator/stanbol/trunk/entityhub/yard/solr/pom.xml
    incubator/stanbol/trunk/frameworkfragment/pom.xml
    incubator/stanbol/trunk/parent/pom.xml

Modified: incubator/stanbol/trunk/enhancer/SemiAutomaticContentEnhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/SemiAutomaticContentEnhancer/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/SemiAutomaticContentEnhancer/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/SemiAutomaticContentEnhancer/pom.xml Fri Mar 25 05:20:29 2011
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: incubator/stanbol/trunk/enhancer/autotagging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/autotagging/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/autotagging/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/autotagging/pom.xml Fri Mar 25 05:20:29 2011
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../parent</relativePath>
 	</parent>	
 	
@@ -85,21 +85,29 @@
 			<artifactId>commons-io</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<!-- The Lucene dependencies need to define the version 3.0.1 here
+		     because the parent POM uses 2.9.4 (compatible to Solr 1.4.1)
+		     TODO: Check this as soon as Solr 3.* gets released.
+		     (Rupert Westenthaler 2011-03-23) -->
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-core</artifactId>
+			<version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-queries</artifactId>
+			<version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers</artifactId>
+			<version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.hp.hpl.jena</groupId>
 			<artifactId>jena</artifactId>

Modified: incubator/stanbol/trunk/enhancer/clerezza/clerezza-sparql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/clerezza/clerezza-sparql/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/clerezza/clerezza-sparql/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/clerezza/clerezza-sparql/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/pom.xml Fri Mar 25 05:20:29 2011
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 	

Modified: incubator/stanbol/trunk/enhancer/engines/autotagging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/autotagging/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/autotagging/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/autotagging/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
@@ -122,19 +122,26 @@
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>org.apache.clerezza.rdf.core</artifactId>
 		</dependency>
+        <!-- The Lucene dependencies need to define the version 3.0.1 here
+             because the parent POM uses 2.9.4 (compatible to Solr 1.4.1)
+             TODO: Check this as soon as Solr 3.* gets released.
+             (Rupert Westenthaler 2011-03-23) -->
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-core</artifactId>
+            <version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-queries</artifactId>
+            <version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers</artifactId>
+            <version>3.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
@@ -87,13 +87,11 @@
         <dependency>
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-            <version>0.1-SNAPSHOT</version>
-			<scope>compile</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
-            <version>0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>

Modified: incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
@@ -94,7 +94,6 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
-      <version>0.9-SNAPSHOT</version>
     </dependency>
         <dependency> <!-- used to parse json responses of geonames.org -->
             <groupId>org.codehaus.jettison</groupId>

Modified: incubator/stanbol/trunk/enhancer/engines/langid/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/langid/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/langid/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/langid/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
     <groupId>org.apache.stanbol</groupId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 

Modified: incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
 		<groupId>org.apache.stanbol</groupId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
@@ -140,6 +140,11 @@
 			<artifactId>icu4j</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+	        <groupId>commons-httpclient</groupId>
+	        <artifactId>commons-httpclient</artifactId>
+            <scope>compile</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -162,7 +167,7 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-jdk14</artifactId>
 		</dependency>
-		
+         		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

Modified: incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
 		<groupId>org.apache.stanbol</groupId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
   <packaging>bundle</packaging>
-  <version>0.9-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
 
   <name>Apache Stanbol Enhancer Enhancement Engine : Zemanta Tagging</name>
   <description></description>

Modified: incubator/stanbol/trunk/enhancer/generic/jobmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jobmanager/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/jobmanager/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/jobmanager/pom.xml Fri Mar 25 05:20:29 2011
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/generic/jsonld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/jsonld/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/jsonld/pom.xml Fri Mar 25 05:20:29 2011
@@ -7,14 +7,14 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
 	<groupId>org.apache.stanbol</groupId>
 	<artifactId>org.apache.stanbol.jsonld</artifactId>
 	<packaging>bundle</packaging>
-	<version>0.9-SNAPSHOT</version>
+	<version>${stanbol-version}</version>
 
 	<name>Apache Stanbol JSON-LD API</name>
 	<description>The FISE JSON-LD API</description>

Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml Fri Mar 25 05:20:29 2011
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/generic/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/standalone/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/standalone/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/standalone/pom.xml Fri Mar 25 05:20:29 2011
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/integration-tests/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/integration-tests/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/integration-tests/pom.xml Fri Mar 25 05:20:29 2011
@@ -1,17 +1,18 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.stanbol</groupId>
         <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>${stanbol-version}</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.enhancer.integration-tests</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <packaging>jar</packaging>
     
     <name>Apache Stanbol Enhancer Integration Tests</name>

Modified: incubator/stanbol/trunk/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/jersey/pom.xml Fri Mar 25 05:20:29 2011
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

Modified: incubator/stanbol/trunk/enhancer/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/full/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/full/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/launchers/full/pom.xml Fri Mar 25 05:20:29 2011
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 
@@ -62,7 +62,7 @@
 							<jarWebSupport>
 								<groupId>org.apache.felix</groupId>
 								<artifactId>org.apache.felix.http.jetty</artifactId>
-								<version>2.0.4</version>
+								<version>2.2.0</version>
 							</jarWebSupport>
 						</configuration>
 					</execution>

Modified: incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml Fri Mar 25 05:20:29 2011
@@ -9,7 +9,7 @@
 		<bundle>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.frameworkfragment</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</bundle>
 		<bundle>
 			<groupId>org.apache.sling</groupId>
@@ -118,6 +118,11 @@
 			<artifactId>httpcore-osgi</artifactId>
 			<version>4.0.1</version>
 		</bundle>
+		<bundle>
+	        <groupId>commons-httpclient</groupId>
+	        <artifactId>commons-httpclient</artifactId>
+	        <version>3.1</version>
+		</bundle>
 	<bundle>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -126,7 +131,7 @@
     <bundle>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.1</version>    
+      <version>1.2.2</version>    
     </bundle>
     <bundle>
         <groupId>joda-time</groupId>
@@ -374,44 +379,44 @@
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
   </startLevel>
   <startLevel level="16">
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.core</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
 	  <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
-	  <version>0.1-SNAPSHOT</version>
+	  <version>0.9-SNAPSHOT</version>
     </bundle>
   </startLevel>
     

Copied: incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg (from r1082932, incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.embedded.EmbeddedSolrPorovider.cfg)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg?p2=incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg&p1=incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.embedded.EmbeddedSolrPorovider.cfg&r1=1082932&r2=1085256&rev=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.embedded.EmbeddedSolrPorovider.cfg (original)
+++ incubator/stanbol/trunk/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg Fri Mar 25 05:20:29 2011
@@ -1 +1 @@
-org.apache.stanbol.entityhub.yard.solr.embedded.solrDataDir=${user.dir}/sling/entityhub/solrYard/indexes
+org.apache.stanbol.entityhub.yard.solr.managedSolrDir=${user.dir}/sling/entityhub/solrYard/indexes

Modified: incubator/stanbol/trunk/enhancer/launchers/lite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/lite/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/lite/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/launchers/lite/pom.xml Fri Mar 25 05:20:29 2011
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 	
@@ -62,7 +62,7 @@
 							<jarWebSupport>
 								<groupId>org.apache.felix</groupId>
 								<artifactId>org.apache.felix.http.jetty</artifactId>
-								<version>2.0.4</version>
+								<version>2.2.0</version>
 							</jarWebSupport>
 						</configuration>
 					</execution>

Modified: incubator/stanbol/trunk/enhancer/launchers/lite/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/lite/src/main/bundles/list.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/lite/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/launchers/lite/src/main/bundles/list.xml Fri Mar 25 05:20:29 2011
@@ -9,7 +9,7 @@
 		<bundle>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.frameworkfragment</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</bundle>
 		<bundle>
 			<groupId>org.apache.sling</groupId>

Modified: incubator/stanbol/trunk/enhancer/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/parent/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/parent/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/parent/pom.xml Fri Mar 25 05:20:29 2011
@@ -6,12 +6,13 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>stanbol-parent</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
+  <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.9-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
 
   <name>Apache Stanbol Enhancer Parent POM</name>
   <description>Parent POM for Apache Stanbol Enhancer</description>

Modified: incubator/stanbol/trunk/enhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/pom.xml Fri Mar 25 05:20:29 2011
@@ -16,14 +16,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>./parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.enhancer.reactor</artifactId>
   <packaging>pom</packaging>
-  <version>0.9-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
 
   <name>Apache Stanbol Enhancer reactor</name>
   <description>

Modified: incubator/stanbol/trunk/enhancer/stores/jcrstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/stores/jcrstore/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/stores/jcrstore/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/stores/jcrstore/pom.xml Fri Mar 25 05:20:29 2011
@@ -4,13 +4,13 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>${stanbol-version}</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 	<groupId>org.apache.stanbol</groupId>
 	<artifactId>org.apache.stanbol.enhancer.stores.jcrstore</artifactId>
 	<packaging>bundle</packaging>
-	<version>0.9-SNAPSHOT</version>
+	<version>${stanbol-version}</version>
 	<name>Apache Stanbol Enhancer JCR Store</name>
 	<description>Implementation of the Stanbol Enhancer Store API that uses JCR
   </description>

Modified: incubator/stanbol/trunk/entityhub/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.core</artifactId>
   <packaging>bundle</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
 
   <name>Apache Stanbol Entityhub Core </name>
   <description>The Core Components of the Entityhub. This includes the default
@@ -76,7 +76,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-scr-plugin</artifactId>
-        <version>1.4.4</version>
       </plugin>
        
     </plugins>
@@ -86,92 +85,50 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <!-- OSGI framework dependencies -->
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.scr.annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
+	<dependency>
+	    <groupId>org.osgi</groupId>
+	    <artifactId>org.osgi.compendium</artifactId>
+	    <scope>provided</scope>
+	</dependency>
+	<!-- utilities -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.2</version>
       <scope>provided</scope>
     </dependency>    
     <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>1.6.2</version>
-        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
-        <version>3.2.1</version>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-      <version>1.1.1</version>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.scr.annotations</artifactId>
-        <version>1.3.0</version>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</artifactId>
-      <version>1.2.4</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.metatype</artifactId>
-      <version>1.0.4</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.4.0</version>
-      <scope>provided</scope>
     </dependency>
-    
     <!-- for tests -->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.test</artifactId>
-      <version>0.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
   <packaging>bundle</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
 
   <name>Apache Stanbol Entityhub Services API</name>
   <description>The Services API of the Entityhub</description>
@@ -74,35 +74,20 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-scr-plugin</artifactId>
-        <version>1.4.4</version>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
-    <!-- <dependency>  no longer needed!
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.core</artifactId>
-      <version>0.12-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency> -->
-    <!-- <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>  -->
-
     <!-- for tests -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/stanbol/trunk/entityhub/generic/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/test/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/test/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/generic/test/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.test</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
   <name>Apache Stanbol Entityhub - Test Framework</name>
   <description>Unit test framework for the Interfaces defined within the
   services APO of the Entityhub</description>
@@ -53,7 +53,6 @@
       <dependency>
           <groupId>org.apache.stanbol</groupId>
           <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-          <version>0.1-SNAPSHOT</version>
       </dependency>
    </dependencies>
 </project>

Modified: incubator/stanbol/trunk/entityhub/indexing/dbPedia/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/dbPedia/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/dbPedia/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/indexing/dbPedia/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-		<version>0.1-SNAPSHOT</version>
+		<version>0.9-SNAPSHOT</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 -->
 	<groupId>org.apache.stanbol</groupId>
 	<artifactId>org.apache.stanbol.entityhub.indexing.dbPedia</artifactId>
 	<packaging>jar</packaging>
-	<version>0.1-SNAPSHOT</version>
+	<version>0.9-SNAPSHOT</version>
 	<name>Apache Stanbol Entityhub Indexing for geonames.org</name>
 	<description>This uses the RDF dump of dbPedia.org to create a Full Yard for dbPedia.org  </description>
   <scm>
@@ -59,27 +59,27 @@
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.entityhub.indexing.genericRdf</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.9-SNAPSHOT</version>
         </dependency>
        <!-- for the main -->
 		<dependency>

Modified: incubator/stanbol/trunk/entityhub/indexing/dblp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/dblp/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/dblp/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/indexing/dblp/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-		<version>0.1-SNAPSHOT</version>
+		<version>0.9-SNAPSHOT</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 -->
 	<groupId>org.apache.stanbol</groupId>
 	<artifactId>org.apache.stanbol.entityhub.indexing.dblp</artifactId>
 	<packaging>jar</packaging>
-	<version>0.1-SNAPSHOT</version>
+	<version>0.9-SNAPSHOT</version>
 	<name>Apache Stanbol Entityhub Indexing for dblp</name>
 	<description>This uses the RDF dump provided by 
         http://dblp.l3s.de/dblp.rdf.gz to create a Full Cache 
@@ -63,27 +63,27 @@
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.entityhub.indexing.genericRdf</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.9-SNAPSHOT</version>
         </dependency>
        <!-- for the main -->
 		<dependency>

Modified: incubator/stanbol/trunk/entityhub/indexing/genericRdf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/genericRdf/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/genericRdf/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/indexing/genericRdf/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.indexing.genericRdf</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
   <name>Apache Stanbol Entityhub Indexing for rdf Resource</name>
   <description>This indexes all kind of RDF sources by using a prased
   configuration (FieldMapper to define index fields and field values and a set 
@@ -53,12 +53,12 @@
     <dependency>
         <groupId>org.apache.stanbol</groupId>
         <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>${stanbol-version}</version>
     </dependency>
     <dependency>
         <groupId>org.apache.stanbol</groupId>
         <artifactId>org.apache.stanbol.entityhub.core</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>${stanbol-version}</version>
     </dependency>
     <dependency>
       <groupId>com.hp.hpl.jena</groupId>

Modified: incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
 	<parent>
 		<groupId>org.apache.stanbol</groupId>
 		<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-		<version>0.1-SNAPSHOT</version>
+		<version>0.9-SNAPSHOT</version>
 		<relativePath>../../parent</relativePath>
 	</parent>
 -->
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.indexing.geonames</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.9-SNAPSHOT</version>
   <name>Apache Stanbol Entityhub Indexing for geonames.org</name>
   <description>This uses the DB dump of geonames.org to create a Full Yard containing all points of
     interest of geonames.org
@@ -61,22 +61,22 @@
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.entityhub.core</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.9-SNAPSHOT</version>
 		</dependency>
        <!-- for the main -->
 		<dependency>

Modified: incubator/stanbol/trunk/entityhub/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/jersey/pom.xml Fri Mar 25 05:20:29 2011
@@ -21,13 +21,13 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
   <packaging>bundle</packaging>
 
   <name>Apache Stanbol Entityhub Jersey JAX-RS API and front-end</name>
@@ -42,10 +42,43 @@
     <url>http://incubator.apache.org/stanbol</url>
   </scm>
 
-  <properties>
-    <jersey-version>1.1.5.1</jersey-version>
-    <pax-exam-version>1.2.0</pax-exam-version>
-  </properties>
+ <build>
+    <!-- make it an OSGi bundle -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.stanbol.entityhub.jersey.*
+            </Export-Package>
+            <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Import-Package>
+              !org.mortbay.*,
+              *
+            </Import-Package>
+            <!--  <Embed-Dependency>freemarker</Embed-Dependency>  -->
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <dependencies>
 
@@ -53,110 +86,63 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.core</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.clerezza</groupId>
       <artifactId>org.apache.clerezza.rdf.core</artifactId>
-      <version>0.12-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.clerezza</groupId>
       <artifactId>org.apache.clerezza.jaxrs.rdf.providers</artifactId>
-      <version>0.13-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.clerezza</groupId>
       <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
-      <version>0.9-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
      <dependency>
       <groupId>org.apache.clerezza</groupId>
       <artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
-      <version>0.10-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.clerezza</groupId>
       <artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
-      <version>0.3-incubating-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- specific deps for this project -->
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jersey-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey-version}</version>
-      <exclusions>
-        <!-- jaxb is now part of java 6 -->
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- no Freemaker UI for now
-    <dependency>
-      <groupId>freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-      <version>2.3.9</version>
-    </dependency> -->
-    <!-- indirect dependency for freemarker -->
-    <!-- <dependency>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-      <version>1.2</version>
-    </dependency> -->
 
+        <!-- Jersey -->
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        
     <!-- servlet container, most useful for the tests -->
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.22</version>
       <scope>provided</scope>
     </dependency>
 
@@ -169,34 +155,26 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.4</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
     </dependency>
 
     <!-- OSGi tax -->
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.scr.annotations</artifactId>
-      <version>1.2.0</version>
-      <scope>provided</scope>
     </dependency>
 
     <!-- for tests -->
@@ -208,43 +186,37 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
-      <version>${jersey-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam</artifactId>
-      <version>${pax-exam-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit</artifactId>
-      <version>${pax-exam-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-default</artifactId>
-      <version>${pax-exam-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
+<!-- 
   <repositories>
-    <!-- needed for jersey -->
     <repository>
       <id>maven2-repository.dev.java.net</id>
       <name>Java.net Repository for Maven</name>
@@ -256,73 +228,11 @@
       <url>http://repository.codehaus.org</url>
     </repository>
 
-    <!-- needed for clerezza SNAPSHOT only -->
     <repository>
       <id>apache repository - snapshot repo</id>
       <name>apache repository</name>
       <url>https://repository.apache.org/content/repositories/snapshots</url>
     </repository>
-  </repositories>
-
-  <build>
-    <!-- make it an OSGi bundle -->
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.stanbol.entityhub.jersey.*
-            </Export-Package>
-            <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Import-Package>
-              !com.sun.grizzly.*,
-              !com.sun.net.*,
-              !javax.activation.*,
-              !javax.annotation.*,
-              !javax.ejb.*,
-              !javax.enterprise.*,
-              !javax.imageio.*,
-              !javax.interceptor.*,
-              !javax.mail.*,
-              !javax.persistence.*,
-              !javax.servlet.annotation.*,
-              !javax.servlet.jsp.*,
-              !org.apache.log.*,
-              !org.apache.tools.*,
-              !org.apache.xml.*,
-              !org.apache.xpath.*,
-              !org.dom4j.*,
-              !org.jaxen.*,
-              !org.jdom.*,
-              !org.mozilla.javascript.*,
-              !org.python.*,
-              
-              !com.sun.xml.bind.v2.*,
-              !org.mortbay.*,
-              *
-            </Import-Package>
-            <!--  <Embed-Dependency>freemarker</Embed-Dependency>  -->
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-scr-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+  </repositories>  -->
+ 
 </project>

Modified: incubator/stanbol/trunk/entityhub/launchers/sling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/pom.xml Fri Mar 25 05:20:29 2011
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>${stanbol-version}</version>
     <relativePath>../../parent</relativePath>
   </parent>
   <groupId>org.apache.stanbol</groupId>
   <artifactId>org.apache.stanbol.entityhub.launchers.sling</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>${stanbol-version}</version>
   <name>Apache Stanbol Entityhub Sling-based standalone launcher</name>
   <description>Runnable jar that runs the standard IKS Entityhub configuration</description>
   <scm>
@@ -42,13 +42,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <filesets>
             <fileset>
               <directory>${basedir}</directory>
               <includes>
-                <include>sling</include>
+                <include>sling/**</include>
               </includes>
             </fileset>
           </filesets>
@@ -62,7 +61,6 @@
             and Karaf description, we could add this.
             See http://sling.apache.org/site/maven-launchpad-plugin.html
          -->
-        <version>2.0.6</version>
         <executions>
           <execution>
             <id>prepare-package</id>
@@ -75,7 +73,7 @@
               <jarWebSupport>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.http.jetty</artifactId>
-                <version>2.0.4</version>
+                <version>2.2.0</version>
               </jarWebSupport>
             </configuration>
           </execution>
@@ -102,9 +100,7 @@
       <!-- maven-launchpad-plugin builds on the launchpad.base app -->
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.launchpad.base</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
       <classifier>app</classifier>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/bundles/list.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/bundles/list.xml Fri Mar 25 05:20:29 2011
@@ -1,302 +1,329 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    List of initial bundles for the RICK Sling-based
-    standalone launcher.
- -->
+	<!--
+		List of initial bundles for the RICK Sling-based standalone launcher.
+	-->
 <bundles>
 
-  <!-- OSGi infrastructure -->
-  <startLevel level="5">
-    <bundle>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.log</artifactId>
-      <version>2.0.6</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.4.0</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr</artifactId>
-      <version>1.6.0</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</artifactId>
-      <version>1.2.8</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.metatype</artifactId>
-      <version>1.0.4</version>
-    </bundle>
-    <bundle>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>4.2.0</version>
-    </bundle>
-  </startLevel>
-
-  <!-- HTTP service -->
-  <startLevel level="5">
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.http.whiteboard</artifactId>
-      <version>2.0.4</version>
-    </bundle>
-  </startLevel>
-
-  <!-- Felix web console and plugins -->
-  <startLevel level="10">
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole</artifactId>
-      <version>3.1.2</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
-      <version>1.0.2</version>
-    </bundle>
-  </startLevel>
-
-  <!-- General-purpose libraries -->
-  <startLevel level="10">
-    <bundle>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>1.2</version>
-    </bundle>
-    <bundle>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.4</version>
-    </bundle>
-    <bundle>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.1</version>
-    </bundle>
-    <bundle>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.4</version>
-    </bundle>
-    <bundle>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-compress</artifactId>
-        <version>1.0</version>
-    </bundle>
-    <bundle>
-	    <groupId>org.apache.httpcomponents</groupId>
-	    <artifactId>httpcore-osgi</artifactId>
-	    <version>4.0.1</version>
-    </bundle>
-	<bundle>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-    </bundle>
-    <bundle>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.2.1</version>    
-    </bundle>
-    <bundle>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>1.6.2</version>
-    </bundle>
-    <bundle>
-        <groupId>org.codehaus.jettison</groupId>
-        <artifactId>jettison</artifactId>
-        <version>1.2</version>    
-    </bundle>
-  </startLevel>
-
-  <!-- RICK infrastructure and required libraries-->
-  <startLevel level="15">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  <startLevel level="16">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.core</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-	  <groupId>org.apache.stanbol</groupId>
-	  <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
-	  <version>0.1-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-  <!-- Clerezza storage and sparql infrastructure -->
-  <startLevel level="17">
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.core</artifactId>
-      <version>0.12-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.utils</artifactId>
-      <version>0.13-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.utils</artifactId>
-      <version>0.1-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
-      <version>0.11-incubating-SNAPSHOT</version>
-    </bundle>
-    <!--
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
-      <version>0.7-incubating-SNAPSHOT</version>
-    </bundle>
-    -->
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.sparql</artifactId>
-      <version>0.5-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.commons</artifactId>
-      <version>0.5-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.facade</artifactId>
-      <version>0.12-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza.ext</groupId>
-      <artifactId>com.hp.hpl.jena.tdb</artifactId>
-      <version>0.3-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza.ext</groupId>
-      <artifactId>javax.mail</artifactId>
-      <version>0.4-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.wymiwyg</groupId>
-      <artifactId>wymiwyg-commons-core</artifactId>
-      <version>0.7.5</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza.ext</groupId>
-      <artifactId>com.ibm.icu</artifactId>
-      <version>0.5-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.storage</artifactId>
-      <version>0.5-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.tdb.storage</artifactId>
-      <version>0.5-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
-      <version>0.9-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
-      <version>0.10-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
-      <version>0.3-incubating-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza.ext</groupId>
-      <artifactId>org.json.simple</artifactId>
-      <version>0.3-incubating-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!-- Additional Clerezza serializers -->
-
-  <startLevel level="18">
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
-      <version>0.9-incubating-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!-- JAX-RS -->
-  <startLevel level="5">
-    <!--
-         WARNING: jersey-core bug, must start before jersey-server
-         to avoid jersey spi class not found errors. Restart jersey-server
-         manually if getting those.
-    -->
-    <bundle>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>1.2</version>
-    </bundle>
-  </startLevel>
-  <startLevel level="16">
-    <bundle>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-      <version>1.1.1</version>
-    </bundle>
-    <bundle>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>1.2</version>
-    </bundle>
-	<bundle>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-      <version>1.2</version>
-    </bundle>
-  </startLevel>
+	<!-- OSGi infrastructure -->
+	<startLevel level="5">
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.frameworkfragment</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.commons.log</artifactId>
+			<version>2.0.6</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<version>1.4.0</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr</artifactId>
+			<version>1.6.0</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.configadmin</artifactId>
+			<version>1.2.8</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.metatype</artifactId>
+			<version>1.0.4</version>
+		</bundle>
+		<bundle>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.compendium</artifactId>
+			<version>4.2.0</version>
+		</bundle>
+	</startLevel>
+
+	<!-- HTTP service -->
+	<startLevel level="5">
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.http.whiteboard</artifactId>
+			<version>2.0.4</version>
+		</bundle>
+		<bundle>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.compendium</artifactId>
+			<version>4.1.0</version>
+		</bundle>
+	</startLevel>
+
+	<!-- Felix web console and plugins -->
+	<startLevel level="10">
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.webconsole</artifactId>
+			<version>3.1.8</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.webconsole.plugins.memoryusage
+			</artifactId>
+			<version>1.0.2</version>
+		</bundle>
+	</startLevel>
+
+	<!-- Sling utility bundles -->
+	<startLevel level="10">
+		<bundle>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.launchpad.installer</artifactId>
+			<version>1.0.0</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.launchpad.api</artifactId>
+			<version>1.0.0</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.installer.core</artifactId>
+			<version>3.1.2</version>
+		</bundle>
+	</startLevel>
+
+	<!-- General-purpose libraries -->
+	<startLevel level="10">
+		<bundle>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+		</bundle>
+		<bundle>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+		</bundle>
+		<bundle>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</bundle>
+		<bundle>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.0</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore-osgi</artifactId>
+			<version>4.0.1</version>
+		</bundle>
+		<bundle>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.4</version>
+		</bundle>
+		<bundle>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.2</version>
+		</bundle>
+		<bundle>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>1.6.2</version>
+		</bundle>
+		<bundle>
+			<groupId>org.codehaus.jettison</groupId>
+			<artifactId>jettison</artifactId>
+			<version>1.2</version>
+		</bundle>
+	</startLevel>
+
+	<!-- RICK infrastructure and required libraries-->
+	<startLevel level="15">
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+        <bundle>
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.entityhub.core</artifactId>
+            <version>0.9-SNAPSHOT</version>
+        </bundle>
+	</startLevel>
+	<startLevel level="20">
+		<bundle>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</bundle>
+	</startLevel>
+
+	<!-- Clerezza storage and sparql infrastructure -->
+	<startLevel level="17">
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.core</artifactId>
+			<version>0.12-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.utils</artifactId>
+			<version>0.13-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.utils</artifactId>
+			<version>0.1-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
+			<version>0.11-incubating-SNAPSHOT</version>
+		</bundle>
+		<!--
+			<bundle> <groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
+			<version>0.7-incubating-SNAPSHOT</version> </bundle>
+		-->
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.sparql</artifactId>
+			<version>0.5-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.commons</artifactId>
+			<version>0.5-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.facade</artifactId>
+			<version>0.12-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza.ext</groupId>
+			<artifactId>com.hp.hpl.jena.tdb</artifactId>
+			<version>0.3-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza.ext</groupId>
+			<artifactId>javax.mail</artifactId>
+			<version>0.4-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.wymiwyg</groupId>
+			<artifactId>wymiwyg-commons-core</artifactId>
+			<version>0.7.5</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza.ext</groupId>
+			<artifactId>com.ibm.icu</artifactId>
+			<version>0.5-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.storage</artifactId>
+			<version>0.5-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.tdb.storage</artifactId>
+			<version>0.5-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+			<version>0.9-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
+			<version>0.10-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
+			<version>0.3-incubating-SNAPSHOT</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza.ext</groupId>
+			<artifactId>org.json.simple</artifactId>
+			<version>0.3-incubating-SNAPSHOT</version>
+		</bundle>
+	</startLevel>
+
+	<!-- Additional Clerezza serializers -->
+
+	<startLevel level="18">
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+			<version>0.9-incubating-SNAPSHOT</version>
+		</bundle>
+	</startLevel>
+
+	<!-- JAX-RS -->
+	<startLevel level="5">
+		<!--
+			WARNING: jersey-core bug, must start before jersey-server to avoid
+			jersey spi class not found errors. Restart jersey-server manually if
+			getting those.
+		-->
+		<bundle>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-core</artifactId>
+			<version>1.2</version>
+		</bundle>
+	</startLevel>
+	<startLevel level="16">
+		<bundle>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>jsr311-api</artifactId>
+			<version>1.1.1</version>
+		</bundle>
+		<bundle>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-server</artifactId>
+			<version>1.2</version>
+		</bundle>
+		<bundle>
+			<groupId>org.codehaus.jettison</groupId>
+			<artifactId>jettison</artifactId>
+			<version>1.2</version>
+		</bundle>
+	</startLevel>
 
 </bundles>

Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config Fri Mar 25 05:20:29 2011
@@ -0,0 +1,8 @@
+org.apache.stanbol.entityhub.description="The\ entityhub\ holding\ all\ locally\ managed\ entities"
+org.apache.stanbol.entityhub.id="entityhub"
+org.apache.stanbol.entityhub.name="Entityhub"
+org.apache.stanbol.entityhub.defaultSymbolState="proposed"
+org.apache.stanbol.entityhub.defaultMappingState="proposed"
+org.apache.stanbol.entityhub.mapping.entityhub=["|\ @\=null;en;de;fr;it","rdfs:label","rdfs:label\ >\ entityhub:label","rdfs:comment","rdfs:comment\ >\ entityhub:description","rdf:type\ |\ d\=entityhub:ref","owl:sameAs\ |\ d\=entityhub:ref","dc:*","dc:title\ >\ entityhub:label","dc:description\ >\ entityhub:description","dc-elements:*","dc-elements:title\ >\ entityhub:label","dc-elements:description\ >\ entityhub:description","geo:lat\ |\ d\=xsd:double","geo:long\ |\ d\=xsd:double","geo:alt\ |\ d\=xsd:int;xsd:float","skos:*","skos:prefLabel\ \ >\ entityhub:label","skos:definition\ >\ entityhub:description","skos:note\ >\ entityhub:description","skos:broader\ |\ d\=entityhub:ref","skos:narrower\ |\ d\=entityhub:ref","skos:related\ |\ d\=entityhub:ref","skos:subject\ |\ d\=entityhub:ref","skos:inScheme\ |\ d\=entityhub:ref","foaf:*","foaf:name\ >\ entityhub:label","foaf:homepage\ |\ d\=xsd:anyURI","foaf:depiction\ |\ d\=xsd:anyURI","foaf:img\ |\ d\=xsd:anyURI","foaf:logo\ |\ d
 \=xsd:anyURI","foaf:page\ |\ d\=xsd:anyURI"]
+org.apache.stanbol.entityhub.yard.entityhubYardId="entityhubYard"
+org.apache.stanbol.entityhub.prefix="urn:org.apache.stanbol:entityhub:"

Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config Fri Mar 25 05:20:29 2011
@@ -0,0 +1,3 @@
+service.pid="org.apache.stanbol.entityhub.core.site.CacheImpl.dbPediaLocalCache"
+org.apache.stanbol.entityhub.yard.cacheYardId="dbPediaCache"
+org.apache.stanbol.entityhub.yard.cache.additionalMappings=["|\ @\=null;en;de;fr;it;es","*"]