merging with dev

README.md

@@ -5,10 +5,19 @@ Get information about any country via a RESTful API http://restcountries.eu
 
 ----------
 
-Work in Progress
+Branches
 ---------
-- More REST search options
-- Add Timezone to Available Data
+##### dev
+* well.. dev environment. play around in here before committing to other branches<br />
+* using java7 and servlet api 3
+
+##### master
+* latest stable release
+* using java7 and servlet api 3
+
+##### servlet2
+* latest stable release
+* using java6 and servlet api 2
 
 Available Data
 ---------
@@ -28,9 +37,9 @@ Available Data
 
 REST Services
 ---------
-- By code ISO 3166-1 alpha-2 http://restcountries.eu/rest/alpha2/NO
+- By code ISO 3166-1 alpha-2 http://restcountries.eu/rest/alpha/NO
 
-- By code ISO 3166-1 alpha-3 http://restcountries.eu/rest/alpha3/NOR
+- By code ISO 3166-1 alpha-3 http://restcountries.eu/rest/alpha/NOR
 
 - By currency http://restcountries.eu/rest/currency/NOK
 

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>vaeke</groupId>
 	<artifactId>restcountries</artifactId>
-	<version>0.6</version>
+	<version>0.7</version>
 	<packaging>war</packaging>
 	<name>restcountries</name>
 	<description>REST interface to get data about countries</description>

src/main/java/vaeke/restcountries/rest/CountryRest.java

@@ -48,6 +48,7 @@ public Object getCountries() {
 
 	@GET
 	@Path("alpha2/{alpha2code}")
+	@Deprecated
 	public Object getByAlpha2(@PathParam("alpha2code") String alpha2) {
 		LOG.info("Getting by alpha2 " + alpha2);
 		try {
@@ -67,6 +68,7 @@ public Object getByAlpha2(@PathParam("alpha2code") String alpha2) {
 
 	@GET
 	@Path("alpha3/{alpha3code}")
+	@Deprecated
 	public Object getByAlpha3(@PathParam("alpha3code") String alpha3) {
 		LOG.info("Getting by alpha3 " + alpha3);
 		try {

src/main/resources/countries.json

@@ -179,7 +179,7 @@
 {"name":"Qatar","tld":".qa","cca2":"QA","ccn3":634,"cca3":"QAT","currency":"QAR","callingcode":"974","capital":"Doha","altSpellings":"QA","relevance":0,"region":"Asia","subregion":"Western Asia"},
 {"name":"R\u00e9union","tld":".re","cca2":"RE","ccn3":638,"cca3":"REU","currency":"EUR","callingcode":"262","capital":"","altSpellings":"RE,Reunion","relevance":0,"region":"Africa","subregion":"Eastern Africa"},
 {"name":"Romania","tld":".ro","cca2":"RO","ccn3":642,"cca3":"ROU","currency":"RON","callingcode":"40","capital":"Bucharest","altSpellings":"RO,Rumania,Roumania,Rom\u00e2nia","relevance":0,"region":"Europe","subregion":"Eastern Europe"},
-{"name":"Russian Federation","tld":".ru","cca2":"RU","ccn3":643,"cca3":"RUS","currency":"RUB","callingcode":"7","capital":"Moskow","altSpellings":"RU,Rossiya","relevance":2.5,"region":"Europe","subregion":"Eastern Europe"},
+{"name":"Russian Federation","tld":".ru","cca2":"RU","ccn3":643,"cca3":"RUS","currency":"RUB","callingcode":"7","capital":"Moscow","altSpellings":"RU,Rossiya","relevance":2.5,"region":"Europe","subregion":"Eastern Europe"},
 {"name":"Rwanda","tld":".rw","cca2":"RW","ccn3":646,"cca3":"RWA","currency":"RWF","callingcode":"250","capital":"Kigali","altSpellings":"RW","relevance":0,"region":"Africa","subregion":"Eastern Africa"},
 {"name":"Saint Barth\u00e9lemy","tld":".bl","cca2":"BL","ccn3":652,"cca3":"BLM","currency":"EUR","callingcode":"590","capital":"Gustavia","altSpellings":"BL,St. Barthelemy","relevance":0,"region":"Americas","subregion":"Caribbean"},
 {"name":"Saint Helena","tld":".sh","cca2":"SH","ccn3":654,"cca3":"SHN","currency":"SHP","callingcode":"290","capital":"Jamestown","altSpellings":"SH,St.","relevance":0,"region":"Africa","subregion":"Western Africa"},

src/main/webapp/js/restcountries.js

@@ -33,6 +33,7 @@ $(function () {
 		ajax($(e.target).html(), function(data) {
 			restc.ui.jsonwell.removeClass('hidden');
 			restc.ui.jsonwell.html(getCodeHtml(data));
+			restc.ui.inputTryit.val($(e.target).html());
 			$(document).scrollTop(restc.ui.searchers.get(0).clientHeight);
 		});
 	});