Author: thomas.heute(a)jboss.com Date: 2009-01-19 09:16:43 -0500 (Mon, 19 Jan 2009) New Revision: 12552 Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java Log: - Rolling back 12451 12547 and removing zipcode display. - updated pom.xml Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2009-01-19 14:11:24 UTC (rev 12551) +++ modules/portlet/trunk/build/pom.xml 2009-01-19 14:16:43 UTC (rev 12552) @@ -18,31 +18,31 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>trunk-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal Portlet Module</name> <description>JBoss Portal Portlet Module</description> <properties> - <version.apache.portals.bridges>1.0.3</version.apache.portals.bridges> + <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> <version.apache-taglibs>1.1.2</version.apache-taglibs> <version.concurrent>1.3.4</version.concurrent> <version.javax.servlet>2.5</version.javax.servlet> <version.javax.servlet.jsp>2.1</version.javax.servlet.jsp> <version.apache.tomcat>5.5.12</version.apache.tomcat> <version.jboss-logging>2.0.4.GA</version.jboss-logging> - <version.jbossxb>2.0.0.CR8</version.jbossxb> + <version.jbossxb>2.0.0.GA</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.3</version.jboss.portal.common> - <version.jboss.portal.web>1.2.2</version.jboss.portal.web> - <version.jboss.unit>1.2.1</version.jboss.unit> + <version.jboss.portal.web>1.2.3</version.jboss.portal.web> + <version.jboss.unit>1.2.2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> - <version.jboss.reflect>2.0.0.Beta12</version.jboss.reflect> + <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer> + <version.jboss.reflect>2.0.2.GA</version.jboss.reflect> <version.cargo>1.0-alpha-6</version.cargo> - <version.junit>3.8.1</version.junit> + <version.junit>3.8.2</version.junit> <version.ant>1.7.0</version.ant> <version.sun-jaxb>2.1.4</version.sun-jaxb> <version.portlet-api>2.0</version.portlet-api> Modified: modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java =================================================================== --- modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2009-01-19 14:11:24 UTC (rev 12551) +++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2009-01-19 14:16:43 UTC (rev 12552) @@ -4,9 +4,15 @@ package org.jboss.portal.portlet.samples.remotecontroller; -import org.w3c.dom.Element; - -import javax.portlet.*; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletURL; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.ResourceURL; +import javax.portlet.WindowState; import java.io.IOException; import java.io.PrintWriter; @@ -14,87 +20,62 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 9979 $ */ -public class RemoteControllerPortlet extends GenericPortlet { +public class RemoteControllerPortlet extends GenericPortlet +{ private static final String ZIPCODE = "zipcode"; - String resUrl = ""; @Override - protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException { + protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException + { renderResponse.setContentType("text/html"); - ResourceURL resource = renderResponse.createResourceURL(); - resUrl = resource.toString(); PrintWriter printWriter = renderResponse.getWriter(); String namespace = renderResponse.getNamespace(); - printWriter.print("<p><a href='#' onclick=\"" + namespace + "_remote=" + namespace + "_openRemote_new('"); - + printWriter.print("<p><a href='#' onclick=\"" + namespace + "_remote=" + namespace + "_openRemote('"); + ResourceURL resource = renderResponse.createResourceURL(); printWriter.print(resource); printWriter.print("')\">Open remote control!</a></p>"); } @Override - protected void doHeaders(RenderRequest renderRequest, RenderResponse renderResponse) { - Element element = renderResponse.createElement("script"); - element.setAttribute("type", "text/javascript"); - String namespace = renderResponse.getNamespace(); - String remoteWindowName = namespace + "_remote"; - - element.setTextContent("" + - "var " + remoteWindowName + " = ''; " + - - "function " + namespace + "_openRemote_new(url){" + - - "this.window.name='" + namespace + "_parent';\n" + - "if (!"+ remoteWindowName +".closed){"+ - "if (" + remoteWindowName +".location) {\n" + - remoteWindowName +".location.reload(true);\n" + -// "try{" + fix recursion/do something different -// "addLoadEvent(" + namespace + "_openRemote_new('" + resUrl +"'));" + -// "}catch(e){}" + - - "}\n" + - "else {\n" + - remoteWindowName +"=window.open(url, '" + remoteWindowName + "', 'width=400,height=200,scrollable=yes');\n" + - - "if (!"+ remoteWindowName +".opener){ "+ remoteWindowName +".opener = self;\n}" + - "}\n" + - "if (window.focus) {"+ remoteWindowName +".focus()}\n" + - "return false;" + - "}}" + - "" + - - "function addLoadEvent(func) {\n" + - "var oldonload = window.onload;\n" + - "if (typeof window.onload != 'function') {\n" + - "window.onload = func;\n" + - "}\n" + - "else {\n" + - "window.onload = function() {\n" + - "oldonload();\n" + - "func();\n" + - "}\n" + - "}\n" + - "}"); - renderResponse.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element); + protected void doHeaders(RenderRequest renderRequest, RenderResponse renderResponse) + { + PrintWriter printWriter = null; + try + { + printWriter = renderResponse.getWriter(); + String namespace = renderResponse.getNamespace(); + String remoteWindowName = namespace + "_remote"; + printWriter.print("<script type='text/javascript'>var " + remoteWindowName + "; function " + namespace + + "_openRemote(url){window.name='" + namespace + "_parent';window.open(url, '" + remoteWindowName + + "', 'width=400,height=200,scrollable=yes')}" + + "onload = function() {" + + "if (typeof " + remoteWindowName + " != 'undefined') {" + remoteWindowName + ".location.reload(true);}" + + "}</script>"); + } + catch (IOException e) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } @Override - public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws PortletException, IOException { + public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws PortletException, IOException + { resourceResponse.setContentType("text/html"); PrintWriter writer = resourceResponse.getWriter(); String namespace = resourceResponse.getNamespace(); writer.print("<html><head><script type='text/javascript'>function openLinkInParent(url){window.open(url,'" - + namespace + "_parent');}</script>\n<link rel=\"stylesheet\" href='" + resourceRequest.getContextPath() + "/css/master.css' type=\"text/css\"/></head><body>"); + + namespace + "_parent');}</script>\n<link rel=\"stylesheet\" href='" + resourceRequest.getContextPath() + "/css/master.css' type=\"text/css\"/></head><body>"); PortletURL url = resourceResponse.createRenderURL(); url.setWindowState(WindowState.MINIMIZED); writer.print("<div class=\"remote-container\"><ul><li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"" + resourceRequest.getContextPath() + "/images/icon-minimize.gif\" alt=\"\"/> minimize parent portlet</a></li>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-minimize.gif\" alt=\"\"/> minimize parent portlet</a></li>"); url.setWindowState(WindowState.MAXIMIZED); writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"" + resourceRequest.getContextPath() + "/images/icon-maximize.gif\" alt=\"\"/> maximize parent portlet</a></li>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-maximize.gif\" alt=\"\"/> maximize parent portlet</a></li>"); url.setWindowState(WindowState.NORMAL); writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"" + resourceRequest.getContextPath() + "/images/icon-normal.gif\" alt=\"\"/> make parent portlet normal</a></li></ul>"); - writer.print("<br/><ul><li><b>'zipcode'</b> public render parameter value: " + resourceRequest.getParameter(ZIPCODE) + "<br/>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-normal.gif\" alt=\"\"/> make parent portlet normal</a></li></ul>"); writer.print("Set value of <b>'zipcode'</b> public render parameter to:</li>"); url.setParameter(ZIPCODE, "80201"); writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">Denver, CO</a>"); @@ -105,7 +86,8 @@ writer.print("</ul></div></body></html>"); } - private String createParentURL(PortletURL url) { + private String createParentURL(PortletURL url) + { return "openLinkInParent('" + url + "')"; } }