# HG changeset patch # User Babis Nikolaou # Date 1410621681 -10800 # Node ID 65db010f01ac022f72e6ae85f41c983211b6a38f # Parent c37086c4a55f2beabc6f59003137220fcfe0e8aa removed dependency to epsg-wkt.jar since one epsg (epsg-hsql.jar) suffices and duplication might rise exceptions (according to this page: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority) diff -r c37086c4a55f -r 65db010f01ac endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java Thu Sep 11 19:00:22 2014 +0300 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java Sat Sep 13 18:21:21 2014 +0300 @@ -13,16 +13,16 @@ import java.io.OutputStream; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; +import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.openrdf.query.BindingSet; import org.openrdf.query.MalformedQueryException; import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQuery; import org.openrdf.query.TupleQueryResult; import org.openrdf.query.TupleQueryResultHandlerException; import org.openrdf.repository.RepositoryException; @@ -31,6 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader.Array; + import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault; import eu.earthobservatory.runtime.generaldb.Strabon; import eu.earthobservatory.utils.Format; diff -r c37086c4a55f -r 65db010f01ac endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java Thu Sep 11 19:00:22 2014 +0300 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java Sat Sep 13 18:21:21 2014 +0300 @@ -28,8 +28,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** - * @author charnik - * + * @author Charalampos Nikolaou */ public class UpdateBean extends HttpServlet { diff -r c37086c4a55f -r 65db010f01ac pom.xml --- a/pom.xml Thu Sep 11 19:00:22 2014 +0300 +++ b/pom.xml Sat Sep 13 18:21:21 2014 +0300 @@ -475,11 +475,14 @@ ${geotools.version} + org.geotools diff -r c37086c4a55f -r 65db010f01ac runtime/pom.xml --- a/runtime/pom.xml Thu Sep 11 19:00:22 2014 +0300 +++ b/runtime/pom.xml Sat Sep 13 18:21:21 2014 +0300 @@ -316,10 +316,12 @@ + org.geotools diff -r c37086c4a55f -r 65db010f01ac runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Thu Sep 11 19:00:22 2014 +0300 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Sat Sep 13 18:21:21 2014 +0300 @@ -18,6 +18,7 @@ import java.sql.SQLException; import java.util.ArrayList; +import org.geotools.factory.Hints; import org.openrdf.model.URI; import org.openrdf.model.ValueFactory; import org.openrdf.query.BindingSet; @@ -114,6 +115,7 @@ //Setting up store //Used for the conversions taking place involving JTS + WGS84 (4326) + //Hints.putSystemDefault(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, Boolean.TRUE); System.setProperty("org.geotools.referencing.forceXY", "true"); //our repository