Strabon

changeset 207:ea0831917846

fix pom.xml to skip tests by default
author George Garbis <ggarbis@di.uoa.gr>
date Thu May 31 11:20:51 2012 +0300 (2012-05-31)
parents b60ef17785fe
children 43997580e39f
files TODO endpoint/WebContent/WEB-INF/beans.xml evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/JTSWrapper.java pom.xml
line diff
     1.1 --- a/TODO	Wed May 30 17:42:28 2012 +0300
     1.2 +++ b/TODO	Thu May 31 11:20:51 2012 +0300
     1.3 @@ -15,3 +15,11 @@
     1.4  	- testRegexI
     1.5  	- testUnionWithCommonObject
     1.6  	- testUnionWithDifferentObject
     1.7 +
     1.8 +GenralTests
     1.9 +	- testQueryRelate (Conversion not allowed)
    1.10 +	- testQueryThematicUnion (Union ?)
    1.11 +	- testQuery6_real (Optional ?)
    1.12 +	- testQuery6_real_union (Optional + Union ?)
    1.13 +	- testQueryNegation (Optional)
    1.14 +	- testQueryNegation2 (Optaional)
     2.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Wed May 30 17:42:28 2012 +0300
     2.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Thu May 31 11:20:51 2012 +0300
     2.3 @@ -19,7 +19,7 @@
     2.4  
     2.5          <constructor-arg type="java.lang.String" >
     2.6              <!-- Database name -->
     2.7 -            <value>DLRstrabonv4</value>
     2.8 +            <value>endpoint</value>
     2.9          </constructor-arg>
    2.10  
    2.11          <constructor-arg type="java.lang.String" >
     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/JTSWrapper.java	Wed May 30 17:42:28 2012 +0300
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/JTSWrapper.java	Thu May 31 11:20:51 2012 +0300
     3.3 @@ -33,8 +33,8 @@
     3.4  		wktr = new WKTReader();
     3.5  		wktw = new WKTWriter();
     3.6  		wkbr = new WKBReader();
     3.7 -//		wkbw = new WKBWriter(); // PostGIS
     3.8 -		wkbw = new WKBWriter(2, WKBConstants.wkbXDR); // MonetDB
     3.9 +		wkbw = new WKBWriter(); // PostGIS
    3.10 +//		wkbw = new WKBWriter(2, WKBConstants.wkbXDR); // MonetDB
    3.11  	}
    3.12  	
    3.13  	public static synchronized JTSWrapper getInstance() {
    3.14 @@ -57,11 +57,11 @@
    3.15  	}
    3.16  	
    3.17  	public synchronized byte[] WKBwrite(Geometry geom) {
    3.18 -//		return wkbw.write(geom); // PostGIS
    3.19 +		return wkbw.write(geom); // PostGIS
    3.20  		// MonetDB
    3.21 -		byte[] temp = wkbw.write(geom);
    3.22 -		temp[0] = 1;
    3.23 -		return temp;
    3.24 +//		byte[] temp = wkbw.write(geom);
    3.25 +//		temp[0] = 1;
    3.26 +//		return temp;
    3.27  		//
    3.28  		
    3.29  	}
     4.1 --- a/pom.xml	Wed May 30 17:42:28 2012 +0300
     4.2 +++ b/pom.xml	Thu May 31 11:20:51 2012 +0300
     4.3 @@ -40,6 +40,7 @@
     4.4  		<xml.bind.version>2.1.7</xml.bind.version>
     4.5  		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     4.6  		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
     4.7 +		<skipTests>true</skipTests>
     4.8  	</properties>
     4.9  
    4.10  	<dependencyManagement>
    4.11 @@ -523,6 +524,15 @@
    4.12  					<autoVersionSubmodules>true</autoVersionSubmodules>
    4.13  				</configuration>
    4.14  			</plugin>
    4.15 +			<!-- The following plugin is to enable skipTest (see also properties) -->
    4.16 +			<plugin>
    4.17 +		        <groupId>org.apache.maven.plugins</groupId>
    4.18 +		        <artifactId>maven-surefire-plugin</artifactId>
    4.19 +		        <version>2.12</version>
    4.20 +		        <configuration>
    4.21 +		          <skipTests>${skipTests}</skipTests>
    4.22 +			    </configuration>
    4.23 +		    </plugin>
    4.24  		</plugins>
    4.25  	</build>
    4.26