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 2012/12/12 12:37:02 UTC
svn commit: r1420623 - in /stanbol/trunk: cmsadapter/web/ commons/jobs/web/
commons/security/usermanagement/ commons/solr/web/ commons/web/home/
commons/web/sparql/ commons/web/viewable/ contenthub/web/ demos/webvie/
enhancer/jersey/ enhancer/topic-web...
Author: fchrist
Date: Wed Dec 12 11:36:56 2012
New Revision: 1420623
URL: http://svn.apache.org/viewvc?rev=1420623&view=rev
Log:
STANBOL-838 renamed commons.viewable to commons.web.viewable. Removed artifact from parent POM since Stanbol artifacts should not be listed there. Fixed missing version information in POMs.
Modified:
stanbol/trunk/cmsadapter/web/pom.xml
stanbol/trunk/commons/jobs/web/pom.xml
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/solr/web/pom.xml
stanbol/trunk/commons/web/home/pom.xml
stanbol/trunk/commons/web/sparql/pom.xml
stanbol/trunk/commons/web/viewable/pom.xml
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/demos/webvie/pom.xml
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/topic-web/pom.xml
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/factstore/factstore/pom.xml
stanbol/trunk/integration-tests/pom.xml
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/parent/pom.xml
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/rules/web/pom.xml
Modified: stanbol/trunk/cmsadapter/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/pom.xml (original)
+++ stanbol/trunk/cmsadapter/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -1,119 +1,120 @@
<?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. -->
+ 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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.cmsadapter.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.cmsadapter.web</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol CMS Adapter Web</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <configuration>
- <excludes>
- org/apache/stanbol/cmsadapter/web/mapping/**
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.10.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.cmsadapter.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.cmsadapter.core</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
- </dependency>
- <!-- Jersey -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-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.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.cmsadapter.parent</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.cmsadapter.web</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol CMS Adapter Web</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <configuration>
+ <excludes>
+ org/apache/stanbol/cmsadapter/web/mapping/**
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.cmsadapter.servicesapi</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.cmsadapter.core</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <!-- Jersey -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-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.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: stanbol/trunk/commons/jobs/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/pom.xml (original)
+++ stanbol/trunk/commons/jobs/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -83,9 +83,10 @@
<!-- specific deps for this project -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Wed Dec 12 11:36:56 2012
@@ -73,33 +73,33 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- </dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.ontologies</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.utils</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<version>3.1.8</version>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.config</artifactId>
- <version>0.3-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.config</artifactId>
+ <version>0.3-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<!-- Jersey, servlet and freemarker -->
<dependency>
@@ -119,10 +119,10 @@
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <type>bundle</type>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <type>bundle</type>
</dependency>
</dependencies>
Modified: stanbol/trunk/commons/solr/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/pom.xml (original)
+++ stanbol/trunk/commons/solr/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -113,9 +113,10 @@
<!-- Web dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/commons/web/home/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Wed Dec 12 11:36:56 2012
@@ -107,7 +107,8 @@
<!-- Jersey, servlet and freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/commons/web/sparql/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/pom.xml (original)
+++ stanbol/trunk/commons/web/sparql/pom.xml Wed Dec 12 11:36:56 2012
@@ -81,9 +81,10 @@
<!-- Jersey and servlet -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/commons/web/viewable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/commons/web/viewable/pom.xml (original)
+++ stanbol/trunk/commons/web/viewable/pom.xml Wed Dec 12 11:36:56 2012
@@ -27,18 +27,18 @@
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Template Viewable</name>
- <description>A service providing classes and message body writer for response rendering with the viewable pattern</description>
+ <name>Apache Stanbol Commons Web Template Viewable</name>
+ <description>A service providing classes and message body writer for response rendering with the viewable pattern.</description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/commons/web/ldviewable
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/commons/web/viewable
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/commons/web/ldviewable
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/commons/web/viewable
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
@@ -64,9 +64,9 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- </dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.utils</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -78,13 +78,11 @@
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
<version>0.10.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
-
</dependencies>
-
</project>
Modified: stanbol/trunk/contenthub/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -146,7 +146,7 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/trunk/demos/webvie/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/webvie/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/demos/webvie/pom.xml (original)
+++ stanbol/trunk/demos/webvie/pom.xml Wed Dec 12 11:36:56 2012
@@ -99,7 +99,8 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<!-- OSGi tax -->
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Wed Dec 12 11:36:56 2012
@@ -128,7 +128,8 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/enhancer/topic-web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/pom.xml (original)
+++ stanbol/trunk/enhancer/topic-web/pom.xml Wed Dec 12 11:36:56 2012
@@ -116,9 +116,10 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Wed Dec 12 11:36:56 2012
@@ -170,7 +170,8 @@
<!-- Jersey and Freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<!-- imported via commons.web.base
Modified: stanbol/trunk/factstore/factstore/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/factstore/factstore/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/factstore/factstore/pom.xml (original)
+++ stanbol/trunk/factstore/factstore/pom.xml Wed Dec 12 11:36:56 2012
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/integration-tests/pom.xml (original)
+++ stanbol/trunk/integration-tests/pom.xml Wed Dec 12 11:36:56 2012
@@ -203,9 +203,10 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -143,9 +143,10 @@
<!-- specific deps for this project -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Wed Dec 12 11:36:56 2012
@@ -810,13 +810,6 @@
<version>${jersey-version}</version>
</dependency>
- <!-- mFreemarker and LDPath Viewable -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
-
<!-- JAX-RS JSR311 -->
<!-- NOTE that JAX-RS is included and exported by jersey-core
using Jersey in combination with this one might cause
@@ -1154,13 +1147,6 @@
<version>3.0.0</version>
</dependency>
- <!-- OWL
- directly defined in the org.apache.stanbol.commons.owl POM
- <dependency>
- <groupId>net.sourceforge.owlapi</groupId>
- <artifactId>owlapi</artifactId>
- <version>3.2.3</version>
- </dependency> -->
<!-- see also lucene-xercesImpl -->
<dependency>
<groupId>xerces</groupId>
Modified: stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -1,257 +1,258 @@
<?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. -->
+ 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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>stanbol-parent</artifactId>
- <version>2-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.web</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol Reasoners Web</name>
- <description>Set of rest services to deal with reasoners</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <!-- use defaults for now <configuration>
- <instructions>
- <Import-Package>
- javax.servlet.*,
- javax.ws.rs.*; version="[0,2)",
- 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.*; provide:=true,
- org.apache.stanbol.commons.jobs.api.*,
- org.apache.stanbol.commons.jobs.impl.*,
- org.apache.stanbol.commons.owl.*,
- org.apache.stanbol.rules.base.api.*,
- org.apache.stanbol.ontologymanager.ontonet.api.*,
- org.apache.stanbol.ontologymanager.servicesapi.*,
- org.apache.stanbol.reasoners.servicesapi.*,
- org.apache.stanbol.reasoners.jena.*,
- org.apache.stanbol.reasoners.owlapi.*
- </Import-Package>
- </instructions>
- </configuration> -->
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- AL20 License -->
- <exclude>src/license/THIRD-PARTY.properties</exclude>
-
- <!-- MIT License -->
- <exclude>src/main/resources/org/apache/stanbol/reasoners/web/static/jquery/jquery-1.6.1</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Stanbol deps -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.10.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.rdf.providers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
- </dependency>
- <!-- specific deps for this project -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <exclusions>
- <!-- jaxb is now part of java 6 -->
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</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>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
- <!-- indirect dependency for freemarker -->
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
-
- <!-- servlet container, most useful for the tests -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
-
- <!-- generic tax -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <!-- OSGi tax -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Testing deps -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.web</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Reasoners Web</name>
+ <description>Set of rest services to deal with reasoners</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <!-- use defaults for now <configuration>
+ <instructions>
+ <Import-Package>
+ javax.servlet.*,
+ javax.ws.rs.*; version="[0,2)",
+ 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.*; provide:=true,
+ org.apache.stanbol.commons.jobs.api.*,
+ org.apache.stanbol.commons.jobs.impl.*,
+ org.apache.stanbol.commons.owl.*,
+ org.apache.stanbol.rules.base.api.*,
+ org.apache.stanbol.ontologymanager.ontonet.api.*,
+ org.apache.stanbol.ontologymanager.servicesapi.*,
+ org.apache.stanbol.reasoners.servicesapi.*,
+ org.apache.stanbol.reasoners.jena.*,
+ org.apache.stanbol.reasoners.owlapi.*
+ </Import-Package>
+ </instructions>
+ </configuration> -->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- MIT License -->
+ <exclude>src/main/resources/org/apache/stanbol/reasoners/web/static/jquery/jquery-1.6.1</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.base</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.manager</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.refactor</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.rdfjson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>jaxrs.rdf.providers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.serializer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <!-- specific deps for this project -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <exclusions>
+ <!-- jaxb is now part of java 6 -->
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</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>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
+ <!-- indirect dependency for freemarker -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
+
+ <!-- servlet container, most useful for the tests -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
+
+ <!-- generic tax -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <!-- OSGi tax -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Testing deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: stanbol/trunk/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1420623&r1=1420622&r2=1420623&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Wed Dec 12 11:36:56 2012
@@ -134,7 +134,8 @@
<!-- Jersey, servlet and freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>