Author: rwesten
Date: Tue Jun 12 05:13:08 2012
New Revision: 1349120
URL: http://svn.apache.org/viewvc?rev=1349120&view=rev
Log:
STANBOL-608: Upgrade Apache Sling dependencies: Most important the
sling.launchpad
* added required javax.** packages that are no longer exported by the sling
launcher to the Stanbol framework fragment (see comment to STANBOL-608 for
details)
* switched to javax.servlet 1.5
Upgraded to Apache Felix Web Console 4.0.0
* including WebConsole plugin changes
* added "org.apache.geronimo.bundles:json:20090211_1" bundle to stanbolcommons
bundle list. This exports "org.json" now required by the Felix Web Console 4.0.0
* changed start level for WebConsole so that it starts after the common bundles
(especially 'json' and 'commons-fileupload')
* Adapted OSGI console test because the /shell subpath is no longer available.
Added test for missing Web Console tabs.
Modified:
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/MockServletContext.java
incubator/stanbol/trunk/frameworkfragment/pom.xml
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
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/parent/pom.xml
Modified:
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/MockServletContext.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/MockServletContext.java?rev=1349120&r1=1349119&r2=1349120&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/MockServletContext.java
(original)
+++
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/MockServletContext.java
Tue Jun 12 05:13:08 2012
@@ -175,4 +175,8 @@ public final class MockServletContext im
return "Mock";
}
+ @Override
+ public String getContextPath() {
+ return null;
+ }
}
Modified: incubator/stanbol/trunk/frameworkfragment/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/frameworkfragment/pom.xml?rev=1349120&r1=1349119&r2=1349120&view=diff
==============================================================================
--- incubator/stanbol/trunk/frameworkfragment/pom.xml (original)
+++ incubator/stanbol/trunk/frameworkfragment/pom.xml Tue Jun 12 05:13:08 2012
@@ -227,7 +227,58 @@
com.sun.xml.internal.ws.wsdl.writer.document.soap,
com.sun.xml.internal.ws.wsdl.writer.document.soap12,
com.sun.xml.internal.ws.wsdl.writer.document.xsd,
- org.w3c.dom.traversal
+ javax.activation,
+ javax.jws,
+ javax.jws.soap,
+ javax.transaction,
+ javax.transaction.xa,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment,
+ javax.xml.bind.helpers,
+ javax.xml.bind.util,
+ javax.xml.crypto,
+ javax.xml.crypto.dom,
+ javax.xml.crypto.dsig,
+ javax.xml.crypto.dsig.dom,
+ javax.xml.crypto.dsig.keyinfo,
+ javax.xml.crypto.dsig.spec,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.soap,
+ javax.xml.stream,
+ javax.xml.stream.events,
+ javax.xml.stream.util,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ javax.xml.transform.stax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.ws,
+ javax.xml.ws.handler,
+ javax.xml.ws.handler.soap,
+ javax.xml.ws.http,
+ javax.xml.ws.soap,
+ javax.xml.ws.spi,
+ javax.xml.ws.wsaddressing,
+ javax.xml.xpath,
+ org.w3c.dom,
+ org.w3c.dom.bootstrap,
+ org.w3c.dom.css,
+ org.w3c.dom.events,
+ org.w3c.dom.html,
+ org.w3c.dom.ls,
+ org.w3c.dom.ranges,
+ org.w3c.dom.stylesheets,
+ org.w3c.dom.traversal,
+ org.w3c.dom.views,
+ org.w3c.dom.xpath,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers
</Export-Package>
</manifestEntries>
</archive>
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java?rev=1349120&r1=1349119&r2=1349120&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
Tue Jun 12 05:13:08 2012
@@ -33,10 +33,12 @@ public class OsgiConsoleTest extends Sta
"logs",
"memoryusage",
"services",
- "shell",
+ //"shell", No longer available with Felix Webconsole 4.0.0
"stanbol_datafileprovider",
"osgi-installer",
- "slinglog"
+ "slinglog",
+ "depfinder",
+ "vmstat"
};
for(String subpath : subpaths) {
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=1349120&r1=1349119&r2=1349120&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 Jun 12 05:13:08 2012
@@ -48,6 +48,32 @@
<artifactId>org.apache.felix.eventadmin</artifactId>
<version>1.2.14</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>3.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
+ <version>3.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.deploymentadmin</artifactId>
+ <version>0.9.0</version>
+ </bundle>
+ <bundle> <!-- OSGi Command Line Shell support -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>0.10.0</version>
+ </bundle>
+<!-- <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.1.0</version>
+ </bundle> -->
+
</startLevel>
<!-- HTTP service and Http related Utilities -->
@@ -65,17 +91,46 @@
</startLevel>
<!-- Felix web console and plugins -->
- <startLevel level="9">
+ <startLevel level="11">
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
+ <version>4.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.6.6</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.extensions.threaddump</artifactId>
+ <version>0.2.2</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.packageadmin</artifactId>
+ <version>1.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
+ <version>1.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.obr</artifactId>
+ <version>1.0.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole.plugins.memoryusage
- </artifactId>
+ <artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
<version>1.0.2</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
+ <version>1.0.4</version>
+ </bundle>
</startLevel>
</bundles>
\ No newline at end of file
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=1349120&r1=1349119&r2=1349120&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 Jun 12 05:13:08 2012
@@ -26,7 +26,7 @@
</startLevel>
<!-- HTTP service and Http related Utilities -->
- <startLevel level="5">
+ <startLevel level="6">
<!-- Allows to parse Http Headers as QueryParameter -->
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -41,13 +41,13 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
+ <version>3.3.6</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.factory.configuration
</artifactId>
- <version>1.0.0</version>
+ <version>1.0.8</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -58,7 +58,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.provider.file</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</bundle>
</startLevel>
@@ -67,12 +67,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.0.0</version>
+ <version>1.1.2</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</bundle>
</startLevel>
@@ -121,6 +121,12 @@
<artifactId>httpcore-osgi</artifactId>
<version>4.1.4</version>
</bundle>
+ <bundle> <!-- Bundle for org.json -->
+ <!-- this bundle was suggested in the release vote of felix.webconsole
4.0.0 -->
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211_1</version>
+ </bundle>
<!-- not a bundle (need to be embedded)
<bundle>
<groupId>org.apache.httpcomponents</groupId>
@@ -147,17 +153,17 @@
<bundle>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
+ <version>1.9.7</version>
</bundle>
<bundle>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
+ <version>1.9.7</version>
</bundle>
<bundle>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
+ <version>1.9.7</version>
</bundle>
</startLevel>
<startLevel level="15">
@@ -186,7 +192,7 @@
<bundle> <!-- used also for all the other JSON parsing/writing in Stanbol
-->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1349120&r1=1349119&r2=1349120&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Tue Jun 12 05:13:08 2012
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.7</version>
<inherited>true</inherited>
<configuration>
<instructions>
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
+ <version>1.7.4</version>
<!-- slf4j impl is needed when QDox inspects/loads classes that use a
static field for the logger, so that those classes can be loaded.
-->
<dependencies>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -747,7 +747,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<!-- Jersey -->
@@ -1224,23 +1224,23 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<classifier>app</classifier>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.0.0</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
+ <version>3.3.6</version>
</dependency>
<!-- Apache James -->
@@ -1324,7 +1324,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>3.2.2</version>
+ <version>4.0.2</version>
<scope>test</scope>
</dependency>
<!-- already present
