Merge pull request #136 from europeana/develop

fix for has geo

entity-common/src/main/resources/config/entity.properties.template

@@ -1,20 +1,3 @@
-# 
-#  Copyright 2007-2012 The Europeana Foundation
-#
-#  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-#  by the European Commission;
-#  You may not use this work except in compliance with the Licence.
-#  
-#  You may obtain a copy of the Licence at:
-#  http://joinup.ec.europa.eu/software/page/eupl
-#
-#  Unless required by applicable law or agreed to in writing, software distributed under 
-#  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-#  any kind, either express or implied.
-#  See the Licence for the specific language governing permissions and limitations under 
-#  the Licence.
-#
-
 #common settings
 #boolean value indicating if the indexing of annotations in solr should be performed. required valid solr configurations
 #entity.indexing.enabled = true

entity-common/src/main/resources/config/swagger.properties.template

@@ -1,20 +1,3 @@
-# 
-#  Copyright 2007-2012 The Europeana Foundation
-#
-#  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-#  by the European Commission;
-#  You may not use this work except in compliance with the Licence.
-#  
-#  You may obtain a copy of the Licence at:
-#  http://joinup.ec.europa.eu/software/page/eupl
-#
-#  Unless required by applicable law or agreed to in writing, software distributed under 
-#  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-#  any kind, either express or implied.
-#  See the Licence for the specific language governing permissions and limitations under 
-#  the Licence.
-#
-
 ########## SPRINGFOX ##################
 #property used by swagger to expose the REST specification
 springfox.documentation.swagger.v2.path=/api-docs

entity-common/src/main/resources/entity-common-context.xml

@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2007 EDL FOUNDATION
-  ~
-  ~  Licensed under the EUPL, Version 1.1 or– as soon they
-  ~  will be approved by the European Commission - subsequent
-  ~  versions of the EUPL (the "Licence");
-  ~  you may not use this work except in compliance with the
-  ~  Licence.
-  ~  You may obtain a copy of the Licence at:
-  ~
-  ~  http://ec.europa.eu/idabc/eupl
-  ~
-  ~  Unless required by applicable law or agreed to in
-  ~  writing, software distributed under the Licence is
-  ~  distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  ~  express or implied.
-  ~  See the Licence for the specific language governing
-  ~  permissions and limitations under the Licence.
-  -->
 <beans:beans
         xmlns:beans="http://www.springframework.org/schema/beans"
         xmlns:util="http://www.springframework.org/schema/util"

entity-definitions/pom.xml

@@ -1,14 +1,5 @@
 <?xml version="1.0"?>
 
-<!-- Copyright 2007-2012 The Europeana Foundation Licenced under the EUPL, 
-	Version 1.1 (the "Licence") and subsequent versions as approved by the European 
-	Commission; You may not use this work except in compliance with the Licence. 
-	You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the Licence is distributed on an "AS IS" basis, without warranties 
-	or conditions of any kind, either express or implied. See the Licence for 
-	the specific language governing permissions and limitations under the Licence. -->
-
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

entity-definitions/src/main/java/eu/europeana/entity/definitions/formats/FormatTypes.java

@@ -1,20 +1,3 @@
-/*
- * Copyright 2007-2012 The Europeana Foundation
- *
- *  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
- *  by the European Commission;
- *  You may not use this work except in compliance with the Licence.
- *  
- *  You may obtain a copy of the Licence at:
- *  http://joinup.ec.europa.eu/software/page/eupl
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under 
- *  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
- *  any kind, either express or implied.
- *  See the Licence for the specific language governing permissions and limitations under 
- *  the Licence.
- */
-
 package eu.europeana.entity.definitions.formats;
 
 import eu.europeana.entity.definitions.exceptions.UnsupportedFormatTypeException;

entity-definitions/src/main/java/eu/europeana/entity/definitions/model/search/result/IdBean.java

@@ -1,20 +1,3 @@
-/*
- * Copyright 2007-2012 The Europeana Foundation
- *
- *  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved
- *  by the European Commission;
- *  You may not use this work except in compliance with the Licence.
- * 
- *  You may obtain a copy of the Licence at:
- *  http://joinup.ec.europa.eu/software/page/eupl
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under
- *  the Licence is distributed on an "AS IS" basis, without warranties or conditions of
- *  any kind, either express or implied.
- *  See the Licence for the specific language governing permissions and limitations under
- *  the Licence.
- */
-
 package eu.europeana.entity.definitions.model.search.result;
 
 import java.util.Date;

entity-eval/pom.xml

@@ -1,14 +1,5 @@
  <?xml version="1.0"?>
 
