You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/02/19 18:04:22 UTC
[18/51] [abbrv] libraries/ compiling
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
new file mode 100644
index 0000000..8618b68
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright (c) 2012 Salzburg Research.
+ ~
+ ~ Licensed 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.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+
+
+ <resource-env-ref>
+ <resource-env-ref-name>BeanManager</resource-env-ref-name>
+ <resource-env-ref-type>
+ javax.enterprise.inject.spi.BeanManager
+ </resource-env-ref-type>
+ </resource-env-ref>
+
+ <filter>
+ <filter-name>KiWiInitFilter</filter-name>
+ <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
+ <init-param>
+ <param-name>kiwi.home</param-name>
+ <param-value>/tmp/kiwi-test</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>KiWiInitFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+
+ <!-- enable CDI / Weld for dependency injection -->
+ <listener>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
+ </listener>
+
+
+
+ <!--
+ RESTeasy Webservices
+
+ Every service in the package kiwi.core.webservices is offered automatically as REST webservice; add additional packages as required
+ -->
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <!-- Startup the H2 database -->
+ <context-param>
+ <param-name>db.url</param-name>
+ <param-value>jdbc:h2:/tmp/kiwi-test/db/kiwi2;MVCC=true;DB_CLOSE_ON_EXIT=FALSE</param-value>
+ </context-param>
+ <context-param>
+ <param-name>db.user</param-name>
+ <param-value>sa</param-value>
+ </context-param>
+ <context-param>
+ <param-name>db.password</param-name>
+ <param-value>sa</param-value>
+ </context-param>
+ <context-param>
+ <param-name>db.tcpServer</param-name>
+ <param-value>-tcpAllowOthers</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.h2.server.web.DbStarter</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>H2Console</servlet-name>
+ <servlet-class>org.h2.server.web.WebServlet</servlet-class>
+ <!-- <init-param> <param-name>webAllowOthers</param-name> <param-value></param-value> </init-param>
+ <init-param> <param-name>trace</param-name> <param-value></param-value> </init-param> -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>H2Console</servlet-name>
+ <url-pattern>/h2/*</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- *************************************************************************************************** -->
+ <!-- Apache SOLR -->
+ <!-- *************************************************************************************************** -->
+
+
+
+ <!-- Any path (name) registered in solrconfig.xml will be sent to that filter -->
+ <filter>
+ <filter-name>SolrRequestFilter</filter-name>
+ <filter-class>org.apache.solr.servlet.SolrDispatchFilter</filter-class>
+ <init-param>
+ <param-name>path-prefix</param-name>
+ <param-value>/solr</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <!--
+ NOTE: When using multicore, /admin JSP URLs with a core specified
+ such as /solr/coreName/admin/stats.jsp get forwarded by a
+ RequestDispatcher to /solr/admin/stats.jsp with the specified core
+ put into request scope keyed as "org.apache.solr.SolrCore".
+
+ It is unnecessary, and potentially problematic, to have the SolrDispatchFilter
+ configured to also filter on forwards. Do not configure
+ this dispatcher as <dispatcher>FORWARD</dispatcher>.
+ -->
+ <filter-name>SolrRequestFilter</filter-name>
+ <url-pattern>/solr/*</url-pattern>
+ </filter-mapping>
+
+
+ <mime-mapping>
+ <extension>.xsl</extension>
+ <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
+ <mime-type>application/xslt+xml</mime-type>
+ </mime-mapping>
+
+
+
+
+
+ <!-- EHCache Web Cache -->
+ <filter>
+ <filter-name>SimpleCachingHeadersPageCachingFilter</filter-name>
+ <filter-class>net.sf.ehcache.constructs.web.filter.SimpleCachingHeadersPageCachingFilter</filter-class>
+ <init-param>
+ <param-name>suppressStackTraces</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cacheName</param-name>
+ <param-value>PageCache</param-value>
+ </init-param>
+
+ </filter>
+
+
+
+ <filter>
+ <filter-name>KiWi Webservices</filter-name>
+ <filter-class>
+ org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
+ </filter-class>
+ <init-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>kiwi.core.webservices.CoreApplication</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>KiWi Webservices</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <context-param>
+ <param-name>resteasy.injector.factory</param-name>
+ <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
+ </context-param>
+
+
+ <servlet>
+ <servlet-name>ServletTestRunner</servlet-name>
+ <servlet-class>org.jboss.arquillian.protocol.servlet_3.ServletTestRunner</servlet-class>
+ </servlet>
+
+
+ <servlet-mapping>
+ <servlet-name>ServletTestRunner</servlet-name>
+ <url-pattern>/ArquillianServletRunner</url-pattern>
+ </servlet-mapping>
+
+</web-app>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/marmotta-webapp/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/arquillian.xml b/launchers/marmotta-webapp/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..dd0594c
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/arquillian.xml
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright (c) 2012 Salzburg Research.
+ ~
+ ~ Licensed 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.
+ -->
+
+<arquillian xmlns="http://jboss.com/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tomcat6="urn:arq:org.jboss.arquillian.container.tomcat.embedded_6"
+ xsi:schemaLocation="http://jboss.com/arquillian ">
+
+ <tomcat6:container>
+ <tomcat6:unpackArchive>true</tomcat6:unpackArchive>
+ </tomcat6:container>
+
+</arquillian>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/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
new file mode 100644
index 0000000..30cc789
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright (c) 2012 Salzburg Research.
+ ~
+ ~ Licensed 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="ehcache.xsd">
+
+ <!--
+ 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"/>
+
+ <!--
+ 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"
+ eternal="true"
+ overflowToDisk="false"
+ memoryStoreEvictionPolicy="LRU"
+ />
+
+ <cache name="org.hibernate.cache.StandardQueryCache"
+ maxElementsInMemory="10000"
+ eternal="true"
+ overflowToDisk="false"
+ memoryStoreEvictionPolicy="LRU"/>
+
+ <cache name="org.hibernate.cache.UpdateTimestampsCache"
+ maxElementsInMemory="10000"
+ eternal="true"
+ overflowToDisk="false"/>
+
+ <cache name="PageCache"
+ maxElementsInMemory="1000"
+ eternal="false"
+ overflowToDisk="true"
+ timeToIdleSeconds="1000"
+ timeToLiveSeconds="1000"
+ 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/4c3a7698/launchers/marmotta-webapp/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/jndi.properties b/launchers/marmotta-webapp/src/test/resources/jndi.properties
new file mode 100644
index 0000000..19e67c7
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/jndi.properties
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2012 Salzburg Research.
+#
+# Licensed 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.
+#
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/marmotta-webapp/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/logback.xml b/launchers/marmotta-webapp/src/test/resources/logback.xml
new file mode 100644
index 0000000..da002ac
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/logback.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (c) 2012 Salzburg Research.
+ ~
+ ~ Licensed 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.
+ -->
+
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <file>kiwi-test.log</file>
+ <append>true</append>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <!--
+ <appender name="SOCKET" class="ch.qos.logback.classic.net.SocketAppender">
+ <remoteHost>localhost</remoteHost>
+ <port>4560</port>
+ <reconnectionDelay>10000</reconnectionDelay>
+ <includeCallerData>true</includeCallerData>
+ </appender>
+
+
+ <appender name="LILITH" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
+ <Compressing>true</Compressing>
+ <ReconnectionDelay>10000</ReconnectionDelay>
+ <IncludeCallerData>true</IncludeCallerData>
+ <RemoteHosts>localhost</RemoteHosts>
+ </appender>
+ -->
+
+
+ <logger name="kiwi.core" level="DEBUG" />
+ <logger name="kiwi.test" level="DEBUG" />
+
+ <logger name="org.hibernate" level="INFO" />
+ <logger name="org.hibernate.SQL" level="DEBUG" />
+ <logger name="org.hibernate.pretty" level="DEBUG" />
+
+ <logger name="org.apache.solr" level="INFO" />
+
+
+ <root level="debug">
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/marmotta-webapp/src/test/resources/test-config.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/test-config.properties b/launchers/marmotta-webapp/src/test/resources/test-config.properties
new file mode 100644
index 0000000..849cb90
--- /dev/null
+++ b/launchers/marmotta-webapp/src/test/resources/test-config.properties
@@ -0,0 +1,73 @@
+#
+# Copyright (c) 2012 Salzburg Research.
+#
+# Licensed 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.
+#
+
+#####################################################################################################################
+# KiWi core configuration
+#####################################################################################################################
+
+
+# KiWi version
+kiwi.version = 1.99.1
+
+# KiWi home directory (for configuration files etc)
+kiwi.home = /tmp/kiwi-test
+
+# directory where KiWi stores the search index for SOLR search
+solr.home = ${kiwi.home}/solr
+
+# directory where KiWi stores the triple index for SPARQL queries (using Sesame)
+sesame.home = ${kiwi.home}/triples
+
+# base URI of this KiWi installation; used for constructing resource URIs
+kiwi.context = http://localhost:9090/test/
+
+# base URL of the KiWi installation; used for accessing additional web services like SOLR and H2
+kiwi.host = http://localhost:9090/test/
+
+#####################################################################################################################
+# KiWi rendering plugins; these are applied when loading/saving content in the KiWi system
+#####################################################################################################################
+
+savelets.source=kiwi.service.render.savelet.ExtractLinksSavelet,\
+ kiwi.service.render.savelet.HtmlCleanerSavelet
+savelets.text=kiwi.service.render.savelet.NavigationalLinksSavelet,\
+ kiwi.service.render.savelet.RdfaSavelet,\
+ kiwi.service.render.savelet.FragmentsSavelet,\
+ kiwi.service.render.savelet.ComponentSavelet
+savelets.media=
+
+
+renderlets.html.source=
+renderlets.html.xom=kiwi.service.render.renderlet.ComponentRenderlet,\
+ kiwi.service.render.renderlet.ComponentDisplayRenderlet,\
+ kiwi.service.render.renderlet.RdfaRenderlet,\
+ kiwi.service.render.renderlet.HtmlLinkRenderlet,\
+ kiwi.service.render.renderlet.HtmlRdfaRenderlet,\
+ kiwi.service.render.renderlet.HtmlFragmentRenderlet,\
+ kiwi.service.render.renderlet.ImageLinkRenderlet,\
+ kiwi.service.render.renderlet.QueryRenderlet
+
+
+renderlets.editor.source=
+renderlets.editor.xom=kiwi.service.render.renderlet.ComponentRenderlet,\
+ kiwi.service.render.renderlet.RdfaRenderlet,\
+ kiwi.service.render.renderlet.EditorLinkRenderlet
+
+renderlets.annotation.source=
+renderlets.annotation.xom=kiwi.service.render.renderlet.HtmlLinkRenderlet,\
+ kiwi.service.render.renderlet.AnnotationLinksRenderlet
+
+renderlets.media=
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 72f9e2a..1cd92d2 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -15,8 +15,14 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>launchers-reactor</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>Apache Marmotta Launchers: Reactor</name>
<description>Different launch configurations for Apache Marmotta (WAR, Installer, etc).</description>
-
+
+ <modules>
+ <module>marmotta-installer</module>
+ <module>marmotta-splash</module>
+ <module>marmotta-webapp</module>
+ </modules>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index 6f434f1..c3c8c8a 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -188,6 +188,11 @@
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-repository-sail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-api</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 8ad20bf..8836f4e 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -153,6 +153,11 @@
<artifactId>sesame-rio-rdfxml</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-repository-sail</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index e7512de..3a92463 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -174,6 +174,11 @@
<artifactId>sesame-rio-rdfxml</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-repository-sail</artifactId>
+ <scope>test</scope>
+ </dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index a55a9cd..f4dcdf4 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -63,6 +63,10 @@
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-sail-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-repository-sail</artifactId>
+ </dependency>
<!-- Utilities -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 78f27ba..54a8b14 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -52,6 +52,10 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>sesame-commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index fd6c3db..1d2d1de 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -55,6 +55,10 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>sesame-commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index e656586..0b5ee5e 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -55,6 +55,10 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>sesame-commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 02c360b..de17994 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -39,9 +39,35 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
+
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
@@ -66,6 +92,12 @@
<artifactId>sesame-rio-n3</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index ab9c0ff..b4115b6 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -70,6 +70,10 @@
<configuration>
<instructions>
<Bundle-Name>LDPath Functions: Math</Bundle-Name>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
<!-- Enable this for including your enhancement chain configuration -->
<!-- <Install-Path>config</Install-Path> -->
<Export-Package>
@@ -90,7 +94,7 @@
</goals>
<configuration>
<properties>
- <service.vendor>Salzburg Research</service.vendor>
+ <service.vendor>Apache Software Foundation</service.vendor>
</properties>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 9efb5c3..624e654 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -17,10 +17,10 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>ldpath-parent</artifactId>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../../parent</relativePath>
</parent>
<name>LDPath Functions: Text</name>
@@ -40,6 +40,7 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-core</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -69,6 +70,10 @@
<configuration>
<instructions>
<Bundle-Name>LDPath Functions: Math</Bundle-Name>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
<!-- Enable this for including your enhancement chain configuration -->
<!-- <Install-Path>config</Install-Path> -->
<Export-Package>
@@ -89,7 +94,7 @@
</goals>
<configuration>
<properties>
- <service.vendor>Salzburg Research</service.vendor>
+ <service.vendor>Apache Software Foundation</service.vendor>
</properties>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 97615f7..5179029 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -17,10 +17,10 @@
<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/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>ldpath-parent</artifactId>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -51,6 +51,7 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-core</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -86,6 +87,10 @@
<configuration>
<instructions>
<Bundle-Name>LDPath Functions: XML</Bundle-Name>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
<!-- Enable this for including your enhancement chain configuration -->
<!-- <Install-Path>config</Install-Path> -->
<Export-Package>
@@ -111,7 +116,7 @@
</goals>
<configuration>
<properties>
- <service.vendor>Salzburg Research</service.vendor>
+ <service.vendor>Apache Software Foundation</service.vendor>
</properties>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index da15b56..2977cf3 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -19,10 +19,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>ldpath-parent</artifactId>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../../parent</relativePath>
</parent>
<name>LDPath Templating: Linked Data</name>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index 452941c..9da9a36 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -19,10 +19,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>ldpath-parent</artifactId>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../../parent</relativePath>
</parent>
<name>LDPath Templating: Core</name>
@@ -58,6 +58,10 @@
<configuration>
<instructions>
<Bundle-Name>LDPath Templating</Bundle-Name>
+ <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <_versionpolicy>$${version;===;${@}}</_versionpolicy>
<!-- Enable this for including your enhancement chain configuration -->
<!-- <Install-Path>config</Install-Path> -->
<Export-Package>
@@ -103,7 +107,7 @@
</goals>
<configuration>
<properties>
- <service.vendor>Salzburg Research</service.vendor>
+ <service.vendor>Apache Software Foundation</service.vendor>
</properties>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ceaf832..df309fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -372,32 +372,6 @@
<artifactId>maven-reactor-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>buildinfo-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <configuration>
- <systemProperties>
- <systemProperty>user.name</systemProperty>
- <systemProperty>user.timezone</systemProperty>
- <systemProperty>java.vm.vendor</systemProperty>
- <systemProperty>java.vm.version</systemProperty>
- <systemProperty>java.vm.name</systemProperty>
- <systemProperty>java.runtime.version</systemProperty>
- <systemProperty>os.name</systemProperty>
- <systemProperty>os.version</systemProperty>
- <systemProperty>os.arch</systemProperty>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>extract</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
@@ -730,6 +704,11 @@
<version>1.7.2</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.9</version>
@@ -1417,6 +1396,22 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 718bb8f..fe40292 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -38,7 +38,7 @@
<!-- usage:
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -77,6 +77,32 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 980a76d..8ce8d44 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -35,10 +35,41 @@
fetched on demand and cached locally.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index a27a301..5d863e9 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -34,11 +34,41 @@
services as well as through a LDPath query endpoint (Web Service).
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 3fe15c4..bf36ec6 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -35,10 +35,41 @@
the database, reasoning is quite efficient.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -50,7 +81,7 @@
<!-- LMF Testing Package -->
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 089b11c..9523d06 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -34,13 +34,43 @@
profiles or fine-grained security rules.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>marmotta-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index bf80710..eb1b374 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -25,7 +25,7 @@
<relativePath>../../parent</relativePath>
</parent>
- <artifactId>lmf-sparql</artifactId>
+ <artifactId>marmotta-sparql</artifactId>
<packaging>jar</packaging>
<name>Apache Marmotta Platform: SPARQL Endpoint</name>
@@ -35,11 +35,42 @@
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>marmotta-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index 7b4e7d9..ce87dfd 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -34,11 +34,42 @@
removing user configurations from the Linked Media Framework.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>marmotta-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 67d5d22..82139ac 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -36,11 +36,41 @@
versioning information in the database. Note that this implies a certain performance overhead.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>buildinfo-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>user.name</systemProperty>
+ <systemProperty>user.timezone</systemProperty>
+ <systemProperty>java.vm.vendor</systemProperty>
+ <systemProperty>java.vm.version</systemProperty>
+ <systemProperty>java.vm.name</systemProperty>
+ <systemProperty>java.runtime.version</systemProperty>
+ <systemProperty>os.name</systemProperty>
+ <systemProperty>os.version</systemProperty>
+ <systemProperty>os.arch</systemProperty>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-core</artifactId>
+ <artifactId>marmotta-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>