Author: ogrisel
Date: Wed Mar 30 15:03:08 2011
New Revision: 1086980
URL: http://svn.apache.org/viewvc?rev=1086980&view=rev
Log:
STANBOL-120: split commons/web into sub-projects for better modularity
Added:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/
(with props)
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/pom.xml
- copied, changed from r1086940,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/
- copied from r1086940,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/BundleHttpContext.java
- copied unchanged from r1086943,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/BundleHttpContext.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/JerseyEndpoint.java
- copied unchanged from r1086959,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JerseyEndpoint.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/resource/BaseStanbolResource.java
- copied unchanged from r1086959,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/resource/BaseStanbolResource.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/resource/StanbolRootResource.java
- copied unchanged from r1086959,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/resource/StanbolRootResource.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/
(with props)
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/sparql/
(with props)
Removed:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/WebFragmentHttpContext.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/resource/NavigationMixin.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/resources/META-INF/templates/ajax/
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/commons/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/README.txt
Modified: incubator/stanbol/branches/http-endpoint-refactoring/commons/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/pom.xml?rev=1086980&r1=1086979&r2=1086980&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/commons/pom.xml
(original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/commons/pom.xml Wed
Mar 30 15:03:08 2011
@@ -1,28 +1,32 @@
<?xml version="1.0"?>
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.reactor</artifactId>
- <version>0.9-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Apache Stanbol Commons Reactor</name>
- <scm>
- <connection>
-
scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons
- </connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons
- </developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
- </scm>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.reactor</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <modules>
- <module>web</module>
- <module>testing/jarexec</module>
- <module>testing/http</module>
- <module>testing/stanbol</module>
- <module>stanboltools/offline</module>
- </modules>
+ <name>Apache Stanbol Commons Reactor</name>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
+
+ <modules>
+ <module>web/base</module>
+ <!--
+ <module>web/home</module>
+ <module>web/sparql</module>
+ -->
+ <module>testing/jarexec</module>
+ <module>testing/http</module>
+ <module>testing/stanbol</module>
+ <module>stanboltools/offline</module>
+ </modules>
</project>
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/README.txt
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/README.txt?rev=1086980&r1=1086979&r2=1086980&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/commons/web/README.txt
(original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/commons/web/README.txt
Wed Mar 30 15:03:08 2011
@@ -1,5 +1,28 @@
-Stanbol HTTP Jersey Endpoint
-============================
+Stanbol HTTP Endpoints
+======================
+The following bundles provide the base infrastructure for building a
+consistent set JAX-RS based HTTP endpoints (RESTful webservices) to
+publish services implemented by the various OSGi bundles of a Stanbol
+distribution.
+The general convention is to make each endpoint self-documented by
+implementing a @GET annotated method that "Accept: text/html" and return
+an HTML page that explains how the endpoint works and give usage examples
+with the `curl` commandline tool and HTML forms to quickly test the
+service from inside the browser.
+
+- `stanbol/commons/web/base` provides the java interface and OSGi / JAX-RS
context
+ bridging tooling but not actual JAX-RS resources
+
+- `stanbol/commons/web/home` provides a simple resource for the home page and
+ default CSS / icons and base freemarker template to be reused by other
Stanbol
+ JAX-RS resources for consistent look and feel accross the all documentation.
+
+- `stanbol/commons/web/sparql` provides a sample JAX-RS resource to publish
+ access to the registered clerezza triple stores using the standardized SPARQL
+ HTTP endpoint API.
+
+TODO: write the documentation to contribute new endpoints that reuse the
styling
+and menu navigation of the default components.
Propchange:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 30 15:03:08 2011
@@ -0,0 +1,5 @@
+.project
+.classpath
+.settings
+target
+
Copied:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/pom.xml
(from r1086940,
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/pom.xml?p2=incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/pom.xml&p1=incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml&r1=1086940&r2=1086980&rev=1086980&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml
(original)
+++
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/pom.xml
Wed Mar 30 15:03:08 2011
@@ -1,163 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ 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>${stanbol-version}</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web</artifactId>
- <version>${stanbol-version}</version>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol Commons Web</name>
- <description>This is the Stanbol HTTP Jersey endpoint
bundle.</description>
- <scm>
- <connection>
-
scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/web
- </connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/web
- </developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
- </scm>
-
- <build>
- <!-- make it an OSGi bundle -->
- <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>
- <configuration>
- <instructions>
- <Export-Package>
-
org.apache.stanbol.commons.web.*,freemarker.cache.*
- </Export-Package>
-
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
-
<Embed-Dependency>freemarker</Embed-Dependency>
-
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>
- !javax.servlet.jsp.*,
- !org.apache.tools.*,
- !org.mortbay.*,
- !org.apache.xpath.*,
- !org.jdom.*,
- !org.jaxen.*,
- !org.apache.xml.*,
-
!org.mozilla.javascript.*,
- !org.python.*,
- !org.dom4j.*,
- !org.apache.log.*,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.jsonld</artifactId>
- </dependency>
-
- <!-- Clerezza dependencies -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
- </dependency>
-
- <!-- Jersey -->
- <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>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-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>
-
- <!-- 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>
-
- <!-- Jetty -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- for tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>${stanbol-version}</version>
+ <relativePath>../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>${stanbol-version}</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons Web</name>
+ <description>This is the Stanbol HTTP Jersey endpoint bundle.</description>
+ <scm>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/web
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/web
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
+
+ <build>
+ <!-- make it an OSGi bundle -->
+ <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>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.stanbol.commons.web.*,freemarker.cache.*
+ </Export-Package>
+
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
+ <Embed-Dependency>freemarker</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ !javax.servlet.jsp.*,
+ !org.apache.tools.*,
+ !org.mortbay.*,
+ !org.apache.xpath.*,
+ !org.jdom.*,
+ !org.jaxen.*,
+ !org.apache.xml.*,
+ !org.mozilla.javascript.*,
+ !org.python.*,
+ !org.dom4j.*,
+ !org.apache.log.*,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.jsonld</artifactId>
+ </dependency>
+
+ <!-- Clerezza dependencies -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+ </dependency>
+
+ <!-- Jersey -->
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-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>
+
+ <!-- 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>
+
+ <!-- Jetty -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- for tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
Propchange:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 30 15:03:08 2011
@@ -0,0 +1,4 @@
+target
+.project
+.classpath
+.settings
Propchange:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/sparql/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 30 15:03:08 2011
@@ -0,0 +1,5 @@
+.project
+.classpath
+.settings
+target
+
