You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@devicemap.apache.org by Kevan Miller <ke...@gmail.com> on 2013/06/04 21:03:26 UTC
Re: svn commit: r1489558 - in /incubator/devicemap/trunk/web/webservice-java/src/main/webapp: index.jsp version.jsp
Gentle reminder of the ASF's policy for source file headers:
http://apache.org/legal/src-headers.html#headers
--kevan
On Jun 4, 2013, at 2:48 PM, rezan@apache.org wrote:
> Author: rezan
> Date: Tue Jun 4 18:48:47 2013
> New Revision: 1489558
>
> URL: http://svn.apache.org/r1489558
> Log:
> updates
>
> Added:
> incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp
> Modified:
> incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp
>
> Modified: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp
> URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp?rev=1489558&r1=1489557&r2=1489558&view=diff
> ==============================================================================
> --- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp (original)
> +++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp Tue Jun 4 18:48:47 2013
> @@ -1,11 +1,93 @@
> +<!DOCTYPE html>
> <html>
> <head>
> -<title>Device Map Java Service</title>
> +<title>Device Map Java Client</title>
> +<meta http-equiv="X-UA-Compatible" content="IE=edge">
> </head>
> -<body>
> -<h1>Device Map Java Service</h1>
> -Project name: ${project.name}<br>
> -Project version: ${project.version}<br>
> -Build date: ${build.date}<br>
> +<body onload="main();">
> +<h1>Device Map Java Client</h1>
> +User-Agent: <input type="text" name="useragent" id="useragent" size="100" value="">
> +<input type="button" name="submit" value="Submit!" onclick="submit()">
> +<br>
> +<br>
> +<div id="uaresults"></div>
> +<br>
> +<br>
> +DeviceMap Java Service <a href="javaservice.html">HTML</a> <a href="javaservice.js">JSON</a><br>
> +<script>
> +
> +function main()
> +{
> + document.getElementById("useragent").value=navigator.userAgent;
> + submit();
> +}
> +
> +function renderResults(json)
> +{
> + var r="";
> + r+="Device: "+json.vendor+" "+json.model+"<br>";
> + r+="Res: "+json.displayWidth+"x"+json.displayHeight+"<br>";
> + r+="Input: "+json.inputDevices+"<br>";
> + r+="Tablet: "+json.tablet+"<br>";
> + r+="Wireless: "+json.wireless+"<br>";
> + r+="ID: "+json.id+"<br>";
> + r+="Time: "+json.clientTime+"ms<br>";
> + r+="Method: "+json.method+"<br>";
> + document.getElementById("uaresults").innerHTML=r;
> +}
> +
> +function submit()
> +{
> + dmapClient.jsonp(document.getElementById("useragent").value,renderResults);
> +}
> +
> +var dmapClient={
> +
> + DMAP_ENDPOINT:"http://devicemap-vm.apache.org/javaservice.js",
> +
> + jsonp:function(s,callback)
> + {
> + var stime=(new Date()).getTime();
> + var ua=encodeURIComponent(s);
> + var cb="dmapjc_cb"+Math.floor(Math.random()*1000*1000*1000);
> +
> + window[cb]=function(json)
> + {
> + json.clientTime=(new Date()).getTime()-stime;
> + json.method="jsonp";
> + if(callback)
> + callback(json);
> + };
> +
> + var st=document.createElement("script");
> + st.async=true;
> + st.src=this.DMAP_ENDPOINT+"?callback="+cb+"&ua="+ua;
> + document.getElementsByTagName("head")[0].appendChild(st);
> + },
> +
> + xhr:function(s,callback)
> + {
> + var stime=(new Date()).getTime();
> + var ua=encodeURIComponent(s);
> + var dxhr=new XMLHttpRequest();
> +
> + dxhr.open("GET",this.DMAP_ENDPOINT+"?ua="+ua,true);
> + dxhr.onreadystatechange=function()
> + {
> + if(dxhr!=null && dxhr.readyState==4 && dxhr.status==200)
> + {
> + var json=JSON.parse(dxhr.responseText);
> + json.clientTime=(new Date()).getTime()-stime;
> + json.method="xhr";
> + if(callback)
> + callback(json);
> + }
> + };
> +
> + dxhr.send();
> + }
> +};
> +
> +</script>
> </body>
> </html>
>
> Added: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp
> URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp?rev=1489558&view=auto
> ==============================================================================
> --- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp (added)
> +++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp Tue Jun 4 18:48:47 2013
> @@ -0,0 +1,11 @@
> +<html>
> +<head>
> +<title>Device Map Java Service</title>
> +</head>
> +<body>
> +<h1>Device Map Java Service</h1>
> +Project name: ${project.name}<br>
> +Project version: ${project.version}<br>
> +Build date: ${build.date}<br>
> +</body>
> +</html>
>
>
Re: svn commit: r1489558 - in /incubator/devicemap/trunk/web/webservice-java/src/main/webapp: index.jsp version.jsp
Posted by Reza <re...@yahoo.com>.
oops... Thanks for pointing this out. I will update the repos tonite :]
________________________________
From: Kevan Miller <ke...@gmail.com>
To: devicemap-dev@incubator.apache.org
Sent: Tuesday, June 4, 2013 3:03 PM
Subject: Re: svn commit: r1489558 - in /incubator/devicemap/trunk/web/webservice-java/src/main/webapp: index.jsp version.jsp
Gentle reminder of the ASF's policy for source file headers:
http://apache.org/legal/src-headers.html#headers
--kevan
On Jun 4, 2013, at 2:48 PM, rezan@apache.org wrote:
> Author: rezan
> Date: Tue Jun 4 18:48:47 2013
> New Revision: 1489558
>
> URL: http://svn.apache.org/r1489558
> Log:
> updates
>
> Added:
> incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp
> Modified:
> incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp
>
> Modified: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp
> URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp?rev=1489558&r1=1489557&r2=1489558&view=diff
> ==============================================================================
> --- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp (original)
> +++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/index.jsp Tue Jun 4 18:48:47 2013
> @@ -1,11 +1,93 @@
> +<!DOCTYPE html>
> <html>
> <head>
> -<title>Device Map Java Service</title>
> +<title>Device Map Java Client</title>
> +<meta http-equiv="X-UA-Compatible" content="IE=edge">
> </head>
> -<body>
> -<h1>Device Map Java Service</h1>
> -Project name: ${project.name}<br>
> -Project version: ${project.version}<br>
> -Build date: ${build.date}<br>
> +<body onload="main();">
> +<h1>Device Map Java Client</h1>
> +User-Agent: <input type="text" name="useragent" id="useragent" size="100" value="">
> +<input type="button" name="submit" value="Submit!" onclick="submit()">
> +<br>
> +<br>
> +<div id="uaresults"></div>
> +<br>
> +<br>
> +DeviceMap Java Service <a href="javaservice.html">HTML</a> <a href="javaservice.js">JSON</a><br>
> +<script>
> +
> +function main()
> +{
> + document.getElementById("useragent").value=navigator.userAgent;
> + submit();
> +}
> +
> +function renderResults(json)
> +{
> + var r="";
> + r+="Device: "+json.vendor+" "+json.model+"<br>";
> + r+="Res: "+json.displayWidth+"x"+json.displayHeight+"<br>";
> + r+="Input: "+json.inputDevices+"<br>";
> + r+="Tablet: "+json.tablet+"<br>";
> + r+="Wireless: "+json.wireless+"<br>";
> + r+="ID: "+json.id+"<br>";
> + r+="Time: "+json.clientTime+"ms<br>";
> + r+="Method: "+json.method+"<br>";
> + document.getElementById("uaresults").innerHTML=r;
> +}
> +
> +function submit()
> +{
> + dmapClient.jsonp(document.getElementById("useragent").value,renderResults);
> +}
> +
> +var dmapClient={
> +
> + DMAP_ENDPOINT:"http://devicemap-vm.apache.org/javaservice.js",
> +
> + jsonp:function(s,callback)
> + {
> + var stime=(new Date()).getTime();
> + var ua=encodeURIComponent(s);
> + var cb="dmapjc_cb"+Math.floor(Math.random()*1000*1000*1000);
> +
> + window[cb]=function(json)
> + {
> + json.clientTime=(new Date()).getTime()-stime;
> + json.method="jsonp";
> + if(callback)
> + callback(json);
> + };
> +
> + var st=document.createElement("script");
> + st.async=true;
> + st.src=this.DMAP_ENDPOINT+"?callback="+cb+"&ua="+ua;
> + document.getElementsByTagName("head")[0].appendChild(st);
> + },
> +
> + xhr:function(s,callback)
> + {
> + var stime=(new Date()).getTime();
> + var ua=encodeURIComponent(s);
> + var dxhr=new XMLHttpRequest();
> +
> + dxhr.open("GET",this.DMAP_ENDPOINT+"?ua="+ua,true);
> + dxhr.onreadystatechange=function()
> + {
> + if(dxhr!=null && dxhr.readyState==4 && dxhr.status==200)
> + {
> + var json=JSON.parse(dxhr.responseText);
> + json.clientTime=(new Date()).getTime()-stime;
> + json.method="xhr";
> + if(callback)
> + callback(json);
> + }
> + };
> +
> + dxhr.send();
> + }
> +};
> +
> +</script>
> </body>
> </html>
>
> Added: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp
> URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp?rev=1489558&view=auto
> ==============================================================================
> --- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp (added)
> +++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/version.jsp Tue Jun 4 18:48:47 2013
> @@ -0,0 +1,11 @@
> +<html>
> +<head>
> +<title>Device Map Java Service</title>
> +</head>
> +<body>
> +<h1>Device Map Java Service</h1>
> +Project name: ${project.name}<br>
> +Project version: ${project.version}<br>
> +Build date: ${build.date}<br>
> +</body>
> +</html>
>
>