# HG changeset patch
# User Kostis Kyzirakos <kkyzir@di.uoa.gr>
# Date 1334680607 -10800
# Node ID 719afbe293bab80ab36d8f4c2c8b36bf1c0a907c
# Parent  54b1e8b253b3bd5913732adb79179c7bfb379aa1
move around scripts

diff -r 54b1e8b253b3 -r 719afbe293ba endpoint/pom.xml
--- a/endpoint/pom.xml	Wed Apr 11 15:21:42 2012 +0300
+++ b/endpoint/pom.xml	Tue Apr 17 19:36:47 2012 +0300
@@ -215,7 +215,6 @@
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 				</configuration>
 			</plugin>
-			<!--
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
@@ -232,7 +231,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			-->
 		</plugins>
 
 		<pluginManagement>
@@ -270,6 +268,5 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-
 	</build>
 </project>
diff -r 54b1e8b253b3 -r 719afbe293ba pom.xml
--- a/pom.xml	Wed Apr 11 15:21:42 2012 +0300
+++ b/pom.xml	Tue Apr 17 19:36:47 2012 +0300
@@ -474,13 +474,11 @@
 				</plugin>
 				
 				<!-- The following plugin is for being able to run tomcat6/7:run -->
-				<!--
 				<plugin>
 					<groupId>org.apache.tomcat.maven</groupId>
 					<artifactId>tomcat7-maven-plugin</artifactId>
 					<version>2.0-SNAPSHOT</version>
 				</plugin>
-				-->
 			</plugins>
 		</pluginManagement>
 
@@ -530,7 +528,6 @@
 	
 	<pluginRepositories>
 		<!-- The following repository is for being able to run tomcat7:run -->
-		<!-- 
 		<pluginRepository>
 			<id>apache.snapshots</id>
 			<name>Apache Snapshots</name>
@@ -542,7 +539,6 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</pluginRepository>
-		-->
 	</pluginRepositories>
 
 	<scm>
