You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/11/22 16:49:05 UTC
svn commit: r1205044 - in /incubator/stanbol/trunk: factstore/
factstore/factstore/
integration-tests/src/test/java/org/apache/stanbol/factstore/
launchers/full/ launchers/full/src/main/bundles/ parent/
Author: fchrist
Date: Tue Nov 22 15:49:03 2011
New Revision: 1205044
URL: http://svn.apache.org/viewvc?rev=1205044&view=rev
Log:
STANBOL-237 Added FactStore bundlelist to parent POM and adjusted full launcher
Modified:
incubator/stanbol/trunk/factstore/factstore/pom.xml
incubator/stanbol/trunk/factstore/pom.xml
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java
incubator/stanbol/trunk/launchers/full/pom.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Modified: incubator/stanbol/trunk/factstore/factstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/pom.xml?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/pom.xml (original)
+++ incubator/stanbol/trunk/factstore/factstore/pom.xml Tue Nov 22 15:49:03 2011
@@ -38,10 +38,10 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore/factstore
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore/factstore
</developerConnection>
<url>http://incubator.apache.org/stanbol</url>
</scm>
Modified: incubator/stanbol/trunk/factstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/pom.xml?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/pom.xml (original)
+++ incubator/stanbol/trunk/factstore/pom.xml Tue Nov 22 15:49:03 2011
@@ -1,164 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
-->
-<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>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.factstore</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol FactStore</name>
- <description>The FactStore stores n-ary relations (facts) about entities and provides a query language for
- those relations.</description>
-
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
- </developerConnection>
- <url>http://incubator.apache.org/stanbol</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.stanbol.factstore.api.*
- </Export-Package>
- <Import-Package>
- <!-- apache derby -->
- org.apache.derby.jdbc,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
-
- <!-- Version will be removed once dependencies are added to stanbol-parent -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.7.1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.testing.http</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.factstore.reactor</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Stanbol FactStore Reactor</name>
+ <description>
+ Pseudo project to build the complete Apache Stanbol FactStore component
+ </description>
+
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/factstore
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol</url>
+ </scm>
+
+ <modules>
+ <module>factstore</module>
+ <module>bundlelist</module>
+ </modules>
+</project>
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/factstore/FactStoreTest.java Tue Nov 22 15:49:03 2011
@@ -174,7 +174,7 @@ public class FactStoreTest extends Stanb
"{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:employeeOf1\",\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}}")
.withHeader("Content-Type", "application/json");
- executor.execute(r2).assertStatus(200).assertContentContains(builder.buildUrl("/factstore/facts"));
+ executor.execute(r2).assertStatus(200).assertHeader("Location", builder.buildUrl("/factstore/facts/http%3A%2F%2Fiks-project.eu%2Font%2FemployeeOf1/1"));
}
@Test
Modified: incubator/stanbol/trunk/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/pom.xml?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/full/pom.xml Tue Nov 22 15:49:03 2011
@@ -165,6 +165,13 @@
<artifactId>org.apache.stanbol.entityhub.bundlelist</artifactId>
<type>partialbundlelist</type>
</dependency>
+
+ <!-- Stanbol FactStore Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.factstore.bundlelist</artifactId>
+ <type>partialbundlelist</type>
+ </dependency>
<!-- Stanbol Ontology Manager Bundle List -->
<dependency>
Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Tue Nov 22 15:49:03 2011
@@ -36,11 +36,13 @@
<artifactId>tika-core</artifactId>
<version>0.9</version>
</bundle>
- <bundle> <!-- only used by the Factstore -->
+ <!-- only used by the Factstore
+ <bundle>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.7.1.1</version>
</bundle>
+ -->
</startLevel>
<!-- Jersey -->
@@ -67,7 +69,7 @@
(Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
********************************************************************* -->
- <!-- FactStore -->
+ <!-- FactStore
<startLevel level="20">
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -75,6 +77,7 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
+ -->
<!-- KReS -->
<startLevel level="22">
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1205044&r1=1205043&r2=1205044&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Tue Nov 22 15:49:03 2011
@@ -551,6 +551,13 @@
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.factstore.bundlelist</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.bundlelist</artifactId>