Author: thomas.heute(a)jboss.com Date: 2008-05-06 04:34:13 -0400 (Tue, 06 May 2008) New Revision: 10748 Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo.jsp modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java Log: - Adapt to the new Google markup - Fixed typo that made the Catalog portlet unable to show up Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo.jsp 2008-05-06 00:10:25 UTC (rev 10747) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo.jsp 2008-05-06 08:34:13 UTC (rev 10748) @@ -18,7 +18,7 @@ <jsp:attribute name="rightcol"> <xportal:portlet name="GoogleMap" applicationName="samples-google-portlet"/> <xportal:portlet name="GoogleWeather" applicationName="samples-google-portlet"/> - <xportal:portlet name="Catalog" applicationName="samples-shoppincart-portlet"/> + <xportal:portlet name="Catalog" applicationName="samples-shoppingcart-portlet"/> <xportal:portlet name="JSPPortlet" applicationName="samples-jsp-portlet"/> </jsp:attribute> </xportal:2columns> Modified: modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java =================================================================== --- modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java 2008-05-06 00:10:25 UTC (rev 10747) +++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java 2008-05-06 08:34:13 UTC (rev 10748) @@ -70,7 +70,7 @@ String html = new String(getBytes(in, 16384), "UTF-8"); in.close(); - String beg = "<div class=e>"; + String beg = "<div id=res><div"; String end = "</table>"; int begIndex = html.indexOf(beg); if (begIndex != -1) @@ -79,6 +79,8 @@ int endIndex = html.indexOf(end, begIndex); html = html.substring(begIndex + beg.length(), endIndex + end.length()); + html = html.substring(html.indexOf(">")+1); + html = postProcessHTML(html); renderResponse.setContentType("text/html");