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 2015/05/20 14:41:58 UTC
svn commit: r1680546 [3/3] - in /stanbol/branches/release-0.12: ./
cmsadapter/cmis/ cmsadapter/core/ cmsadapter/jcr/
cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/mapping/
cmsadapter/servicesapi/ cmsadapter/web/ cmsadapter/web/src/main...
Modified: stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -71,6 +71,11 @@
<artifactId>jackson-core</artifactId>
<version>2.3.1</version>
</bundle>
+ <bundle> <!-- hazelcast dependency -->
+ <groupId>com.eclipsesource.minimal-json</groupId>
+ <artifactId>minimal-json</artifactId>
+ <version>0.9.2</version>
+ </bundle>
</startLevel>
<startLevel level="5">
@@ -87,12 +92,12 @@
<bundle>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-runtime-osgi</artifactId>
- <version>2.7.11</version>
+ <version>${sesame-version}</version>
</bundle>
<bundle>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-commons</artifactId>
- <version>3.2.0</version>
+ <version>${marmotta-version}</version>
</bundle>
</startLevel>
@@ -110,7 +115,7 @@
<bundle>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
- <version>3.1.6</version>
+ <version>3.3.1</version>
</bundle>
<!-- EHCache Caching
Modified: stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -37,27 +37,27 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.0</version>
+ <version>1.8.4</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.10</version>
+ <version>1.0.12</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</bundle>
<!-- bundle>
<groupId>org.apache.felix</groupId>
@@ -87,41 +87,46 @@
<bundle> <!-- STANNBOL-1025 upgraded to Sling logging 3.0.0 -->
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>3.0.0</version>
+ <version>4.0.2</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.logservice</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
</bundle>
<bundle> <!-- Can not use 1.7 because of o.a.sling.commons.log -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
+ <version>${slf4j-version}</version>
</bundle>
<bundle>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.6</version>
+ <version>${slf4j-version}</version>
</bundle>
<bundle>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.6.6</version>
+ <version>${slf4j-version}</version>
</bundle>
</startLevel>
<!-- HTTP service and Http related Utilities -->
<!--
- NOTE: in case of a JAR launcher the <jarWebSupport> bundle (by default the
- felix.http.jetty bundle) is expected to use a startLevel of 3
+ NOTE: now that also http version used by the Maven Launchpad plugin is
+ > 2.3 we can add the API modules again to the bundle list.
-->
- <startLevel level="4">
+ <startLevel level="1">
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <version>${felix-http-version}</version>
+ </bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.3.0</version>
+ <version>${felix-http-version}</version>
</bundle>
</startLevel>
@@ -135,12 +140,12 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.2.2</version>
+ <version>4.2.8</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.6</version>
+ <version>2.0.4</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
@@ -160,17 +165,17 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole.plugins.obr</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
- <version>1.1.0</version>
+ <version>1.1.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
- <version>1.0.4</version>
+ <version>1.0.6</version>
</bundle>
<bundle> <!-- The Apache Sling Installer WebConsole plugin -->
<groupId>org.apache.sling</groupId>
Modified: stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -45,12 +45,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.5.4</version>
+ <version>3.6.4</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.14</version>
+ <version>1.1.2</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -60,7 +60,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.provider.file</artifactId>
- <version>1.0.4</version>
+ <version>1.1.0</version>
</bundle>
</startLevel>
@@ -74,12 +74,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
+ <version>1.3.6</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.2.0</version>
+ <version>1.2.2</version>
</bundle>
</startLevel>
@@ -101,7 +101,7 @@
<bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>3.4</version>
</bundle>
<bundle>
<groupId>commons-collections</groupId>
@@ -116,7 +116,7 @@
<bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</bundle>
<bundle>
<groupId>org.tukaani</groupId>
@@ -126,7 +126,7 @@
<bundle>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.9</version>
+ <version>1.10</version>
</bundle>
<bundle>
<groupId>commons-fileupload</groupId>
@@ -151,7 +151,7 @@
<bundle> <!-- used by Lucene core -->
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
<artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</bundle>
<bundle> <!-- used by Solr and Clerezza -->
<groupId>com.ibm.icu</groupId>
@@ -161,12 +161,12 @@
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2.3</version>
+ <version>${httpcomponents-version}</version>
</bundle>
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2.3</version>
+ <version>${httpcomponents-version}</version>
</bundle>
<!-- Stax support -->
@@ -174,17 +174,17 @@
<bundle>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.2</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</bundle>
<bundle> <!-- XML stax lib used by jackson -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.1.4</version>
+ <version>4.4.1</version>
</bundle>
<bundle>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>3.1.4</version>
+ <version>4.0.0</version>
</bundle>
<bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org -->
@@ -195,28 +195,28 @@
<bundle> <!-- only used by the Entityhub -->
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.3</version>
+ <version>2.7</version>
</bundle>
<!-- JSON libs -->
<bundle> <!-- used for simple JSON parsing/writing in Stanbol -->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.5</version>
+ <version>1.3.7</version>
</bundle>
<bundle> <!-- used for stream parsing/serialization -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.13</version>
+ <version>${jackson-version}</version>
</bundle>
<bundle> <!-- JSON Tree model and JSON - Object mappings -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <version>${jackson-version}</version>
</bundle>
<bundle> <!-- for JAX-RS integration -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
+ <version>${jackson-version}</version>
</bundle>
<!-- Velocity -->
<!-- only used by Enhancer Benchmarking (org.apache.stanbol.enhancer.benchmark) -->
@@ -244,89 +244,54 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.18.1</version>
+ <version>1.19</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <version>2.5.0</version>
</bundle>
</startLevel>
<startLevel level="25">
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.18.1</version>
+ <version>1.19</version>
</bundle>
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
- <version>1.18.1</version>
+ <version>1.19</version>
</bundle>
<!-- needed to read data from mime multipart requests -->
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.utils</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</bundle>
<!-- still used in many places also it only runs on jersey and the code is not portable across jax-rs implementations -->
<bundle>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
- <version>1.18.1</version>
+ <version>1.19</version>
</bundle>
<!-- dependency of jersey-multipart -->
<bundle>
- <groupId>org.jvnet</groupId>
+ <groupId>org.jvnet.mimepull</groupId>
<artifactId>mimepull</artifactId>
- <version>1.6</version>
+ <version>1.9.5</version>
</bundle>
<!-- MessageBodyReaders and Writers for Clereza RDF entities -->
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.13-incubating</version>
+ <version>0.15</version>
</bundle>
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->
<startLevel level="26">
<bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- <version>0.12-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <version>0.13-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils</artifactId>
- <version>0.1-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <version>0.11-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.sparql</artifactId>
- <version>0.5-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.commons</artifactId>
- <version>0.5-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.facade</artifactId>
- <version>0.12-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena.tdb</artifactId>
- <version>0.3-incubating</version>
- </bundle>
- <bundle>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>javax.mail</artifactId>
<version>0.4-incubating</version>
@@ -334,7 +299,7 @@
<bundle>
<groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
- <version>0.7.6</version>
+ <version>0.8</version>
</bundle>
<!-- ICU is an bundle in the meantime
bundle>
@@ -342,36 +307,6 @@
<artifactId>com.ibm.icu</artifactId>
<version>0.5-incubating</version>
</bundle -->
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.storage</artifactId>
- <version>0.5-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.tdb.storage</artifactId>
- <version>0.5-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- <version>0.9-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- <version>0.10-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- <version>0.3-incubating</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.json.simple</artifactId>
- <version>0.3-incubating</version>
- </bundle>
<!--
Add support for fast index based in-memory models
-->
@@ -531,17 +466,17 @@
<bundle> <!-- LD Path -->
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-api</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</bundle>
<bundle>
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-core-bundle</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</bundle>
<bundle>
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-template</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/branches/release-0.12/launchers/bundlelists/zzshell/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/zzshell/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/zzshell/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/zzshell/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -21,24 +21,34 @@
<!-- Scala -->
<startLevel level="32">
<bundle>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
- <version>2.8.1_1</version>
- </bundle>
- <bundle>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.scala-compiler</artifactId>
- <version>2.8.1_1</version>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.3</version>
</bundle>
+ <bundle>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-actors</artifactId>
+ <version>2.10.3</version>
+ </bundle>
+ <bundle>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>2.10.3</version>
+ </bundle>
+ <bundle>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <version>2.10.3</version>
+ </bundle>
<bundle>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>slf4j-scala-api</artifactId>
- <version>1.6.1-incubating</version>
+ <version>1.6.3</version>
</bundle>
<bundle>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>script-engine</artifactId>
- <version>0.1-incubating</version>
+ <version>0.3</version>
</bundle>
</startLevel>
Modified: stanbol/branches/release-0.12/launchers/full-war/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full-war/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full-war/pom.xml (original)
+++ stanbol/branches/release-0.12/launchers/full-war/pom.xml Wed May 20 12:41:56 2015
@@ -54,11 +54,14 @@
</goals>
<configuration>
<includeDefaultBundles>false</includeDefaultBundles>
- <!-- jarWebSupport> - not needed for a WAR launcher -
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <startLevel>3</startLevel>
- </jarWebSupport -->
+ <!-- additionalBundles>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
+ </bundle>
+ </additionalBundles -->
</configuration>
</execution>
</executions>
@@ -66,17 +69,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <!-- not needed for a WAR launcher
- <addClasspath>true</addClasspath>
- <mainClass>org.apache.sling.launchpad.app.Main</mainClass>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- -->
- </manifest>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -87,7 +79,7 @@
<webResources>
<resource>
<directory>
- ${project.build.directory}/launchpad-bundles
+ ${project.build.directory}/launchpad-bundles/
</directory>
<targetPath>WEB-INF</targetPath>
</resource>
@@ -144,14 +136,33 @@
<version>0.12.1-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
- <!-- Security Support-->
+
+ <!-- Clerezza RDF bundles -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf</artifactId>
+ <version>0.1</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Clerezza Jena TDB storage (used by Ontonet) -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf.tdb</artifactId>
+ <version>0.1</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Security Support
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
<version>0.12.1-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<!-- Stanbol CMS Adapter Bundle List -->
<dependency>
Modified: stanbol/branches/release-0.12/launchers/full-war/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full-war/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full-war/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/full-war/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -26,11 +26,11 @@
********************************************************************* -->
<!-- General-purpose libraries -->
<startLevel level="20">
- <bundle> <!-- only used by the Contenthub -->
+ <!-- bundle> - only used by the Contenthub -
<groupId>eu.medsea.mimeutil</groupId>
<artifactId>mime-util</artifactId>
<version>2.1.3</version>
- </bundle>
+ </bundle> -->
<!-- <bundle> only used by the Factstore
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -43,7 +43,7 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.15</version>
+ <version>${jersey-version}</version>
</bundle>
</startLevel>
@@ -53,7 +53,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</bundle>
</startLevel>
Added: stanbol/branches/release-0.12/launchers/full-war/src/main/sling/common.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full-war/src/main/sling/common.properties?rev=1680546&view=auto
==============================================================================
--- stanbol/branches/release-0.12/launchers/full-war/src/main/sling/common.properties (added)
+++ stanbol/branches/release-0.12/launchers/full-war/src/main/sling/common.properties Wed May 20 12:41:56 2015
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file is loaded by Apache Sling during startup. Properties defined
+# in this file are copied over to the sling.properties file in the {sling.home}
+# directory.
+
+clerezza.shell.disable=true
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
+sling.system.packages.servletdescription=javax.servlet.descriptor;version=3.0.0
\ No newline at end of file
Modified: stanbol/branches/release-0.12/launchers/full-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full-war/src/main/webapp/WEB-INF/web.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full-war/src/main/webapp/WEB-INF/web.xml (original)
+++ stanbol/branches/release-0.12/launchers/full-war/src/main/webapp/WEB-INF/web.xml Wed May 20 12:41:56 2015
@@ -1,54 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License.
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Stanbol Full Web Application</display-name>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Stanbol Full Web Application</display-name>
- <!-- The Felix Http Service Listener Proxy for HTTP Session events -->
- <listener>
- <listener-class>
- org.apache.sling.launchpad.webapp.SlingSessionListener
- </listener-class>
- </listener>
+ <!-- The Felix Http Service Listener Proxy for HTTP Session events -->
+ <listener>
+ <listener-class>
+ org.apache.sling.launchpad.webapp.SlingSessionListener
+ </listener-class>
+ </listener>
- <servlet>
- <display-name>Sling Servlet</display-name>
- <servlet-name>sling</servlet-name>
- <servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
+ <servlet>
+ <display-name>Stanbol Servlet</display-name>
+ <servlet-name>stanbol</servlet-name>
+ <servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
+ <!--
+ Any init-params defined for the servlet will overwrite
+ the default settings in the sling.properties file.
+
+ The most important init-param to be set here is the
+ sling.home parameter defining where Sling will place
+ its files such as the bundle cache, logs, configuration,
+ etc.
+
+ If the sling.home parameter is not set a default value is
+ set as ${user.dir}/sling/${context.path} where ${user.dir}
+ is the current working directory and ${context.path} is the
+ servlet context path with slashes replaced by underscores and
+ the root context represented as just a single underscore.
+
+ Example: For Sling deployed in the root context, the default
+ sling.home would be sling/_. For Sling deployed in the context
+ /sling/i1, the default sling.home would be sling/_sling_i1.
+ -->
+ <init-param> <!-- the default sling.home is set to stanbol -->
+ <param-name>sling.home</param-name>
+ <param-value>${user.dir}/stanbol/${context.path}</param-value>
+ </init-param>
<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>
+ <param-name>org.osgi.framework.startlevel.beginning</param-name>
+ <param-value>40</param-value>
</init-param>
<init-param> <!-- set the stanbol.home to the sling.home -->
- <param-name>stanbol.home</param-name>
- <param-value>${sling.home}</param-value>
+ <param-name>stanbol.home</param-name>
+ <param-value>${sling.home}</param-value>
</init-param>
<init-param> <!-- set the sling file installer dir to {working-dir}/stanbol/fileinstall -->
- <param-name>sling.fileinstall.dir</param-name>
- <param-value>${sling.home}/fileinstall</param-value>
+ <param-name>sling.fileinstall.dir</param-name>
+ <param-value>${sling.home}/fileinstall</param-value>
</init-param>
<load-on-startup>100</load-on-startup>
</servlet>
- <!-- Default Mapping for the Context -->
- <servlet-mapping>
- <servlet-name>sling</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
+ <!-- Default Mapping for the Context -->
+ <servlet-mapping>
+ <servlet-name>stanbol</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: stanbol/branches/release-0.12/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full/pom.xml (original)
+++ stanbol/branches/release-0.12/launchers/full/pom.xml Wed May 20 12:41:56 2015
@@ -79,23 +79,16 @@
<bundles>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>2.3.0</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>2.3.0</version>
- <startLevel>3</startLevel>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>1.0.0</version>
+ <version>${felix-jetty-version}</version>
<startLevel>3</startLevel>
</bundle>
</bundles>
@@ -212,6 +205,25 @@
<scope>provided</scope>
</dependency>
+ <!-- Clerezza RDF bundles -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf</artifactId>
+ <version>0.1</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Clerezza Jena TDB storage (used by Ontonet) -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf.tdb</artifactId>
+ <version>0.1</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+
<!-- Security Support -->
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/branches/release-0.12/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full/src/main/bundles/list.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/full/src/main/bundles/list.xml Wed May 20 12:41:56 2015
@@ -38,7 +38,7 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.15</version>
+ <version>${jersey-version}</version>
</bundle>
</startLevel>
@@ -48,7 +48,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: stanbol/branches/release-0.12/launchers/stable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/stable/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/stable/pom.xml (original)
+++ stanbol/branches/release-0.12/launchers/stable/pom.xml Wed May 20 12:41:56 2015
@@ -80,25 +80,18 @@
<bundles>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>2.3.0</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>2.3.0</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>1.0.0</version>
- <startLevel>3</startLevel>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
</bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <!-- explicit version is required (STANBOL-1402) -->
+ <version>${felix-jetty-version}</version>
+ <startLevel>3</startLevel>
+ </bundle>
</bundles>
</jarWebSupport>
</configuration>
Modified: stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java (original)
+++ stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java Wed May 20 12:41:56 2015
@@ -81,12 +81,8 @@ public class MockOsgiContext {
// reset Clerezza objects
tcManager = new TcManager();
tcManager.addWeightedTcProvider(new SimpleTcProvider());
- parser = new Parser(); // add Jena-supported formats + RDF/JSON
- parser.bindParsingProvider(new JenaParserProvider());
- parser.bindParsingProvider(new RdfJsonParsingProvider());
- serializer = new Serializer(); // add Jena-supported formats + RDF/JSON
- serializer.bindSerializingProvider(new JenaSerializerProvider());
- serializer.bindSerializingProvider(new RdfJsonSerializingProvider());
+ parser = Parser.getInstance();
+ serializer = Serializer.getInstance();
// reset Stanbol objects
ontologyProvider = new ClerezzaOntologyProvider(tcManager, offline, parser);
Modified: stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java (original)
+++ stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java Wed May 20 12:41:56 2015
@@ -19,19 +19,15 @@ package org.apache.stanbol.ontologymanag
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
-import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
-import org.apache.clerezza.rdf.rdfjson.parser.RdfJsonParsingProvider;
-import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
public class MockOsgiContext {
- public static Parser parser;
+ public static Parser parser = Parser.getInstance();
public static TcManager tcManager;
-
- public static Serializer serializer;
+
+ public static Serializer serializer = Serializer.getInstance();
static {
reset();
@@ -40,14 +36,6 @@ public class MockOsgiContext {
public static void reset() {
tcManager = new TcManager();
tcManager.addWeightedTcProvider(new SimpleTcProvider());
-
- serializer = new Serializer();
- serializer.bindSerializingProvider(new JenaSerializerProvider());
- serializer.bindSerializingProvider(new RdfJsonSerializingProvider());
-
- parser = new Parser();
- parser.bindParsingProvider(new JenaParserProvider());
- parser.bindParsingProvider(new RdfJsonParsingProvider());
}
}
Modified: stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java (original)
+++ stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java Wed May 20 12:41:56 2015
@@ -49,7 +49,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.util.AutoIRIMapper;
/**
- * Verifies the correct setup of ontology registries.
+ * Verifies the correct setup of ontology registries. As these objects are virtually unaware of the OSGi
+ * environment, the context is constructed using plain Java objects.
*/
public class TestOntologyRegistry {
@@ -71,7 +72,7 @@ public class TestOntologyRegistry {
OfflineConfiguration offline = new OfflineConfigurationImpl(config);
// The registry manager can be updated via calls to createModel()
regman = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(new SimpleTcProvider(),
- offline, new Parser()), config);
+ offline, Parser.getInstance()), config);
}
/**
Modified: stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java (original)
+++ stanbol/branches/release-0.12/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java Wed May 20 12:41:56 2015
@@ -17,7 +17,6 @@
package org.apache.stanbol.ontologymanager.registry;
import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.parser;
-import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.reset;
import static org.apache.stanbol.ontologymanager.registry.MockOsgiContext.tcManager;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -81,7 +80,7 @@ public class TestRegistryManager {
.toString()});
offline = new OfflineConfigurationImpl(configuration);
- reset();
+ MockOsgiContext.reset();
}
@@ -94,7 +93,7 @@ public class TestRegistryManager {
@After
public void cleanup() throws Exception {
- reset();
+ MockOsgiContext.reset();
provider = new ClerezzaOntologyProvider(tcManager, offline, parser);
}
Modified: stanbol/branches/release-0.12/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java (original)
+++ stanbol/branches/release-0.12/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java Wed May 20 12:41:56 2015
@@ -23,10 +23,6 @@ import java.util.Hashtable;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
-import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
-import org.apache.clerezza.rdf.rdfjson.parser.RdfJsonParsingProvider;
-import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
/**
@@ -58,14 +54,8 @@ public class MockOsgiContext {
// reset Clerezza objects
tcManager = new TcManager();
tcManager.addWeightedTcProvider(new SimpleTcProvider());
- parser = new Parser(); // add Jena-supported formats + RDF/JSON
- parser.bindParsingProvider(new JenaParserProvider());
- parser.bindParsingProvider(new RdfJsonParsingProvider());
- serializer = new Serializer(); // add Jena-supported formats + RDF/JSON
- serializer.bindSerializingProvider(new JenaSerializerProvider());
- serializer.bindSerializingProvider(new RdfJsonSerializingProvider());
-
- // reset Stanbol objects
+ parser = Parser.getInstance();
+ serializer = Serializer.getInstance();
}
}
Modified: stanbol/branches/release-0.12/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/parent/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/parent/pom.xml (original)
+++ stanbol/branches/release-0.12/parent/pom.xml Wed May 20 12:41:56 2015
@@ -58,14 +58,22 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>1.15</jersey-version>
- <freemarker-version>2.3.19</freemarker-version>
+ <freemarker-version>2.3.22</freemarker-version>
<owlapi-version>3.3</owlapi-version>
<solr-version>4.4.0</solr-version>
<pax-exam-version>2.3.0.M1</pax-exam-version>
- <sesame-version>2.7.11</sesame-version>
- <marmotta-version>3.2.0</marmotta-version>
+ <sesame-version>2.7.13</sesame-version>
+ <marmotta-version>3.3.0</marmotta-version>
<ldpath-version>${marmotta-version}</ldpath-version>
<tika-version>1.5</tika-version>
+ <httpcomponents-version>4.4.1</httpcomponents-version>
+ <jackson-version>1.9.13</jackson-version>
+ <slf4j-version>1.7.12</slf4j-version>
+ <!-- OSGi http service versions for jar launchers (see also STANBOL-1402) -->
+ <felix-http-version>2.3.2</felix-http-version>
+ <felix-jetty-version>3.0.2</felix-jetty-version>
+ <felix-servlet-api-version>1.1.0</felix-servlet-api-version>
+
<sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor>
</properties>
@@ -183,14 +191,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.16.0</version>
+ <version>1.21.0</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>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
</dependencies>
<executions>
@@ -538,12 +546,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.1.0</version>
+ <!-- with older versions the scr plugin complains (see FELIX-4450)-->
+ <version>4.3.1</version>
</dependency>
<!-- Apache Felix -->
@@ -555,12 +564,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.8</version>
+ <version>1.9.12</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.0</version>
+ <version>1.8.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -570,22 +579,27 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.3.0</version>
+ <version>${felix-jetty-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>2.3.0</version>
+ <version>${felix-http-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.0.0</version>
+ <version>${felix-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.3.0</version>
+ <version>${felix-http-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>4.2.8</version>
</dependency>
@@ -598,89 +612,100 @@
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
- <version>0.7.5</version>
+ <version>0.7.6</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>utils</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.12-incubating</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.13-incubating</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.metadata</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.11-incubating</version>
+ <version>0.12</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>0.9-incubating</version>
+ <version>0.11</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
- <version>0.10-incubating</version>
+ <version>0.12</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.sparql</artifactId>
- <version>0.5-incubating</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.content</artifactId>
- <version>0.13-incubating</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.6-incubating</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.13-incubating</version>
+ <version>0.15</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.simple.storage</artifactId>
- <version>0.7-incubating</version>
+ <version>0.8</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.facade</artifactId>
- <version>0.12-incubating</version>
+ <version>0.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.commons</artifactId>
+ <version>0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.storage</artifactId>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core.test</artifactId>
- <version>0.13-incubating</version>
+ <version>0.15</version>
<scope>test</scope>
</dependency>
+
<!-- Sesame (openrdf) -->
@@ -748,12 +773,17 @@
<artifactId>kiwi-caching-hazelcast</artifactId>
<version>${marmotta-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-model-vocabs</artifactId>
+ <version>${marmotta-version}</version>
+ </dependency>
<!-- Commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.4</version>
</dependency>
<!-- As commons-beanutils:commons-beanutils is not bundle we use the
org.apache.stanbol.servuemix version instead -->
@@ -773,6 +803,11 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
@@ -785,12 +820,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.4.1</version>
+ <version>1.9</version>
</dependency>
<dependency> <!-- dependency of commons-compress 1.4+ -->
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -800,41 +835,51 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.7</version>
+ <version>1.10</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2.1</version>
+ <version>${httpcomponents-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2.1</version>
+ <version>${httpcomponents-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.2.1</version>
+ <version>${httpcomponents-version}</version>
</dependency>
<!-- Google Commons -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
+ <version>18.0</version>
</dependency>
<!-- Joda Time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.0</version>
+ <version>2.7</version>
</dependency>
<!-- Javax Mail -->
@@ -867,27 +912,27 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency> <!-- when using log4j for the logging -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -967,67 +1012,78 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3</version>
+ <version>1.3.7</version>
</dependency>
<!-- Jackson -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.11</version>
+ <version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.11</version>
+ <version>${jackson-version}</version>
</dependency>
-
- <!-- Jena -->
+
+ <!-- Jena (and Clerezza Jena Modules)-->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.3</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.11.0</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <version>2.8.5</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-core</artifactId>
+ <version>2.11.1_1</version>
</dependency>
+
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
- <version>0.8.7</version>
- <type>jar</type>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-tdb</artifactId>
+ <version>1.0.1_1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-arq</artifactId>
+ <version>2.11.1_1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-iri</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-iri</artifactId>
+ <version>1.0.1_1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-text</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+
<dependency>
<groupId>org.hsqldb</groupId>
@@ -1206,7 +1262,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>4.8.1.1</version>
+ <version>49.1</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -1285,18 +1341,6 @@
</exclusions>
</dependency>
- <!-- OpenNLP -->
- <dependency>
- <groupId>org.clojars.zaxtax</groupId>
- <artifactId>opennlp-tools</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.clojars.zaxtax</groupId>
- <artifactId>maxent</artifactId>
- <version>3.0.0</version>
- </dependency>
-
<!-- see also lucene-xercesImpl -->
<dependency>
<groupId>xerces</groupId>
@@ -1472,20 +1516,20 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>2.5.0</version>
+ <version>5.0.0-2.6.0</version>
<classifier>app</classifier>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>2.5.0</version>
+ <version>5.0.0-2.6.0</version>
<classifier>webapp</classifier>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.2.0</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -1500,7 +1544,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.5.0</version>
+ <version>3.6.4</version>
</dependency>
<!-- Apache James -->
@@ -1514,13 +1558,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: stanbol/branches/release-0.12/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/pom.xml (original)
+++ stanbol/branches/release-0.12/pom.xml Wed May 20 12:41:56 2015
@@ -81,9 +81,8 @@
<module>launchers/bundlelists</module>
<module>launchers/full</module>
-
- <module>launchers/stable</module>
<module>launchers/full-war</module>
+ <module>launchers/stable</module>
<module>development/archetypes/statefull-webmodule</module>
<module>development/archetypes/stateless-webmodule</module>
Modified: stanbol/branches/release-0.12/reasoners/jena/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/reasoners/jena/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/reasoners/jena/pom.xml (original)
+++ stanbol/branches/release-0.12/reasoners/jena/pom.xml Wed May 20 12:41:56 2015
@@ -123,16 +123,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <type>jar</type>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: stanbol/branches/release-0.12/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/reasoners/web/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/reasoners/web/pom.xml (original)
+++ stanbol/branches/release-0.12/reasoners/web/pom.xml Wed May 20 12:41:56 2015
@@ -191,8 +191,8 @@
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<scope>provided</scope>
</dependency>
Modified: stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java Wed May 20 12:41:56 2015
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* @author anuzzolese
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdaptersFactory.class)
public class RuleAdaptersFactoryImpl implements RuleAdaptersFactory, ServiceListener {
Modified: stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java Wed May 20 12:41:56 2015
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapterManager.class)
public class RuleAdaptersManagerImpl implements RuleAdapterManager {
Modified: stanbol/branches/release-0.12/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java Wed May 20 12:41:56 2015
@@ -77,7 +77,7 @@ import com.hp.hpl.jena.util.FileManager;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapter.class)
public class ClerezzaAdapter extends AbstractRuleAdapter {
Modified: stanbol/branches/release-0.12/rules/adapters/jena/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/jena/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/jena/pom.xml (original)
+++ stanbol/branches/release-0.12/rules/adapters/jena/pom.xml Wed May 20 12:41:56 2015
@@ -96,8 +96,8 @@
<!-- Jena deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Testing deps -->
Modified: stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java Wed May 20 12:41:56 2015
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* @author anuzzolese
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdaptersFactory.class)
public class RuleAdaptersFactoryImpl implements RuleAdaptersFactory, ServiceListener {
Modified: stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java Wed May 20 12:41:56 2015
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapterManager.class)
public class RuleAdaptersManagerImpl implements RuleAdapterManager {
Modified: stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java Wed May 20 12:41:56 2015
@@ -91,7 +91,7 @@ import com.ibm.icu.util.Output;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapter.class)
public class JenaAdapter extends AbstractRuleAdapter {
Modified: stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java Wed May 20 12:41:56 2015
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapter.class)
public class SPARQLAdapter extends AbstractRuleAdapter {
Modified: stanbol/branches/release-0.12/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java (original)
+++ stanbol/branches/release-0.12/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java Wed May 20 12:41:56 2015
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(RuleAdapter.class)
public class SWRLAdapter extends AbstractRuleAdapter {
Modified: stanbol/branches/release-0.12/rules/base/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/base/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/base/pom.xml (original)
+++ stanbol/branches/release-0.12/rules/base/pom.xml Wed May 20 12:41:56 2015
@@ -77,8 +77,8 @@
<!-- OWL deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Persistence -->
Modified: stanbol/branches/release-0.12/rules/manager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/manager/pom.xml (original)
+++ stanbol/branches/release-0.12/rules/manager/pom.xml Wed May 20 12:41:56 2015
@@ -94,12 +94,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<!-- OSGi deps -->
@@ -108,16 +108,6 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <!-- OWL deps -->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- </dependency>
-
<!-- Persistence deps -->
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java (original)
+++ stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java Wed May 20 12:41:56 2015
@@ -17,11 +17,13 @@
package org.apache.stanbol.rules.manager.arqextention;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory;
import com.hp.hpl.jena.sparql.core.Var;
import com.hp.hpl.jena.sparql.engine.ExecutionContext;
import com.hp.hpl.jena.sparql.engine.QueryIterator;
import com.hp.hpl.jena.sparql.engine.binding.Binding;
import com.hp.hpl.jena.sparql.engine.binding.Binding1;
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArg;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArgType;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionEval;
@@ -45,8 +47,9 @@ public class CreateURI extends PropertyF
Node ref = argumentSubject.getArg();
if (ref.isVariable()) {
String argumentString = argumentObject.getArg().toString().replace("\"", "");
-
- b = new Binding1(binding, Var.alloc(ref), Node.createURI(argumentString));
+ //STANBOL-621: Binding1 has no longer a public constructor
+ //b = new Binding1(binding, Var.alloc(ref), NodeFactory.createURI(argumentString));
+ b = BindingFactory.binding(binding, Var.alloc(ref), NodeFactory.createURI(argumentString));
}
}
Modified: stanbol/branches/release-0.12/rules/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/refactor/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/refactor/pom.xml (original)
+++ stanbol/branches/release-0.12/rules/refactor/pom.xml Wed May 20 12:41:56 2015
@@ -70,22 +70,22 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.adapters.abstract</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<!-- OSGi deps -->
@@ -104,12 +104,12 @@
<!-- OWL deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Persistence deps -->
Modified: stanbol/branches/release-0.12/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original)
+++ stanbol/branches/release-0.12/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Wed May 20 12:41:56 2015
@@ -62,7 +62,7 @@ import com.hp.hpl.jena.sparql.pfunction.
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(Refactorer.class)
public class RefactorerImpl implements Refactorer {
Modified: stanbol/branches/release-0.12/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/web/pom.xml?rev=1680546&r1=1680545&r2=1680546&view=diff
==============================================================================
--- stanbol/branches/release-0.12/rules/web/pom.xml (original)
+++ stanbol/branches/release-0.12/rules/web/pom.xml Wed May 20 12:41:56 2015
@@ -123,8 +123,8 @@
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<dependency>