Author: taylor
Date: Sun Apr 19 20:17:46 2015
New Revision: 1674685
URL: http://svn.apache.org/r1674685
Log:
fixing Google Maps Portlet as it was broken. Yahoo GeoCode Service is no longer
available
Modified:
portals/applications/demo/trunk/pom.xml
portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml
Modified: portals/applications/demo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=1674685&r1=1674684&r2=1674685&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Sun Apr 19 20:17:46 2015
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.portals</groupId>
<artifactId>applications-pom</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</parent>
<packaging>war</packaging>
<name>Apache Portals Applications Demo Application</name>
@@ -35,9 +35,9 @@
<properties>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<portals.applications.apa-gems.version>1.1</portals.applications.apa-gems.version>
- <velocity.version>1.6.3</velocity.version>
+ <velocity.version>1.6.4</velocity.version>
<velocity-tools.version>1.3</velocity-tools.version>
-
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.common.version>2.1</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.script.version>2.0</org.apache.portals.bridges.script.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
@@ -48,8 +48,9 @@
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<taglibs-random.version>1.0.2</taglibs-random.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
- <javax.servlet.version>2.4</javax.servlet.version>
- <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
+ <javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+ <javax.servlet.jsp.version>2.2.1</javax.servlet.jsp.version>
<castor.version>1.1.1</castor.version>
<groovy.version>1.7.0</groovy.version>
<commons-collections.version>3.2</commons-collections.version>
@@ -68,18 +69,18 @@
<version>${portals.portlet2-api-spec.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${javax.servlet.jsp.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
Modified:
portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm?rev=1674685&r1=1674684&r2=1674685&view=diff
==============================================================================
---
portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
(original)
+++
portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
Sun Apr 19 20:17:46 2015
@@ -15,45 +15,34 @@
limitations under the License.
*#
<script language="JavaScript" type="text/javascript">
-var ${renderResponse.namespace}loc =
escape("$!renderRequest.getParameter('address')");
-if (${renderResponse.namespace}loc == null)
-{
- ${renderResponse.namespace}loc =
escape("$renderRequest.getPreferences().getValue('Location','')");
-}
-else
-{
- ${renderResponse.namespace}loc =
${renderResponse.namespace}loc.replace(/^\s*/, "").replace(/\s*$/, "");
- if (${renderResponse.namespace}loc == "")
- {
- ${renderResponse.namespace}loc =
escape("$renderRequest.getPreferences().getValue('Location','')");
- }
-}
-
-function ${renderResponse.namespace}mapsLoaded() {
- var appid = escape("$renderRequest.getPreferences().getValue('APIKey','')");
- var getLatitudeLongitudeUrl =
"$renderRequest.getScheme():\/\/$renderRequest.getServerName():$renderRequest.getServerPort()$renderRequest.getContextPath()\/yahoogeocode?location="
+ ${renderResponse.namespace}loc + "&appid=" + appid;
- dojo.io.bind({
- url: getLatitudeLongitudeUrl,
- mimetype: "text/xml",
- error: function(type, error)
+ var ${renderResponse.namespace}loc =
escape("$!renderRequest.getParameter('address')");
+ if (${renderResponse.namespace}loc == null)
{
- dojo.raise( "request failed for yahoo latitude-longitude type=" + type
+ " error=" + error );
- },
- load: function( type, data, evt )
+ ${renderResponse.namespace}loc =
escape("$renderRequest.getPreferences().getValue('Location','')");
+ }
+ else
{
- lat = data.getElementsByTagName("Latitude").item(0).firstChild.nodeValue;
- lng =
data.getElementsByTagName("Longitude").item(0).firstChild.nodeValue;
- //alert ("ll: " + lat + "," + lng);
- var map = new
google.maps.Map2(document.getElementById("${renderResponse.namespace}map"));
- map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());
- map.setCenter(new google.maps.LatLng(lat, lng), 13);
+ ${renderResponse.namespace}loc =
${renderResponse.namespace}loc.replace(/^\s*/, "").replace(/\s*$/, "");
+ if (${renderResponse.namespace}loc == "")
+ {
+ ${renderResponse.namespace}loc =
escape("$renderRequest.getPreferences().getValue('Location','')");
+ }
+ }
+
+ function ${renderResponse.namespace}mapsLoaded() {
+ var appid =
escape("$renderRequest.getPreferences().getValue('APIKey','')");
+ var address = unescape(${renderResponse.namespace}loc);
+
+ var geocoder = new google.maps.Geocoder();
+ geocoder.geocode( { 'address': address}, function(results, status) {
+ if (status == google.maps.GeocoderStatus.OK) {
+ var map = new
google.maps.Map(document.getElementById("${renderResponse.namespace}map"),
{zoom: 13, center: results[0].geometry.location});
+ }
+ });
+ }
+ function ${renderResponse.namespace}mapit() {
+ google.load("maps", "3", {"callback" :
${renderResponse.namespace}mapsLoaded});
}
- });
-}
-function ${renderResponse.namespace}mapit() {
- google.load("maps", "2", {"callback" :
${renderResponse.namespace}mapsLoaded});
-}
</script>
<div id="${renderResponse.namespace}map" style="width: 100%; height:
$renderRequest.getPreferences().getValue('MapHeight','400px')"></div>
Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml?rev=1674685&r1=1674684&r2=1674685&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml Sun Apr 19
20:17:46 2015
@@ -52,24 +52,12 @@
<servlet-class>groovy.servlet.TemplateServlet</servlet-class>
</servlet>
- <!-- jdp YahooGeocodeProxyServlet -->
- <servlet>
- <servlet-name>YahooGeocodeProxyServlet</servlet-name>
-
<servlet-class>org.apache.portals.gems.googlemaps.YahooGeocodeProxyServlet</servlet-class>
- </servlet>
-
<servlet>
<description>Servlet for Testing SSO</description>
<display-name>SSODemo Servlet</display-name>
<servlet-name>SSODemo</servlet-name>
<servlet-class>org.apache.portals.applications.demo.servlet.SSODemoServlet</servlet-class>
</servlet>
-
- <!-- jdp Map /yahoogecode files to YahooGeocodeProxy -->
- <servlet-mapping>
- <servlet-name>YahooGeocodeProxyServlet</servlet-name>
- <url-pattern>/yahoogeocode</url-pattern>
- </servlet-mapping>
<servlet-mapping>
<servlet-name>SSODemo</servlet-name>