diff -r 54b1e8b253b3 -r 719afbe293ba query.sh
--- a/query.sh	Wed Apr 11 15:21:42 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#!/bin/bash
-#BASE=/home/strabon/experiments/data/naive/10mil
-#10mil  0.01     11552771
-#100mil 0.0034   99758140
-#500mil 0.0015  512505143
-#1bil   0.001  1153249211
-
-DB="noa-d4_1"
-LOGPATH="/home/strabon/experiments/logs"
-STEP="0.01"
-TOTALTRIPLES="11552771"
-
-(cd jars/target &&
-java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb 
-"PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> PREFIX georss: <http://www.georss.org/georss/> PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> PREFIX lgdo: <http://linkedgeodata.org/ontology/> PREFIX gn: <http://www.geonames.org/ontology#> PREFIX iman: <http://teleios.di.uoa.gr/ontologies/imageAnnotationOntology.owl#> PREFIX eolo: <http://www.dlr.de/ontologies/EOLO.owl#> SELECT ?h ?hGeo ?hAcqTime ?hConfidence ?hProvider ?hConfirmation ?hSensor WHERE { ?h a noa:Hotspot ;    noa:hasGeometry ?hGeo ;    noa:hasAcquisitionTime ?hAcqTime ;    noa:hasConfidence ?hConfidence ;    noa:isProducedBy ?hProvider ;    noa:hasConfirmation ?hConfirmation ;    noa:isDerivedFromSensor ?hSensor ;    FILTER( \"2007-08-23T00:00:00\" <= str(?hAcqTime)    && str(?hAcqTime) <= \"2007-08-26T23:59:59\" ) .    FILTER( strdf:contains(\"POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))\"^^strdf:WKT, ?hGeo) ) .}" 
-XML)
-
diff -r 54b1e8b253b3 -r 719afbe293ba query2.sh
--- a/query2.sh	Wed Apr 11 15:21:42 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-#BASE=/home/strabon/experiments/data/naive/10mil
-#10mil  0.01     11552771
-#100mil 0.0034   99758140
-#500mil 0.0015  512505143
-#1bil   0.001  1153249211
-
-DB="test"
-
-(cd jars/target &&
-java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb "SELECT * WHERE {?s ?p ?o} LIMIT 1" XML)
-
diff -r 54b1e8b253b3 -r 719afbe293ba scripts/query.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/query.sh	Tue Apr 17 19:36:47 2012 +0300
@@ -0,0 +1,17 @@
+#!/bin/bash
+#BASE=/home/strabon/experiments/data/naive/10mil
+#10mil  0.01     11552771
+#100mil 0.0034   99758140
+#500mil 0.0015  512505143
+#1bil   0.001  1153249211
+
+DB="noa-d4_1"
+LOGPATH="/home/strabon/experiments/logs"
+STEP="0.01"
+TOTALTRIPLES="11552771"
+
+(cd jars/target &&
+java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb 
+"PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> PREFIX georss: <http://www.georss.org/georss/> PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> PREFIX lgdo: <http://linkedgeodata.org/ontology/> PREFIX gn: <http://www.geonames.org/ontology#> PREFIX iman: <http://teleios.di.uoa.gr/ontologies/imageAnnotationOntology.owl#> PREFIX eolo: <http://www.dlr.de/ontologies/EOLO.owl#> SELECT ?h ?hGeo ?hAcqTime ?hConfidence ?hProvider ?hConfirmation ?hSensor WHERE { ?h a noa:Hotspot ;    noa:hasGeometry ?hGeo ;    noa:hasAcquisitionTime ?hAcqTime ;    noa:hasConfidence ?hConfidence ;    noa:isProducedBy ?hProvider ;    noa:hasConfirmation ?hConfirmation ;    noa:isDerivedFromSensor ?hSensor ;    FILTER( \"2007-08-23T00:00:00\" <= str(?hAcqTime)    && str(?hAcqTime) <= \"2007-08-26T23:59:59\" ) .    FILTER( strdf:contains(\"POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))\"^^strdf:WKT, ?hGeo) ) .}" 
+XML)
+
diff -r 54b1e8b253b3 -r 719afbe293ba scripts/query2.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/query2.sh	Tue Apr 17 19:36:47 2012 +0300
@@ -0,0 +1,12 @@
+#!/bin/bash
+#BASE=/home/strabon/experiments/data/naive/10mil
+#10mil  0.01     11552771
+#100mil 0.0034   99758140
+#500mil 0.0015  512505143
+#1bil   0.001  1153249211
+
+DB="test"
+
+(cd jars/target &&
+java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb "SELECT * WHERE {?s ?p ?o} LIMIT 1" XML)
+
diff -r 54b1e8b253b3 -r 719afbe293ba scripts/strabon
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/strabon	Tue Apr 17 19:36:47 2012 +0300
@@ -0,0 +1,28 @@
+#! /bin/bash
+
+dbName=$1
+dirs=$2
+
+# Evaluates a query using Strabon that is stored in $dir
+#dir='/home/ggarbis/workspaces/Strabon-workspace/Strabon/jars/target'
+dir='/home/kkyzir/teleios/nkua/Strabon/jars/target'
+
+# Arguments for QueryDir
+HOST='localhost'
+PORT='50000'
+DATABASE=$dbName
+USERNAME='monetdb'
+PASSWORD='monetdb'
+FORMAT=''
+DIRS=$2
+EXT=$3
+
+# Construct classpath with dependencies
+cd $dir &&
+for file in `ls -1 *.jar`;
+do 
+	myVar=$myVar./$file":";
+done;
+
+# Evaluate a query
+java -Xmx5000M -cp $myVar eu.earthobservatory.runtime.monetdb.QueryDir $HOST $PORT $DATABASE $USERNAME $PASSWORD "$DIRS" "$EXT" $FORMAT
diff -r 54b1e8b253b3 -r 719afbe293ba strabon
--- a/strabon	Wed Apr 11 15:21:42 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#! /bin/bash
-
-dbName=$1
-dirs=$2
-
-# Evaluates a query using Strabon that is stored in $dir
-#dir='/home/ggarbis/workspaces/Strabon-workspace/Strabon/jars/target'
-dir='/home/kkyzir/teleios/nkua/Strabon/jars/target'
-
-# Arguments for QueryDir
-HOST='localhost'
-PORT='50000'
-DATABASE=$dbName
-USERNAME='monetdb'
-PASSWORD='monetdb'
-FORMAT=''
-DIRS=$2
-EXT=$3
-
-# Construct classpath with dependencies
-cd $dir &&
-for file in `ls -1 *.jar`;
-do 
-	myVar=$myVar./$file":";
-done;
-
-# Evaluate a query
-java -Xmx5000M -cp $myVar eu.earthobservatory.runtime.monetdb.QueryDir $HOST $PORT $DATABASE $USERNAME $PASSWORD "$DIRS" "$EXT" $FORMAT