You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/11/05 11:52:29 UTC
[24/52] [partial] Reverting the erroneous merge by Sebastian
according to the instructions in INFRA-6876
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index 3da7e34..3e23da2 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -1,6 +1,8 @@
-Apache Marmotta Installer, Copyright 2012-2013 The Apache Software Foundation
+Apache Marmotta Installer
+Copyright 2012-2013 The Apache Software Foundation
-This product includes software developed at The Apache Software Foundation (http://www.apache.org).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org).
Portions of this software were originally based on the following:
@@ -8,295 +10,33 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
-This product also includes the following third-party components:
+This product also includes some third-party binary components:
-* Apache Tomcat, http://tomcat.apache.org
+ * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://www.h2database.com
- Copyright (c) 2013 The Apache Software Foundation
+ * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://logback.qos.ch
- Java compilation software for JSP pages is provided by Eclipse,
- which is open source software. The original software and
- related information is available at http://www.eclipse.org.
+ * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla
+ Public License (MPL) 1.1. The original software is available from
+ http://www.jboss.org/javassist
- The bayeux implementation is derivative work originating at
- the Dojo Foundation
- * Copyright 2007-2008 Guy Molinari
- * Copyright 2007-2008 Filip Hanik
- * Copyright 2007 Dojo Foundation
- * Copyright 2007 Mort Bay Consulting Pty. Ltd.
+ * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
- The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - jsp_2_2.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
- may be obtained from http://java.sun.com/xml/ns/javaee/
+ * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
-* H2, http://www.h2database.com
+ * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed
+ under the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
- Copyright (c) 2013 H2 Group
-
-* Logback, http://logback.qos.ch
-
- Copyright (C) 2012 QOS.ch
-
-* JDOM, http://www.jdom.org
-
- Copyright (c) 2012 Jason Hunter & Brett McLaughlin
-
-* Freemarker, http://freemarker.org
-
- Copyright (c) 2003 The Visigoth Software Society
-
-* CAL10N, http://cal10n.qos.ch
-
- Copyright (c) 2009 QOS.ch
-
-* Guava, http://guava-libraries.googlecode.com
-
- Copyright (c) 2013 Google Inc.
-
-* Jackson, http://jackson.codehaus.org
-
- Copyright (c) 2010 FasterXML LLC.
-
-* MimeUtil, http://mime-util.sourceforge.net
-
- Copyright (c) 2010 Medsea Business Solutions S.L.
-
-* IzPack, http://izpack.org
-
- Copyright (c) 2012 Julien Ponge
-
-* Apache Ant, http://ant.apache.org
-
- Copyright (c) 2012 The Apache Software Foundation
-
- This product includes also software developed by:
- - the W3C consortium, http://www.w3.org
- - the SAX project, http://www.saxproject.org
-
- Please read the different LICENSE files present in the
- root directory of this distribution.
-
-* OpenCSV, http://opencsv.sourceforge.net
-
- Copyright (c) 2005 Bytecode Pty Ltd.
-
-* OpenRDF Sesame, http://www.openrdf.org
-
- Copyright (c) 2013 Aduna
-
- This software includes code developed by Aduna
- (http://www.aduna-software.com/).
-
- This software includes code developed by Ontotext AD
- (http://www.ontotext.com/).
-
- This software includes code developed by 3 Round Stones
- (http://www.3roundstones.com/).
-
- This software includes code developed by Fluid Operations
- (http://www.fluidops.com/).
-
- This software includes code developed by the Information Management Group at
- Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
-
- This software includes code developed by Clark & Parsia
- (http://clarkparsia.com/).
-
- This software includes code developed by the Institute for Defense Analyses
- (IDA) (http://www.ida.org/).
-
- This software includes code developed by Atos (http://www.atos.net/).
-
- This software includes code developed by Peter Ansell.
-
- The above parties have licensed their code contributions to Aduna under the
- terms of a contributor license agreement (CLA).
-
- This product includes software developed by the JUnit project
- (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
-
- Parts of this product use software developed by JSON.org
- (http://www.json.org). License: http://www.json.org/license.html
-
- Parts of this product use software developed by the Mockito project
- (http://mockito.googlecode.com). License: https://github.com/mockito/mockito/blob/master/LICENSE
-
-* PostgreSQL JDBC, http://jdbc.postgresql.org
-
- Copyright (c) 2011 PostgreSQL Global Development Group
-
-* Scannotation, http://scannotation.sourceforge.net
-
- Copyright (c) 2011 Bill Burke
-
-* SLF4J, http://www.slf4j.org
-
- Copyright (c) 2013 QOS.ch
-
-* Semargl, http://semarglproject.org
-
- Copyright (c) 2012 Lev Khomich
-
- This product uses software developed by The Apache Software Foundation:
- Clerezza, Jena, IO Commons (http://www.apache.org/).
-
- This product includes/uses test suite developed by Hewlett-Packard
- (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
-
- This product includes/uses test suite developed by W3C Consortium.
-
- This product includes/uses RDFa test harness developed by RDF Web Applications
- Working Group (http://www.w3.org/2010/02/rdfa/).
-
-* Janino, http://janino.codehaus.org
-
- Copyright (c) 2010 Arno Unkrig
-
-* Java Injection API, http://atinject.googlecode.com
-
- Copyright (c) 2009 The JSR-330 Expert Group
-
-* Javassist, http://www.jboss.org/javassist
-
- Copyright (c) 2013 Shigeru Chiba
-
-* Jaxen, http://jaxen.codehaus.org
-
- Copyright (c) 2006 The Werken Company
-
-* JSoup, http://jsoup.org
-
- Copyright (c) 2013 Jonathan Hedley
-
-* EHCache, http://ehcache.org
-
- Copyright (c) 2010 Terracotta, Inc.
-
-* CDI, http://github.com/jboss/cdi
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Weld, http://github.com/weld
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Bean Validation, http://github.com/hibernate/hibernate-validator
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* JBoss EJB Common Interceptor, http://github.com/jbossinterceptors/jbossinterceptors
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* RESTEasy, http://www.jboss.org/resteasy
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Java Activation, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Java Servlet API, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Common Annotations (JSR-250), http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Expression Language, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Apache Xerces, http://xerces.apache.org
-
- Copyright (c) 2013 The Apache Software Foundation
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation, http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems, http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at
- iClick, Inc., software copyright (c) 1999.
-
-* "Java Concurrency in Practice" book annotations component, http://jcip.net
-
- Copyright (c) 2005 Brian Goetz and Tim Peierls
-
-* Hamcrest, http://www.hamcrest.org
-
- Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
-
-* D3.js, http://d3js.org
-
- Copyright (c) 2013 Michael Bostock
-
-* Dracula Graph Library, http://www.graphdracula.net
-
- Copyright (c) 2013 Johann Philipp Strathausen
-
-* strftime, http://hacks.bluesmoon.info/strftime
-
- Copyright (c) 2008 Philip S Tellis
-
-* jQuery, http://jquery.com
-
- Copyright (c) 2013 jQuery Foundation
-
-* CodeMirror, http://codemirror.net
-
- Copyright (c) 2013 Marijn Haverbeke
-
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
-
- Copyright (c) 2007 Richard Cyganiak
-
-* script.aculo.us, http://script.aculo.us
-
- Copyright (c) 2010 Thomas Fuchs
-
-* Prototype, http://prototypejs.org
-
- Copyright (c) 2010 Sam Stephenson
-
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
-
- Copyright (c) 2011 TSO Ltd
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
-
-* MigLayout, http://www.migcalendar.com/miglayout
-
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
-
-* ROME, http://rometools.jira.com
-
- Copyright (c) 2004 Sun Microsystems
-
-* JSONLD-Java, http://github.com/tristan/jsonld-java
-
- Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
-
-* JSON-LD Test Suite, http://json-ld.org/test-suite
-
- Public Domain (Creative Commons Zero license) without copyright
-
-* ical4j test suite, http://ical4j.googlecode.com
-
- Copyright (c) 2011 Ben Fortuna
+ * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under
+ the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
+ * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The
+ original source code is available from http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index 2d67d85..aea7c89 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>7.0.37</version>
+ <version>7.0.39</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
index 312a0bd..22b650e 100644
--- a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
+++ b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
@@ -1,10 +1,11 @@
Apache Marmotta LDPath
-Copyright [2012-2013] The Apache Software Foundation
+Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
- MigLayout licensed under New BSD License
- SwingBits licensed under New BSD License
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
index 0feb1c2..da32381 100644
--- a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
+++ b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
@@ -1,15 +1,11 @@
Apache Marmotta Splash Screen
-Copyright [2012-2013] The Apache Software Foundation
+Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
-* MigLayout, http://www.migcalendar.com/miglayout
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 142537c..60d6f86 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -76,22 +76,10 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <path>${marmotta.context}</path>
- <port>${marmotta.port}</port>
- <systemProperties>
- <marmotta.home>${marmotta.home}</marmotta.home>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<configuration>
<path>${marmotta.context}</path>
<port>${marmotta.port}</port>
@@ -102,28 +90,7 @@
<!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
</configuration>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
- <configuration>
- <contextPath>${marmotta.context}</contextPath>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${marmotta.port}</port>
- </connector>
- </connectors>
- <systemProperties>
- <systemProperty>
- <name>marmotta.home</name>
- <value>${marmotta.home}</value>
- </systemProperty>
- </systemProperties>
- <stopKey>marmotta</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- </plugin>
- </plugins>
+ </plugins>
</pluginManagement>
<resources>
<resource>
@@ -134,17 +101,9 @@
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
@@ -262,7 +221,7 @@
<!-- Servlet / CDI Environment -->
<dependency>
<groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <artifactId>javax.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -278,7 +237,7 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>org.jumpmind.symmetric.jdbc</groupId>
+ <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/main/resources/ehcache-lmf.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/resources/ehcache-lmf.xml b/launchers/marmotta-webapp/src/main/resources/ehcache-lmf.xml
deleted file mode 100644
index f2dca9c..0000000
--- a/launchers/marmotta-webapp/src/main/resources/ehcache-lmf.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?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.
-
--->
-<!--
-CacheManager Configuration
-==========================
-An ehcache-lmf.xml corresponds to a single CacheManager.
-
-See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
-
-System property tokens can be specified in this file which are replaced when the configuration
-is loaded. For example multicastGroupPort=${multicastGroupPort} can be replaced with the
-System property either from an environment variable or a system property specified with a
-command line switch such as -DmulticastGroupPort=4446.
-
-The attributes of <ehcache> are:
-* name - an optional name for the CacheManager. The name is optional and primarily used
-for documentation or to distinguish Terracotta clustered cache state. With Terracotta
-clustered caches, a combination of CacheManager name and cache name uniquely identify a
-particular cache store in the Terracotta clustered memory.
-* updateCheck - an optional boolean flag specifying whether this CacheManager should check
-for new versions of Ehcache over the Internet. If not specified, updateCheck="true".
-* monitoring - an optional setting that determines whether the CacheManager should
-automatically register the SampledCacheMBean with the system MBean server. Currently,
-this monitoring is only useful when using Terracotta and thus the "autodetect" value
-will detect the presence of Terracotta and register the MBean. Other allowed values
-are "on" and "off". The default is "autodetect".
--->
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
- updateCheck="false"
- name="lmf">
-
- <!--
- DiskStore configuration
- =======================
-
- The diskStore element is optional. To turn off disk store path creation, comment out the diskStore
- element below.
-
- Configure it if you have overflowToDisk or diskPersistent enabled for any cache.
-
- If it is not configured, and a cache is created which requires a disk store, a warning will be
- issued and java.io.tmpdir will automatically be used.
-
- diskStore has only one attribute - "path". It is the path to the directory where
- .data and .index files will be created.
-
- If the path is one of the following Java System Property it is replaced by its value in the
- running VM. For backward compatibility these are not specified without being enclosed in the ${token}
- replacement syntax.
-
- The following properties are translated:
- * user.home - KiWiUser's home directory
- * user.dir - KiWiUser's current working directory
- * java.io.tmpdir - Default temp file path
- * ehcache.disk.store.dir - A system property you would normally specify on the command line
- e.g. java -Dehcache.disk.store.dir=/u01/myapp/diskdir ...
-
- Subdirectories can be specified below the property e.g. java.io.tmpdir/one
-
- -->
- <diskStore path="java.io.tmpdir/lmf-cache/lmf"/>
-
- <!--
- Cachemanagereventlistener
- =========================
- Specifies a CacheManagerEventListenerFactory which is notified when Caches are added
- or removed from the CacheManager.
-
- The attributes of CacheManagerEventListenerFactory are:
- * class - a fully qualified factory class name
- * properties - comma separated properties having meaning only to the factory.
-
- Sets the fully qualified class name to be registered as the CacheManager event listener.
-
- The events include:
- * adding a Cache
- * removing a Cache
-
- Callbacks to listener methods are synchronous and unsynchronized. It is the responsibility
- of the implementer to safely handle the potential performance and thread safety issues
- depending on what their listener is doing.
-
- If no class is specified, no listener is created. There is no default.
- -->
- <cacheManagerEventListenerFactory class="" properties=""/>
-
-
- <!--
- CacheManagerPeerProvider
- ========================
- (For distributed operation)
-
- Specifies a CacheManagerPeerProviderFactory which will be used to create a
- CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
-
- One or more providers can be configured. The first one in the ehcache-lmf.xml is the default, which is used
- for replication and bootstrapping.
-
- The attributes of cacheManagerPeerProviderFactory are:
- * class - a fully qualified factory class name
- * properties - comma separated properties having meaning only to the factory.
-
- Providers are available for RMI, JGroups and JMS as shown following.
-
- RMICacheManagerPeerProvider
- +++++++++++++++++++++++++++
-
- Ehcache comes with a built-in RMI-based distribution system with two means of discovery of
- CacheManager peers participating in the cluster:
- * automatic, using a multicast group. This one automatically discovers peers and detects
- changes such as peers entering and leaving the group
- * manual, using manual rmiURL configuration. A hardcoded list of peers is provided at
- configuration time.
-
- Configuring Automatic Discovery:
- Automatic discovery is configured as per the following example:
- <cacheManagerPeerProviderFactory
- class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
- properties="hostName=fully_qualified_hostname_or_ip,
- peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
- multicastGroupPort=4446, timeToLive=32"/>
-
- Valid properties are:
- * peerDiscovery (mandatory) - specify "automatic"
- * multicastGroupAddress (mandatory) - specify a valid multicast group address
- * multicastGroupPort (mandatory) - specify a dedicated port for the multicast heartbeat
- traffic
- * timeToLive - specify a value between 0 and 255 which determines how far the packets will
- propagate.
-
- By convention, the restrictions are:
- 0 - the same host
- 1 - the same subnet
- 32 - the same site
- 64 - the same region
- 128 - the same continent
- 255 - unrestricted
-
- * hostName - the hostname or IP of the interface to be used for sending and receiving multicast packets
- (relevant to mulithomed hosts only)
-
- Configuring Manual Discovery:
- Manual discovery requires a unique configuration per host. It is contains a list of rmiURLs for the peers, other
- than itself. So, if we have server1, server2 and server3 the configuration will be:
-
- In server1's configuration:
- <cacheManagerPeerProviderFactory class=
- "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
- properties="peerDiscovery=manual,
- rmiUrls=//server2:40000/sampleCache1|//server3:40000/sampleCache1
- | //server2:40000/sampleCache2|//server3:40000/sampleCache2"
- propertySeparator="," />
-
- In server2's configuration:
- <cacheManagerPeerProviderFactory class=
- "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
- properties="peerDiscovery=manual,
- rmiUrls=//server1:40000/sampleCache1|//server3:40000/sampleCache1
- | //server1:40000/sampleCache2|//server3:40000/sampleCache2"
- propertySeparator="," />
-
- In server3's configuration:
- <cacheManagerPeerProviderFactory class=
- "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
- properties="peerDiscovery=manual,
- rmiUrls=//server1:40000/sampleCache1|//server2:40000/sampleCache1
- | //server1:40000/sampleCache2|//server2:40000/sampleCache2"
- propertySeparator="," />
-
-
- Valid properties are:
- * peerDiscovery (mandatory) - specify "manual"
- * rmiUrls (mandatory) - specify a pipe separated list of rmiUrls, in the form
- //hostname:port
- * hostname (optional) - the hostname is the hostname of the remote CacheManager peer. The port is the listening
- port of the RMICacheManagerPeerListener of the remote CacheManager peer.
-
- JGroupsCacheManagerPeerProvider
- +++++++++++++++++++++++++++++++
- <cacheManagerPeerProviderFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheManagerPeerProviderFactory"
- properties="connect=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;
- mcast_send_buf_size=150000;mcast_recv_buf_size=80000):
- PING(timeout=2000;num_initial_members=6):
- MERGE2(min_interval=5000;max_interval=10000):
- FD_SOCK:VERIFY_SUSPECT(timeout=1500):
- pbcast.NAKACK(gc_lag=10;retransmit_timeout=3000):
- UNICAST(timeout=5000):
- pbcast.STABLE(desired_avg_gossip=20000):
- FRAG:
- pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)"
- propertySeparator="::"
- />
- The only property necessary is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation
- of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be
- used.
-
-
- JMSCacheManagerPeerProviderFactory
- ++++++++++++++++++++++++++++++++++
- <cacheManagerPeerProviderFactory
- class="net.sf.ehcache.distribution.jms.JMSCacheManagerPeerProviderFactory"
- properties="..."
- propertySeparator=","
- />
-
- The JMS PeerProviderFactory uses JNDI to maintain message queue independence. Refer to the manual for full configuration
- examples using ActiveMQ and Open Message Queue.
-
- Valid properties are:
- * initialContextFactoryName (mandatory) - the name of the factory used to create the message queue initial context.
- * providerURL (mandatory) - the JNDI configuration information for the service provider to use.
- * topicConnectionFactoryBindingName (mandatory) - the JNDI binding name for the TopicConnectionFactory
- * topicBindingName (mandatory) - the JNDI binding name for the topic name
- * getQueueBindingName (mandatory only if using jmsCacheLoader) - the JNDI binding name for the queue name
- * securityPrincipalName - the JNDI java.naming.security.principal
- * securityCredentials - the JNDI java.naming.security.credentials
- * urlPkgPrefixes - the JNDI java.naming.factory.url.pkgs
- * userName - the user name to use when creating the TopicConnection to the Message Queue
- * password - the password to use when creating the TopicConnection to the Message Queue
- * acknowledgementMode - the JMS Acknowledgement mode for both publisher and subscriber. The available choices are
- AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE and SESSION_TRANSACTED. The default is AUTO_ACKNOWLEDGE.
- -->
-<!-- <cacheManagerPeerProviderFactory-->
-<!-- class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"-->
-<!-- properties="peerDiscovery=automatic,-->
-<!-- multicastGroupAddress=230.0.0.1,-->
-<!-- multicastGroupPort=4446, timeToLive=1"-->
-<!-- propertySeparator=","-->
-<!-- />-->
-
-
- <!--
- CacheManagerPeerListener
- ========================
- (Enable for distributed operation)
-
- Specifies a CacheManagerPeerListenerFactory which will be used to create a
- CacheManagerPeerListener, which listens for messages from cache replicators participating in the cluster.
-
- The attributes of cacheManagerPeerListenerFactory are:
- class - a fully qualified factory class name
- properties - comma separated properties having meaning only to the factory.
-
- Ehcache comes with a built-in RMI-based distribution system. The listener component is
- RMICacheManagerPeerListener which is configured using
- RMICacheManagerPeerListenerFactory. It is configured as per the following example:
-
- <cacheManagerPeerListenerFactory
- class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
- properties="hostName=fully_qualified_hostname_or_ip,
- port=40001,
- remoteObjectPort=40002,
- socketTimeoutMillis=120000"
- propertySeparator="," />
-
- All properties are optional. They are:
- * hostName - the hostName of the host the listener is running on. Specify
- where the host is multihomed and you want to control the interface over which cluster
- messages are received. Defaults to the host name of the default interface if not
- specified.
- * port - the port the RMI Registry listener listens on. This defaults to a free port if not specified.
- * remoteObjectPort - the port number on which the remote objects bound in the registry receive calls.
- This defaults to a free port if not specified.
- * socketTimeoutMillis - the number of ms client sockets will stay open when sending
- messages to the listener. This should be long enough for the slowest message.
- If not specified it defaults to 120000ms.
-
- -->
-<!-- <cacheManagerPeerListenerFactory-->
-<!-- class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>-->
-
- <!-- Cache configuration.
-
- The following attributes are required.
-
- name:
- Sets the name of the cache. This is used to identify the cache. It must be unique.
-
- maxElementsInMemory:
- Sets the maximum number of objects that will be created in memory
-
- maxElementsOnDisk:
- Sets the maximum number of objects that will be maintained in the DiskStore
- The default value is zero, meaning unlimited.
-
- eternal:
- Sets whether elements are eternal. If eternal, timeouts are ignored and the
- element is never expired.
-
- overflowToDisk:
- Sets whether elements can overflow to disk when the memory store
- has reached the maxInMemory limit.
-
- The following attributes are optional.
-
- timeToIdleSeconds:
- Sets the time to idle for an element before it expires.
- i.e. The maximum amount of time between accesses before an element expires
- Is only used if the element is not eternal.
- Optional attribute. A value of 0 means that an Element can idle for infinity.
- The default value is 0.
-
- timeToLiveSeconds:
- Sets the time to live for an element before it expires.
- i.e. The maximum time between creation time and when an element expires.
- Is only used if the element is not eternal.
- Optional attribute. A value of 0 means that and Element can live for infinity.
- The default value is 0.
-
- diskPersistent:
- Whether the disk store persists between restarts of the Virtual Machine.
- The default value is false.
-
- diskExpiryThreadIntervalSeconds:
- The number of seconds between runs of the disk expiry thread. The default value
- is 120 seconds.
-
- memoryStoreEvictionPolicy:
- Policy would be enforced upon reaching the maxElementsInMemory limit. Default
- policy is Least Recently Used (specified as LRU). Other policies available -
- First In First Out (specified as FIFO) and Less Frequently Used
- (specified as LFU)
-
- -->
-
- <!--
- Mandatory Default Cache configuration. These settings will be applied to caches
- created programmtically using CacheManager.add(String cacheName)
- -->
- <defaultCache
- maxElementsInMemory="20000"
- overflowToDisk="false"
- memoryStoreEvictionPolicy="LRU"
- />
-
-
- <!-- the cache used for triple queries by KiWi -->
- <cache name="uri-node-cache"
- statistics="true"
- maxElementsInMemory="100000"
- timeToIdleSeconds="3600"
- overflowToDisk="false"/>
- <cache name="anon-node-cache"
- statistics="true"
- maxElementsInMemory="10000"
- timeToIdleSeconds="3600"
- overflowToDisk="false"/>
- <cache name="literal-cache"
- statistics="true"
- maxElementsInMemory="10000"
- timeToIdleSeconds="3600"
- overflowToDisk="false"/>
-
- <cache name="namespace-prefix-cache"
- statistics="true"
- maxElementsInMemory="100"
- overflowToDisk="true"/>
-
- <cache name="namespace-uri-cache"
- statistics="true"
- maxElementsInMemory="100"
- overflowToDisk="true"/>
-
- <!-- the cache used for triple queries by KiWi -->
- <cache name="query-cache"
- statistics="true"
- maxElementsInMemory="200000"
- timeToIdleSeconds="3600"
- overflowToDisk="false"/>
-
- <!-- the cache used for resource lookups from module jar files -->
- <cache name="resource-cache"
- statistics="true"
- maxElementsInMemory="10000"
- timeToIdleSeconds="3600"
- timeToLiveSeconds="3600"
- overflowToDisk="false"
- memoryStoreEvictionPolicy="LRU"/>
-
- <!-- the cache used for triple queries by KiWi -->
- <cache name="page-cache"
- statistics="true"
- maxElementsInMemory="500"
- timeToIdleSeconds="3600"
- memoryStoreEvictionPolicy="LRU"
- overflowToDisk="true"/>
-
- <cache name="http-content-cache"
- statistics="true"
- maxElementsInMemory="500"
- timeToIdleSeconds="3600"
- memoryStoreEvictionPolicy="LRU"
- overflowToDisk="true"/>
-
-
- <!-- uncomment to enable cache debugging -->
-<!--
- <cacheManagerPeerListenerFactory
- class="org.terracotta.ehcachedx.monitor.probe.ProbePeerListenerFactory"
- properties="monitorAddress=localhost, monitorPort=9889" />
--->
-
-</ehcache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/main/resources/ehcache-marmotta.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/resources/ehcache-marmotta.xml b/launchers/marmotta-webapp/src/main/resources/ehcache-marmotta.xml
new file mode 100644
index 0000000..eb01074
--- /dev/null
+++ b/launchers/marmotta-webapp/src/main/resources/ehcache-marmotta.xml
@@ -0,0 +1,407 @@
+<?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.
+
+-->
+<!--
+CacheManager Configuration
+==========================
+An ehcache-marmotta.xml corresponds to a single CacheManager.
+
+See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
+
+System property tokens can be specified in this file which are replaced when the configuration
+is loaded. For example multicastGroupPort=${multicastGroupPort} can be replaced with the
+System property either from an environment variable or a system property specified with a
+command line switch such as -DmulticastGroupPort=4446.
+
+The attributes of <ehcache> are:
+* name - an optional name for the CacheManager. The name is optional and primarily used
+for documentation or to distinguish Terracotta clustered cache state. With Terracotta
+clustered caches, a combination of CacheManager name and cache name uniquely identify a
+particular cache store in the Terracotta clustered memory.
+* updateCheck - an optional boolean flag specifying whether this CacheManager should check
+for new versions of Ehcache over the Internet. If not specified, updateCheck="true".
+* monitoring - an optional setting that determines whether the CacheManager should
+automatically register the SampledCacheMBean with the system MBean server. Currently,
+this monitoring is only useful when using Terracotta and thus the "autodetect" value
+will detect the presence of Terracotta and register the MBean. Other allowed values
+are "on" and "off". The default is "autodetect".
+-->
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
+ updateCheck="false"
+ name="lmf">
+
+ <!--
+ DiskStore configuration
+ =======================
+
+ The diskStore element is optional. To turn off disk store path creation, comment out the diskStore
+ element below.
+
+ Configure it if you have overflowToDisk or diskPersistent enabled for any cache.
+
+ If it is not configured, and a cache is created which requires a disk store, a warning will be
+ issued and java.io.tmpdir will automatically be used.
+
+ diskStore has only one attribute - "path". It is the path to the directory where
+ .data and .index files will be created.
+
+ If the path is one of the following Java System Property it is replaced by its value in the
+ running VM. For backward compatibility these are not specified without being enclosed in the ${token}
+ replacement syntax.
+
+ The following properties are translated:
+ * user.home - KiWiUser's home directory
+ * user.dir - KiWiUser's current working directory
+ * java.io.tmpdir - Default temp file path
+ * ehcache.disk.store.dir - A system property you would normally specify on the command line
+ e.g. java -Dehcache.disk.store.dir=/u01/myapp/diskdir ...
+
+ Subdirectories can be specified below the property e.g. java.io.tmpdir/one
+
+ -->
+ <!--
+ <diskStore path="java.io.tmpdir/lmf-cache/lmf"/>
+ -->
+ <!--
+ Cachemanagereventlistener
+ =========================
+ Specifies a CacheManagerEventListenerFactory which is notified when Caches are added
+ or removed from the CacheManager.
+
+ The attributes of CacheManagerEventListenerFactory are:
+ * class - a fully qualified factory class name
+ * properties - comma separated properties having meaning only to the factory.
+
+ Sets the fully qualified class name to be registered as the CacheManager event listener.
+
+ The events include:
+ * adding a Cache
+ * removing a Cache
+
+ Callbacks to listener methods are synchronous and unsynchronized. It is the responsibility
+ of the implementer to safely handle the potential performance and thread safety issues
+ depending on what their listener is doing.
+
+ If no class is specified, no listener is created. There is no default.
+ -->
+ <cacheManagerEventListenerFactory class="" properties=""/>
+
+
+ <!--
+ CacheManagerPeerProvider
+ ========================
+ (For distributed operation)
+
+ Specifies a CacheManagerPeerProviderFactory which will be used to create a
+ CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
+
+ One or more providers can be configured. The first one in the ehcache-marmotta.xml is the default, which is used
+ for replication and bootstrapping.
+
+ The attributes of cacheManagerPeerProviderFactory are:
+ * class - a fully qualified factory class name
+ * properties - comma separated properties having meaning only to the factory.
+
+ Providers are available for RMI, JGroups and JMS as shown following.
+
+ RMICacheManagerPeerProvider
+ +++++++++++++++++++++++++++
+
+ Ehcache comes with a built-in RMI-based distribution system with two means of discovery of
+ CacheManager peers participating in the cluster:
+ * automatic, using a multicast group. This one automatically discovers peers and detects
+ changes such as peers entering and leaving the group
+ * manual, using manual rmiURL configuration. A hardcoded list of peers is provided at
+ configuration time.
+
+ Configuring Automatic Discovery:
+ Automatic discovery is configured as per the following example:
+ <cacheManagerPeerProviderFactory
+ class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
+ properties="hostName=fully_qualified_hostname_or_ip,
+ peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
+ multicastGroupPort=4446, timeToLive=32"/>
+
+ Valid properties are:
+ * peerDiscovery (mandatory) - specify "automatic"
+ * multicastGroupAddress (mandatory) - specify a valid multicast group address
+ * multicastGroupPort (mandatory) - specify a dedicated port for the multicast heartbeat
+ traffic
+ * timeToLive - specify a value between 0 and 255 which determines how far the packets will
+ propagate.
+
+ By convention, the restrictions are:
+ 0 - the same host
+ 1 - the same subnet
+ 32 - the same site
+ 64 - the same region
+ 128 - the same continent
+ 255 - unrestricted
+
+ * hostName - the hostname or IP of the interface to be used for sending and receiving multicast packets
+ (relevant to mulithomed hosts only)
+
+ Configuring Manual Discovery:
+ Manual discovery requires a unique configuration per host. It is contains a list of rmiURLs for the peers, other
+ than itself. So, if we have server1, server2 and server3 the configuration will be:
+
+ In server1's configuration:
+ <cacheManagerPeerProviderFactory class=
+ "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
+ properties="peerDiscovery=manual,
+ rmiUrls=//server2:40000/sampleCache1|//server3:40000/sampleCache1
+ | //server2:40000/sampleCache2|//server3:40000/sampleCache2"
+ propertySeparator="," />
+
+ In server2's configuration:
+ <cacheManagerPeerProviderFactory class=
+ "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
+ properties="peerDiscovery=manual,
+ rmiUrls=//server1:40000/sampleCache1|//server3:40000/sampleCache1
+ | //server1:40000/sampleCache2|//server3:40000/sampleCache2"
+ propertySeparator="," />
+
+ In server3's configuration:
+ <cacheManagerPeerProviderFactory class=
+ "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
+ properties="peerDiscovery=manual,
+ rmiUrls=//server1:40000/sampleCache1|//server2:40000/sampleCache1
+ | //server1:40000/sampleCache2|//server2:40000/sampleCache2"
+ propertySeparator="," />
+
+
+ Valid properties are:
+ * peerDiscovery (mandatory) - specify "manual"
+ * rmiUrls (mandatory) - specify a pipe separated list of rmiUrls, in the form
+ //hostname:port
+ * hostname (optional) - the hostname is the hostname of the remote CacheManager peer. The port is the listening
+ port of the RMICacheManagerPeerListener of the remote CacheManager peer.
+
+ JGroupsCacheManagerPeerProvider
+ +++++++++++++++++++++++++++++++
+ <cacheManagerPeerProviderFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheManagerPeerProviderFactory"
+ properties="connect=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;
+ mcast_send_buf_size=150000;mcast_recv_buf_size=80000):
+ PING(timeout=2000;num_initial_members=6):
+ MERGE2(min_interval=5000;max_interval=10000):
+ FD_SOCK:VERIFY_SUSPECT(timeout=1500):
+ pbcast.NAKACK(gc_lag=10;retransmit_timeout=3000):
+ UNICAST(timeout=5000):
+ pbcast.STABLE(desired_avg_gossip=20000):
+ FRAG:
+ pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)"
+ propertySeparator="::"
+ />
+ The only property necessary is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation
+ of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be
+ used.
+
+
+ JMSCacheManagerPeerProviderFactory
+ ++++++++++++++++++++++++++++++++++
+ <cacheManagerPeerProviderFactory
+ class="net.sf.ehcache.distribution.jms.JMSCacheManagerPeerProviderFactory"
+ properties="..."
+ propertySeparator=","
+ />
+
+ The JMS PeerProviderFactory uses JNDI to maintain message queue independence. Refer to the manual for full configuration
+ examples using ActiveMQ and Open Message Queue.
+
+ Valid properties are:
+ * initialContextFactoryName (mandatory) - the name of the factory used to create the message queue initial context.
+ * providerURL (mandatory) - the JNDI configuration information for the service provider to use.
+ * topicConnectionFactoryBindingName (mandatory) - the JNDI binding name for the TopicConnectionFactory
+ * topicBindingName (mandatory) - the JNDI binding name for the topic name
+ * getQueueBindingName (mandatory only if using jmsCacheLoader) - the JNDI binding name for the queue name
+ * securityPrincipalName - the JNDI java.naming.security.principal
+ * securityCredentials - the JNDI java.naming.security.credentials
+ * urlPkgPrefixes - the JNDI java.naming.factory.url.pkgs
+ * userName - the user name to use when creating the TopicConnection to the Message Queue
+ * password - the password to use when creating the TopicConnection to the Message Queue
+ * acknowledgementMode - the JMS Acknowledgement mode for both publisher and subscriber. The available choices are
+ AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE and SESSION_TRANSACTED. The default is AUTO_ACKNOWLEDGE.
+ -->
+<!-- <cacheManagerPeerProviderFactory-->
+<!-- class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"-->
+<!-- properties="peerDiscovery=automatic,-->
+<!-- multicastGroupAddress=230.0.0.1,-->
+<!-- multicastGroupPort=4446, timeToLive=1"-->
+<!-- propertySeparator=","-->
+<!-- />-->
+
+
+ <!--
+ CacheManagerPeerListener
+ ========================
+ (Enable for distributed operation)
+
+ Specifies a CacheManagerPeerListenerFactory which will be used to create a
+ CacheManagerPeerListener, which listens for messages from cache replicators participating in the cluster.
+
+ The attributes of cacheManagerPeerListenerFactory are:
+ class - a fully qualified factory class name
+ properties - comma separated properties having meaning only to the factory.
+
+ Ehcache comes with a built-in RMI-based distribution system. The listener component is
+ RMICacheManagerPeerListener which is configured using
+ RMICacheManagerPeerListenerFactory. It is configured as per the following example:
+
+ <cacheManagerPeerListenerFactory
+ class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
+ properties="hostName=fully_qualified_hostname_or_ip,
+ port=40001,
+ remoteObjectPort=40002,
+ socketTimeoutMillis=120000"
+ propertySeparator="," />
+
+ All properties are optional. They are:
+ * hostName - the hostName of the host the listener is running on. Specify
+ where the host is multihomed and you want to control the interface over which cluster
+ messages are received. Defaults to the host name of the default interface if not
+ specified.
+ * port - the port the RMI Registry listener listens on. This defaults to a free port if not specified.
+ * remoteObjectPort - the port number on which the remote objects bound in the registry receive calls.
+ This defaults to a free port if not specified.
+ * socketTimeoutMillis - the number of ms client sockets will stay open when sending
+ messages to the listener. This should be long enough for the slowest message.
+ If not specified it defaults to 120000ms.
+
+ -->
+<!-- <cacheManagerPeerListenerFactory-->
+<!-- class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>-->
+
+ <!-- Cache configuration.
+
+ The following attributes are required.
+
+ name:
+ Sets the name of the cache. This is used to identify the cache. It must be unique.
+
+ maxElementsInMemory:
+ Sets the maximum number of objects that will be created in memory
+
+ maxElementsOnDisk:
+ Sets the maximum number of objects that will be maintained in the DiskStore
+ The default value is zero, meaning unlimited.
+
+ eternal:
+ Sets whether elements are eternal. If eternal, timeouts are ignored and the
+ element is never expired.
+
+ overflowToDisk:
+ Sets whether elements can overflow to disk when the memory store
+ has reached the maxInMemory limit.
+
+ The following attributes are optional.
+
+ timeToIdleSeconds:
+ Sets the time to idle for an element before it expires.
+ i.e. The maximum amount of time between accesses before an element expires
+ Is only used if the element is not eternal.
+ Optional attribute. A value of 0 means that an Element can idle for infinity.
+ The default value is 0.
+
+ timeToLiveSeconds:
+ Sets the time to live for an element before it expires.
+ i.e. The maximum time between creation time and when an element expires.
+ Is only used if the element is not eternal.
+ Optional attribute. A value of 0 means that and Element can live for infinity.
+ The default value is 0.
+
+ diskPersistent:
+ Whether the disk store persists between restarts of the Virtual Machine.
+ The default value is false.
+
+ diskExpiryThreadIntervalSeconds:
+ The number of seconds between runs of the disk expiry thread. The default value
+ is 120 seconds.
+
+ memoryStoreEvictionPolicy:
+ Policy would be enforced upon reaching the maxElementsInMemory limit. Default
+ policy is Least Recently Used (specified as LRU). Other policies available -
+ First In First Out (specified as FIFO) and Less Frequently Used
+ (specified as LFU)
+
+ -->
+
+ <!--
+ Mandatory Default Cache configuration. These settings will be applied to caches
+ created programmtically using CacheManager.add(String cacheName)
+ -->
+ <defaultCache
+ maxElementsInMemory="20000"
+ overflowToDisk="false"
+ memoryStoreEvictionPolicy="LRU"
+ />
+
+
+ <!-- the cache used for triple queries by KiWi -->
+ <cache name="uri-node-cache"
+ statistics="true"
+ maxElementsInMemory="100000"
+ timeToIdleSeconds="3600"
+ overflowToDisk="false"/>
+ <cache name="anon-node-cache"
+ statistics="true"
+ maxElementsInMemory="10000"
+ timeToIdleSeconds="3600"
+ overflowToDisk="false"/>
+ <cache name="literal-cache"
+ statistics="true"
+ maxElementsInMemory="10000"
+ timeToIdleSeconds="3600"
+ overflowToDisk="false"/>
+
+ <cache name="namespace-prefix-cache"
+ statistics="true"
+ maxElementsInMemory="100"
+ overflowToDisk="false"/>
+
+ <cache name="namespace-uri-cache"
+ statistics="true"
+ maxElementsInMemory="100"
+ overflowToDisk="false"/>
+
+ <!-- the cache used for triple queries by KiWi -->
+ <cache name="query-cache"
+ statistics="true"
+ maxElementsInMemory="200000"
+ timeToIdleSeconds="3600"
+ overflowToDisk="false"/>
+
+ <!-- the cache used for resource lookups from module jar files -->
+ <cache name="resource-cache"
+ statistics="true"
+ maxElementsInMemory="10000"
+ timeToIdleSeconds="3600"
+ timeToLiveSeconds="3600"
+ overflowToDisk="false"
+ memoryStoreEvictionPolicy="LRU"/>
+
+ <!-- uncomment to enable cache debugging -->
+<!--
+ <cacheManagerPeerListenerFactory
+ class="org.terracotta.ehcachedx.monitor.probe.ProbePeerListenerFactory"
+ properties="monitorAddress=localhost, monitorPort=9889" />
+-->
+
+</ehcache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
index 9631d61..28c0c4f 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
@@ -2689,6 +2689,37 @@ For the JSONLD-Java component,
THE POSSIBILITY OF SUCH DAMAGE.
+For the marmotta-commons component,
+
+ located at commons/marmotta-commons/src/ext/java
+
+ Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+ Copyright (c) 2012, Javolution (http://javolution.org/)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
Apache Marmotta 3rd party data files:
====================================
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index 881a91a..f2b7b92 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -1,6 +1,8 @@
-Apache Marmotta Webapp, Copyright 2012-2013 The Apache Software Foundation
+Apache Marmotta Webapp
+Copyright 2012-2013 The Apache Software Foundation
-This product includes software developed at The Apache Software Foundation (http://www.apache.org).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org).
Portions of this software were originally based on the following:
@@ -8,252 +10,33 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
-This product also includes the following third-party components:
+This product also includes some third-party binary components:
-* H2, http://www.h2database.com
+ * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://www.h2database.com
- Copyright (c) 2013 H2 Group
+ * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://logback.qos.ch
-* Logback, http://logback.qos.ch
+ * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla
+ Public License (MPL) 1.1. The original software is available from
+ http://www.jboss.org/javassist
- Copyright (C) 2012 QOS.ch
+ * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
-* JDOM, http://www.jdom.org
+ * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
- Copyright (c) 2012 Jason Hunter & Brett McLaughlin
+ * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed
+ under the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
-* Freemarker, http://freemarker.org
-
- Copyright (c) 2003 The Visigoth Software Society
-
-* CAL10N, http://cal10n.qos.ch
-
- Copyright (c) 2009 QOS.ch
-
-* Guava, http://guava-libraries.googlecode.com
-
- Copyright (c) 2013 Google Inc.
-
-* Jackson, http://jackson.codehaus.org
-
- Copyright (c) 2010 FasterXML LLC.
-
-* MimeUtil, http://mime-util.sourceforge.net
-
- Copyright (c) 2010 Medsea Business Solutions S.L.
-
-* OpenCSV, http://opencsv.sourceforge.net
-
- Copyright (c) 2005 Bytecode Pty Ltd.
-
-* OpenRDF Sesame, http://www.openrdf.org
-
- Copyright (c) 2013 Aduna
-
- This software includes code developed by Aduna
- (http://www.aduna-software.com/).
-
- This software includes code developed by Ontotext AD
- (http://www.ontotext.com/).
-
- This software includes code developed by 3 Round Stones
- (http://www.3roundstones.com/).
-
- This software includes code developed by Fluid Operations
- (http://www.fluidops.com/).
-
- This software includes code developed by the Information Management Group at
- Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
-
- This software includes code developed by Clark & Parsia
- (http://clarkparsia.com/).
-
- This software includes code developed by the Institute for Defense Analyses
- (IDA) (http://www.ida.org/).
-
- This software includes code developed by Atos (http://www.atos.net/).
-
- This software includes code developed by Peter Ansell.
-
- The above parties have licensed their code contributions to Aduna under the
- terms of a contributor license agreement (CLA).
-
- This product includes software developed by the JUnit project
- (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
-
- Parts of this product use software developed by JSON.org
- (http://www.json.org). License: http://www.json.org/license.html
-
- Parts of this product use software developed by the Mockito project
- (http://mockito.googlecode.com). License: https://github.com/mockito/mockito/blob/master/LICENSE
-
-* PostgreSQL JDBC, http://jdbc.postgresql.org
-
- Copyright (c) 2011 PostgreSQL Global Development Group
-
-* Scannotation, http://scannotation.sourceforge.net
-
- Copyright (c) 2011 Bill Burke
-
-* SLF4J, http://www.slf4j.org
-
- Copyright (c) 2013 QOS.ch
-
-* Semargl, http://semarglproject.org
-
- Copyright (c) 2012 Lev Khomich
-
- This product uses software developed by The Apache Software Foundation:
- Clerezza, Jena, IO Commons (http://www.apache.org/).
-
- This product includes/uses test suite developed by Hewlett-Packard
- (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
-
- This product includes/uses test suite developed by W3C Consortium.
-
- This product includes/uses RDFa test harness developed by RDF Web Applications
- Working Group (http://www.w3.org/2010/02/rdfa/).
-
-* Janino, http://janino.codehaus.org
-
- Copyright (c) 2010 Arno Unkrig
-
-* Java Injection API, http://atinject.googlecode.com
-
- Copyright (c) 2009 The JSR-330 Expert Group
-
-* Javassist, http://www.jboss.org/javassist
-
- Copyright (c) 2013 Shigeru Chiba
-
-* Jaxen, http://jaxen.codehaus.org
-
- Copyright (c) 2006 The Werken Company
-
-* JSoup, http://jsoup.org
-
- Copyright (c) 2013 Jonathan Hedley
-
-* EHCache, http://ehcache.org
-
- Copyright (c) 2010 Terracotta, Inc.
-
-* CDI, http://github.com/jboss/cdi
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Weld, http://github.com/weld
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Bean Validation, http://github.com/hibernate/hibernate-validator
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* JBoss EJB Common Interceptor, http://github.com/jbossinterceptors/jbossinterceptors
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* RESTEasy, http://www.jboss.org/resteasy
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Java Activation, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Java Servlet API, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Common Annotations (JSR-250), http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Expression Language, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Apache Xerces, http://xerces.apache.org
-
- Copyright (c) 2013 The Apache Software Foundation
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation, http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems, http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at
- iClick, Inc., software copyright (c) 1999.
-
-* "Java Concurrency in Practice" book annotations component, http://jcip.net
-
- Copyright (c) 2005 Brian Goetz and Tim Peierls
-
-* Hamcrest, http://www.hamcrest.org
-
- Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
-
-* D3.js, http://d3js.org
-
- Copyright (c) 2013 Michael Bostock
-
-* Dracula Graph Library, http://www.graphdracula.net
-
- Copyright (c) 2013 Johann Philipp Strathausen
-
-* strftime, http://hacks.bluesmoon.info/strftime
-
- Copyright (c) 2008 Philip S Tellis
-
-* jQuery, http://jquery.com
-
- Copyright (c) 2013 jQuery Foundation
-
-* CodeMirror, http://codemirror.net
-
- Copyright (c) 2013 Marijn Haverbeke
-
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
-
- Copyright (c) 2007 Richard Cyganiak
-
-* script.aculo.us, http://script.aculo.us
-
- Copyright (c) 2010 Thomas Fuchs
-
-* Prototype, http://prototypejs.org
-
- Copyright (c) 2010 Sam Stephenson
-
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
-
- Copyright (c) 2011 TSO Ltd
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
-
-* MigLayout, http://www.migcalendar.com/miglayout
-
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
-
-* ROME, http://rometools.jira.com
-
- Copyright (c) 2004 Sun Microsystems
-
-* JSONLD-Java, http://github.com/tristan/jsonld-java
-
- Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
-
-* JSON-LD Test Suite, http://json-ld.org/test-suite
-
- Public Domain (Creative Commons Zero license) without copyright
-
-* ical4j test suite, http://ical4j.googlecode.com
-
- Copyright (c) 2011 Ben Fortuna
+ * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under
+ the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
+ * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The
+ original source code is available from http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
index 528ad91..fd0e8be 100644
--- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
@@ -51,8 +51,8 @@
<!-- handle OPTIONS requests -->
<filter>
- <filter-name>MarmottaOptionsFilter</filter-name>
- <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class>
+ <filter-name>MarmottaOptionsFilter</filter-name>
+ <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>MarmottaOptionsFilter</filter-name>
@@ -73,13 +73,11 @@
<init-param>
<param-name>cors.supportedHeaders</param-name>
- <param-value>Origin, Accept</param-value>
+ <param-value>Origin, Accept, Content-Type</param-value>
</init-param>
</filter>
-
<filter-mapping>
- <!-- CORS Filter mapping -->
<filter-name>CORS</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/ehcache.xml b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
index 727aef0..7cd8120 100644
--- a/launchers/marmotta-webapp/src/test/resources/ehcache.xml
+++ b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
@@ -19,7 +19,7 @@
<!--
CacheManager Configuration
==========================
-An ehcache-lmf.xml corresponds to a single CacheManager.
+An ehcache-marmotta.xml corresponds to a single CacheManager.
See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
@@ -107,7 +107,7 @@ are "on" and "off". The default is "autodetect".
Specifies a CacheManagerPeerProviderFactory which will be used to create a
CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
- One or more providers can be configured. The first one in the ehcache-lmf.xml is the default, which is used
+ One or more providers can be configured. The first one in the ehcache-marmotta.xml is the default, which is used
for replication and bootstrapping.
The attributes of cacheManagerPeerProviderFactory are:
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 01fc15b..8aa8a8d 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index ce9fda9..c4bcf84 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/582abb5b/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index 8d77e79..e76b396 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
@@ -115,8 +114,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
@@ -167,7 +166,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jumpmind.symmetric.jdbc</groupId>
+ <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
@@ -208,6 +207,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-store-testsuite</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>