remove old reposirories in pom.xml

fix bug for is_in in autcomplete by declaring the field change mail to contact when needed update leaflet plugin (https and local ressources)
gisgraphy · Dec 29, 2017 · ccd2815 · ccd2815
1 parent 7d21b86
commit ccd2815
Show file tree

Hide file tree

Showing 26 changed files with 3,076 additions and 38 deletions.
diff --git a/data/cookbook-distrib.txt b/data/cookbook-distrib.txt
@@ -5,21 +5,14 @@ change year and version in pom.xml
 format
 tests
 upload maven repo
-refaire les feed d'exemples
 verifier dans le pom qu'il n'y a pas de snapshots
 
 modifier https://www.gisgraphy.com/news/getnews.php to tell new version and obsolete
 site
-save feedbacks
-mettre page maintenance
 dist
-check javadoc 
-install
 upload doc
-migration guide / changes / update date of release
-upload dist to google
 link to dist in download page
-re-process sitemaps
-update gisgraphy sitemap
 save the stats usage
-change password of user and admin
+change password of user and admin
+image docker
+modify webapp.version in application ressources
diff --git a/data/download_site/footer.inc b/data/download_site/footer.inc
@@ -5,7 +5,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="footerelmt"> &copy gisgraphy 2014  | Logo by <a href="http://www.icondrawer.com/">icondrawer</a> | <a href="mailto:davidmasclet@gisgraphy.com">Contact</a> | <a href="http://davidmasclet.gisgraphy.com">Blog</a> (in french) </div>
+      <div class="footerelmt"> &copy gisgraphy 2014  | Logo by <a href="http://www.icondrawer.com/">icondrawer</a> | <a href="mailto:contact@gisgraphy.com">Contact</a> | <a href="http://davidmasclet.gisgraphy.com">Blog</a> (in french) </div>
 <br/>
       <div class="clear">
         <hr/>

diff --git a/data/download_site/header.inc b/data/download_site/header.inc
@@ -68,7 +68,7 @@
 						<li><a href="https://www.gisgraphy.com/documentation/installation/index.htm">Installation</a></li>
 						<li><a href="https://www.gisgraphy.com/forum/"  target="gisgraphyservices">Forum</a></li>
 						<li><a href="https://www.gisgraphy.com/faq.html">FAQ</a></li>
-						<li><a href="mailto:davidmasclet@gisgraphy.com">Contact</a></li>
+						<li><a href="mailto:contact@gisgraphy.com">Contact</a></li>
 						<li><a href="https://www.gisgraphy.com/changes-report.html">Changes Report</a></li>
 						<li><a href="https://www.gisgraphy.com/license.html">License</a></li>
 						<li><a href="https://www.gisgraphy.com/documentation/client-libraries.htm">Client libraries</a></li>

diff --git a/data/download_site/readme.txt b/data/download_site/readme.txt
@@ -2,7 +2,7 @@
 Welcome to Gisgraphy download server. Since 2006, Gisgraphy is a free opensource framework based on <a href="http://www.openstreetmap.org" target="gis">Openstreetmap</a>, <a href="http://www.geonames.org" target="gis">Geonames</a> and  <a href="http://quattroshapes.com/" target="gis">Quatroshapes</a> data that offers the ability to do geolocalisation, geocoding, and reverse geooding via Java APIs or REST webservices.
 <br/>
 More informations on the <a href="https://www.gisgraphy.com">Gisgraphy web site</a>.<br/>
-<div style="color:#FF0000">Due to people that have abused / hacked the service, only PBF are available. CSV files for import are curently unavailable. Please send a mail to davidmasclet@gisgraphy.com if you really need it urgently.</div><br/>
+<div style="color:#FF0000">Due to people that have abused / hacked the service, only PBF are available. CSV files for import are curently unavailable. Please send a mail to contact@gisgraphy.com if you really need it urgently.</div><br/>
 <strong>
 <ul>
 <li>Freely available</li>
@@ -11,7 +11,7 @@ More informations on the <a href="https://www.gisgraphy.com">Gisgraphy web site<
 </ul>
 </strong>
 
