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/02/03 08:24:03 UTC
[1/4] git commit: cosmetics
Updated Branches:
refs/heads/develop 3ca77fa01 -> 5dbe1f491
cosmetics
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b10097be
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b10097be
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b10097be
Branch: refs/heads/develop
Commit: b10097be91d414ec223d7c693fb9d6e0c578c9f9
Parents: e26b3ce
Author: Sergio Fernández <wi...@apache.org>
Authored: Sun Feb 2 19:41:53 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sun Feb 2 19:41:53 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/b10097be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55a45e0..fae3f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,8 @@
<url>https://git-wip-us.apache.org/repos/asf/marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/marmotta.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<issueManagement>
<system>Jira</system>
[2/4] 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/cfac8504
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cfac8504
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cfac8504
Branch: refs/heads/develop
Commit: cfac8504379ff48224083d861dcce5cbdc28e325
Parents: b10097b 3ca77fa
Author: Sergio Fernández <wi...@apache.org>
Authored: Sun Feb 2 19:41:57 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sun Feb 2 19:41:57 2014 +0100
----------------------------------------------------------------------
libraries/kiwi/kiwi-loader/pom.xml | 112 +---
.../apache/marmotta/kiwi/loader/KiWiLoader.java | 593 -------------------
.../kiwi/loader/KiWiLoaderConfiguration.java | 22 -
.../kiwi/loader/generic/KiWiBatchHandler.java | 1 -
.../kiwi/loader/generic/KiWiHandler.java | 34 +-
.../kiwi/loader/generic/Statistics.java | 223 -------
.../kiwi/loader/util/UnitFormatter.java | 44 --
.../marmotta/kiwi/loader/KiWiLoaderTest.java | 246 --------
.../marmotta/kiwi/persistence/KiWiDialect.java | 2 +-
loader/marmotta-loader-berkeley/pom.xml | 84 +++
.../berkeley/BerkeleyDBLoaderBackend.java | 80 +++
...org.apache.marmotta.loader.api.LoaderBackend | 1 +
.../src/main/resources/logback.xml | 27 +
loader/marmotta-loader-core/pom.xml | 160 +++++
.../marmotta/loader/api/LoaderBackend.java | 42 ++
.../marmotta/loader/api/LoaderHandler.java | 28 +
.../marmotta/loader/api/LoaderOptions.java | 64 ++
.../marmotta/loader/context/ContextHandler.java | 37 ++
.../marmotta/loader/core/MarmottaLoader.java | 542 +++++++++++++++++
.../functions/BackendIdentifierFunction.java | 16 +
.../loader/sesame/SesameLoaderHandler.java | 39 ++
.../marmotta/loader/statistics/Statistics.java | 215 +++++++
.../loader/statistics/StatisticsHandler.java | 69 +++
.../marmotta/loader/util/DirectoryFilter.java | 25 +
.../marmotta/loader/util/UnitFormatter.java | 44 ++
.../loader/wrapper/LoaderHandlerWrapper.java | 123 ++++
.../marmotta/loader/core/test/CLITest.java | 151 +++++
.../marmotta/loader/core/test/LoadTest.java | 150 +++++
.../core/test/dummy/DummyLoaderBackend.java | 51 ++
.../core/test/dummy/DummyLoaderHandler.java | 51 ++
...org.apache.marmotta.loader.api.LoaderBackend | 1 +
.../src/test/resources/demo-data.rdf | 78 +++
.../src/test/resources/demo-data.rdf.bz2 | Bin 0 -> 1469 bytes
.../src/test/resources/demo-data.rdf.gz | Bin 0 -> 1314 bytes
loader/marmotta-loader-hbase/pom.xml | 116 ++++
.../src/main/assembly/launcher.xml | 20 +
.../loader/hbase/HBaseLoaderBackend.java | 105 ++++
...org.apache.marmotta.loader.api.LoaderBackend | 1 +
.../src/main/resources/logback.xml | 32 +
loader/marmotta-loader-kiwi/pom.xml | 140 +++++
.../marmotta/loader/kiwi/KiWiLoaderBackend.java | 89 +++
.../marmotta/loader/kiwi/KiWiLoaderHandler.java | 190 ++++++
...org.apache.marmotta.loader.api.LoaderBackend | 1 +
loader/marmotta-loader-titan/pom.xml | 79 +++
.../loader/titan/TitanLoaderHandler.java | 111 ++++
.../marmotta/loader/titan/TitanRDFHandler.java | 274 +++++++++
loader/pom.xml | 85 +++
pom.xml | 1 +
48 files changed, 3335 insertions(+), 1264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/cfac8504/pom.xml
----------------------------------------------------------------------
[3/4] git commit: updated to Sesame 2.7.10
Posted by wi...@apache.org.
updated to Sesame 2.7.10
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/74296287
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/74296287
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/74296287
Branch: refs/heads/develop
Commit: 742962871cd9bb46b488e7c0b541879ec9679863
Parents: cfac850
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Feb 3 08:20:49 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Feb 3 08:20:49 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/74296287/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 33d783d..0c1b630 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
<url>http://marmotta.apache.org</url>
<properties>
- <sesame.version>2.7.9</sesame.version>
+ <sesame.version>2.7.10</sesame.version>
<junit.version>4.11</junit.version>
<weld.version>2.1.Final</weld.version>
<weld.core.version>2.1.1.Final</weld.core.version>
[4/4] git commit: MARMOTTA-431: added debian packaging for the webapp
launcher
Posted by wi...@apache.org.
MARMOTTA-431: added debian packaging for the webapp launcher
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5dbe1f49
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5dbe1f49
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5dbe1f49
Branch: refs/heads/develop
Commit: 5dbe1f49111d1304b59b379b6cbc584eb9d1bfcb
Parents: 7429628
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Feb 3 08:23:37 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Feb 3 08:23:37 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 57 +++++++++++++++++---
.../marmotta-webapp/src/deb/control/control | 8 +++
.../marmotta-webapp/src/deb/control/postinst | 8 +++
.../marmotta-webapp/src/deb/control/postrm | 18 +++++++
.../marmotta-webapp/src/deb/control/preinst | 5 ++
launchers/marmotta-webapp/src/deb/control/prerm | 4 ++
.../marmotta-webapp/src/deb/home/marmotta.txt | 2 +
.../marmotta-webapp/src/deb/tomcat/marmotta.xml | 10 ++++
8 files changed, 105 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 00e824e..84dc039 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -107,7 +107,6 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
@@ -120,6 +119,56 @@
<noticeMessage>* {0}, under {1}</noticeMessage>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>jdeb</artifactId>
+ <groupId>org.vafer</groupId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ <configuration>
+ <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb>
+ <controlDir>${basedir}/src/deb/control</controlDir>
+ <dataSet>
+ <data>
+ <src>${basedir}/src/deb/home</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>var/lib/marmotta</prefix>
+ <user>tomcat7</user>
+ <group>tomcat7</group>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/${project.build.finalName}.war</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>usr/share/marmotta</prefix>
+ <user>tomcat7</user>
+ <group>tomcat7</group>
+ </mapper>
+ </data>
+ <data>
+ <src>${basedir}/src/deb/tomcat/marmotta.xml</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>var/lib/tomcat7/conf/Catalina/localhost</prefix>
+ <user>tomcat7</user>
+ <group>tomcat7</group>
+ </mapper>
+ </data>
+ </dataSet>
+ <verbose>false</verbose>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -160,7 +209,6 @@
</dependencies>
</profile>
-
<profile>
<id>titan-berkeleydb</id>
<activation>
@@ -188,7 +236,6 @@
</dependencies>
</profile>
-
<profile>
<id>titan-hbase</id>
<activation>
@@ -240,13 +287,9 @@
</exclusion>
</exclusions>
</dependency>
-
-
-
</dependencies>
</profile>
-
<profile>
<id>bigdata</id>
<activation>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/control/control
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/control b/launchers/marmotta-webapp/src/deb/control/control
new file mode 100644
index 0000000..68c23b8
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/control/control
@@ -0,0 +1,8 @@
+Package: marmotta
+Version: [[version]]
+Section: java
+Priority: extra
+Architecture: all
+Description: [[description]]
+Maintainer: wikier@apache.org
+Depends: tomcat7 (>=7.0.30-1)
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/control/postinst
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/postinst b/launchers/marmotta-webapp/src/deb/control/postinst
new file mode 100644
index 0000000..ca20fc2
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/control/postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo $(date) >> var/lib/marmotta/marmotta.txt
+
+service tomcat7 start
+
+exit 0
+
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/control/postrm
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/postrm b/launchers/marmotta-webapp/src/deb/control/postrm
new file mode 100644
index 0000000..58cbe36
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/control/postrm
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+operation="$1"
+
+case "$operation" in
+ remove)
+
+ ;;
+ purge)
+ rm -rf /var/lib/marmotta
+
+ ;;
+ *)
+ ;;
+esac
+
+exit 0
+
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/control/preinst
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/preinst b/launchers/marmotta-webapp/src/deb/control/preinst
new file mode 100644
index 0000000..b6c4e6e
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/control/preinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+service tomcat7 stop
+
+exit 0
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/control/prerm
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/prerm b/launchers/marmotta-webapp/src/deb/control/prerm
new file mode 100644
index 0000000..500fb1e
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/control/prerm
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exit 0
+
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/home/marmotta.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/home/marmotta.txt b/launchers/marmotta-webapp/src/deb/home/marmotta.txt
new file mode 100644
index 0000000..b81bd2b
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/home/marmotta.txt
@@ -0,0 +1,2 @@
+Apache Marmotta home directory
+created by the debian package
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5dbe1f49/launchers/marmotta-webapp/src/deb/tomcat/marmotta.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/tomcat/marmotta.xml b/launchers/marmotta-webapp/src/deb/tomcat/marmotta.xml
new file mode 100644
index 0000000..bfa33a3
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/tomcat/marmotta.xml
@@ -0,0 +1,10 @@
+<Context docBase="/usr/share/marmotta/marmotta.war" unpackWAR="false" useNaming="true">
+
+ <Parameter name="marmotta.home" value="/var/lib/marmotta" override="false"/>
+
+ <Resource name="BeanManager" auth="Container"
+ type="javax.enterprise.inject.spi.BeanManager"
+ factory="org.jboss.weld.resources.ManagerObjectFactory"
+ />
+
+</Context>