Author: rwesten
Date: Wed May 20 10:18:00 2015
New Revision: 1680513
URL: http://svn.apache.org/r1680513
Log:
STANBOL-1419: Adaptions to the WAR launchers (see according comment of the
Issue for details)
Added:
stanbol/trunk/launchers/full-war/src/main/sling/
stanbol/trunk/launchers/full-war/src/main/sling/common.properties
Modified:
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1680513&r1=1680512&r2=1680513&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Wed May 20 10:18:00 2015
@@ -63,11 +63,6 @@
</goals>
<configuration>
<includeDefaultBundles>false</includeDefaultBundles>
- <!-- jarWebSupport> - not needed for a WAR launcher -
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <startLevel>3</startLevel>
- </jarWebSupport -->
</configuration>
</execution>
</executions>
@@ -75,17 +70,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <!-- not needed for a WAR launcher
- <addClasspath>true</addClasspath>
- <mainClass>org.apache.sling.launchpad.app.Main</mainClass>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- -->
- </manifest>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -123,7 +107,7 @@
<path>${stanbol.context}</path>
<port>${stanbol.port}</port>
<systemProperties>
- <sling.home>${stanbol.home}</sling.home> <!-- TODO: later
overwritten by a servlet -->
+ <sling.home>${stanbol.home}</sling.home> <!-- TODO later
overwritten by a servlet -->
</systemProperties>
<addWarDependenciesInClassloader>true</addWarDependenciesInClassloader>
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
@@ -140,15 +124,16 @@
<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>
@@ -157,15 +142,26 @@
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Clerezza Jena TDB storage (used by Ontonet) -->
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf.tdb</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>
- <!-- Security Support-->
+
+ <!-- Security Support -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
@@ -173,47 +169,51 @@
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
-
- <!-- Stanbol CMS Adapter Bundle List
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>partialbundlelist</type>
- </dependency> -->
-
- <!-- Stanbol Contenthub Bundle List
+
+ <!-- Clerezza zz> Shell Bundle List -->
<dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>shell</artifactId>
+ <version>0.1</version>
<type>partialbundlelist</type>
- </dependency> -->
-
+ <scope>provided</scope>
+ </dependency>
+
<!-- Stanbol Data Bundle List -->
<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>
- <dependency> <!-- include all OpenNLP models in the full launcher -->
+ <!-- include all OpenNLP models in the full launcher -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId>
<version>1.1.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 Entityhub Bundle List -->
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.enhancer-engines-restricted</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol Entityhub Bundle List(s) -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
@@ -235,6 +235,14 @@
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
+ <!-- Marmotta integration with the Entityhub -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.marmotta.kiwi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
<!-- Stanbol Ontology Manager Bundle List -->
<dependency>
@@ -242,14 +250,16 @@
<artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
+ <scope>provided</scope>
</dependency>
-
- <!-- Stanbol Rules Bundle List -->
+
+ <!-- Stanbol Rules Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
+ <scope>provided</scope>
</dependency>
<!-- Stanbol Reasoners Bundle List -->
@@ -259,6 +269,24 @@
<version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
+ </dependency>
+
+ <!-- Language Extras -->
+ <!-- Basic Cinese language support (STANBOL-855) -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Japanese Language Support -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.kuromoji</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
Added: stanbol/trunk/launchers/full-war/src/main/sling/common.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/src/main/sling/common.properties?rev=1680513&view=auto
==============================================================================
--- stanbol/trunk/launchers/full-war/src/main/sling/common.properties (added)
+++ stanbol/trunk/launchers/full-war/src/main/sling/common.properties Wed May
20 10:18:00 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
Modified: stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml?rev=1680513&r1=1680512&r2=1680513&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml (original)
+++ stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml Wed May 20
10:18:00 2015
@@ -1,54 +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.
+ 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>
+ 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>
+ <!-- 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>Sling Servlet</display-name>
- <servlet-name>sling</servlet-name>
-
<servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class>
+ <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> <!-- the default sling.home is set to stanbol -->
- <param-name>sling.home</param-name>
- <param-value>stanbol/</param-value>
- </init-param>
+ <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>
+ <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>
+ <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>sling</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
+ <!-- Default Mapping for the Context -->
+ <servlet-mapping>
+ <servlet-name>stanbol</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
</web-app>
