Strabon

changeset 761:9d2553759226

Merge
author Stella Giannakopoulou <sgian@di.uoa.gr>
date Fri Nov 30 15:23:53 2012 +0200 (2012-11-30)
parents 3e360dce98ef 647131f2ba9e
children 91c47ca1dd39
files
line diff
     1.1 --- a/.hgignore	Fri Nov 30 15:20:08 2012 +0200
     1.2 +++ b/.hgignore	Fri Nov 30 15:23:53 2012 +0200
     1.3 @@ -11,3 +11,4 @@
     1.4  stdout\.txt
     1.5  stderr\.log
     1.6  stdout\.log
     1.7 +endpoint-client/dependency-reduced-pom\.xml
     2.1 --- a/AUTHORS	Fri Nov 30 15:20:08 2012 +0200
     2.2 +++ b/AUTHORS	Fri Nov 30 15:23:53 2012 +0200
     2.3 @@ -6,4 +6,4 @@
     2.4  Charalampos Nikolaou	<charnik@di.uoa.gr>
     2.5  Stella Gianakopoulou	<sgian@di.uoa.gr>
     2.6  Panagiotis Smeros	<psmeros@di.uoa.gr>
     2.7 -Kallirroi Dogani	<roi@di.uoa.gr>
     2.8 +Kallirroi Dogani	<kallirroi@di.uoa.gr>
     3.1 --- a/ChangeLog	Fri Nov 30 15:20:08 2012 +0200
     3.2 +++ b/ChangeLog	Fri Nov 30 15:23:53 2012 +0200
     3.3 @@ -2,6 +2,12 @@
     3.4  
     3.5  	* Version 3.2.5 released.
     3.6  
     3.7 +	* Added support for querying temporal information.
     3.8 +
     3.9 +	* Changed behaviour of Strabon and Strabon Endpoint for connecting to
    3.10 +	a spatially-enabled database. Only one instance of Strabon is allowed
    3.11 +	at a time.
    3.12 +
    3.13  	* Implemented a Java client for Strabon Endpoint. The client should be
    3.14  	used only with endpoint versions >=3.2.5. The implementation may be
    3.15  	found int the `endpoint-client' submodule of maven. Currently, only
     4.1 --- a/endpoint-client/pom.xml	Fri Nov 30 15:20:08 2012 +0200
     4.2 +++ b/endpoint-client/pom.xml	Fri Nov 30 15:23:53 2012 +0200
     4.3 @@ -61,12 +61,6 @@
     4.4  	<build>
     4.5  		<pluginManagement>
     4.6  			<plugins>
     4.7 -				<!-- FIXME: version 2.2-beta-2 causes a lot problems -->
     4.8 -				<plugin>
     4.9 -					<groupId>org.apache.maven.plugins</groupId>
    4.10 -					<artifactId>maven-assembly-plugin</artifactId>
    4.11 -					<version>2.2-beta-1</version>
    4.12 -				</plugin>
    4.13  				<plugin>
    4.14  					<groupId>org.eclipse.m2e</groupId>
    4.15  					<artifactId>lifecycle-mapping</artifactId>
    4.16 @@ -97,6 +91,23 @@
    4.17  		<plugins>
    4.18  			<plugin>
    4.19  				<groupId>org.apache.maven.plugins</groupId>
    4.20 +				<artifactId>maven-shade-plugin</artifactId>
    4.21 +				<version>2.0</version>
    4.22 +			<!--
    4.23 +				<configuration>
    4.24 +				</configuration>
    4.25 +			-->
    4.26 +				<executions>
    4.27 +					<execution>
    4.28 +						<phase>package</phase>
    4.29 +						<goals>
    4.30 +							<goal>shade</goal>
    4.31 +						</goals>
    4.32 +					</execution>
    4.33 +				</executions>
    4.34 +			</plugin>
    4.35 +			<plugin>
    4.36 +				<groupId>org.apache.maven.plugins</groupId>
    4.37  				<artifactId>maven-compiler-plugin</artifactId>
    4.38  				<version>2.3.2</version>
    4.39  				<configuration>
     5.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Fri Nov 30 15:20:08 2012 +0200
     5.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Fri Nov 30 15:23:53 2012 +0200
     5.3 @@ -55,7 +55,7 @@
     5.4  
     5.5          <constructor-arg type="boolean" >
     5.6              <!-- Check for locks and remove them (in case of a crash) -->
     5.7 -            <value>true</value>
     5.8 +            <value>false</value>
     5.9          </constructor-arg>
    5.10  
    5.11          <constructor-arg type="java.lang.String" >
    5.12 @@ -70,12 +70,13 @@
    5.13          
    5.14          <constructor-arg type="java.lang.String" >
    5.15              <!-- Default prefixes -->
    5.16 +            <!-- PREFIX gag: <http://teleios.di.uoa.gr/ontologies/gagKallikratis.rdf#> -->
    5.17              <value><![CDATA[PREFIX lgd:<http://linkedgeodata.org/triplify/>
    5.18  PREFIX lgdgeo:<http://www.w3.org/2003/01/geo/wgs84_pos#>
    5.19  PREFIX lgdont:<http://linkedgeodata.org/ontology/>
    5.20  PREFIX geonames:<http://www.geonames.org/ontology#>
    5.21  PREFIX clc: <http://geo.linkedopendata.gr/corine/ontology#>
    5.22 -PREFIX gag: <http://teleios.di.uoa.gr/ontologies/gagKallikratis.rdf#>
    5.23 +PREFIX gag: <http://geo.linkedopendata.gr/gag/ontology/>
    5.24  PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
    5.25  PREFIX dlr: <http://www.earthobservatory.eu/ontologies/dlrOntology-v2.owl#>
    5.26  PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
     6.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Fri Nov 30 15:20:08 2012 +0200
     6.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Fri Nov 30 15:23:53 2012 +0200
     6.3 @@ -132,7 +132,7 @@
     6.4  			try {
     6.5  				logger.warn("[StrabonEndpoint] Strabon not initialized yet.");
     6.6  				logger.warn("[StrabonEndpoint] Initializing Strabon.");
     6.7 -				logger.info("[StrabonEndpoint] Connection details:\n" + this.getDetails());
     6.8 +				//logger.info("[StrabonEndpoint] Connection details:\n" + this.getDetails());
     6.9  				
    6.10  				// initialize Strabon according to user preference
    6.11  				if (Common.DBBACKEND_MONETDB.equalsIgnoreCase(dbBackend)) {
    6.12 @@ -150,7 +150,7 @@
    6.13  				
    6.14  				
    6.15  			} catch (Exception e) {
    6.16 -				logger.error("[StrabonEndpoint] Exception occured while creating Strabon.\n" + this.getDetails(), e);
    6.17 +				logger.error("[StrabonEndpoint] Exception occured while creating Strabon. {}\n{}", e.getMessage(), this.getDetails());
    6.18  				return false;
    6.19  			}
    6.20  		}
     7.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Fri Nov 30 15:20:08 2012 +0200
     7.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Fri Nov 30 15:23:53 2012 +0200
     7.3 @@ -76,15 +76,19 @@
     7.4  	private SailRepository repo1;
     7.5  	private SailRepositoryConnection con1 = null;
     7.6  
     7.7 -	public Strabon(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable) throws SQLException, ClassNotFoundException {
     7.8 +	public Strabon(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable) throws Exception {
     7.9  		this.databaseName = databaseName;
    7.10  		this.user = user;
    7.11  		this.password = password;
    7.12  		this.port = port;
    7.13  		this.serverName = serverName;
    7.14  		
    7.15 -		if (checkForLockTable == true) {
    7.16 +		if (checkForLockTable == true) { // force check of locked table and delete if exists
    7.17  			checkAndDeleteLock(databaseName, user, password, port, serverName);
    7.18 +			
    7.19 +		} else if (isLocked()) { // check for lock and exit if exists
    7.20 +			throw new Exception("Cannot connect to database. Database is already locked by another process.");
    7.21 +			
    7.22  		}
    7.23  
    7.24  		initiate(databaseName, user, password, port, serverName);
    7.25 @@ -143,6 +147,12 @@
    7.26  		}
    7.27  	}
    7.28  
    7.29 +	/**
    7.30 +	 * Check whether the database is locked by another instance of Strabon or Endpoint.
    7.31 +	 * 
    7.32 +	 * @return
    7.33 +	 */
    7.34 +	protected abstract boolean isLocked() throws SQLException, ClassNotFoundException;
    7.35  
    7.36  	protected abstract void checkAndDeleteLock(String databaseName, String user, String password, int port, String serverName)
    7.37  			throws SQLException, ClassNotFoundException;
    7.38 @@ -166,8 +176,17 @@
    7.39  			con1.close();
    7.40  			repo1.shutDown();
    7.41  			
    7.42 +			// delete the lock as well
    7.43 +			checkAndDeleteLock(databaseName, user, password, port, serverName);
    7.44 +			
    7.45  		} catch (RepositoryException e) {
    7.46  			logger.error("[Strabon.close]", e);
    7.47 +			
    7.48 +		} catch (SQLException e) {
    7.49 +			logger.error("[Strabon.close] Error in deleting lock", e);
    7.50 +			
    7.51 +		} catch (ClassNotFoundException e) {
    7.52 +			logger.error("[Strabon.close] Error in deleting lock", e);
    7.53  		}
    7.54  
    7.55  		logger.info("[Strabon.close] Connection closed.");
     8.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/DescribeOp.java	Fri Nov 30 15:20:08 2012 +0200
     8.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/DescribeOp.java	Fri Nov 30 15:23:53 2012 +0200
     8.3 @@ -48,7 +48,7 @@
     8.4  
     8.5  		Strabon strabon = null;
     8.6  		try { 
     8.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
     8.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
     8.9  			strabon.describe(queryString, format, strabon.getSailRepoConnection(), System.out);
    8.10  			
    8.11  		} catch (Exception e) {
     9.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/QueryDir.java	Fri Nov 30 15:20:08 2012 +0200
     9.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/QueryDir.java	Fri Nov 30 15:23:53 2012 +0200
     9.3 @@ -58,7 +58,7 @@
     9.4  
     9.5  		Strabon strabon = null;
     9.6  		try {
     9.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
     9.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
     9.9  
    9.10  			File dir = new File(path);
    9.11  			FilenameFilter filter = new FilenameFilter() {
    10.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/QueryOp.java	Fri Nov 30 15:20:08 2012 +0200
    10.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/QueryOp.java	Fri Nov 30 15:23:53 2012 +0200
    10.3 @@ -49,7 +49,7 @@
    10.4  
    10.5  		Strabon strabon = null;
    10.6  		try {
    10.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    10.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    10.9  			strabon.query(queryString, Format.fromString(resultsFormat), strabon.getSailRepoConnection(), System.out);
   10.10  			
   10.11  		} catch (Exception e) {
    11.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/StoreOp.java	Fri Nov 30 15:20:08 2012 +0200
    11.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/StoreOp.java	Fri Nov 30 15:23:53 2012 +0200
    11.3 @@ -47,7 +47,7 @@
    11.4  
    11.5  		Strabon strabon = null;
    11.6  		try {
    11.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    11.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    11.9  			strabon.storeInRepo(src, format);
   11.10  		
   11.11  		} catch (Exception e) {
    12.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/Strabon.java	Fri Nov 30 15:20:08 2012 +0200
    12.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/Strabon.java	Fri Nov 30 15:23:53 2012 +0200
    12.3 @@ -13,17 +13,23 @@
    12.4  import java.sql.DriverManager;
    12.5  import java.sql.ResultSet;
    12.6  import java.sql.SQLException;
    12.7 +import java.sql.Statement;
    12.8  
    12.9  import org.openrdf.sail.monetdb.MonetDBSqlStore;
   12.10  import org.slf4j.Logger;
   12.11  import org.slf4j.LoggerFactory;
   12.12  
   12.13 +/**
   12.14 + * 
   12.15 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   12.16 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   12.17 + */
   12.18  public class Strabon extends eu.earthobservatory.runtime.generaldb.Strabon {
   12.19  	
   12.20  	private static Logger logger = LoggerFactory.getLogger(eu.earthobservatory.runtime.monetdb.Strabon.class);
   12.21  
   12.22  	public Strabon(String databaseName, String user, String password, int port, 
   12.23 -			String serverName, boolean checkForLockTable) throws SQLException, ClassNotFoundException {
   12.24 +			String serverName, boolean checkForLockTable) throws Exception {
   12.25  		super(databaseName, user, password, port, serverName, checkForLockTable);
   12.26  	}
   12.27  
   12.28 @@ -59,8 +65,9 @@
   12.29  			java.sql.Statement st = conn.createStatement();
   12.30  			// change
   12.31  			ResultSet resultSet = st.executeQuery("SELECT true FROM sys._tables WHERE name='locked' AND system=false");
   12.32 -			if ( resultSet.next() )
   12.33 +			if (resultSet.next()) {
   12.34  				st.execute("DROP TABLE \"locked\"");
   12.35 +			}
   12.36  			st.close();
   12.37  			conn.close();
   12.38  		} catch (SQLException e) {
   12.39 @@ -84,4 +91,42 @@
   12.40  	        logger.warn("[Strabon.deregisterDriver] Could not deregister JDBC driver: {}", e.getMessage());
   12.41  	    }
   12.42  	}
   12.43 +
   12.44 +	@Override
   12.45 +	protected boolean isLocked() throws SQLException, ClassNotFoundException {
   12.46 +		Connection conn = null;
   12.47 +		Statement st = null;
   12.48 +		String url = "";
   12.49 +		
   12.50 +		try {
   12.51 +			logger.info("[Strabon] Checking for locks...");
   12.52 +			Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
   12.53 +			url = "jdbc:monetdb://" + serverName + ":" + port + "/" + databaseName + "?user=" + user + "&password=" + password;
   12.54 +			
   12.55 +			conn = DriverManager.getConnection(url);
   12.56 +			st = conn.createStatement();
   12.57 +
   12.58 +			ResultSet resultSet = st.executeQuery("SELECT true FROM sys._tables WHERE name='locked' AND system=false");
   12.59 +			return resultSet.next() ? true:false;
   12.60 +			
   12.61 +		} catch (SQLException e) {
   12.62 +			logger.error("[Strabon.isLocked] SQL Exception occured. Connection URL is <{}>: {}", url, e.getMessage());
   12.63 +			throw e;
   12.64 +			
   12.65 +		} catch (ClassNotFoundException e) {
   12.66 +			logger.error("[Strabon.isLocked] Could not load postgres jdbc driver: {}", e.getMessage());
   12.67 +			throw e;
   12.68 +			
   12.69 +		} finally {
   12.70 +			// close statement and connection
   12.71 +			if (st != null) {
   12.72 +				st.close();
   12.73 +			}
   12.74 +			
   12.75 +			if (conn != null) {
   12.76 +				conn.close();
   12.77 +			}
   12.78 +		}
   12.79 +
   12.80 +	}
   12.81  }
    13.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/UpdateOp.java	Fri Nov 30 15:20:08 2012 +0200
    13.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/monetdb/UpdateOp.java	Fri Nov 30 15:23:53 2012 +0200
    13.3 @@ -43,7 +43,7 @@
    13.4  		
    13.5  		Strabon strabon = null;
    13.6  		try {
    13.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    13.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    13.9  			strabon.update(queryString, strabon.getSailRepoConnection());
   13.10  			
   13.11  		} catch (Exception e) {
    14.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/DescribeOp.java	Fri Nov 30 15:20:08 2012 +0200
    14.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/DescribeOp.java	Fri Nov 30 15:23:53 2012 +0200
    14.3 @@ -47,7 +47,7 @@
    14.4  		
    14.5  		Strabon strabon = null;
    14.6  		try {
    14.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    14.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    14.9  			strabon.describe(queryString, format, strabon.getSailRepoConnection(), System.out);
   14.10  			
   14.11  		} catch (Exception e) {
    15.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryDir.java	Fri Nov 30 15:20:08 2012 +0200
    15.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryDir.java	Fri Nov 30 15:23:53 2012 +0200
    15.3 @@ -57,7 +57,7 @@
    15.4  
    15.5  		Strabon strabon = null;
    15.6  		try {
    15.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    15.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    15.9  	
   15.10  			File dir = new File(path);
   15.11  			FilenameFilter filter = new FilenameFilter() {
    16.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryOp.java	Fri Nov 30 15:20:08 2012 +0200
    16.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/QueryOp.java	Fri Nov 30 15:23:53 2012 +0200
    16.3 @@ -49,7 +49,7 @@
    16.4  
    16.5  		Strabon strabon = null;
    16.6  		try {
    16.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    16.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    16.9  			strabon.query(queryString, Format.fromString(resultsFormat), strabon.getSailRepoConnection(), System.out);
   16.10  			
   16.11  		} catch (Exception e) {
    17.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/StoreOp.java	Fri Nov 30 15:20:08 2012 +0200
    17.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/StoreOp.java	Fri Nov 30 15:23:53 2012 +0200
    17.3 @@ -48,7 +48,7 @@
    17.4  
    17.5  		Strabon strabon = null;
    17.6  		try {
    17.7 -			strabon = new Strabon(db, user, passwd, port, host, true);
    17.8 +			strabon = new Strabon(db, user, passwd, port, host, false);
    17.9  			strabon.storeInRepo(src, format);
   17.10  			
   17.11  		} catch (Exception e) {
    18.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/Strabon.java	Fri Nov 30 15:20:08 2012 +0200
    18.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/Strabon.java	Fri Nov 30 15:23:53 2012 +0200
    18.3 @@ -11,22 +11,28 @@
    18.4  
    18.5  import java.sql.Connection;
    18.6  import java.sql.DriverManager;
    18.7 +import java.sql.ResultSet;
    18.8  import java.sql.SQLException;
    18.9 +import java.sql.Statement;
   18.10  
   18.11  import org.openrdf.sail.postgis.PostGISSqlStore;
   18.12  import org.slf4j.Logger;
   18.13  import org.slf4j.LoggerFactory;
   18.14  
   18.15 +/**
   18.16 + * 
   18.17 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   18.18 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   18.19 + */
   18.20  public class Strabon extends eu.earthobservatory.runtime.generaldb.Strabon {
   18.21  
   18.22  	private static Logger logger = LoggerFactory.getLogger(eu.earthobservatory.runtime.postgis.Strabon.class);
   18.23  	
   18.24  	public Strabon(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable) 
   18.25 -	throws SQLException, ClassNotFoundException {
   18.26 +	throws Exception {
   18.27  		super(databaseName, user, password, port, serverName, checkForLockTable);
   18.28  	}
   18.29  
   18.30 -
   18.31  	protected void initiate(String databaseName, String user, String password, int port, String serverName) {
   18.32  		db_store = new PostGISSqlStore();
   18.33  
   18.34 @@ -76,4 +82,41 @@
   18.35  	        logger.warn("[Strabon.deregisterDriver] Could not deregister JDBC driver: {}", e.getMessage());
   18.36  	    }
   18.37  	}
   18.38 +
   18.39 +	@Override
   18.40 +	protected boolean isLocked() throws SQLException, ClassNotFoundException{
   18.41 +		Connection conn = null;
   18.42 +		Statement st = null;
   18.43 +		String url = "";
   18.44 +		
   18.45 +		try {
   18.46 +			logger.info("[Strabon] Checking for locks...");
   18.47 +			Class.forName("org.postgresql.Driver");
   18.48 +			url = "jdbc:postgresql://" + serverName + ":" + port + "/" + databaseName + "?user=" + user + "&password=" + password;
   18.49 +			
   18.50 +			conn = DriverManager.getConnection(url);
   18.51 +			st = conn.createStatement();
   18.52 +			ResultSet rs = st.executeQuery("SELECT tablename FROM pg_tables WHERE schemaname='public' AND tablename='locked';");
   18.53 +
   18.54 +			return rs.next() ? true:false;
   18.55 +			
   18.56 +		} catch (SQLException e) {
   18.57 +			logger.error("[Strabon.isLocked] SQL Exception occured. Connection URL is <{}>: {}", url, e.getMessage());
   18.58 +			throw e;
   18.59 +			
   18.60 +		} catch (ClassNotFoundException e) {
   18.61 +			logger.error("[Strabon.isLocked] Could not load postgres jdbc driver: {}", e.getMessage());
   18.62 +			throw e;
   18.63 +			
   18.64 +		} finally {
   18.65 +			// close statement and connection
   18.66 +			if (st != null) {
   18.67 +				st.close();
   18.68 +			}
   18.69 +			
   18.70 +			if (conn != null) {
   18.71 +				conn.close();
   18.72 +			}
   18.73 +		}
   18.74 +	}
   18.75  }
    19.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/UpdateOp.java	Fri Nov 30 15:20:08 2012 +0200
    19.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/UpdateOp.java	Fri Nov 30 15:23:53 2012 +0200
    19.3 @@ -42,7 +42,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.update(queryString, strabon.getSailRepoConnection());
   19.10  			
   19.11  		} catch (Exception e) {
    20.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/testCRS.java	Fri Nov 30 15:20:08 2012 +0200
    20.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/testCRS.java	Fri Nov 30 15:23:53 2012 +0200
    20.3 @@ -33,6 +33,8 @@
    20.4  		} catch (ClassNotFoundException e) {
    20.5  			// TODO Auto-generated catch block
    20.6  			e.printStackTrace();
    20.7 +		} catch (Exception e) {
    20.8 +			e.printStackTrace();
    20.9  		}
   20.10  		
   20.11  		String text = 
    21.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/AggregateTests.java	Fri Nov 30 15:20:08 2012 +0200
    21.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/AggregateTests.java	Fri Nov 30 15:23:53 2012 +0200
    21.3 @@ -9,16 +9,10 @@
    21.4   */
    21.5  package eu.earthobservatory.runtime.monetdb;
    21.6  
    21.7 -import java.io.IOException;
    21.8  import java.sql.SQLException;
    21.9  
   21.10  import org.junit.AfterClass;
   21.11  import org.junit.BeforeClass;
   21.12 -import org.openrdf.repository.RepositoryException;
   21.13 -import org.openrdf.rio.RDFHandlerException;
   21.14 -import org.openrdf.rio.RDFParseException;
   21.15 -
   21.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   21.17  
   21.18  /**
   21.19   * A set of simple tests on SPARQL query functionality 
   21.20 @@ -28,7 +22,7 @@
   21.21  public class AggregateTests extends eu.earthobservatory.runtime.generaldb.AggregateTests {
   21.22  
   21.23  	@BeforeClass
   21.24 -	public static void beforeClass(String inputfile) throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   21.25 +	public static void beforeClass(String inputfile) throws Exception
   21.26  	{
   21.27  		 strabon = TemplateTests.beforeClass("/aggregate-tests-srid.nt");
   21.28  
    22.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/GeneralTests.java	Fri Nov 30 15:20:08 2012 +0200
    22.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/GeneralTests.java	Fri Nov 30 15:23:53 2012 +0200
    22.3 @@ -18,11 +18,6 @@
    22.4  import org.openrdf.query.MalformedQueryException;
    22.5  import org.openrdf.query.QueryEvaluationException;
    22.6  import org.openrdf.query.TupleQueryResultHandlerException;
    22.7 -import org.openrdf.repository.RepositoryException;
    22.8 -import org.openrdf.rio.RDFHandlerException;
    22.9 -import org.openrdf.rio.RDFParseException;
   22.10 -
   22.11 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   22.12  
   22.13  /**
   22.14   * A set of simple tests on SPARQL query functionality 
   22.15 @@ -32,7 +27,7 @@
   22.16  public class GeneralTests extends eu.earthobservatory.runtime.generaldb.GeneralTests {
   22.17  	
   22.18  	@BeforeClass
   22.19 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   22.20 +	public static void beforeClass() throws Exception
   22.21  	{
   22.22  		strabon = TemplateTests.beforeClass("/more-tests.nt");
   22.23  	}
    23.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/HavingTests.java	Fri Nov 30 15:20:08 2012 +0200
    23.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/HavingTests.java	Fri Nov 30 15:23:53 2012 +0200
    23.3 @@ -9,16 +9,10 @@
    23.4   */
    23.5  package eu.earthobservatory.runtime.monetdb;
    23.6  
    23.7 -import java.io.IOException;
    23.8  import java.sql.SQLException;
    23.9  
   23.10  import org.junit.AfterClass;
   23.11  import org.junit.BeforeClass;
   23.12 -import org.openrdf.repository.RepositoryException;
   23.13 -import org.openrdf.rio.RDFHandlerException;
   23.14 -import org.openrdf.rio.RDFParseException;
   23.15 -
   23.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   23.17  
   23.18  /**
   23.19   * 
   23.20 @@ -28,7 +22,7 @@
   23.21  public class HavingTests extends eu.earthobservatory.runtime.generaldb.HavingTests {
   23.22  	
   23.23  	@BeforeClass
   23.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   23.25 +	public static void beforeClass() throws Exception
   23.26  	{
   23.27  		strabon = TemplateTests.beforeClass("/having-tests-srid.nt");
   23.28  	}
    24.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/JoinTests.java	Fri Nov 30 15:20:08 2012 +0200
    24.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/JoinTests.java	Fri Nov 30 15:23:53 2012 +0200
    24.3 @@ -9,16 +9,10 @@
    24.4   */
    24.5  package eu.earthobservatory.runtime.monetdb;
    24.6  
    24.7 -import java.io.IOException;
    24.8  import java.sql.SQLException;
    24.9  
   24.10  import org.junit.AfterClass;
   24.11  import org.junit.BeforeClass;
   24.12 -import org.openrdf.repository.RepositoryException;
   24.13 -import org.openrdf.rio.RDFHandlerException;
   24.14 -import org.openrdf.rio.RDFParseException;
   24.15 -
   24.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   24.17  
   24.18  /**
   24.19   * 
   24.20 @@ -28,7 +22,7 @@
   24.21  public class JoinTests extends eu.earthobservatory.runtime.generaldb.JoinTests {
   24.22  
   24.23  	@BeforeClass
   24.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   24.25 +	public static void beforeClass() throws Exception
   24.26  	{
   24.27  		strabon = TemplateTests.beforeClass("/join-tests-srid.nt");
   24.28  	}
    25.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/MeaningfulAggregateTests.java	Fri Nov 30 15:20:08 2012 +0200
    25.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/MeaningfulAggregateTests.java	Fri Nov 30 15:23:53 2012 +0200
    25.3 @@ -9,21 +9,15 @@
    25.4   */
    25.5  package eu.earthobservatory.runtime.monetdb;
    25.6  
    25.7 -import java.io.IOException;
    25.8  import java.sql.SQLException;
    25.9  
   25.10  import org.junit.AfterClass;
   25.11  import org.junit.BeforeClass;
   25.12 -import org.openrdf.repository.RepositoryException;
   25.13 -import org.openrdf.rio.RDFHandlerException;
   25.14 -import org.openrdf.rio.RDFParseException;
   25.15 -
   25.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   25.17  
   25.18  public class MeaningfulAggregateTests extends eu.earthobservatory.runtime.generaldb.SimpleTests {
   25.19  	
   25.20  	@BeforeClass
   25.21 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   25.22 +	public static void beforeClass() throws Exception
   25.23  	{
   25.24  		strabon = TemplateTests.beforeClass("/more-tests.nt");
   25.25  	}
    26.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/SimpleTests.java	Fri Nov 30 15:20:08 2012 +0200
    26.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/SimpleTests.java	Fri Nov 30 15:23:53 2012 +0200
    26.3 @@ -9,16 +9,10 @@
    26.4   */
    26.5  package eu.earthobservatory.runtime.monetdb;
    26.6  
    26.7 -import java.io.IOException;
    26.8  import java.sql.SQLException;
    26.9  
   26.10  import org.junit.AfterClass;
   26.11  import org.junit.BeforeClass;
   26.12 -import org.openrdf.repository.RepositoryException;
   26.13 -import org.openrdf.rio.RDFHandlerException;
   26.14 -import org.openrdf.rio.RDFParseException;
   26.15 -
   26.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   26.17  
   26.18  /**
   26.19   * A set of simple tests on SPARQL query functionality 
   26.20 @@ -28,7 +22,7 @@
   26.21  public class SimpleTests extends eu.earthobservatory.runtime.generaldb.SimpleTests {
   26.22  
   26.23  	@BeforeClass
   26.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   26.25 +	public static void beforeClass() throws Exception
   26.26  	{
   26.27  		strabon = TemplateTests.beforeClass("/simple-tests.nt");
   26.28  	}
    27.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/SpatialTests.java	Fri Nov 30 15:20:08 2012 +0200
    27.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/SpatialTests.java	Fri Nov 30 15:23:53 2012 +0200
    27.3 @@ -9,16 +9,10 @@
    27.4   */
    27.5  package eu.earthobservatory.runtime.monetdb;
    27.6  
    27.7 -import java.io.IOException;
    27.8  import java.sql.SQLException;
    27.9  
   27.10  import org.junit.AfterClass;
   27.11  import org.junit.BeforeClass;
   27.12 -import org.openrdf.repository.RepositoryException;
   27.13 -import org.openrdf.rio.RDFHandlerException;
   27.14 -import org.openrdf.rio.RDFParseException;
   27.15 -
   27.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   27.17  
   27.18  /**
   27.19   * A set of simple tests on SPARQL query functionality 
   27.20 @@ -28,7 +22,7 @@
   27.21  public class SpatialTests extends eu.earthobservatory.runtime.generaldb.SpatialTests {
   27.22  	
   27.23  	@BeforeClass
   27.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   27.25 +	public static void beforeClass() throws Exception
   27.26  	{
   27.27  		strabon = TemplateTests.beforeClass("/spatial-tests-srid.nt");
   27.28  	}
    28.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/TemplateTests.java	Fri Nov 30 15:20:08 2012 +0200
    28.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/TemplateTests.java	Fri Nov 30 15:23:53 2012 +0200
    28.3 @@ -34,7 +34,7 @@
    28.4  public class TemplateTests extends eu.earthobservatory.runtime.generaldb.SimpleTests {
    28.5  
    28.6  	@BeforeClass
    28.7 -	public static Strabon beforeClass(String inputfile) throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
    28.8 +	public static Strabon beforeClass(String inputfile) throws Exception
    28.9  	{
   28.10  		// Read properties
   28.11  		Properties properties = new Properties();
    29.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/TransformTests.java	Fri Nov 30 15:20:08 2012 +0200
    29.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/monetdb/TransformTests.java	Fri Nov 30 15:23:53 2012 +0200
    29.3 @@ -9,16 +9,10 @@
    29.4   */
    29.5  package eu.earthobservatory.runtime.monetdb;
    29.6  
    29.7 -import java.io.IOException;
    29.8  import java.sql.SQLException;
    29.9  
   29.10  import org.junit.AfterClass;
   29.11  import org.junit.BeforeClass;
   29.12 -import org.openrdf.repository.RepositoryException;
   29.13 -import org.openrdf.rio.RDFHandlerException;
   29.14 -import org.openrdf.rio.RDFParseException;
   29.15 -
   29.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   29.17  
   29.18  /**
   29.19   * A set of simple tests on SPARQL query functionality 
   29.20 @@ -28,7 +22,7 @@
   29.21  public class TransformTests extends eu.earthobservatory.runtime.generaldb.TransformTests {
   29.22  	
   29.23  	@BeforeClass
   29.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   29.25 +	public static void beforeClass() throws Exception
   29.26  	{
   29.27  		strabon = TemplateTests.beforeClass("/transform-tests.nt");
   29.28  	}
    30.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/AggregateTests.java	Fri Nov 30 15:20:08 2012 +0200
    30.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/AggregateTests.java	Fri Nov 30 15:23:53 2012 +0200
    30.3 @@ -9,22 +9,16 @@
    30.4   */
    30.5  package eu.earthobservatory.runtime.postgis;
    30.6  
    30.7 -import java.io.IOException;
    30.8  import java.sql.SQLException;
    30.9  
   30.10  import org.junit.AfterClass;
   30.11  import org.junit.BeforeClass;
   30.12 -import org.openrdf.repository.RepositoryException;
   30.13 -import org.openrdf.rio.RDFHandlerException;
   30.14 -import org.openrdf.rio.RDFParseException;
   30.15 -
   30.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   30.17  
   30.18  
   30.19  public class AggregateTests extends eu.earthobservatory.runtime.generaldb.AggregateTests {
   30.20  	
   30.21  	@BeforeClass
   30.22 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   30.23 +	public static void beforeClass() throws Exception
   30.24  	{
   30.25  		strabon = TemplateTests.beforeClass("/aggregate-tests-srid.nt");
   30.26  	}
    31.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/GeneralTests.java	Fri Nov 30 15:20:08 2012 +0200
    31.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/GeneralTests.java	Fri Nov 30 15:23:53 2012 +0200
    31.3 @@ -18,11 +18,6 @@
    31.4  import org.openrdf.query.MalformedQueryException;
    31.5  import org.openrdf.query.QueryEvaluationException;
    31.6  import org.openrdf.query.TupleQueryResultHandlerException;
    31.7 -import org.openrdf.repository.RepositoryException;
    31.8 -import org.openrdf.rio.RDFHandlerException;
    31.9 -import org.openrdf.rio.RDFParseException;
   31.10 -
   31.11 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   31.12  
   31.13  /**
   31.14   * A set of simple tests on SPARQL query functionality 
   31.15 @@ -32,7 +27,7 @@
   31.16  public class GeneralTests extends eu.earthobservatory.runtime.generaldb.GeneralTests {
   31.17  	
   31.18  	@BeforeClass
   31.19 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   31.20 +	public static void beforeClass() throws Exception
   31.21  	{
   31.22  		strabon = TemplateTests.beforeClass("/more-tests.nt");
   31.23  	}
    32.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/HavingTests.java	Fri Nov 30 15:20:08 2012 +0200
    32.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/HavingTests.java	Fri Nov 30 15:23:53 2012 +0200
    32.3 @@ -9,22 +9,16 @@
    32.4   */
    32.5  package eu.earthobservatory.runtime.postgis;
    32.6  
    32.7 -import java.io.IOException;
    32.8  import java.sql.SQLException;
    32.9  
   32.10  import org.junit.AfterClass;
   32.11  import org.junit.BeforeClass;
   32.12 -import org.openrdf.repository.RepositoryException;
   32.13 -import org.openrdf.rio.RDFHandlerException;
   32.14 -import org.openrdf.rio.RDFParseException;
   32.15 -
   32.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   32.17  
   32.18  
   32.19  public class HavingTests extends eu.earthobservatory.runtime.generaldb.HavingTests {
   32.20  	
   32.21  	@BeforeClass
   32.22 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   32.23 +	public static void beforeClass() throws Exception
   32.24  	{
   32.25  		strabon = TemplateTests.beforeClass("/having-tests-srid.nt");
   32.26  	}
    33.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/JoinTests.java	Fri Nov 30 15:20:08 2012 +0200
    33.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/JoinTests.java	Fri Nov 30 15:23:53 2012 +0200
    33.3 @@ -9,21 +9,15 @@
    33.4   */
    33.5  package eu.earthobservatory.runtime.postgis;
    33.6  
    33.7 -import java.io.IOException;
    33.8  import java.sql.SQLException;
    33.9  
   33.10  import org.junit.AfterClass;
   33.11  import org.junit.BeforeClass;
   33.12 -import org.openrdf.repository.RepositoryException;
   33.13 -import org.openrdf.rio.RDFHandlerException;
   33.14 -import org.openrdf.rio.RDFParseException;
   33.15 -
   33.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   33.17  
   33.18  public class JoinTests extends eu.earthobservatory.runtime.generaldb.JoinTests {
   33.19  	
   33.20  	@BeforeClass
   33.21 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   33.22 +	public static void beforeClass() throws Exception
   33.23  	{
   33.24  		strabon = TemplateTests.beforeClass("/join-tests-srid.nt");
   33.25  	}
    34.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/MeaningfulAggregateTests.java	Fri Nov 30 15:20:08 2012 +0200
    34.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/MeaningfulAggregateTests.java	Fri Nov 30 15:23:53 2012 +0200
    34.3 @@ -9,23 +9,17 @@
    34.4   */
    34.5  package eu.earthobservatory.runtime.postgis;
    34.6  
    34.7 -import java.io.IOException;
    34.8  import java.sql.SQLException;
    34.9  
   34.10  import org.junit.AfterClass;
   34.11  import org.junit.BeforeClass;
   34.12 -import org.openrdf.repository.RepositoryException;
   34.13 -import org.openrdf.rio.RDFHandlerException;
   34.14 -import org.openrdf.rio.RDFParseException;
   34.15 -
   34.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   34.17  
   34.18  
   34.19  public class MeaningfulAggregateTests extends eu.earthobservatory.runtime.generaldb.MeaningfulAggregateTests {
   34.20  	
   34.21  	
   34.22  	@BeforeClass
   34.23 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   34.24 +	public static void beforeClass() throws Exception
   34.25  	{
   34.26  		strabon = TemplateTests.beforeClass("/group-tests-srid.nt");
   34.27  	}
    35.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SPARQL11Tests.java	Fri Nov 30 15:20:08 2012 +0200
    35.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SPARQL11Tests.java	Fri Nov 30 15:23:53 2012 +0200
    35.3 @@ -9,16 +9,10 @@
    35.4   */
    35.5  package eu.earthobservatory.runtime.postgis;
    35.6  
    35.7 -import java.io.IOException;
    35.8  import java.sql.SQLException;
    35.9  
   35.10  import org.junit.AfterClass;
   35.11  import org.junit.BeforeClass;
   35.12 -import org.openrdf.repository.RepositoryException;
   35.13 -import org.openrdf.rio.RDFHandlerException;
   35.14 -import org.openrdf.rio.RDFParseException;
   35.15 -
   35.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   35.17  
   35.18  /**
   35.19   * A set of simple tests on SPARQL query functionality 
   35.20 @@ -29,7 +23,7 @@
   35.21  public class SPARQL11Tests extends eu.earthobservatory.runtime.generaldb.SPARQL11Tests {
   35.22  	
   35.23  	@BeforeClass
   35.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   35.25 +	public static void beforeClass() throws Exception
   35.26  	{
   35.27  		strabon = TemplateTests.beforeClass("/sparql11-tests.nt");
   35.28  	}
    36.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SimpleTests.java	Fri Nov 30 15:20:08 2012 +0200
    36.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SimpleTests.java	Fri Nov 30 15:23:53 2012 +0200
    36.3 @@ -9,16 +9,10 @@
    36.4   */
    36.5  package eu.earthobservatory.runtime.postgis;
    36.6  
    36.7 -import java.io.IOException;
    36.8  import java.sql.SQLException;
    36.9  
   36.10  import org.junit.AfterClass;
   36.11  import org.junit.BeforeClass;
   36.12 -import org.openrdf.repository.RepositoryException;
   36.13 -import org.openrdf.rio.RDFHandlerException;
   36.14 -import org.openrdf.rio.RDFParseException;
   36.15 -
   36.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   36.17  
   36.18  /**
   36.19   * A set of simple tests on SPARQL query functionality 
   36.20 @@ -28,7 +22,7 @@
   36.21  public class SimpleTests extends eu.earthobservatory.runtime.generaldb.SimpleTests {
   36.22  	
   36.23  	@BeforeClass
   36.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   36.25 +	public static void beforeClass() throws Exception
   36.26  	{
   36.27  		strabon = TemplateTests.beforeClass("/simple-tests.nt");
   36.28  	}
    37.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SpatialTests.java	Fri Nov 30 15:20:08 2012 +0200
    37.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/SpatialTests.java	Fri Nov 30 15:23:53 2012 +0200
    37.3 @@ -9,16 +9,10 @@
    37.4   */
    37.5  package eu.earthobservatory.runtime.postgis;
    37.6  
    37.7 -import java.io.IOException;
    37.8  import java.sql.SQLException;
    37.9  
   37.10  import org.junit.AfterClass;
   37.11  import org.junit.BeforeClass;
   37.12 -import org.openrdf.repository.RepositoryException;
   37.13 -import org.openrdf.rio.RDFHandlerException;
   37.14 -import org.openrdf.rio.RDFParseException;
   37.15 -
   37.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   37.17  
   37.18  /**
   37.19   * A set of simple tests on SPARQL query functionality 
   37.20 @@ -29,7 +23,7 @@
   37.21  public class SpatialTests extends eu.earthobservatory.runtime.generaldb.SpatialTests {
   37.22  	
   37.23  	@BeforeClass
   37.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   37.25 +	public static void beforeClass() throws Exception
   37.26  	{
   37.27  		strabon = TemplateTests.beforeClass("/spatial-tests-srid.nt");
   37.28  	}
    38.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/TemplateTests.java	Fri Nov 30 15:20:08 2012 +0200
    38.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/TemplateTests.java	Fri Nov 30 15:23:53 2012 +0200
    38.3 @@ -44,8 +44,7 @@
    38.4  	public static Integer port = null;
    38.5  	
    38.6  	@BeforeClass
    38.7 -	public static Strabon beforeClass(String inputFile)
    38.8 -		throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
    38.9 +	public static Strabon beforeClass(String inputFile) throws Exception
   38.10  	{
   38.11  		// Read properties
   38.12  		Properties properties = new Properties();
    39.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/postgis/TransformTests.java	Fri Nov 30 15:20:08 2012 +0200
    39.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/postgis/TransformTests.java	Fri Nov 30 15:23:53 2012 +0200
    39.3 @@ -9,16 +9,10 @@
    39.4   */
    39.5  package eu.earthobservatory.runtime.postgis;
    39.6  
    39.7 -import java.io.IOException;
    39.8  import java.sql.SQLException;
    39.9  
   39.10  import org.junit.AfterClass;
   39.11  import org.junit.BeforeClass;
   39.12 -import org.openrdf.repository.RepositoryException;
   39.13 -import org.openrdf.rio.RDFHandlerException;
   39.14 -import org.openrdf.rio.RDFParseException;
   39.15 -
   39.16 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
   39.17  
   39.18  /**
   39.19   * A set of simple tests on SPARQL query functionality 
   39.20 @@ -29,7 +23,7 @@
   39.21  public class TransformTests extends eu.earthobservatory.runtime.generaldb.TransformTests {
   39.22  	
   39.23  	@BeforeClass
   39.24 -	public static void beforeClass() throws SQLException, ClassNotFoundException, RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   39.25 +	public static void beforeClass() throws Exception
   39.26  	{
   39.27  		strabon = TemplateTests.beforeClass("/transform-tests.nt");
   39.28  	}