Return-Path: 
 <jetspeed-dev-return-33035-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 24493 invoked from network); 30 Nov 2008 19:05:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Nov 2008 19:05:10 -0000
Received: (qmail 14586 invoked by uid 500); 30 Nov 2008 19:05:21 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 14558 invoked by uid 500); 30 Nov 2008 19:05:21 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 14547 invoked by uid 99); 30 Nov 2008 19:05:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Nov 2008 11:05:21 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Nov 2008 19:03:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 03FD323888A4; Sun, 30 Nov 2008 11:04:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r721872 - in
 /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications:
 demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
 gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
Date: Sun, 30 Nov 2008 19:04:37 -0000
To: jetspeed-dev@portals.apache.org
From: taylor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081130190438.03FD323888A4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: taylor
Date: Sun Nov 30 11:04:37 2008
New Revision: 721872

URL: http://svn.apache.org/viewvc?rev=721872&view=rev
Log:
fixing google maps portlet, they changed the url at yahoo, and, it the impl was dependent on a default app id that no longer exists
TODO: check in for 2.2 as well

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm?rev=721872&r1=721871&r2=721872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm Sun Nov 30 11:04:37 2008
@@ -17,8 +17,9 @@
 <script language="JavaScript" type="text/javascript">
     function portletGoogleMapsLoadMap()
     {
-        var loc = escape("$renderRequest.getPreferences().getValue('Location','')");
-        var getLatitudeLongitudeUrl = "$renderRequest.getScheme():\/\/$renderRequest.getServerName():$renderRequest.getServerPort()$renderRequest.getContextPath()\/yahoogeocode?location=" + loc ;
+        var loc = escape("$renderRequest.getPreferences().getValue('Location','')");
+        var appid = escape("$renderRequest.getPreferences().getValue('APIKey','')");
+        var getLatitudeLongitudeUrl = "$renderRequest.getScheme():\/\/$renderRequest.getServerName():$renderRequest.getServerPort()$renderRequest.getContextPath()\/yahoogeocode?location=" + loc + "&appid=" + appid;
         dojo.io.bind({
 		    url: getLatitudeLongitudeUrl,
 		    mimetype: "text/xml",

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java?rev=721872&r1=721871&r2=721872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java Sun Nov 30 11:04:37 2008
@@ -46,16 +46,18 @@
     /**
      * Configuration 
      */
-     private static final String YAHOO_REQUEST = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=YahooDemo&location=";
-
+     // OLD: private static final String YAHOO_REQUEST = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=YahooDemo&location=";
+     private static final String YAHOO_REQUEST = "http://local.yahooapis.com/MapsService/V1/geocode?appid="; //YahooDemo&location=";
     /**
      * doGet() override doGet
      */
      protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 		throws ServletException, java.io.IOException {
 		String location = req.getParameter("location");
+		String appid = req.getParameter("appid");
 		location = URLEncoder.encode(location,"UTF-8");
-		String url = YAHOO_REQUEST + location;
+		appid = URLEncoder.encode(location,"UTF-8");
+		String url = YAHOO_REQUEST + appid + "&location=" +location;
 		String content = "<error/>";
 		
 		// get content from yahoo, code from http://jakarta.apache.org/commons/httpclient/tutorial.html



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org