Merge pull request #10 from hobbit-project/spbv_2.0.backup

SPBv v2.0

Makefile

@@ -1,20 +1,18 @@
-
 default: build dockerize
 
-build:
+build:	
 	mvn clean package -U -Dmaven.test.skip=true
 
 dockerize:
-	docker build -f docker/versioningbenchmarkcontroller.docker -t git.project-hobbit.eu:4567/papv/versioningbenchmarkcontroller:1.0 .
-	docker build -f docker/versioningdatagenerator.docker -t git.project-hobbit.eu:4567/papv/versioningdatagenerator:1.0 .
-	docker build -f docker/versioningtaskgenerator.docker -t git.project-hobbit.eu:4567/papv/versioningtaskgenerator:1.0 .
-	docker build -f docker/versioningevaluationmodule.docker -t git.project-hobbit.eu:4567/papv/versioningevaluationmodule:1.0 .
-	docker build -f docker/versioningvirtuososystemadapter.docker -t git.project-hobbit.eu:4567/papv/versioningsystem:1.0 .
-#	docker build -f docker/versioningr43plessystemadapter.docker -t git.project-hobbit.eu:4567/papv/versioningr43plessystem .
+	docker build -f docker/versioningbenchmarkcontroller.docker -t git.project-hobbit.eu:4567/papv/versioningbenchmarkcontroller:2.0 .
+	docker build -f docker/versioningdatagenerator.docker -t git.project-hobbit.eu:4567/papv/versioningdatagenerator:2.0 .
+	docker build -f docker/versioningtaskgenerator.docker -t git.project-hobbit.eu:4567/papv/versioningtaskgenerator:2.0 .
+	docker build -f docker/versioningevaluationmodule.docker -t git.project-hobbit.eu:4567/papv/versioningevaluationmodule:2.0 .
+	docker build -f docker/versioningvirtuososystemadapter.docker -t git.project-hobbit.eu:4567/papv/versioningsystem:2.0 .
+
+	docker push git.project-hobbit.eu:4567/papv/versioningbenchmarkcontroller:2.0
+	docker push git.project-hobbit.eu:4567/papv/versioningdatagenerator:2.0
+	docker push git.project-hobbit.eu:4567/papv/versioningtaskgenerator:2.0
+	docker push git.project-hobbit.eu:4567/papv/versioningevaluationmodule:2.0
+	docker push git.project-hobbit.eu:4567/papv/versioningsystem:2.0
 
-	docker push git.project-hobbit.eu:4567/papv/versioningbenchmarkcontroller:1.0
-	docker push git.project-hobbit.eu:4567/papv/versioningdatagenerator:1.0
-	docker push git.project-hobbit.eu:4567/papv/versioningtaskgenerator:1.0
-	docker push git.project-hobbit.eu:4567/papv/versioningevaluationmodule:1.0
-	docker push git.project-hobbit.eu:4567/papv/versioningsystem:1.0
-#	docker push git.project-hobbit.eu:4567/papv/versioningr43plessystem

dependency-reduced-pom.xml

@@ -73,6 +73,20 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>eu.ldbc</groupId>
+      <artifactId>semanticpublishing</artifactId>
+      <version>2.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/src/main/resources/semanticpublishing-2.0.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>org.virtuoso</groupId>
+      <artifactId>virtjdbc</artifactId>
+      <version>4.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/src/main/resources/virtjdbc-4.2.jar</systemPath>
+    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

docker/versioningdatagenerator.docker

@@ -1,35 +1,6 @@
-FROM ubuntu:trusty
+FROM tenforce/virtuoso
 
-# get Virtuoso
-ENV VIRT_HOME /opt/virtuoso-opensource
-
-ENV VIRT_BUILD_OPTS --with-readline
-
-ENV VIRT_DB /var/lib/virtuoso/db
-
-RUN apt-get -y update && \
-  apt-get -y clean && \
-  apt-get -y install dpkg-dev build-essential && \
-  apt-get -y install autoconf automake libtool flex bison git gperf gawk m4 make libxml2-dev libssl-dev libreadline-dev wget && \
-  rm -rf /var/lib/apt/lists/* && \
-  rm -rf /tmp/*
-
-WORKDIR /opt
-RUN git clone git://github.com/openlink/virtuoso-opensource.git virtuoso-opensource.src
-
-WORKDIR /opt/virtuoso-opensource.src
-RUN git checkout stable/7
-RUN ./autogen.sh && ./configure --prefix=$VIRT_HOME $VIRT_BUILD_OPTS && make && make install
-
-ADD virtuoso.ini.template /var/lib/virtuoso/db/virtuoso.ini
-ADD virtuoso.ini.template /versioning/virtuoso.ini
-
-RUN export PATH=$PATH:/opt/virtuoso-opensource/bin
-
-EXPOSE 1112
-EXPOSE 8891
-
-# get java8
+# get java 8
 RUN apt-get update && \
   apt-get -y upgrade && \
   apt-get -y install software-properties-common && \

pom.xml

@@ -66,16 +66,23 @@
     <dependency>
 		<groupId>eu.ldbc</groupId>
 		<artifactId>semanticpublishing</artifactId>
-		<version>0.1</version>
+		<version>2.0</version>
+		<scope>system</scope>
+    	<systemPath>${project.basedir}/src/main/resources/semanticpublishing-2.0.jar</systemPath>
     </dependency>
     <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
 	<dependency>
 	    <groupId>com.fasterxml.jackson.core</groupId>
 	    <artifactId>jackson-core</artifactId>
 	    <version>2.8.8</version>
 	</dependency>
-
-
+    <dependency>
+		<groupId>org.virtuoso</groupId>
+		<artifactId>virtjdbc</artifactId>
+		<version>4.2</version>
+		<scope>system</scope>
+    	<systemPath>${project.basedir}/src/main/resources/virtjdbc-4.2.jar</systemPath>
+    </dependency>
     <dependency>
 		<groupId>org.aksw.jena-sparql-api</groupId>
 		<artifactId>jena-sparql-api-core</artifactId>
@@ -95,7 +102,6 @@
 			</exclusion>
 		</exclusions>
 	</dependency>
-
   </dependencies>
 
   <build>