You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/01/16 16:07:40 UTC
[1/3] git commit: updated year at default copyright line
Updated Branches:
refs/heads/develop 4ebf089b3 -> 019fa30e3
updated year at default copyright line
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d733f6de
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d733f6de
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d733f6de
Branch: refs/heads/develop
Commit: d733f6de8a78e6204ff8d9e7ea4b0eb4fd45a449
Parents: ebf1e64
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jan 16 14:58:59 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jan 16 14:58:59 2014 +0100
----------------------------------------------------------------------
.../marmotta-core/src/main/resources/config-defaults.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d733f6de/platform/marmotta-core/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties
index b6c7dab..b5b67b6 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -48,7 +48,7 @@ kiwi.pages.project = marmotta
kiwi.pages.project.marmotta.logo = core/public/img/logo/marmotta-logo.png
# marmotta footer
-kiwi.pages.project.marmotta.footer = Copyright © 2013 The Apache Software Foundation, Licensed under the <a href\="\#">Apache License, Version 2.0.</a><br>Apache, Marmotta, the Apache feather and Marmotta logos are trademarks of The Apache Software Foundation.
+kiwi.pages.project.marmotta.footer = Copyright © 2013-2014 The Apache Software Foundation, Licensed under the <a href\="\#">Apache License, Version 2.0.</a><br>Apache, Marmotta, the Apache feather and Marmotta logos are trademarks of The Apache Software Foundation.
# lmf logo
kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png
@@ -205,4 +205,4 @@ contexts.inferred = ${kiwi.context}context/inferred
# Turn on cluster-specific configuration options (e.g. replicated and distributed caching, synchronization, ...)
clustering.enabled = false
-clustering.name = Marmotta
\ No newline at end of file
+clustering.name = Marmotta
[2/3] git commit: MARMOTTA-422: added initial profiles draft to
manage different backends
Posted by wi...@apache.org.
MARMOTTA-422: added initial profiles draft to manage different backends
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bc080e09
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bc080e09
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bc080e09
Branch: refs/heads/develop
Commit: bc080e09d82a019323daf1a98519facff4cec272
Parents: d733f6d
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jan 16 16:07:08 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jan 16 16:07:08 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 99 ++++++++++++++++++++++------------
1 file changed, 65 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc080e09/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 0d79cb4..e571f67 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -33,10 +33,10 @@
<description>Web Application bundle (WAR file) containing Apache Marmotta</description>
<properties>
- <!-- these are used for the goals tomcat6/7:run or jetty:run -->
<marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
<marmotta.context>/</marmotta.context>
<marmotta.port>8080</marmotta.port>
+ <marmotta.backend>kiwi</marmotta.backend>
</properties>
<build>
@@ -124,6 +124,64 @@
</build>
<profiles>
+
+ <!-- backend profiles -->
+
+ <profile>
+ <id>kiwi</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>marmotta.backend</name>
+ <value>kiwi</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-backend-kiwi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-ldcache-kiwi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-reasoner-kiwi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-versioning-kiwi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>bigdata</id>
+ <activation>
+ <property>
+ <name>marmotta.backend</name>
+ <value>bigdata</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-backend-bigdata</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-ldcache-file</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<profile>
<id>cleanall</id>
<build>
@@ -178,12 +236,12 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldpath</artifactId>
+ <artifactId>marmotta-sparql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-backend-kiwi</artifactId>
+ <artifactId>marmotta-ldpath</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -193,17 +251,12 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldcache-kiwi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-reasoner-kiwi</artifactId>
+ <artifactId>marmotta-versioning-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-sparql</artifactId>
+ <artifactId>marmotta-user</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -211,35 +264,15 @@
<artifactId>marmotta-security</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-versioning-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-versioning-kiwi</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- Optional
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-templating</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-->
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-user</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Servlet / CDI Environment -->
+ <!-- JavaEE / Servlet / CDI Environment -->
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
@@ -261,8 +294,6 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
-
- <!-- CORS filter -->
<dependency>
<groupId>com.thetransactioncompany</groupId>
<artifactId>cors-filter</artifactId>
[3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by wi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/019fa30e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/019fa30e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/019fa30e
Branch: refs/heads/develop
Commit: 019fa30e33aab408036aad83a2797a75ff1a471b
Parents: bc080e0 4ebf089
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jan 16 16:07:23 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jan 16 16:07:23 2014 +0100
----------------------------------------------------------------------
.../ldcache/backend/infinispan/LDCachingInfinispanBackend.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------