Author: suat
Date: Tue Oct 4 23:52:38 2011
New Revision: 1179012
URL: http://svn.apache.org/viewvc?rev=1179012&view=rev
Log:
STANBOL-319:
-Added attach-bundle-list goal of launchpad plugin of stable launcher to
generate a bundle list to be used from other launchers
-Included bundles of stable launcher in full as default, removed duplicates
from list.xml of full
Modified:
incubator/stanbol/trunk/launchers/full/pom.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stable/pom.xml
Modified: incubator/stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/pom.xml?rev=1179012&r1=1179011&r2=1179012&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/full/pom.xml Tue Oct 4 23:52:38 2011
@@ -75,13 +75,18 @@
<goal>prepare-package</goal>
</goals>
<configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
+ <includeDefaultBundles>true</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
<version>2.2.0</version>
</jarWebSupport>
+ <defaultBundleList>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.stable</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </defaultBundleList>
</configuration>
</execution>
</executions>
Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1179012&r1=1179011&r2=1179012&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Tue Oct 4
23:52:38 2011
@@ -19,169 +19,12 @@
List of initial bundles for the Stanbol Sling-based standalone
launcher.
-->
<bundles>
-
- <!-- *********************************************************************
- start level < 10 reserved for OSGI and Sling Infrastructure
- *********************************************************************
-->
- <!-- OSGi infrastructure -->
- <startLevel level="5">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.frameworkfragment</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.log</artifactId>
- <version>2.1.2</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>
- </startLevel>
-
- <!-- HTTP service -->
- <startLevel level="5">
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.4.0</version>
- </bundle>
- </startLevel>
-
- <!-- Sling installer and Stanbol extensions -->
- <startLevel level="8">
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.installer.bundleprovider</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.provider.file</artifactId>
- <version>1.0.0</version>
- </bundle>
- </startLevel>
-
- <!-- Felix web console and plugins -->
- <startLevel level="9">
- <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 launchpad -->
- <startLevel level="9">
- <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>
- </startLevel>
-
<!-- *********************************************************************
start level 10 TO 19 reserved for required libraries
(internal and external)
*********************************************************************
-->
<!-- 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>
- <!--
- not a bundle
- <bundle>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </bundle>
- -->
- <bundle>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.5</version>
- </bundle>
- <bundle>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- </bundle>
- <bundle> <!-- only used by the Entityhub -->
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6.2</version>
- </bundle>
<bundle> <!-- only used by the Contenthub -->
<groupId>eu.medsea.mimeutil</groupId>
<artifactId>mime-util</artifactId>
@@ -199,240 +42,30 @@
</bundle>
</startLevel>
- <!-- Jersey -->
- <startLevel level="14">
- <!--
- NOTE: 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.7</version>
- </bundle>
- </startLevel>
+ <!-- Jersey Client -->
<startLevel level="15">
<bundle>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.7</version>
- </bundle>
- <bundle>
- <groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.7</version>
</bundle>
- <!-- needed to read data from mime multipart requests -->
- <bundle>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>1.7</version>
- </bundle>
- <!-- dependency of jersey-multipart -->
- <bundle>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- <version>1.4</version>
- </bundle>
- <bundle> <!-- used also for all the other JSON parsing/writing in Stanbol
-->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3</version>
- </bundle>
- </startLevel>
-
- <!-- Clerezza storage and sparql infrastructure -->
- <startLevel level="16">
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <version>0.11-incubating-SNAPSHOT</version>
- </bundle>
- <!--
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.simple.storage</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
- </bundle>
- -->
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.sparql</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.commons</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>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>rdf.jena.storage</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.tdb.storage</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- <version>0.9-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>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>
<!-- Stanbol Commons -->
<startLevel level="17">
- <!-- Allows to run Stanbol in offline mode -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- DataFileProvider and implementations -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- OpenNLP as bundle + utilities -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- support for JSON-LD -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
<!-- The common web interface -->
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.home</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
- <!-- The default data expected by the default configuration of Stanbol -->
- <startLevel level="19">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.0-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.0-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.sites.dbpedia.default</artifactId>
- <version>1.0.2-incubating</version>
- </bundle>
- </startLevel>
-
<!-- *********************************************************************
start level 20 TO 24 reserved for Stanbol Framework
(Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
*********************************************************************
-->
- <!-- Stanbol Enhancer infrastructure and required libraries-->
- <startLevel level="20">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.jobmanager</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
<!-- Clerezza based SPARQL query engine -->
<startLevel level="20">
<bundle>
@@ -442,44 +75,6 @@
</bundle>
</startLevel>
- <!-- Stanbol Entityhub infrastructure and required libraries-->
- <startLevel level="20">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.site.linkeddata</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
<!-- FactStore -->
<startLevel level="20">
<bundle>
@@ -489,19 +84,6 @@
</bundle>
</startLevel>
- <!-- Stanbol Web Fragments -->
- <startLevel level="21">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
<!-- Benchmarks for the Stanbol Enhancer -->
<startLevel level="21">
<bundle>
@@ -712,11 +294,6 @@
<artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
<!--
The geonames.org LocationEnhancement Engines needs two additional
bundles 1) jettyjson 2) commons-io.
Both of them are already present in the bundle list.
@@ -726,12 +303,6 @@
<artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <!-- Entity Tagging Engine (depends on the Entityhub) -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.engine.entitytagging</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
<!-- Taxonomy Linking Engine (depends on the Entityhub) Deprecated
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/pom.xml?rev=1179012&r1=1179011&r2=1179012&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/stable/pom.xml Tue Oct 4 23:52:38 2011
@@ -71,6 +71,7 @@
<id>prepare-package</id>
<goals>
<goal>prepare-package</goal>
+ <goal>attach-bundle-list</goal>
</goals>
<configuration>
<includeDefaultBundles>false</includeDefaultBundles>
