Strabon

changeset 865:152031be6487

merge
author George Garbis <ggarbis@di.uoa.gr>
date Wed Jan 23 12:50:41 2013 +0200 (2013-01-23)
parents 1c1b26b37c41 03ac2de7ca64
children c94a157459eb
files
line diff
     1.1 --- a/.hgtags	Wed Jan 23 12:50:26 2013 +0200
     1.2 +++ b/.hgtags	Wed Jan 23 12:50:41 2013 +0200
     1.3 @@ -15,3 +15,4 @@
     1.4  331163be068281f22f61b79b31484eb0f4cfc564 Teleios_System_v1-1-1
     1.5  7089b2d52c7f36b40301063efc73476a093f2134 v3.2.5
     1.6  97afadc6d589b318924ca774659418c055fdf3a0 v3.2.6
     1.7 +b3e0d7415823df2e814aa6fa45aa13374a81e706 v3.2.7
     2.1 --- a/ChangeLog	Wed Jan 23 12:50:26 2013 +0200
     2.2 +++ b/ChangeLog	Wed Jan 23 12:50:41 2013 +0200
     2.3 @@ -1,7 +1,21 @@
     2.4  Day Month Date Hour:Min:Sec Year   Pyravlos Team
     2.5  
     2.6 +	* Version 3.2.8 released.
     2.7 +
     2.8 +Wed Jan 09 18:06:41 2013   Pyravlos Team
     2.9 +
    2.10  	* Version 3.2.7 released.
    2.11  
    2.12 +	* Add an extension function 
    2.13 +	<http://strdf.di.uoa.gr/extensions/ontology#diffDateTime> for computing the
    2.14 +	span (in milliseconds) between two timestamps.
    2.15 +
    2.16 +	* Added an <endpoint-exec> module. This module builds an executable jar file 
    2.17 +	with an embedded Apache Tomcat 7. To create and run the executable jar just 
    2.18 +	type:
    2.19 +		$ mvn clean package
    2.20 +		$ java -jar endpoint-exec/target/strabon-endpoint-executable-*.jar
    2.21 +
    2.22  	* Modified strabon script and postgis/monetdb.StoreOP class to get an
    2.23  	option for storing a RDF file in a named graph. Moreover, the RDF
    2.24  	format of the input RDF file now is given as an option (still, if it
     3.1 --- a/endpoint-client/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     3.2 +++ b/endpoint-client/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     3.3 @@ -5,7 +5,7 @@
     3.4  	<parent>
     3.5  		<groupId>eu.earthobservatory</groupId>
     3.6  		<artifactId>strabon</artifactId>
     3.7 -		<version>3.2.7</version>
     3.8 +		<version>3.2.8-SNAPSHOT</version>
     3.9  	</parent>
    3.10  
    3.11  	<artifactId>strabon-endpoint-client</artifactId>
     4.1 --- a/endpoint-exec/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     4.2 +++ b/endpoint-exec/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     4.3 @@ -5,7 +5,7 @@
     4.4  	<parent>
     4.5  		<groupId>eu.earthobservatory</groupId>
     4.6  		<artifactId>strabon</artifactId>
     4.7 -		<version>3.2.7</version>
     4.8 +		<version>3.2.8-SNAPSHOT</version>
     4.9  	</parent>
    4.10  
    4.11  	<artifactId>strabon-endpoint-exec</artifactId>
     5.1 --- a/endpoint/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     5.2 +++ b/endpoint/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     5.3 @@ -4,7 +4,7 @@
     5.4  	<parent>
     5.5  		<groupId>eu.earthobservatory</groupId>
     5.6  		<artifactId>strabon</artifactId>
     5.7 -		<version>3.2.7</version>
     5.8 +		<version>3.2.8-SNAPSHOT</version>
     5.9  	</parent>
    5.10  
    5.11  	<artifactId>strabon-endpoint</artifactId>
     6.1 --- a/evaluation/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     6.2 +++ b/evaluation/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     6.3 @@ -5,7 +5,7 @@
     6.4  	<parent>
     6.5  		<groupId>eu.earthobservatory</groupId>
     6.6  		<artifactId>strabon</artifactId>
     6.7 -		<version>3.2.7</version>
     6.8 +		<version>3.2.8-SNAPSHOT</version>
     6.9  	</parent>
    6.10  
    6.11  	<groupId>org.openrdf.sesame</groupId>
     7.1 --- a/generaldb/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     7.2 +++ b/generaldb/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     7.3 @@ -6,7 +6,7 @@
     7.4  	<parent>
     7.5  		<groupId>eu.earthobservatory</groupId>
     7.6  		<artifactId>strabon</artifactId>
     7.7 -		<version>3.2.7</version>
     7.8 +		<version>3.2.8-SNAPSHOT</version>
     7.9  	</parent>
    7.10    
    7.11  	<groupId>org.openrdf.sesame</groupId>
     8.1 --- a/monetdb/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     8.2 +++ b/monetdb/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     8.3 @@ -6,7 +6,7 @@
     8.4  	<parent>
     8.5  		<groupId>eu.earthobservatory</groupId>
     8.6  		<artifactId>strabon</artifactId>
     8.7 -		<version>3.2.7</version>
     8.8 +		<version>3.2.8-SNAPSHOT</version>
     8.9  	</parent>
    8.10    
    8.11  	<groupId>org.openrdf.sesame</groupId>
     9.1 --- a/pom.xml	Wed Jan 23 12:50:26 2013 +0200
     9.2 +++ b/pom.xml	Wed Jan 23 12:50:41 2013 +0200
     9.3 @@ -4,7 +4,7 @@
     9.4  
     9.5  	<groupId>eu.earthobservatory</groupId>
     9.6  	<artifactId>strabon</artifactId>
     9.7 -	<version>3.2.7</version>
     9.8 +	<version>3.2.8-SNAPSHOT</version>
     9.9  	<packaging>pom</packaging>
    9.10  
    9.11  	<parent>
    9.12 @@ -31,7 +31,7 @@
    9.13  	</modules>
    9.14  
    9.15  	<properties>
    9.16 -        <eu.earthobservatory.version>3.2.7</eu.earthobservatory.version>
    9.17 +        <eu.earthobservatory.version>3.2.8-SNAPSHOT</eu.earthobservatory.version>
    9.18  		<sesame.version>2.6.3</sesame.version>
    9.19  		<aduna.appbase.version>3.5.0</aduna.appbase.version>
    9.20  		<!--slf4j.version>1.5.8</slf4j.version-->
    10.1 --- a/postgis/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    10.2 +++ b/postgis/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    10.3 @@ -6,7 +6,7 @@
    10.4  	<parent>
    10.5  		<groupId>eu.earthobservatory</groupId>
    10.6  		<artifactId>strabon</artifactId>
    10.7 -		<version>3.2.7</version>
    10.8 +		<version>3.2.8-SNAPSHOT</version>
    10.9  	</parent>
   10.10    
   10.11  	<groupId>org.openrdf.sesame</groupId>
    11.1 --- a/resultio-spatial/api/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    11.2 +++ b/resultio-spatial/api/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    11.3 @@ -5,7 +5,7 @@
    11.4  	<parent>
    11.5  		<groupId>org.openrdf.sesame</groupId>
    11.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    11.7 -		<version>3.2.7</version>
    11.8 +		<version>3.2.8-SNAPSHOT</version>
    11.9  	</parent>
   11.10  
   11.11  	<artifactId>sesame-queryresultio-spatial-api</artifactId>
    12.1 --- a/resultio-spatial/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    12.2 +++ b/resultio-spatial/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    12.3 @@ -5,7 +5,7 @@
    12.4  	<parent>
    12.5  		<groupId>eu.earthobservatory</groupId>
    12.6  		<artifactId>strabon</artifactId>
    12.7 -		<version>3.2.7</version>
    12.8 +		<version>3.2.8-SNAPSHOT</version>
    12.9  	</parent>
   12.10  
   12.11  	<groupId>org.openrdf.sesame</groupId>
    13.1 --- a/resultio-spatial/sparqlgeojson/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    13.2 +++ b/resultio-spatial/sparqlgeojson/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    13.3 @@ -5,7 +5,7 @@
    13.4  	<parent>
    13.5  		<groupId>org.openrdf.sesame</groupId>
    13.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    13.7 -		<version>3.2.7</version>
    13.8 +		<version>3.2.8-SNAPSHOT</version>
    13.9  	</parent>
   13.10  
   13.11  	<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
    14.1 --- a/resultio-spatial/sparqlhtml/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    14.2 +++ b/resultio-spatial/sparqlhtml/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    14.3 @@ -5,7 +5,7 @@
    14.4  	<parent>
    14.5  		<groupId>org.openrdf.sesame</groupId>
    14.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    14.7 -		<version>3.2.7</version>
    14.8 +		<version>3.2.8-SNAPSHOT</version>
    14.9  	</parent>
   14.10  
   14.11  	<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
    15.1 --- a/resultio-spatial/sparqlkml/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    15.2 +++ b/resultio-spatial/sparqlkml/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    15.3 @@ -5,7 +5,7 @@
    15.4  	<parent>
    15.5  		<groupId>org.openrdf.sesame</groupId>
    15.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    15.7 -		<version>3.2.7</version>
    15.8 +		<version>3.2.8-SNAPSHOT</version>
    15.9  	</parent>
   15.10  
   15.11  	<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
    16.1 --- a/resultio-spatial/sparqlxml/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    16.2 +++ b/resultio-spatial/sparqlxml/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    16.3 @@ -5,7 +5,7 @@
    16.4  	<parent>
    16.5  		<groupId>org.openrdf.sesame</groupId>
    16.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    16.7 -		<version>3.2.7</version>
    16.8 +		<version>3.2.8-SNAPSHOT</version>
    16.9  	</parent>
   16.10  
   16.11  	<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
    17.1 --- a/resultio-spatial/text/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    17.2 +++ b/resultio-spatial/text/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    17.3 @@ -5,7 +5,7 @@
    17.4  	<parent>
    17.5  		<groupId>org.openrdf.sesame</groupId>
    17.6  		<artifactId>sesame-queryresultio-spatial</artifactId>
    17.7 -		<version>3.2.7</version>
    17.8 +		<version>3.2.8-SNAPSHOT</version>
    17.9  	</parent>
   17.10  
   17.11  	<artifactId>sesame-queryresultio-spatial-text</artifactId>
    18.1 --- a/runtime/pom.xml	Wed Jan 23 12:50:26 2013 +0200
    18.2 +++ b/runtime/pom.xml	Wed Jan 23 12:50:41 2013 +0200
    18.3 @@ -5,7 +5,7 @@
    18.4  	<parent>
    18.5  		<groupId>eu.earthobservatory</groupId>
    18.6  		<artifactId>strabon</artifactId>
    18.7 -		<version>3.2.7</version>
    18.8 +		<version>3.2.8-SNAPSHOT</version>
    18.9  	</parent>
   18.10  
   18.11  	<artifactId>strabon-runtime</artifactId>
    19.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryOp.java	Wed Jan 23 12:50:26 2013 +0200
    19.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryOp.java	Wed Jan 23 12:50:41 2013 +0200
    19.3 @@ -49,7 +49,7 @@
    19.4  
    19.5  		Strabon strabon = null;
    19.6  		try {
    19.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    19.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    19.9  			strabon.query(queryString, Format.fromString(resultsFormat), strabon.getSailRepoConnection(), System.out);
   19.10  			
   19.11  		} catch (Exception e) {