Author: reto
Date: Tue Aug 7 18:24:32 2012
New Revision: 1370421
URL: http://svn.apache.org/viewvc?rev=1370421&view=rev
Log:
STANBOL-714: increased the start-level of all bundles with a startLevel greate
or equals 10 by 10
Modified:
incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties
incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties
Modified:
incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
---
incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
Tue Aug 7 18:24:32 2012
@@ -91,7 +91,7 @@
</startLevel>
<!-- Felix web console and plugins -->
- <startLevel level="11">
+ <startLevel level="21">
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
Modified:
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
---
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Tue Aug 7 18:24:32 2012
@@ -80,7 +80,7 @@
start level 10 TO 19 reserved for required libraries (internal and
external)
********************************************************************* -->
<!-- General-purpose libraries -->
- <startLevel level="10">
+ <startLevel level="20">
<bundle>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -141,7 +141,7 @@
</startLevel>
<!-- Jersey -->
- <startLevel level="14">
+ <startLevel level="24">
<!-- NOTE: jersey-core bug, must start before jersey-server to avoid
jersey spi class not found errors. Restart jersey-server manually if
getting
those. -->
@@ -166,7 +166,7 @@
<version>1.9.7</version>
</bundle>
</startLevel>
- <startLevel level="15">
+ <startLevel level="25">
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
@@ -197,7 +197,7 @@
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->
- <startLevel level="16">
+ <startLevel level="26">
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
@@ -294,7 +294,7 @@
</startLevel>
<!-- Stanbol Commons -->
- <startLevel level="17">
+ <startLevel level="27">
<!-- Allows to run Stanbol in offline mode -->
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -341,7 +341,7 @@
</startLevel>
<!-- OpenNLP as bundle + utilities -->
- <startLevel level="17">
+ <startLevel level="27">
<bundle>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-maxent</artifactId>
@@ -360,7 +360,7 @@
</startLevel>
<!-- Apache Solr as bundle + utilities -->
- <startLevel level="17">
+ <startLevel level="27">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
@@ -382,7 +382,7 @@
<version>0.10.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
- <startLevel level="18">
+ <startLevel level="28">
<bundle> <!-- defualt config for Solr -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.defaults</artifactId>
@@ -391,7 +391,7 @@
</startLevel>
<!-- The common web interface -->
- <startLevel level="17">
+ <startLevel level="27">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
@@ -405,7 +405,7 @@
</startLevel>
<!-- LD Path -->
- <startLevel level="17">
+ <startLevel level="27">
<bundle> <!-- LD Path -->
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-api</artifactId>
Modified:
incubator/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
---
incubator/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
Tue Aug 7 18:24:32 2012
@@ -19,7 +19,7 @@
<!-- Scala -->
- <startLevel level="22">
+ <startLevel level="32">
<bundle>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
@@ -43,7 +43,7 @@
</startLevel>
<!-- Console Shell -->
- <startLevel level="23">
+ <startLevel level="33">
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>shell</artifactId>
@@ -67,7 +67,7 @@
</startLevel>
<!-- SSH Shell access -->
- <startLevel level="24">
+ <startLevel level="34">
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>sshshell</artifactId>
Modified: incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml Tue
Aug 7 18:24:32 2012
@@ -25,7 +25,7 @@
(internal and external)
*********************************************************************
-->
<!-- General-purpose libraries -->
- <startLevel level="10">
+ <startLevel level="20">
<bundle> <!-- only used by the Contenthub -->
<groupId>eu.medsea.mimeutil</groupId>
<artifactId>mime-util</artifactId>
@@ -39,7 +39,7 @@
</startLevel>
<!-- Jersey -->
- <startLevel level="15">
+ <startLevel level="25">
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
@@ -48,7 +48,7 @@
</startLevel>
<!-- Stanbol Commons -->
- <startLevel level="17">
+ <startLevel level="27">
<!-- The common web interface -->
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -63,7 +63,7 @@
*********************************************************************
-->
<!-- KReS
- <startLevel level="22">
+ <startLevel level="32">
</startLevel> -->
<!-- *********************************************************************
@@ -71,7 +71,7 @@
(currently the Enhancement Engines)
*********************************************************************
-->
- <startLevel level="26">
+ <startLevel level="36">
<!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified:
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
Tue Aug 7 18:24:32 2012
@@ -27,7 +27,11 @@
<display-name>Sling Servlet</display-name>
<servlet-name>sling</servlet-name>
<servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
- <init-param> <!-- the default sling.home is set to stanbol -->
+ <init-param> <!-- the initial framework startlevel -->
+
<param-name>org.osgi.framework.startlevel.beginning</param-name>
+ <param-value>40/</param-value>
+ </init-param>
+ <init-param> <!-- the default sling.home is set to stanbol -->
<param-name>sling.home</param-name>
<param-value>stanbol/</param-value>
</init-param>
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=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Tue Aug 7
18:24:32 2012
@@ -25,7 +25,7 @@
(internal and external)
*********************************************************************
-->
<!-- General-purpose libraries -->
- <startLevel level="10">
+ <startLevel level="20">
<!-- <bundle> only used by the Contenthub -->
<!-- <groupId>eu.medsea.mimeutil</groupId> -->
<!-- <artifactId>mime-util</artifactId> -->
@@ -34,7 +34,7 @@
</startLevel>
<!-- Jersey -->
- <startLevel level="15">
+ <startLevel level="25">
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
@@ -43,7 +43,7 @@
</startLevel>
<!-- Stanbol Commons -->
- <startLevel level="17">
+ <startLevel level="27">
<!-- The common web interface -->
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -59,7 +59,7 @@
<!-- Stanbol OWL now part of commons -->
<!--
- <startLevel level="22">
+ <startLevel level="32">
</startLevel>
-->
@@ -68,7 +68,7 @@
(currently the Enhancement Engines)
*********************************************************************
-->
- <startLevel level="26">
+ <startLevel level="36">
<!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified:
incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties
(original)
+++ incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties Tue
Aug 7 18:24:32 2012
@@ -20,5 +20,6 @@
# The stanbol home directory
# by default this is set to the same value as sling.home
+org.osgi.framework.startlevel.beginning=40
stanbol.home=${sling.home}
clerezza.shell.disable=true
Modified:
incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties?rev=1370421&r1=1370420&r2=1370421&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties
(original)
+++ incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties
Tue Aug 7 18:24:32 2012
@@ -21,3 +21,4 @@
# The stanbol home directory
# by default this is set to the same value as sling.home
stanbol.home=${sling.home}
+org.osgi.framework.startlevel.beginning=40