-More questions, needs consulting, suggestions, comments, special needs ? site : <a href="https://www.gisgraphy.com/">https://www.gisgraphy.com/</a> or Mail : <a href="mailto:davidmasclet@gisgraphy.com">davidmasclet@gisgraphy.com</a><br/>
+More questions, needs consulting, suggestions, comments, special needs ? site : <a href="https://www.gisgraphy.com/">https://www.gisgraphy.com/</a> or Mail : <a href="mailto:contact@gisgraphy.com">contact@gisgraphy.com</a><br/>
 You can <a href="https://premium.gisgraphy.com/products#data">order custom extracts</a> (based on openstreetmap tags. e.g :maxspeed), address databases, zipcodes extract, or Gisgraphy dumps on <a href="https://premium.gisgraphy.com/products#dump">gisgraphy premium page</a><br/>
 <br/>
 <div class="center"><center><a href="/images/osmfiles.jpg" target="gis"><img src="/images/osmfiles.jpg" width="600"/><br/>

diff --git a/pom.xml b/pom.xml
@@ -586,10 +586,10 @@
 		</repository>-->
 	</repositories>
 	<pluginRepositories>
-		<pluginRepository>
+		<!-- <pluginRepository>
 			<id>appfuse</id>
 			<url>http://static.appfuse.org/repository</url>
-		</pluginRepository>
+		</pluginRepository>-->
 	</pluginRepositories>
 	<!-- Dependencies calculated by AppFuse when running full-source plugin -->
 	<dependencies>
@@ -1712,7 +1712,7 @@
 
 	<properties>
 		<!-- Application settings -->
-		<copyright.year>2014</copyright.year>
+		<copyright.year>2018</copyright.year>
 		<dao.framework>hibernate</dao.framework>
 		<web.framework>struts</web.framework>
 		<amp.genericCore>true</amp.genericCore>

diff --git a/src/main/resources/ApplicationResources.properties b/src/main/resources/ApplicationResources.properties
@@ -27,10 +27,10 @@ gisgraphy.version=4.0-beta1
 gisgraphyMessage=
 webapp.name=Gisgraphy
 webapp.tagline=Free opensource geocoder and webservices for Geonames and Openstreetmap data.
-webapp.version=Version 4.0-beta1
+webapp.version=Version 5.0-beta1
 company.name=Gisgraphy
 company.url=https://www.gisgraphy.com
-company.mail=david.masclet@gisgraphy.com
+company.mail=contact@gisgraphy.com
 copyright.year=2014
 
 user.status=Logged in as: 

diff --git a/src/main/resources/ApplicationResources_de.properties b/src/main/resources/ApplicationResources_de.properties
@@ -84,7 +84,7 @@ clickstreams.heading=Alle Clickstreams
 # -- clickstreams page --
 clickstreams.title=Alle Clickstreams
 colon=
-company.mail=david.masclet@gisgraphy.com
+company.mail=contact@gisgraphy.com
 company.name=Gisgraphy
 company.url=https://www.gisgraphy.com
 config.googlemapapikey.empty=Bisher wurde noch kein GoogleMaps API-Key eingerichtet. Bitte tragen Sie den Key in env.properties ein und starten Gisgraphy neu, um die Google Map-Funktionen nutzen zu k\u00f6nnen.

diff --git a/src/main/resources/mail.properties b/src/main/resources/mail.properties
@@ -23,7 +23,7 @@
 # This properties file is used to configure mail settings in 
 # /WEB-INF/applicationContext-service.xml.
 
-mail.default.from=gisgraphy <david.masclet@gisgraphy.com>
+mail.default.from=gisgraphy <contact@gisgraphy.com>
 mail.debug=false
 mail.transport.protocol=smtp
 mail.host=localhost

diff --git a/src/main/resources/schema.xml b/src/main/resources/schema.xml
@@ -389,7 +389,7 @@ decompound after lower because words of dictionary are in lower, unpunct
   <field name="suggest_all_label" type="suggest" indexed="true" stored="false" multiValued="true"/>
   <field name="suggest_in" type="suggest" indexed="true" stored="false" multiValued="true"/>
   <copyField source="name*" dest="suggest_name"/>
