Author: rwesten
Date: Wed May 20 11:25:33 2015
New Revision: 1680524
URL: http://svn.apache.org/r1680524
Log:
STANBOL-1419: addes WAR launcher versions for all JAR launchers; STANBOL-533:
moved the refactor engine to the reasoning module bundlelist. Also re-enabled
the refacotor engine in trunk
Added:
stanbol/trunk/launchers/mini-war/
stanbol/trunk/launchers/mini-war/pom.xml
stanbol/trunk/launchers/mini-war/src/
stanbol/trunk/launchers/mini-war/src/main/
stanbol/trunk/launchers/mini-war/src/main/bundles/
stanbol/trunk/launchers/mini-war/src/main/bundles/list.xml
stanbol/trunk/launchers/mini-war/src/main/config/
stanbol/trunk/launchers/mini-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
stanbol/trunk/launchers/mini-war/src/main/sling/
stanbol/trunk/launchers/mini-war/src/main/sling/common.properties
stanbol/trunk/launchers/mini-war/src/main/webapp/
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/web.xml
stanbol/trunk/launchers/stable-war/
stanbol/trunk/launchers/stable-war/pom.xml
stanbol/trunk/launchers/stable-war/src/
stanbol/trunk/launchers/stable-war/src/main/
stanbol/trunk/launchers/stable-war/src/main/bundles/
stanbol/trunk/launchers/stable-war/src/main/bundles/list.xml
stanbol/trunk/launchers/stable-war/src/main/config/
stanbol/trunk/launchers/stable-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
stanbol/trunk/launchers/stable-war/src/main/sling/
stanbol/trunk/launchers/stable-war/src/main/sling/common.properties
stanbol/trunk/launchers/stable-war/src/main/webapp/
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/web.xml
Modified:
stanbol/trunk/enhancement-engines/pom.xml
stanbol/trunk/enhancement-engines/refactor/pom.xml
stanbol/trunk/enhancement-engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/dereferencer/DereferencerImpl.java
stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/reasoners/src/main/bundles/list.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/pom.xml
Modified: stanbol/trunk/enhancement-engines/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/pom.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/pom.xml Wed May 20 11:25:33 2015
@@ -53,8 +53,7 @@
<module>xmpextractor</module>
<!-- TODO: reactivate as soon as mvn repo is back online -->
<!-- module>metaxa</module -->
- <!-- TODO: reactivate when ontologymanager is part of ng -->
- <!-- <module>refactor</module> -->
+ <module>refactor</module>
<!-- NLP processing engines -->
<module>langdetect</module>
Modified: stanbol/trunk/enhancement-engines/refactor/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/refactor/pom.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/refactor/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/refactor/pom.xml Wed May 20 11:25:33 2015
@@ -111,37 +111,16 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.entityhub.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
-
- <!-- KReS dependencies -->
- <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
- -->
- <dependency>
+
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -196,45 +175,16 @@
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
</dependency>
+
</dependencies>
</project>
Modified:
stanbol/trunk/enhancement-engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/dereferencer/DereferencerImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/dereferencer/DereferencerImpl.java?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/dereferencer/DereferencerImpl.java
(original)
+++
stanbol/trunk/enhancement-engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/dereferencer/DereferencerImpl.java
Wed May 20 11:25:33 2015
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* @author andrea.nuzzolese
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service(Dereferencer.class)
public class DereferencerImpl implements Dereferencer {
Modified: stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml Wed
May 20 11:25:33 2015
@@ -171,7 +171,7 @@
<artifactId>org.apache.stanbol.enhancer.engines.langdetect</artifactId>
<version>1.0.0-SNAPSHOT</version>
</bundle>
- <bundle>
+ <bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.langid</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -221,12 +221,11 @@
<version>1.0.0-SNAPSHOT</version>
</bundle>
- <!-- NLP metadata to RDF (using NIF 1.0) - NOT YET READY FOR DEFAULT CONFIG
- <bundle>
+ <bundle> <!-- allows to serialize NLP Annotations as NIF 1.0 and NIF 2.0
-->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </bundle> -->
+ </bundle>
<!-- Sentiment Enhancement Engines -->
<bundle><!-- Sentiment Word Classifiers -->
<groupId>org.apache.stanbol</groupId>
@@ -314,7 +313,7 @@
</bundle>
<!-- Refactor Enhancement Engine -->
- <!-- TODO: reactivate when ontologymanager is part of ng
+ <!-- Moved to the refactor bundlelist
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
Modified:
stanbol/trunk/launchers/bundlelists/reasoners/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/reasoners/src/main/bundles/list.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/reasoners/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/reasoners/src/main/bundles/list.xml Wed
May 20 11:25:33 2015
@@ -39,6 +39,13 @@
<version>1.0.0-SNAPSHOT</version>
</bundle>
</startLevel>
+ <startLevel level="35">
+ <bundle> <!-- NOTE: This requires the Enhancer Component -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
<startLevel level="38">
<bundle>
<groupId>org.apache.stanbol</groupId>
Added: stanbol/trunk/launchers/mini-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/pom.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/mini-war/pom.xml (added)
+++ stanbol/trunk/launchers/mini-war/pom.xml Wed May 20 11:25:33 2015
@@ -0,0 +1,156 @@
+<?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>6-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.mini-war</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>Apache Stanbol Minimal WAR Launcher</name>
+ <description>WAR packaging for a Apache Stanbol Minimal
Launcher</description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/mini-war/
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/mini-war/
+ </developerConnection>
+ <url>http://stanbol.apache.org/</url>
+ </scm>
+
+ <properties>
+ <stanbol.context>/stanbol</stanbol.context>
+ <stanbol.port>8080</stanbol.port>
+
<stanbol.home>${project.build.directory}${file.separator}stanbol</stanbol.home>
+ </properties>
+
+ <build>
+ <finalName>stanbol</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <goals>
+ <goal>prepare-package</goal>
+ </goals>
+ <configuration>
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <packagingExcludes>WEB-INF/classes/META-INF/*</packagingExcludes>
+ <warName>stanbol</warName>
+ <webResources>
+ <resource>
+ <directory>
+ ${project.build.directory}/launchpad-bundles
+ </directory>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}/META-INF</directory>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <path>${stanbol.context}</path>
+ <port>${stanbol.port}</port>
+ <systemProperties>
+ <sling.home>${stanbol.home}</sling.home> <!-- TODO later
overwritten by a servlet -->
+ </systemProperties>
+
<addWarDependenciesInClassloader>true</addWarDependenciesInClassloader>
+
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.base</artifactId>
+ <classifier>webapp</classifier>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- OSGi Framemework Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Clerezza RDF bundles -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf</artifactId>
+ <version>0.1</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>
+
+ </dependencies>
+</project>
Added: stanbol/trunk/launchers/mini-war/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/src/main/bundles/list.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/mini-war/src/main/bundles/list.xml (added)
+++ stanbol/trunk/launchers/mini-war/src/main/bundles/list.xml Wed May 20
11:25:33 2015
@@ -0,0 +1,65 @@
+<?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>
+
+ <!-- *********************************************************************
+ start level 10 TO 19 reserved for required libraries
+ (internal and external)
+ *********************************************************************
-->
+
+ <!-- Stanbol Commons -->
+ <startLevel level="27">
+ <!-- The common web interface -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
+ <!-- *********************************************************************
+ start level 20 TO 24 reserved for Stanbol Framework
+ (Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
+ *********************************************************************
-->
+
+ <!-- KReS
+ <startLevel level="32">
+ </startLevel> -->
+
+ <!-- *********************************************************************
+ start level 25 TO 29 reserved for Stanbol plug-ins
+ (currently the Enhancement Engines)
+ *********************************************************************
-->
+
+ <startLevel level="36">
+ <!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
+ <!-- bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.demos.enhancer.vie</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle -->
+ </startLevel>
+
+ <!-- *********************************************************************
+ start level >= 30 are unused
+ *********************************************************************
-->
+
+</bundles>
Added:
stanbol/trunk/launchers/mini-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1680524&view=auto
==============================================================================
---
stanbol/trunk/launchers/mini-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
(added)
+++
stanbol/trunk/launchers/mini-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
Wed May 20 11:25:33 2015
@@ -0,0 +1,31 @@
+# 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/trunk/launchers/mini-war/src/main/sling/common.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/src/main/sling/common.properties?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/mini-war/src/main/sling/common.properties (added)
+++ stanbol/trunk/launchers/mini-war/src/main/sling/common.properties Wed May
20 11:25:33 2015
@@ -0,0 +1,27 @@
+# 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
+org.osgi.framework.startlevel.beginning=40
+clerezza.shell.disable=true
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
+sling.system.packages.servletdescription=javax.servlet.descriptor;version=3.0.0
\ No newline at end of file
Added:
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1680524&view=auto
==============================================================================
---
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
(added)
+++
stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
Wed May 20 11:25:33 2015
@@ -0,0 +1,31 @@
+# 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/trunk/launchers/mini-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/web.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/web.xml (added)
+++ stanbol/trunk/launchers/mini-war/src/main/webapp/WEB-INF/web.xml Wed May 20
11:25:33 2015
@@ -0,0 +1,73 @@
+<?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.
+-->
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ <display-name>Stanbol Full Web Application</display-name>
+
+ <!-- The Felix Http Service Listener Proxy for HTTP Session events -->
+ <listener>
+ <listener-class>
+ org.apache.sling.launchpad.webapp.SlingSessionListener
+ </listener-class>
+ </listener>
+
+ <servlet>
+ <display-name>Stanbol Servlet</display-name>
+ <servlet-name>stanbol</servlet-name>
+
<servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
+ <!--
+ Any init-params defined for the servlet will overwrite
+ the default settings in the sling.properties file.
+
+ The most important init-param to be set here is the
+ sling.home parameter defining where Sling will place
+ its files such as the bundle cache, logs, configuration,
+ etc.
+
+ If the sling.home parameter is not set a default value is
+ set as ${user.dir}/sling/${context.path} where ${user.dir}
+ is the current working directory and ${context.path} is the
+ servlet context path with slashes replaced by underscores and
+ the root context represented as just a single underscore.
+
+ Example: For Sling deployed in the root context, the default
+ sling.home would be sling/_. For Sling deployed in the context
+ /sling/i1, the default sling.home would be sling/_sling_i1.
+ -->
+ <init-param> <!-- the default sling.home is set to stanbol -->
+ <param-name>sling.home</param-name>
+ <param-value>${user.dir}/stanbol/${context.path}</param-value>
+ </init-param>
+ <init-param> <!-- the initial framework startlevel -->
+ <param-name>org.osgi.framework.startlevel.beginning</param-name>
+ <param-value>40</param-value>
+ </init-param>
+ <init-param> <!-- set the stanbol.home to the sling.home -->
+ <param-name>stanbol.home</param-name>
+ <param-value>${sling.home}</param-value>
+ </init-param>
+ <init-param> <!-- set the sling file installer dir to
{working-dir}/stanbol/fileinstall -->
+ <param-name>sling.fileinstall.dir</param-name>
+ <param-value>${sling.home}/fileinstall</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+
+ <!-- Default Mapping for the Context -->
+ <servlet-mapping>
+ <servlet-name>stanbol</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Wed May 20 11:25:33 2015
@@ -83,23 +83,16 @@
<bundles>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-jetty-version}</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-http-api-version}</version>
- <startLevel>3</startLevel>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-sevlet-api-version}</version>
+ <version>${felix-jetty-version}</version>
<startLevel>3</startLevel>
</bundle>
</bundles>
Added: stanbol/trunk/launchers/stable-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/pom.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/stable-war/pom.xml (added)
+++ stanbol/trunk/launchers/stable-war/pom.xml Wed May 20 11:25:33 2015
@@ -0,0 +1,194 @@
+<?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>6-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.launchers.stable-war</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>Apache Stanbol Stable WAR Launcher</name>
+ <description>
+ A Stanbol Launcher including stable modules of the Enhancer and Entityhub
+ component. This launcher comes with the default configuration but does
only
+ include English NLP models.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/mini-war/
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/mini-war/
+ </developerConnection>
+ <url>http://stanbol.apache.org/</url>
+ </scm>
+
+ <properties>
+ <stanbol.context>/stanbol</stanbol.context>
+ <stanbol.port>8080</stanbol.port>
+
<stanbol.home>${project.build.directory}${file.separator}stanbol</stanbol.home>
+ </properties>
+
+ <build>
+ <finalName>stanbol</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <goals>
+ <goal>prepare-package</goal>
+ </goals>
+ <configuration>
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <packagingExcludes>WEB-INF/classes/META-INF/*</packagingExcludes>
+ <warName>stanbol</warName>
+ <webResources>
+ <resource>
+ <directory>
+ ${project.build.directory}/launchpad-bundles
+ </directory>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}/META-INF</directory>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <path>${stanbol.context}</path>
+ <port>${stanbol.port}</port>
+ <systemProperties>
+ <sling.home>${stanbol.home}</sling.home> <!-- TODO later
overwritten by a servlet -->
+ </systemProperties>
+
<addWarDependenciesInClassloader>true</addWarDependenciesInClassloader>
+
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.base</artifactId>
+ <classifier>webapp</classifier>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- OSGi Framemework Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Clerezza RDF bundles -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf</artifactId>
+ <version>0.1</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>
+
+ <!-- Stanbol Enhancer Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Data Bundle List -->
+ <!-- Adds some data and configurations for demo purposes -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Entityhub Bundle List -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.clerezza</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: stanbol/trunk/launchers/stable-war/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/src/main/bundles/list.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/stable-war/src/main/bundles/list.xml (added)
+++ stanbol/trunk/launchers/stable-war/src/main/bundles/list.xml Wed May 20
11:25:33 2015
@@ -0,0 +1,65 @@
+<?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>
+
+ <!-- *********************************************************************
+ start level 10 TO 19 reserved for required libraries
+ (internal and external)
+ *********************************************************************
-->
+
+ <!-- Stanbol Commons -->
+ <startLevel level="27">
+ <!-- The common web interface -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
+ <!-- *********************************************************************
+ start level 20 TO 24 reserved for Stanbol Framework
+ (Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
+ *********************************************************************
-->
+
+ <!-- KReS
+ <startLevel level="32">
+ </startLevel> -->
+
+ <!-- *********************************************************************
+ start level 25 TO 29 reserved for Stanbol plug-ins
+ (currently the Enhancement Engines)
+ *********************************************************************
-->
+
+ <startLevel level="36">
+ <!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
+ <!-- bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.demos.enhancer.vie</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle -->
+ </startLevel>
+
+ <!-- *********************************************************************
+ start level >= 30 are unused
+ *********************************************************************
-->
+
+</bundles>
Added:
stanbol/trunk/launchers/stable-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1680524&view=auto
==============================================================================
---
stanbol/trunk/launchers/stable-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
(added)
+++
stanbol/trunk/launchers/stable-war/src/main/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
Wed May 20 11:25:33 2015
@@ -0,0 +1,31 @@
+# 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/trunk/launchers/stable-war/src/main/sling/common.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/src/main/sling/common.properties?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/stable-war/src/main/sling/common.properties (added)
+++ stanbol/trunk/launchers/stable-war/src/main/sling/common.properties Wed May
20 11:25:33 2015
@@ -0,0 +1,27 @@
+# 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
+org.osgi.framework.startlevel.beginning=40
+clerezza.shell.disable=true
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
+sling.system.packages.servletdescription=javax.servlet.descriptor;version=3.0.0
\ No newline at end of file
Added:
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1680524&view=auto
==============================================================================
---
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
(added)
+++
stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
Wed May 20 11:25:33 2015
@@ -0,0 +1,31 @@
+# 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/trunk/launchers/stable-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/web.xml?rev=1680524&view=auto
==============================================================================
--- stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/web.xml (added)
+++ stanbol/trunk/launchers/stable-war/src/main/webapp/WEB-INF/web.xml Wed May
20 11:25:33 2015
@@ -0,0 +1,73 @@
+<?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.
+-->
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ <display-name>Stanbol Full Web Application</display-name>
+
+ <!-- The Felix Http Service Listener Proxy for HTTP Session events -->
+ <listener>
+ <listener-class>
+ org.apache.sling.launchpad.webapp.SlingSessionListener
+ </listener-class>
+ </listener>
+
+ <servlet>
+ <display-name>Stanbol Servlet</display-name>
+ <servlet-name>stanbol</servlet-name>
+
<servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
+ <!--
+ Any init-params defined for the servlet will overwrite
+ the default settings in the sling.properties file.
+
+ The most important init-param to be set here is the
+ sling.home parameter defining where Sling will place
+ its files such as the bundle cache, logs, configuration,
+ etc.
+
+ If the sling.home parameter is not set a default value is
+ set as ${user.dir}/sling/${context.path} where ${user.dir}
+ is the current working directory and ${context.path} is the
+ servlet context path with slashes replaced by underscores and
+ the root context represented as just a single underscore.
+
+ Example: For Sling deployed in the root context, the default
+ sling.home would be sling/_. For Sling deployed in the context
+ /sling/i1, the default sling.home would be sling/_sling_i1.
+ -->
+ <init-param> <!-- the default sling.home is set to stanbol -->
+ <param-name>sling.home</param-name>
+ <param-value>${user.dir}/stanbol/${context.path}</param-value>
+ </init-param>
+ <init-param> <!-- the initial framework startlevel -->
+ <param-name>org.osgi.framework.startlevel.beginning</param-name>
+ <param-value>40</param-value>
+ </init-param>
+ <init-param> <!-- set the stanbol.home to the sling.home -->
+ <param-name>stanbol.home</param-name>
+ <param-value>${sling.home}</param-value>
+ </init-param>
+ <init-param> <!-- set the sling file installer dir to
{working-dir}/stanbol/fileinstall -->
+ <param-name>sling.fileinstall.dir</param-name>
+ <param-value>${sling.home}/fileinstall</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+
+ <!-- Default Mapping for the Context -->
+ <servlet-mapping>
+ <servlet-name>stanbol</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Wed May 20 11:25:33 2015
@@ -31,7 +31,11 @@
<packaging>jar</packaging>
<name>Apache Stanbol Launchers Stable Launcher</name>
- <description>Runnable jar that runs the stable Stanbol
configuration.</description>
+ <description>
+ A Stanbol Launcher including stable modules of the Enhancer and Entityhub
+ component. This launcher comes with the default configuration but does only
+ include English NLP models.
+ </description>
<scm>
<connection>
@@ -81,23 +85,16 @@
<bundles>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-jetty-version}</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-http-api-version}</version>
- <startLevel>3</startLevel>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-sevlet-api-version}</version>
+ <version>${felix-jetty-version}</version>
<startLevel>3</startLevel>
</bundle>
</bundles>
Modified: stanbol/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/pom.xml?rev=1680524&r1=1680523&r2=1680524&view=diff
==============================================================================
--- stanbol/trunk/pom.xml (original)
+++ stanbol/trunk/pom.xml Wed May 20 11:25:33 2015
@@ -82,8 +82,10 @@
<module>launchers/bundlelists</module>
<module>launchers/mini</module>
- <module>launchers/full</module>
+ <module>launchers/mini-war</module>
<module>launchers/stable</module>
+ <module>launchers/stable-war</module>
+ <module>launchers/full</module>
<module>launchers/full-war</module>
<module>development/archetypes/statefull-webmodule</module>
