1.1 --- a/pom.xml	Fri May 02 17:27:46 2014 +0200
     1.2 +++ b/pom.xml	Fri May 02 17:39:27 2014 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  
     1.5  	<groupId>eu.earthobservatory</groupId>
     1.6  	<artifactId>strabon</artifactId>
     1.7 -	<version>3.2.3-MonetDB-SNAPSHOT</version>
     1.8 +	<version>3.2.10-MonetDB-SNAPSHOT</version>
     1.9  	<packaging>pom</packaging>
    1.10  
    1.11  	<parent>
    1.12 @@ -17,6 +17,113 @@
    1.13  	<description>Strabon is a storage and query evaluation module for stRDF/stSPARQL.</description>
    1.14  	<url>http://www.strabon.di.uoa.gr/</url>
    1.15  	<inceptionYear>2008</inceptionYear>
    1.16 +	
    1.17 +	<organization>
    1.18 +		<name>Strabon Team - Team Pyravlos</name>
    1.19 +		<url>http://www.strabon.di.uoa.gr/</url>
    1.20 +	</organization>
    1.21 +	
    1.22 +	<licenses>
    1.23 +		<license>
    1.24 +		<name>Mozilla Public License, v. 2.0</name>
    1.25 +		<url>http://www.strabon.di.uoa.gr/license</url>
    1.26 +		<distribution>repo</distribution>
    1.27 +		</license>
    1.28 +	</licenses>
    1.29 +	
    1.30 +	<developers>
    1.31 +		<developer>
    1.32 +			<id>manolee</id>
    1.33 +			<name>Manos Karpathiotakis</name>
    1.34 +			<email>manos.karpathiotakis@epfl.ch</email>
    1.35 +			<url>http://people.epfl.ch/manos.karpathiotakis</url>
    1.36 +			<organization>Data-Intensive Applications and Systems Laboratory, Institute of Core Computing Science, School of Computer and Communication Sciences, Ecole polytechnique fédérale de Lausanne
    1.37 +			</organization>
    1.38 +			<organizationUrl>http://search.epfl.ch/ubrowse.action?acro=DIAS</organizationUrl>
    1.39 +			<timezone>+1</timezone>
    1.40 +			<properties>
    1.41 +				<picUrl>http://people.epfl.ch/cgi-bin/people/getPhoto?id=222383</picUrl>
    1.42 +			</properties>
    1.43 +		</developer>
    1.44 +		<developer>
    1.45 +			<id>kk</id>
    1.46 +			<name>Kostis Kyzirakos</name>
    1.47 +			<email>kk@di.uoa.gr</email>
    1.48 +			<url>http://www.di.uoa.gr/~kkyzir</url>
    1.49 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.50 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    1.51 +			<timezone>+2</timezone>
    1.52 +			<properties>
    1.53 +				<picUrl>http://cgi.di.uoa.gr/~kkyzir/images/me.jpg</picUrl>
    1.54 +			</properties>
    1.55 +		</developer>
    1.56 +		<developer>
    1.57 +			<id>charnik</id>
    1.58 +			<name>Charalampos Nikolaou</name>
    1.59 +			<email>charnik@di.uoa.gr</email>
    1.60 +			<url>http://www.di.uoa.gr/~charnik</url>
    1.61 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.62 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    1.63 +			<timezone>+2</timezone>
    1.64 +			<properties>
    1.65 +				<picUrl>http://www.madgik.di.uoa.gr/sites/default/files/imagecache/profile_image/madgik-photo-charnik_0.jpg</picUrl>
    1.66 +			</properties>
    1.67 +		</developer>
    1.68 +		<developer>
    1.69 +			<id>ggarbis</id>
    1.70 +			<name>Giorgos Garbis</name>
    1.71 +			<email>ggarbis@di.uoa.gr</email>
    1.72 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.73 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    1.74 +			<timezone>+2</timezone>
    1.75 +		</developer>
    1.76 +		<developer>
    1.77 +			<id>kbereta</id>
    1.78 +			<name>Konstantina Bereta</name>
    1.79 +			<email>konstantina.bereta@di.uoa.gr</email>
    1.80 +			<url>http://cgi.di.uoa.gr/~grad1110/</url>
    1.81 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.82 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    1.83 +			<timezone>+2</timezone>
    1.84 +		</developer>
    1.85 +		<developer>
    1.86 +			<id>sgian</id>
    1.87 +			<name>Stella Gianakopoulou</name>
    1.88 +			<email>sgian@di.uoa.gr</email>
    1.89 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.90 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    1.91 +			<timezone>+2</timezone>
    1.92 +		</developer>
    1.93 +		<developer>
    1.94 +			<id>psmeros</id>
    1.95 +			<name>Panayiotis Smeros</name>
    1.96 +			<email>psmeros@di.uoa.gr</email>
    1.97 +			<url>http://users.uoa.gr/~psmeros/</url>
    1.98 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    1.99 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
   1.100 +			<timezone>+2</timezone>
   1.101 +			<properties>
   1.102 +				<picUrl>http://users.uoa.gr/~psmeros/images/psmeros.jpg</picUrl>
   1.103 +			</properties>
   1.104 +		</developer>
   1.105 +		<developer>
   1.106 +			<id>roi</id>
   1.107 +			<name>Kallirroi Dogani</name>
   1.108 +			<email>kallirroi@di.uoa.gr</email><url>http://www.di.uoa.gr/~charnik</url>
   1.109 +			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
   1.110 +			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
   1.111 +			<timezone>+2</timezone>
   1.112 +		</developer>
   1.113 +		<developer>
   1.114 +			<id>koubarak</id>
   1.115 +			<name>Manolis Koubarakis</name>
   1.116 +			<email>koubarak@di.uoa.gr</email>
   1.117 +			<url>http://www.di.uoa.gr/~koubarak</url>
   1.118 +			<organization>Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
   1.119 +			<organizationUrl>http://www.di.uoa.gr/</organizationUrl>
   1.120 +			<timezone>+2</timezone>
   1.121 +		</developer>
   1.122 +	</developers>
   1.123  
   1.124  	<modules>
   1.125  		<module>evaluation</module>
   1.126 @@ -24,12 +131,16 @@
   1.127  		<module>postgis</module>
   1.128  		<module>monetdb</module>
   1.129  		<module>generaldb</module>
   1.130 -		<module>resultio</module>
   1.131 +		<module>resultio-spatial</module>
   1.132  		<module>endpoint</module>
   1.133 +		<module>endpoint-client</module>
   1.134 +		<module>endpoint-exec</module>
   1.135 +		<module>testsuite</module>
   1.136 +		<module>vocab</module>
   1.137  	</modules>
   1.138  
   1.139  	<properties>
   1.140 -        <eu.earthobservatory.version>3.2.3-MonetDB-SNAPSHOT</eu.earthobservatory.version>
   1.141 +	        <eu.earthobservatory.version>3.2.10-MonetDB-SNAPSHOT</eu.earthobservatory.version>
   1.142  		<sesame.version>2.6.3</sesame.version>
   1.143  		<aduna.appbase.version>3.5.0</aduna.appbase.version>
   1.144  		<!--slf4j.version>1.5.8</slf4j.version-->
   1.145 @@ -53,11 +164,67 @@
   1.146  				<version>${eu.earthobservatory.version}</version>
   1.147  			</dependency>
   1.148  
   1.149 +
   1.150 +		<!-- queryresultio-spatial dependencies-->
   1.151  			<dependency>
   1.152  				<groupId>org.openrdf.sesame</groupId>
   1.153 -				<artifactId>sesame-queryresultio-spatial</artifactId>
   1.154 +				<artifactId>sesame-queryresultio-spatial-api</artifactId>
   1.155  				<version>${eu.earthobservatory.version}</version>
   1.156  			</dependency>
   1.157 +			<dependency>
   1.158 +				<groupId>org.openrdf.sesame</groupId>
   1.159 +				<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
   1.160 +				<version>${eu.earthobservatory.version}</version>
   1.161 +			</dependency>
   1.162 +			<dependency>
   1.163 +				<groupId>org.openrdf.sesame</groupId>
   1.164 +				<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
   1.165 +				<version>${eu.earthobservatory.version}</version>
   1.166 +			</dependency>
   1.167 +			<dependency>
   1.168 +				<groupId>org.openrdf.sesame</groupId>
   1.169 +				<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
   1.170 +				<version>${eu.earthobservatory.version}</version>
   1.171 +			</dependency>
   1.172 +			<dependency>
   1.173 +				<groupId>org.openrdf.sesame</groupId>
   1.174 +				<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
   1.175 +				<version>${eu.earthobservatory.version}</version>
   1.176 +			</dependency>
   1.177 +			<dependency>
   1.178 +				<groupId>org.openrdf.sesame</groupId>
   1.179 +				<artifactId>sesame-queryresultio-spatial-text</artifactId>
   1.180 +				<version>${eu.earthobservatory.version}</version>
   1.181 +			</dependency>
   1.182 +		<!-- queryresultio-spatial dependencies-->
   1.183 +
   1.184 +		<!-- sesame queryresultio dependencies -->
   1.185 +			<dependency>
   1.186 +				<groupId>org.openrdf.sesame</groupId>
   1.187 +				<artifactId>sesame-queryresultio-api</artifactId>
   1.188 +				<version>${sesame.version}</version>
   1.189 +			</dependency>
   1.190 +			<dependency>
   1.191 +				<groupId>org.openrdf.sesame</groupId>
   1.192 +				<artifactId>sesame-queryresultio-sparqlxml</artifactId>
   1.193 +				<version>${sesame.version}</version>
   1.194 +			</dependency>
   1.195 +			<dependency>
   1.196 +				<groupId>org.openrdf.sesame</groupId>
   1.197 +				<artifactId>sesame-queryresultio-text</artifactId>
   1.198 +				<version>${sesame.version}</version>
   1.199 +			</dependency>
   1.200 +			<dependency>
   1.201 +				<groupId>org.openrdf.sesame</groupId>
   1.202 +				<artifactId>sesame-queryresultio-binary</artifactId>
   1.203 +				<version>${sesame.version}</version>
   1.204 +			</dependency>
   1.205 +			<dependency>
   1.206 +				<groupId>org.openrdf.sesame</groupId>
   1.207 +				<artifactId>sesame-queryresultio-sparqljson</artifactId>
   1.208 +				<version>${sesame.version}</version>
   1.209 +			</dependency>
   1.210 +		<!-- sesame queryresultio dependencies -->
   1.211  
   1.212  			<dependency>
   1.213  				<groupId>org.openrdf.sesame</groupId>
   1.214 @@ -84,6 +251,12 @@
   1.215  			</dependency>
   1.216  
   1.217  			<dependency>
   1.218 +				<groupId>eu.earthobservatory</groupId>
   1.219 +				<artifactId>strabon-vocabulary</artifactId>
   1.220 +				<version>${eu.earthobservatory.version}</version>
   1.221 +			</dependency>
   1.222 +
   1.223 +			<dependency>
   1.224  				<groupId>org.openrdf.sesame</groupId>
   1.225  				<artifactId>sesame-sail-postgis</artifactId>
   1.226  				<version>${eu.earthobservatory.version}</version>
   1.227 @@ -209,6 +382,11 @@
   1.228  			<!-- RIO -->
   1.229  			<dependency>
   1.230  				<groupId>org.openrdf.sesame</groupId>
   1.231 +				<artifactId>sesame-rio-api</artifactId>
   1.232 +				<version>${sesame.version}</version>
   1.233 +			</dependency>
   1.234 +			<dependency>
   1.235 +				<groupId>org.openrdf.sesame</groupId>
   1.236  				<artifactId>sesame-rio-rdfxml</artifactId>
   1.237  				<version>${sesame.version}</version>
   1.238  			</dependency>
   1.239 @@ -354,11 +532,13 @@
   1.240  				<version>5.1.15</version>
   1.241  			</dependency>
   1.242  
   1.243 +			<!--
   1.244  			<dependency>
   1.245  				<groupId>net.sf</groupId>
   1.246  				<artifactId>log4jdbc4</artifactId>
   1.247  				<version>1.2</version>
   1.248  			</dependency>
   1.249 +			-->
   1.250  
   1.251  			<!--  LOG4J -->
   1.252  			<dependency>
   1.253 @@ -495,16 +675,16 @@
   1.254  				<version>2.2</version>
   1.255  			</dependency>
   1.256  
   1.257 -<dependency>
   1.258 -	<groupId>org.jvnet.ogc</groupId>
   1.259 -	<artifactId>ogc-tools-gml-jts</artifactId>
   1.260 -	<version>1.0.2</version>
   1.261 -</dependency>
   1.262 -<dependency>
   1.263 -	<groupId>com.sun.xml.bind</groupId>
   1.264 -	<artifactId>jaxb-impl</artifactId>
   1.265 -	<version>2.1.1</version>
   1.266 -</dependency>
   1.267 +			<dependency>
   1.268 +				<groupId>org.jvnet.ogc</groupId>
   1.269 +				<artifactId>ogc-tools-gml-jts</artifactId>
   1.270 +				<version>1.0.2</version>
   1.271 +			</dependency>
   1.272 +			<dependency>
   1.273 +				<groupId>com.sun.xml.bind</groupId>
   1.274 +				<artifactId>jaxb-impl</artifactId>
   1.275 +				<version>2.1.1</version>
   1.276 +			</dependency>
   1.277  
   1.278  			<dependency>
   1.279  				<groupId>javax</groupId>
   1.280 @@ -560,9 +740,9 @@
   1.281  			<plugin>
   1.282  		        <groupId>org.apache.maven.plugins</groupId>
   1.283  		        <artifactId>maven-surefire-plugin</artifactId>
   1.284 -		        <version>2.12</version>
   1.285 +		        <version>2.14</version>
   1.286  		        <configuration>
   1.287 -		          <skipTests>${skipTests}</skipTests>
   1.288 +		        <skipTests>${skipTests}</skipTests>
   1.289  			    </configuration>
   1.290  		    </plugin>
   1.291  		</plugins>
   1.292 @@ -579,6 +759,31 @@
   1.293  					<encoding>utf8</encoding>
   1.294  				</configuration>
   1.295  			</plugin>
   1.296 +			<!--
   1.297 +			<plugin>
   1.298 +				<groupId>org.apache.maven.plugins</groupId>
   1.299 +				<artifactId>maven-javadoc-plugin</artifactId>
   1.300 +				<reportSets>
   1.301 +					<reportSet>
   1.302 +						<id>uml</id>
   1.303 +						<configuration>
   1.304 +							<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
   1.305 +							<docletArtifact>
   1.306 +								<groupId>org.umlgraph</groupId>
   1.307 +								<artifactId>doclet</artifactId>
   1.308 +								<version>5.1</version>
   1.309 +							</docletArtifact>
   1.310 +							<additionalparam>-views</additionalparam>
   1.311 +							<destDir>target/uml</destDir>
   1.312 +							<show>private</show>
   1.313 +						</configuration>
   1.314 +						<reports>
   1.315 +						<report>javadoc</report>
   1.316 +						</reports>
   1.317 +					</reportSet>
   1.318 +				</reportSets>
   1.319 +			</plugin>
   1.320 +			-->
   1.321  		</plugins>
   1.322  	</reporting>
   1.323  
   1.324 @@ -602,12 +807,38 @@
   1.325  	</pluginRepositories>
   1.326  
   1.327  	<scm>
   1.328 -		<connection>scm:hg:ssh://hg.strabon.di.uoa.gr//opt/hg/Strabon/</connection>
   1.329 +		<connection>scm:hg:http://hg.strabon.di.uoa.gr/Strabon/</connection>
   1.330  		<developerConnection>scm:hg:ssh://hg.strabon.di.uoa.gr//opt/hg/Strabon/</developerConnection>
   1.331  		<url>http://hg.strabon.di.uoa.gr/Strabon/</url>
   1.332  	  <tag>HEAD</tag>
   1.333    </scm>
   1.334 -
   1.335 +	
   1.336 +	<issueManagement>
   1.337 +		<system>Trac</system>
   1.338 +		<url>http://bug.strabon.di.uoa.gr/</url>
   1.339 +	</issueManagement>
   1.340 +	
   1.341 +	<ciManagement>
   1.342 +		<system>Jekins - Continuous Integration System</system>
   1.343 +		<url>http://test.strabon.di.uoa.gr/cis</url>
   1.344 +	</ciManagement>
   1.345 +	
   1.346 +	<mailingLists>
   1.347 +		<mailingList>
   1.348 +			<name>User List</name>
   1.349 +			<subscribe>strabon-users-request@di.uoa.gr</subscribe>
   1.350 +			<unsubscribe>strabon-users-request@di.uoa.gr</unsubscribe>
   1.351 +			<post>strabon-users@di.uoa.gr</post>
   1.352 +			<archive>http://cgi.di.uoa.gr/~mailman/pipermail/strabon-users/</archive>
   1.353 +		</mailingList>
   1.354 +		<mailingList>
   1.355 +			<name>Developers List</name>
   1.356 +			<subscribe>strabon-devel-request@di.uoa.gr</subscribe>
   1.357 +			<unsubscribe>strabon-devel-request@di.uoa.gr</unsubscribe>
   1.358 +			<post>strabon-devel@di.uoa.gr</post>
   1.359 +			<archive>http://cgi.di.uoa.gr/~mailman/pipermail/strabon-devel/</archive>
   1.360 +		</mailingList>
   1.361 +	</mailingLists>
   1.362  	<repositories>
   1.363  		<!--
   1.364  		<repository>
   1.365 @@ -644,6 +875,8 @@
   1.366  			<name>Strabon - maven repository - snapshots</name>
   1.367  			<url>http://maven.strabon.di.uoa.gr/content/repositories/snapshots</url>
   1.368  		</repository>
   1.369 +
   1.370 +		<!--
   1.371  		<repository>
   1.372  			<releases>
   1.373  				<enabled>true</enabled>
   1.374 @@ -655,6 +888,7 @@
   1.375  			<name>Strabon - maven repository - sesame artifacts (temporary)</name>
   1.376  			<url>http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame</url>
   1.377  		</repository>
   1.378 +		-->
   1.379  		<!--
   1.380  		<repository>
   1.381  			<releases>
   1.382 @@ -687,6 +921,16 @@
   1.383  			<name>OpenGeo Maven Repository</name>
   1.384  			<url>http://download.osgeo.org/webdav/geotools/</url>
   1.385  		</repository>
   1.386 +		<!--
   1.387 +		<repository>
   1.388 +			<snapshots>
   1.389 +				<enabled>false</enabled>
   1.390 +			</snapshots>
   1.391 +			<id>umlgraph</id>
   1.392 +			<name>UMLGraph binaries provider</name>
   1.393 +			<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
   1.394 +		</repository>
   1.395 +		-->
   1.396  	</repositories>
   1.397  
   1.398  	<distributionManagement>