-<!--    <copyField source="is_in*" dest="suggest_in"/>-->
+  <copyField source="is_in*" dest="suggest_in"/>
   <copyField source="all_name" dest="suggest_all_name"/>
   <copyField source="fully_qualified_name" dest="suggest_fqdn_name"/>
   <copyField source="all_label" dest="suggest_all_label"/>

diff --git a/src/main/resources/xslt/atom.xsl b/src/main/resources/xslt/atom.xsl
@@ -34,7 +34,7 @@
       </subtitle>
       <author>
         <name>David MASCLET</name>
-        <email>davidmasclet@gisgraphy.com</email>
+        <email>contact@gisgraphy.com</email>
       </author>
       <link href="http://services.gisgraphy.com/"/>
       <updated>2008-12-01T07:02:32Z</updated>

diff --git a/src/main/webapp/503.htm b/src/main/webapp/503.htm
@@ -0,0 +1,27 @@
+<html>
+<head>
+<title>Too much requests</title>
+<style>
+body { font-family: Tahoma, Verdana, Arial, sans-serif; }
+</style>
+</head>
+<body bgcolor="white" text="black">
+<table width="100%" height="100%">
+<tr>
+<td align="center" valigin="middle">
+Your request can not be processed :
+<ul>
+<li>Are you a bot or do you use those webservices in a software ? you can only use the webservice in a browser</li>
+<li>Do you use a GTS software (not allowed)</li>
+<li>Do you reach the maximum number of requests / seconds allowed</li>
+</ul>
+<br/><br/>
+Wait a little bit and resubmit your request
+</br></br/>
+ If you want to have better QOS and SLA, you can <a href="http://premium.gisgraphy.com/">subscribe to premium webservices</a>
+</td>
+</tr>
+</table>
+</body>
+</html>
+
diff --git a/src/main/webapp/WEB-INF/pages/mainMenu.jsp b/src/main/webapp/WEB-INF/pages/mainMenu.jsp
@@ -47,7 +47,7 @@ com.gisgraphy.importer.ImporterManager importerManager = (com.gisgraphy.importer
 		<a href="<c:url value='/admin/stats.html'/>"><fmt:message key="stats.title"/></a>
 	</li>
 	<li>
-		<a href="mailto:davidmasclet@gisgraphy.com?subject=[contact_from_admin_page]"><fmt:message key="global.contact"/></a>
+		<a href="mailto:contact@gisgraphy.com?subject=[contact_from_admin_page]"><fmt:message key="global.contact"/></a>
 	</li>
   	<li>
         <fmt:message key="global.gohome"/>

diff --git a/src/main/webapp/decorators/ui.jsp b/src/main/webapp/decorators/ui.jsp
@@ -80,7 +80,7 @@
 <span><a href="/?locale=no"><img src="/images/languages/NO.png"  alt="Gisgraphy in Norwegian"/></a></span> |
 <span><a href="/?locale=tr"><img src="/images/languages/TR.png"  alt="Gisgraphy in Turkish"/></a></span> |
 <span><a href="/?locale=kr"><img src="/images/languages/KR.png"  alt="Gisgraphy in Korean"/></a></span> |
-<br/><br/> <a href="mailto:davidmasclet@gisgraphy.com?subject=help for translation">We need help for translation</a>
+<br/><br/> <a href="mailto:contact@gisgraphy.com?subject=help for translation">We need help for translation</a>
 </div>
 <script type="text/javascript">
 _uacct = "<%= com.gisgraphy.domain.valueobject.GisgraphyConfig.googleanalytics_uacctcode %>";

diff --git a/src/main/webapp/static/gisgraphy_opensearch_fulltext.xml b/src/main/webapp/static/gisgraphy_opensearch_fulltext.xml
@@ -4,7 +4,7 @@
 	<ShortName>Gisgraphy search</ShortName>
 	<Description>Free and open sources GIS services</Description>
 	<Tags>Free and open sources GIS services</Tags>
-	<Contact>davidmasclet@gisgraphy.com</Contact>	
+	<Contact>contact@gisgraphy.com</Contact>	
 	<InputEncoding>UTF-8</InputEncoding>
 	<OutputEncoding>UTF-8</OutputEncoding>
 	<Image height="16" width="16" type="image/png">https://www.gisgraphy.com/images/logos/logo_16.png</Image>

diff --git a/src/main/webapp/static/leaflet/index.html b/src/main/webapp/static/leaflet/index.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
 
 
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
+    <link rel="stylesheet" href="style/leaflet.css" />
     <link href="style/gisgraphy-leaflet.css" rel="stylesheet" type="text/css">
 </head>
 
@@ -20,16 +20,17 @@
     <script src="js/typeahead/handlebars-v1.3.0.js"></script>
     <script src="js/gisgraphy-js-api.js"></script>
 
-    <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <script src="js/leaflet.js"></script>
     <script src="js/gisgraphy-leaflet-geocoder.js"></script>
 
     <script src="js/gisgraphy-leaflet-reverse-geocoder.js"></script>
     <script src="js/util/NumberFormatter.js"></script>
 
 
     <div id="header">
-        <a href="https://www.gisgraphy.com"><img src="https://www.gisgraphy.com/images/logos/logo_48.png" style="vertical-align:middle;" />Gisgraphy</a> is open sources and only use open data. This server is for <a href="https://www.gisgraphy.com/free-access.php">demonstration only</a>. Test it, <a href="/public/geocoding.html">Play with webservices</a> but then
-		 <a href="https://www.gisgraphy.com/documentation/installation/index.php">Install Gisgraphy locally</a> or subscribe to  <a href="http://premium.gisgraphy.com">premium hosted services</a> </div>
+        <a href="https://www.gisgraphy.com"><img src="https://www.gisgraphy.com/images/logos/logo_48.png" style="vertical-align:middle;" />Gisgraphy project</a> | <a href="/public/geocoding.html">Play with webservices</a> | <a href="http://premium.gisgraphy.com/">Premium plans</a> | <a href="http://download.gisgraphy.com">Download Data</a> | <a href="http://www.gisgraphy.com/documentation/installation/index.htm">Install on your servers</a> | <a href="http://www.gisgraphy.com/documentation/index.htm">Documentation</a>
+        <br/>Gisgraphy is free and open sources, and run with opensources data. This server is for demonstration only.<br/>
+		 Please, <a href="http://www.gisgraphy.com/documentation/installation/index.htm">Install Gisgraphy locally</a> or subscribe to  <a href="http://premium.gisgraphy.com">premium hosted services</a> </div>
     <div id="map"></div>
 
     <script>
@@ -39,7 +40,7 @@
         var layerUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
         L.tileLayer(layerUrl, {
             maxZoom: 18,
-            attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors | <a href="https://www.gisgraphy.com/attributions.html">attributions</a> | geocoding by <a href="https://www.gisgraphy.com">Gisgraphy</a>',
+            attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors | <a href="http://www.gisgraphy.com/attributions.html">attributions</a> | geocoding by <a href="http://www.gisgraphy.com">Gisgraphy</a>',
             id: 'examples.map-i875mjb7'
         }).addTo(map);
 

diff --git a/src/main/webapp/static/leaflet/js/images/layers-2x.png b/src/main/webapp/static/leaflet/js/images/layers-2x.png
diff --git a/src/main/webapp/static/leaflet/js/images/layers.png b/src/main/webapp/static/leaflet/js/images/layers.png
diff --git a/src/main/webapp/static/leaflet/js/images/marker-icon-2x.png b/src/main/webapp/static/leaflet/js/images/marker-icon-2x.png
diff --git a/src/main/webapp/static/leaflet/js/images/marker-icon.png b/src/main/webapp/static/leaflet/js/images/marker-icon.png
diff --git a/src/main/webapp/static/leaflet/js/images/marker-shadow.png b/src/main/webapp/static/leaflet/js/images/marker-shadow.png
diff --git a/src/main/webapp/static/leaflet/js/leaflet.js b/src/main/webapp/static/leaflet/js/leaflet.js