Author: enridaga
Date: Wed Dec 14 12:56:09 2011
New Revision: 1214222
URL: http://svn.apache.org/viewvc?rev=1214222&view=rev
Log:
This commit includes changes on reasoner poms, dependency definitions in
stanbol parent and the kres launcher.
Details:
* The reasoners/web/pom.xml have been cleaned, see STANBOL-420. This should
also fix STANBOL-419
* Created reasoners/bundlelist module (STANBOL-427)
* Revised the KReS launcher to make use of bundlelist artifacts (STANBOL-428)
* Added Stanbol Jobs dependency definitions to the parent pom (STANBOL-429)
* Added Stanbol Reasoners dependency definitions in the parent pom (STANBOL-430)
* Fixed log level in a message of JenaModelWriter (minor)
* Removed the reengineer module form the kres launcher (this module looks to be
in stand-by, we should discuss this in the list)
Added:
incubator/stanbol/trunk/reasoners/bundlelist/
incubator/stanbol/trunk/reasoners/bundlelist/pom.xml (with props)
incubator/stanbol/trunk/reasoners/bundlelist/src/
incubator/stanbol/trunk/reasoners/bundlelist/src/main/
incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/
incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/list.xml
Modified:
incubator/stanbol/trunk/commons/jobs/ (props changed)
incubator/stanbol/trunk/launchers/kres/pom.xml
incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/reasoners/README.md
incubator/stanbol/trunk/reasoners/pom.xml
incubator/stanbol/trunk/reasoners/web/pom.xml
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
incubator/stanbol/trunk/reengineer/web/pom.xml
Propchange: incubator/stanbol/trunk/commons/jobs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 14 12:56:09 2011
@@ -1 +1,2 @@
.project
+.settings
Modified: incubator/stanbol/trunk/launchers/kres/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/pom.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/kres/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/kres/pom.xml Wed Dec 14 12:56:09 2011
@@ -9,7 +9,6 @@
<relativePath>../../parent</relativePath>
</parent>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.kres</artifactId>
<packaging>jar</packaging>
@@ -90,5 +89,69 @@
<artifactId>org.apache.sling.launchpad.base</artifactId>
<classifier>app</classifier>
</dependency>
- </dependencies>
+
+ <!-- OSGi Framemework Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Commons Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Data Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Enhancer Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Entityhub Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Ontology Manager Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Rules Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Reasoners Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml Wed Dec 14
12:56:09 2011
@@ -19,386 +19,71 @@
<!-- List of initial bundles for the Stanbol Sling-based standalone launcher.
-->
<bundles>
- <!-- *********************************************************************
- start level < 10 reserved for OSGI and Sling Infrastructure
- *********************************************************************
-->
-
- <!-- OSGi infrastructure -->
- <startLevel level="5">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.frameworkfragment</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.log</artifactId>
- <version>2.1.2</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.8</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.4</version>
- </bundle>
- </startLevel>
-
- <!-- HTTP service -->
- <startLevel level="5">
- <bundle>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.4.0</version>
- </bundle>
- </startLevel>
-
- <!-- Sling installer and Stanbol extensions -->
- <startLevel level="8">
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.installer.factory.configuration
- </artifactId>
- <version>1.0.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.installer.bundleprovider
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.installer.provider.file</artifactId>
- <version>1.0.0</version>
- </bundle>
- </startLevel>
-
- <!-- Felix web console and plugins -->
- <startLevel level="9">
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.webconsole.plugins.memoryusage
- </artifactId>
- <version>1.0.2</version>
- </bundle>
- </startLevel>
-
- <!-- Sling launchpad -->
- <startLevel level="9">
- <bundle>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.0.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.0.0</version>
- </bundle>
- </startLevel>
-
- <!--
*********************************************************************
+ <!-- *********************************************************************
start level 10 TO 19 reserved for required libraries
(internal and external)
*********************************************************************
-->
-
<!-- General-purpose libraries -->
<startLevel level="10">
- <bundle>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </bundle>
- <bundle>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </bundle>
- <bundle>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.0.1</version>
- </bundle>
- <bundle>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.5</version>
- </bundle>
+ <bundle> <!-- only used by the Contenthub -->
+ <groupId>eu.medsea.mimeutil</groupId>
+ <artifactId>mime-util</artifactId>
+ <version>2.1.3</version>
+ </bundle>
+ <bundle> <!-- used by langid -->
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>0.9</version>
+ </bundle>
</startLevel>
<!-- Jersey -->
- <startLevel level="14">
- <!--
- NOTE: jersey-core bug, must start before jersey-server to avoid jersey
- spi class not found errors. Restart jersey-server manually if getting
those.
- -->
- <bundle>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.7</version>
- </bundle>
- </startLevel>
<startLevel level="15">
<bundle>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
+ <artifactId>jersey-client</artifactId>
<version>1.7</version>
</bundle>
- <!-- needed to read data from mime multipart requests -->
- <bundle>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>1.7</version>
- </bundle>
- <!-- dependency of jersey-multipart -->
- <bundle>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- <version>1.4</version>
- </bundle>
- <bundle> <!-- used also for all the other JSON parsing/writing in Stanbol
-->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3</version>
- </bundle>
- </startLevel>
-
- <!-- Clerezza storage and sparql infrastructure -->
- <startLevel level="16">
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <version>0.11-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.sparql</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.commons</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.facade</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena.tdb</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>javax.mail</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wymiwyg-commons-core</artifactId>
- <version>0.7.5</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.ibm.icu</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.storage</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.tdb.storage</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- <version>0.9-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.json.simple</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- </bundle>
</startLevel>
-
- <!-- Stanbol Commons -->
+
+ <!-- Stanbol Commons -->
<startLevel level="17">
- <!-- Allows to run Stanbol in offline mode -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- DataFileProvider and implementations -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- support for JSON-LD -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
<!-- The common web interface -->
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.home</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
-
- <!-- *********************************************************************
+
+ <!-- *********************************************************************
start level 20 TO 24 reserved for Stanbol Framework
(Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
*********************************************************************
-->
- <!-- Stanbol knowledge management infrastructure -->
- <startLevel level="20">
+ <!-- OWL utils -->
+ <!-- FIXME This should be moved to stanbol.commons -->
+ <startLevel level="22">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owl</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.registry</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.manager</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.jena</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.owllink</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- <bundle> <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reengineer.xerces</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version> </bundle>
-->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
+ </bundle>
+ </startLevel>
+
+ <!-- *********************************************************************
+ start level 25 TO 29 reserved for Stanbol plug-ins
+ (currently the Enhancement Engines)
+ *********************************************************************
-->
+
+ <startLevel level="26">
+ <!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.vie</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
<startLevel level="25">
<bundle>
@@ -408,40 +93,10 @@
</bundle>
</startLevel>
- <startLevel level="28">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reengineer.db</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reengineer.xml</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
- <startLevel level="30">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.web</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.web</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reengineer.web</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.web</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
+ <!-- *********************************************************************
+ start level >= 30 are unused
+ *********************************************************************
-->
+
</bundles>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Wed Dec 14 12:56:09 2011
@@ -322,6 +322,16 @@
<artifactId>org.apache.stanbol.commons.solr.web</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
<!-- Data Bundles included in the standard Stanbol Distribution -->
<dependency>
@@ -488,6 +498,44 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
+ <!-- Stanbol Reasoners bundles -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.manager</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owllink</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.test</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.services-tests</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.http</artifactId>
@@ -570,7 +618,12 @@
<version>0.9.0-incubating-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.bundlelist</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ </dependency>
<!-- OSGi -->
<dependency>
Modified: incubator/stanbol/trunk/reasoners/README.md
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/README.md?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/README.md (original)
+++ incubator/stanbol/trunk/reasoners/README.md Wed Dec 14 12:56:09 2011
@@ -85,7 +85,7 @@ Supported return formats are all classic
Recently added
=============
-* Support for long-term operations. This is crucial for reasoning tasks, since
it can take some time with large graphs. This is needed in general for Stanbol,
something like "Stanbol Jobs".
+* Support for long-term operations.
Todo
=============
Added: incubator/stanbol/trunk/reasoners/bundlelist/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/bundlelist/pom.xml?rev=1214222&view=auto
==============================================================================
--- incubator/stanbol/trunk/reasoners/bundlelist/pom.xml (added)
+++ incubator/stanbol/trunk/reasoners/bundlelist/pom.xml Wed Dec 14 12:56:09
2011
@@ -0,0 +1,38 @@
+<?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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>org.apache.stanbol.reasoners.bundlelist</artifactId>
+ <packaging>partialbundlelist</packaging>
+
+ <name>Apache Stanbol Reasoners Bundle List</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange: incubator/stanbol/trunk/reasoners/bundlelist/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/list.xml?rev=1214222&view=auto
==============================================================================
--- incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/list.xml
(added)
+++ incubator/stanbol/trunk/reasoners/bundlelist/src/main/bundles/list.xml Wed
Dec 14 12:56:09 2011
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<!--
+ 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.
+-->
+
+<bundles>
+ <startLevel level="20">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.manager</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.jena</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+ <startLevel level="28">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.web</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+</bundles>
Modified: incubator/stanbol/trunk/reasoners/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/pom.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/pom.xml Wed Dec 14 12:56:09 2011
@@ -33,20 +33,15 @@
<inceptionYear>2011</inceptionYear>
<modules>
- <!--module>../jersey</module>
- <module>../ontologymanager/ontonet</module>
- <module>../owl</module>
- <module>../rules/base</module>
- <module>../rules/manager</module-->
<module>servicesapi</module>
<module>manager</module>
<module>owlapi</module>
<module>jena</module>
<module>test</module>
- <module>hermit</module>
- <!--module>base</module-->
+ <!-- module>hermit</module -->
<module>owllink</module>
<module>web</module>
+ <module>bundlelist</module>
</modules>
<profiles>
<profile>
Modified: incubator/stanbol/trunk/reasoners/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/pom.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/web/pom.xml Wed Dec 14 12:56:09 2011
@@ -26,26 +26,11 @@
<relativePath>../../parent</relativePath>
</parent>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.web</artifactId>
<packaging>bundle</packaging>
- <name>Apache Stanbol Reasoner Web</name>
+ <name>Apache Stanbol Reasoners: Web</name>
<description>Set of rest services to deal with reasoners</description>
-
- <properties>
- <!-- Set this to run the server on a specific port -->
- <http.port></http.port>
-
- <!-- Set this to run tests against an existing server instance -->
- <test.server.url></test.server.url>
-
- <!-- Options for the VM that executes our runnable jar -->
- <jar.executor.vm.options>-Xmx512m
-Dorg.apache.stanbol.offline.mode=true</jar.executor.vm.options>
-
- <!-- Set this to true to keep the runnable jar running - useful to debug
tests -->
- <keepJarRunning>false</keepJarRunning>
- </properties>
<build>
<!-- make it an OSGi bundle -->
@@ -60,80 +45,34 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.reasoners.web.*
- </Export-Package>
-
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl
- </Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
<Import-Package>
- !org.apache.felix.http.jetty,
- !org.mortbay.jetty.*,
- org.apache.stanbol.reasoners.servicesapi.*,
- org.apache.stanbol.reasoners.jena.*,
- org.apache.stanbol.reasoners.owlapi.*,
- org.apache.stanbol.reasoners.jobs.api.*,
- *
- </Import-Package>
+ javax.servlet.*,
+ javax.ws.rs.*,
+ org.slf4j.*,
+ org.osgi.framework.*,
+ org.osgi.service.*,
+ freemarker.cache.*,
+ com.sun.jersey.api.*,
+ com.sun.jersey.multipart.*,
+ org.apache.clerezza.rdf.core.*,
+ com.hp.hpl.jena.*,
+ org.semanticweb.owlapi.*,
+ org.coode.owlapi.*,
+ uk.ac.manchester.cs.owl.owlapi.*,
+ org.apache.commons.io.*,
+ org.apache.stanbol.commons.web.base.*,
+ org.apache.stanbol.commons.jobs.api.*,
+ org.apache.stanbol.commons.jobs.impl.*,
+ org.apache.stanbol.owl.*,
+ org.apache.stanbol.rules.base.api.*,
+ org.apache.stanbol.ontologymanager.ontonet.api.*,
+ org.apache.stanbol.reasoners.servicesapi.*,
+ org.apache.stanbol.reasoners.jena.*,
+ org.apache.stanbol.reasoners.owlapi.*
+ </Import-Package>
</instructions>
</configuration>
</plugin>
-<!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-runnable-jar</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
-
<includeArtifactIds>org.apache.stanbol.launchers.full</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-server-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <test.server.url>${test.server.url}</test.server.url>
- <jar.executor.server.port>${http.port}</jar.executor.server.port>
-
<jar.executor.vm.options>${jar.executor.vm.options}</jar.executor.vm.options>
-
<jar.executor.jar.folder>${project.basedir}/target/dependency</jar.executor.jar.folder>
-
<jar.executor.jar.name.regexp>org.apache.stanbol.*full.*jar$</jar.executor.jar.name.regexp>
-
<jar.executor.workingdirectory>${project.build.directory}/launchdir</jar.executor.workingdirectory>
- <keepJarRunning>${keepJarRunning}</keepJarRunning>
- <server.ready.timeout.seconds>180</server.ready.timeout.seconds>
- <server.ready.path.1>/:stanbol.css</server.ready.path.1>
- <server.ready.path.2>/engines:There are
currently</server.ready.path.2>
- <server.ready.path.3>/contenthub:Recently uploaded Content
Items</server.ready.path.3>
- </systemPropertyVariables>
- </configuration>
- </plugin> -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -153,14 +92,6 @@
</build>
<dependencies>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.launchers.full</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- -->
<!-- dependencies on other IKS modules -->
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -217,9 +148,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>freemarker</groupId>
+ <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.9</version>
+ <!-- version>2.3.9</version -->
</dependency>
<!-- indirect dependency for freemarker -->
<dependency>
@@ -265,33 +196,6 @@
<scope>provided</scope>
</dependency>
- <!-- for tests -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -301,12 +205,6 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
</dependency>
- <!-- dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency-->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
@@ -327,23 +225,28 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
+ <!-- version>0.9.0-incubating-SNAPSHOT</version -->
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.jena</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
+ <!-- version>0.9.0-incubating-SNAPSHOT</version -->
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
+ <!-- version>0.9.0-incubating-SNAPSHOT</version -->
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+ <!-- version>0.9.0-incubating-SNAPSHOT</version -->
+ </dependency>
<!-- Testing deps -->
<dependency>
@@ -351,19 +254,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.testing.jarexec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.testing.stanbol</artifactId>
- </dependency-->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </dependency>
</dependencies>
@@ -386,10 +276,6 @@
<name>apache repository</name>
<url>https://repository.apache.org/content/repositories/snapshots</url>
</repository>
- <repository>
- <id>stlab-cnr-repo</id>
- <url>http://stlab.istc.cnr.it/software/maven/repo</url>
- </repository>
</repositories>
</project>
Modified:
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
---
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
(original)
+++
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
Wed Dec 14 12:56:09 2011
@@ -61,7 +61,7 @@ public class JenaModelWriter implements
MediaType mediaType) {
log.debug("Called size of item");
stream = toStream(t, mediaType.toString());
- log.error("Returning {} bytes", stream.size());
+ log.debug("Returning {} bytes", stream.size());
return Integer.valueOf(stream.toByteArray().length).longValue();
}
Modified: incubator/stanbol/trunk/reengineer/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/pom.xml?rev=1214222&r1=1214221&r2=1214222&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/web/pom.xml Wed Dec 14 12:56:09 2011
@@ -159,7 +159,7 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <!-- for tests -->
+ <!-- for tests
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
@@ -172,6 +172,8 @@
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
@@ -190,6 +192,7 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
+ -->
<!-- Stanbol deps -->
<dependency>