-<!-- Copyright 2007-2012 The Europeana Foundation Licenced under the EUPL, 
-	Version 1.1 (the "Licence") and subsequent versions as approved by the European 
-	Commission; You may not use this work except in compliance with the Licence. 
-	You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the Licence is distributed on an "AS IS" basis, without warranties 
-	or conditions of any kind, either express or implied. See the Licence for 
-	the specific language governing permissions and limitations under the Licence. -->
-
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

entity-eval/src/test/resources/entity-eval-context.xml

@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2007 EDL FOUNDATION
-  ~
-  ~  Licensed under the EUPL, Version 1.1 or– as soon they
-  ~  will be approved by the European Commission - subsequent
-  ~  versions of the EUPL (the "Licence");
-  ~  you may not use this work except in compliance with the
-  ~  Licence.
-  ~  You may obtain a copy of the Licence at:
-  ~
-  ~  http://ec.europa.eu/idabc/eupl
-  ~
-  ~  Unless required by applicable law or agreed to in
-  ~  writing, software distributed under the Licence is
-  ~  distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  ~  express or implied.
-  ~  See the Licence for the specific language governing
-  ~  permissions and limitations under the Licence.
-  -->
+
 <beans:beans
         xmlns="http://www.springframework.org/schema/security"
         xmlns:beans="http://www.springframework.org/schema/beans"

entity-mongo/pom.xml

@@ -1,14 +1,5 @@
 <?xml version="1.0"?>
 
-<!-- Copyright 2007-2012 The Europeana Foundation Licenced under the EUPL, 
-	Version 1.1 (the "Licence") and subsequent versions as approved by the European 
-	Commission; You may not use this work except in compliance with the Licence. 
-	You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the Licence is distributed on an "AS IS" basis, without warranties 
-	or conditions of any kind, either express or implied. See the Licence for 
-	the specific language governing permissions and limitations under the Licence. -->
-
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

entity-mongo/src/main/resources/entity-mongo-context.xml

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
-
 <beans 
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

entity-mongo/src/main/resources/internal/entity-mongo-beans.xml

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
-
 <beans 
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

entity-mongo/src/main/resources/internal/entity-mongo-dao.xml

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
-
 <beans 
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

entity-mongo/src/main/resources/internal/entity-mongo-datasource.xml

@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
 
 <beans 
 	xmlns="http://www.springframework.org/schema/beans"

entity-solr/pom.xml

@@ -1,12 +1,3 @@
-<!-- Copyright 2007-2012 The Europeana Foundation Licenced under the EUPL, 
-	Version 1.1 (the "Licence") and subsequent versions as approved by the European 
-	Commission; You may not use this work except in compliance with the Licence. 
-	You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the Licence is distributed on an "AS IS" basis, without warranties 
-	or conditions of any kind, either express or implied. See the Licence for 
-	the specific language governing permissions and limitations under the Licence. -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 

entity-solr/src/main/resources/entity-solr-context.xml

@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Copyright 2007-2012 The Europeana Foundation Licenced under the EUPL, 
-	Version 1.1 (the "Licence") and subsequent versions as approved by the European 
-	Commission; You may not use this work except in compliance with the Licence. 
-	You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the Licence is distributed on an "AS IS" basis, without warranties 
-	or conditions of any kind, either express or implied. See the Licence for 
-	the specific language governing permissions and limitations under the Licence. -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"

entity-solr/src/main/resources/internal/entity-solr-server.xml

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
-
 <beans 
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

entity-solr/src/test/resources/entity-solr-test.xml

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-  Copyright 2007-2012 The Europeana Foundation
-
-  Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved 
-  by the European Commission;
-  You may not use this work except in compliance with the Licence.
-  
-  You may obtain a copy of the Licence at:
-  http://joinup.ec.europa.eu/software/page/eupl
-
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the Licence is distributed on an "AS IS" basis, without warranties or conditions of 
-  any kind, either express or implied.
-  See the Licence for the specific language governing permissions and limitations under 
-  the Licence.
- -->
-
 <beans
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

entity-utils/src/main/java/eu/europeana/entity/utils/EntityUtils.java

@@ -1,10 +1,16 @@
 package eu.europeana.entity.utils;
 
+import eu.europeana.entity.definitions.model.vocabulary.WebEntityConstants;
+
 public class EntityUtils {
 
 	public static String createWikimediaResourceString(String wikimediaCommonsId) {
 		assert wikimediaCommonsId.contains("Special:FilePath/");
 		return wikimediaCommonsId.replace("Special:FilePath/", "File:");
 	}
+
+	public static String toGeoUri(String latLon){
+		return WebEntityConstants.PROTOCOL_GEO + latLon;
+	}
 
 }

entity-utils/src/main/java/eu/europeana/entity/utils/jsonld/EntityJsonComparator.java

@@ -1,20 +1,3 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
 package eu.europeana.entity.utils.jsonld;
 
 import java.util.Comparator;