You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/06/07 10:36:25 UTC
svn commit: r1490539 - in /stanbol/branches/commons-ng: ./
commons/freemarker/ commons/jobs/web/ commons/owl/
commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/
commons/security/usermanagement/
commons/web/base/src/main/java/org/apache/stanb...
Author: reto
Date: Fri Jun 7 08:36:24 2013
New Revision: 1490539
URL: http://svn.apache.org/r1490539
Log:
STANBOL-1098: created a mini launcher to allow tackling remaining issues with jersey update
Added:
stanbol/branches/commons-ng/launchers/mini/ (with props)
stanbol/branches/commons-ng/launchers/mini/README.md
stanbol/branches/commons-ng/launchers/mini/nbactions.xml
- copied unchanged from r1490372, stanbol/branches/commons-ng/launchers/full/nbactions.xml
stanbol/branches/commons-ng/launchers/mini/pom.xml
stanbol/branches/commons-ng/launchers/mini/src/
stanbol/branches/commons-ng/launchers/mini/src/main/
stanbol/branches/commons-ng/launchers/mini/src/main/bundles/
stanbol/branches/commons-ng/launchers/mini/src/main/bundles/list.xml
stanbol/branches/commons-ng/launchers/mini/src/main/config/
stanbol/branches/commons-ng/launchers/mini/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
stanbol/branches/commons-ng/launchers/mini/src/main/resources/
stanbol/branches/commons-ng/launchers/mini/src/main/sling/
stanbol/branches/commons-ng/launchers/mini/src/main/sling/common.properties
Modified:
stanbol/branches/commons-ng/commons/freemarker/pom.xml
stanbol/branches/commons-ng/commons/jobs/web/pom.xml
stanbol/branches/commons-ng/commons/owl/pom.xml
stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/LinkResource.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ScriptResource.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
stanbol/branches/commons-ng/commons/web/home/pom.xml
stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java
stanbol/branches/commons-ng/commons/web/rdfviewable-writer/pom.xml
stanbol/branches/commons-ng/commons/web/sparql/pom.xml
stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml
stanbol/branches/commons-ng/commons/web/viewable/pom.xml
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/branches/commons-ng/parent/pom.xml
stanbol/branches/commons-ng/pom.xml
Modified: stanbol/branches/commons-ng/commons/freemarker/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/freemarker/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/freemarker/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/freemarker/pom.xml Fri Jun 7 08:36:24 2013
@@ -67,7 +67,6 @@ from the bundles. More Freemarker utilit
<Import-Package>
!javax.servlet.jsp.*,
!org.apache.tools.*,
- !org.mortbay.*,
!org.apache.xpath.*,
!org.jdom.*,
!org.jaxen.*,
@@ -80,9 +79,6 @@ from the bundles. More Freemarker utilit
!javax.el,
!org.zeroturnaround.javarebel,
javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs;version="[0,2)",
- javax.ws.rs.ext;version="[0,2)",
- javax.ws.rs.core;version="[0,2)",
*
</Import-Package>
</instructions>
Modified: stanbol/branches/commons-ng/commons/jobs/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/jobs/web/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/jobs/web/pom.xml Fri Jun 7 08:36:24 2013
@@ -47,8 +47,6 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
Modified: stanbol/branches/commons-ng/commons/owl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/owl/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/owl/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/owl/pom.xml Fri Jun 7 08:36:24 2013
@@ -75,8 +75,6 @@
uk.ac.manchester.cs.owl.*;version=${owlapi-version}
</_exportcontents>
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
org.apache.stanbol.commons.owl,
org.apache.stanbol.commons.owl.transformation,
Modified: stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java (original)
+++ stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java Fri Jun 7 08:36:24 2013
@@ -63,7 +63,6 @@ public class OWLFragment implements WebF
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
- classes.add(OWLOntologyWriter.class);
return classes;
}
Modified: stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml Fri Jun 7 08:36:24 2013
@@ -67,8 +67,6 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
org.apache.felix.webconsole; provide:=true,
*
Modified: stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/LinkResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/LinkResource.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/LinkResource.java (original)
+++ stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/LinkResource.java Fri Jun 7 08:36:24 2013
@@ -20,6 +20,7 @@ package org.apache.stanbol.commons.web.b
* Simple data transfer object for stylesheet (CSS) and fiveicon list to be contributed by WebFragment for
* inclusion to the HTML head of the pages by the NavigationMixin abstract JAX-RS resource.
*/
+@Deprecated
public class LinkResource implements Comparable<LinkResource> {
private final String rel;
Modified: stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ScriptResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ScriptResource.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ScriptResource.java (original)
+++ stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ScriptResource.java Fri Jun 7 08:36:24 2013
@@ -20,6 +20,7 @@ package org.apache.stanbol.commons.web.b
* Simple data transfer object for scripts (typically javascript) to be contributed by WebFragment for
* inclusion to the HTML head of the pages by the NavigationMixin abstract JAX-RS resource.
*/
+@Deprecated
public class ScriptResource implements Comparable<ScriptResource> {
private final String type;
Modified: stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java (original)
+++ stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java Fri Jun 7 08:36:24 2013
@@ -24,8 +24,10 @@ import java.util.Set;
* Interface to be implemented by bundles that want to customize the stanbol web interface and REST API by
* contributing static resources, JAX-RS resources and Freemarker views.
*
+ * @deprecated The whiteboard pattern should be used for registering OSGi components and navigations links, Links and ScriptResource should be in the template
* TODO: add some kind of ordering information
*/
+@Deprecated
public interface WebFragment {
/**
Modified: stanbol/branches/commons-ng/commons/web/home/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/home/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/home/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/home/pom.xml Fri Jun 7 08:36:24 2013
@@ -56,9 +56,7 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true; version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true; version="[0.11,2)",
*;
</Import-Package>
<Private-Package>
Modified: stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java (original)
+++ stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java Fri Jun 7 08:36:24 2013
@@ -64,7 +64,6 @@ public class HomeWebFragment implements
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
- classes.add(StanbolRootResource.class);
return classes;
}
Modified: stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java (original)
+++ stanbol/branches/commons-ng/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java Fri Jun 7 08:36:24 2013
@@ -22,6 +22,9 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -31,6 +34,9 @@ import org.apache.stanbol.commons.web.ba
* Root JAX-RS resource. The HTML view is implicitly rendered by a freemarker template to be found in the
* META-INF/templates folder.
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/")
public class StanbolRootResource extends BaseStanbolResource {
Modified: stanbol/branches/commons-ng/commons/web/rdfviewable-writer/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/rdfviewable-writer/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/rdfviewable-writer/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/rdfviewable-writer/pom.xml Fri Jun 7 08:36:24 2013
@@ -57,10 +57,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>
- javax.ws.rs.*; version="[0,2)",
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/branches/commons-ng/commons/web/sparql/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/sparql/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/sparql/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/sparql/pom.xml Fri Jun 7 08:36:24 2013
@@ -57,7 +57,6 @@
<instructions>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true; version="[0.11,0.13)",
*;
</Import-Package>
Modified: stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml Fri Jun 7 08:36:24 2013
@@ -59,7 +59,6 @@
<configuration>
<instructions>
<Import-Package>
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
Modified: stanbol/branches/commons-ng/commons/web/viewable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/viewable/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/viewable/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/viewable/pom.xml Fri Jun 7 08:36:24 2013
@@ -67,7 +67,6 @@
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
Modified: stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Fri Jun 7 08:36:24 2013
@@ -136,7 +136,7 @@
<bundle>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0.1</version>
+ <version>14.0.1</version>
</bundle>
<bundle> <!-- used by Solr4 spatial -->
<groupId>org.apache.servicemix.bundles</groupId>
@@ -218,6 +218,14 @@
</bundle>
</startLevel>
<!-- Jersey -->
+ <!-- javax.annotation has to go first! -->
+ <startLevel level="1">
+ <bundle>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2-b04</version>
+ </bundle>
+ </startLevel>
<startLevel level="24">
<!-- NOTE: jersey-core bug, must start before jersey-server to avoid
jersey spi class not found errors. Restart jersey-server manually if getting
@@ -227,9 +235,79 @@
<artifactId>jersey-core</artifactId>
<version>1.15</version>
</bundle> -->
+ <bundle>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <!-- if your container implements Servlet API older than 3.0,
+ use "jersey-container-servlet-core", otherwise
+ "jersey-container-servlet" -->
+ <artifactId>jersey-container-servlet-core</artifactId>
+ <version>2.0</version>
+ </bundle>
+ <bundle>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.1.0.Final</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>2.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>2.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
+ <version>2.1.88</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-locator</artifactId>
+ <version>2.1.88</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-utils</artifactId>
+ <version>2.1.88</version>
+ </bundle>
+ <bundle>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>osgi-resource-locator</artifactId>
+ <version>1.0.1</version>
+ </bundle>
+
+<bundle>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>2.1.88</version>
+</bundle>
+<bundle>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>asm-all-repackaged</artifactId>
+ <version>2.1.88</version>
+</bundle>
+<bundle>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1.88</version>
+</bundle>
+<bundle>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0</version>
+</bundle>
+
</startLevel>
<startLevel level="25">
- <bundle>
+ <!-- <bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.15</version>
@@ -238,7 +316,7 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>1.15</version>
- </bundle>
+ </bundle> -->
<!-- needed to read data from mime multipart requests -->
<bundle>
<groupId>org.apache.clerezza</groupId>
Propchange: stanbol/branches/commons-ng/launchers/mini/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 7 08:36:24 2013
@@ -0,0 +1 @@
+target
Added: stanbol/branches/commons-ng/launchers/mini/README.md
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/README.md?rev=1490539&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/README.md (added)
+++ stanbol/branches/commons-ng/launchers/mini/README.md Fri Jun 7 08:36:24 2013
@@ -0,0 +1,28 @@
+This module builds a runnable Stanbol jar using the Sling Launchpad Maven plugin,
+including the bundles defined at src/main/bundles/list.xml.
+
+This launcher includes only Stanbol components that were agreed on being stable
+components.
+
+To start this after building use:
+
+ java -Xmx512M -jar target/org.apache.stanbol.launchers.stable-*-SNAPSHOT.jar
+
+The Stanbol Enhancer HTTP endpoint should then be available at
+
+ http://localhost:8080
+
+So that you can POST content using, for example:
+
+ curl -H "Content-Type: text/plain" \
+ -T ../../enhancer/data/text-examples/obama-signing.txt \
+ http://localhost:8080/engines
+
+Configure any required parameter for the enhancement engines, at
+
+ http://localhost:8080/system/console/
+
+The OSGi state is stored in the ./stanbol folder.
+
+The logs are found at stanbol/logs/error.log and can be configured from the
+OSGi console.
Added: stanbol/branches/commons-ng/launchers/mini/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/pom.xml?rev=1490539&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/pom.xml (added)
+++ stanbol/branches/commons-ng/launchers/mini/pom.xml Fri Jun 7 08:36:24 2013
@@ -0,0 +1,201 @@
+<?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>4-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.mini</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Apache Stanbol Launchers Mini Launcher</name>
+ <description>Runnable jar that runs a minimal Stanbol configuration.
+ Modules providing actual functionality have to be installed separately</description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/stable/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/stable/
+ </developerConnection>
+ <url>http://stanbol.apache.org/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>stanbol/**</include>
+ <include>factstore/**</include>
+ <include>*.log</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <!--
+ TODO the maven-launchpad-plugin can also generate a war file and
+ Karaf description, we could add this. See
+ http://sling.apache.org/site/maven-launchpad-plugin.html
+ -->
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <goals>
+ <goal>prepare-package</goal>
+ </goals>
+ <configuration>
+ <includeDefaultBundles>false</includeDefaultBundles>
+ <!-- Standalone jar requires an OSGi http service implementation -->
+ <jarWebSupport>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>2.2.0</version>
+ </jarWebSupport>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.7.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <!-- Use this to in/exclude only specific dependencies -->
+ <includes>
+ <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+ <include>org.apache.sling:org.apache.sling.launchpad.base</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes></excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <configuration>
+ <target>
+ <property name="vm.args" value=""/>
+ <java fork="true" jar="${project.build.directory}/${project.build.finalName}.jar"
+ dir="${project.build.directory}">
+ <jvmarg line="-Xmx1024m -XX:MaxPermSize=256M ${vm.args}"/>
+ </java>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <!-- The Apache Stanbol lauchpad -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <!-- maven-launchpad-plugin builds on the launchpad.base app -->
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.base</artifactId>
+ <classifier>app</classifier>
+ </dependency>
+
+ <!-- OSGi Framemework Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <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>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Security Support -->
+ <!-- getting exception about missing RuntimePermission anonymous actually has <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency> -->
+
+ <!-- Security currently depends on zzshell! -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.bundlelists.zzshell</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added: stanbol/branches/commons-ng/launchers/mini/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/src/main/bundles/list.xml?rev=1490539&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/src/main/bundles/list.xml (added)
+++ stanbol/branches/commons-ng/launchers/mini/src/main/bundles/list.xml Fri Jun 7 08:36:24 2013
@@ -0,0 +1,35 @@
+<?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.
+-->
+ <!--
+ List of initial bundles for the Stanbol Sling-based standalone launcher.
+ -->
+<bundles>
+ <!-- General-purpose libraries -->
+
+ <!-- *********************************************************************
+ start level 20 TO 24 reserved for Stanbol Framework
+ (Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
+ ********************************************************************* -->
+
+
+
+ <!-- *********************************************************************
+ start level >= 30 are unused
+ ********************************************************************* -->
+
+</bundles>
Added: stanbol/branches/commons-ng/launchers/mini/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1490539&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg (added)
+++ stanbol/branches/commons-ng/launchers/mini/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg Fri Jun 7 08:36:24 2013
@@ -0,0 +1,32 @@
+# 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.
+
+
+
+# Example default OSGi config that's loaded
+# at startup if Sling's org.apache.sling.launchpad.installer
+# bundle is active.
+#
+# The filename defines the config PID.
+
+# Factory configs should be named like foo.bar-X.cfg
+# whereo.foo.bar is the factory PID and X a unique value
+# for that PID. The actual config PID is then automatically
+# generated PID, and the value of X is stored as an alias
+# property in the configuration.
+
+message=This test config should be loaded at startup
+
+anotherValue = This is AnotherValue.
\ No newline at end of file
Added: stanbol/branches/commons-ng/launchers/mini/src/main/sling/common.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/src/main/sling/common.properties?rev=1490539&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/src/main/sling/common.properties (added)
+++ stanbol/branches/commons-ng/launchers/mini/src/main/sling/common.properties Fri Jun 7 08:36:24 2013
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file is loaded by Apache Sling during startup. Properties defined
+# in this file are copied over to the sling.properties file in the {sling.home}
+# directory.
+
+# The stanbol home directory
+# by default this is set to the same value as sling.home
+stanbol.home=${sling.home}
+org.osgi.framework.startlevel.beginning=40
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
Modified: stanbol/branches/commons-ng/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/parent/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/parent/pom.xml (original)
+++ stanbol/branches/commons-ng/parent/pom.xml Fri Jun 7 08:36:24 2013
@@ -165,6 +165,10 @@
<inherited>true</inherited>
<configuration>
<instructions>
+ <Import-Package>
+ javax.ws.rs.*; version="[0,3)",
+ *
+ </Import-Package>
<Bundle-DocURL>http://stanbol.apache.org</Bundle-DocURL>
<Bundle-Vendor>Apache Stanbol</Bundle-Vendor>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
@@ -758,7 +762,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0.1</version>
+ <version>14.0.1</version>
</dependency>
<!-- Joda Time -->
Modified: stanbol/branches/commons-ng/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/pom.xml?rev=1490539&r1=1490538&r2=1490539&view=diff
==============================================================================
--- stanbol/branches/commons-ng/pom.xml (original)
+++ stanbol/branches/commons-ng/pom.xml Fri Jun 7 08:36:24 2013
@@ -78,10 +78,11 @@
<module>reasoners</module>
- <module>demos/webvie</module>
+ <module>demos/webvie</module> -->
<module>launchers/bundlelists</module>
- <module>launchers/full</module>
+ <module>launchers/mini</module>
+<!-- <module>launchers/full</module>
<module>launchers/stable</module>
<module>launchers/full-war</module>