JBoss Portal SVN: r12559 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-19 11:16:05 -0500 (Mon, 19 Jan 2009)
New Revision: 12559
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
Log:
fixing path to archives in cms archive selenium testcase
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-19 15:57:09 UTC (rev 12558)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-19 16:16:05 UTC (rev 12559)
@@ -13,14 +13,14 @@
@Test(groups = { "cms_archive_upload" }, enabled = true)
public class CMSArchiveUploadTestCase extends JBossPortalSeleniumTestCase {
- private static final String ARCHIVE_WAITING = "120000";
+ private static final String ARCHIVE_WAITING = "60000";
/* uncomment following lines and set the right path to the workspace in the case
* you want to use this test case locally from eclipse */
-
+ /*
{
System.setProperty("workspace","/home/vrockai/workspace/p2.7tests/ui-tests/");
}
-
+ */
private static final String SUB_CANCEL_ARCH_UPLOAD = "cancel";
private static final String LNK_ADMIN = "link=Admin";
private static final String LNK_CMS = "link=CMS";
17 years, 3 months
JBoss Portal SVN: r12558 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-server-war and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-19 10:57:09 -0500 (Mon, 19 Jan 2009)
New Revision: 12558
Added:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/ParameterSanitizer.java
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/util/ParameterSanitizer.java
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java
Log:
- Cleaned-up DynaAjaxServlet, still investigating whether removal is safe or not.
- Moved ParameterSanitizer to server module and renamed methods to follow common.
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/util/ParameterSanitizer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/util/ParameterSanitizer.java 2009-01-19 15:54:33 UTC (rev 12557)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/util/ParameterSanitizer.java 2009-01-19 15:57:09 UTC (rev 12558)
@@ -1,52 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.jboss.portal.core.util;
-
-import org.jboss.portal.common.util.ParameterValidation;
-
-import java.util.regex.Pattern;
-
-/**
- * TODO
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- * @deprecated Should use {@link org.jboss.portal.common.util.ParameterValidation#sanitize} instead starting with 2.7.2
- */
-public class ParameterSanitizer
-{
- public final static Pattern CSS_DISTANCE = Pattern.compile("\\d+\\W*(em|ex|px|in|cm|mm|pt|pc|%)?");
-
- public static String sanitize(String value, Pattern regex, String defaultValue)
- {
- ParameterValidation.throwIllegalArgExceptionIfNull(regex, "expected value format");
-
- if(value == null || !regex.matcher(value).matches())
- {
- return defaultValue;
- }
- else
- {
- return value;
- }
- }
-}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-01-19 15:54:33 UTC (rev 12557)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-01-19 15:57:09 UTC (rev 12558)
@@ -21,23 +21,24 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
<%@ page pageEncoding="utf-8" %>
-<%@page import="org.jboss.portal.identity.UserStatus"%>
-<%@page import="org.jboss.portal.core.util.ParameterSanitizer"%>
-<%@page import="java.util.ResourceBundle"%>
+<%@page import="org.jboss.portal.identity.UserStatus" %>
+<%@page import="org.jboss.portal.server.ParameterSanitizer" %>
+<%@page import="java.util.ResourceBundle" %>
<%
ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale());
// todo: use ParameterValidation.sanitize after 2.7.1
String loginheight = request.getParameter("loginheight");
boolean paramPresent = loginheight != null;
- loginheight = ParameterSanitizer.sanitize(loginheight, ParameterSanitizer.CSS_DISTANCE, "300px");
+ loginheight = ParameterSanitizer.sanitizeFromPattern(loginheight, ParameterSanitizer.CSS_DISTANCE, "300px");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title><%= rb.getString("LOGIN_TITLE") %></title>
+ <title><%= rb.getString("LOGIN_TITLE") %>
+ </title>
<style type="text/css">
/* <![CDATA[ */
body {
@@ -46,20 +47,24 @@
border: 0;
padding-top: <%=loginheight%>;
}
+
/* ]]> */
</style>
<script>
- function setFocusOnLoginForm() {
- try {
- document.loginform.j_username.focus();
+ function setFocusOnLoginForm()
+ {
+ try
+ {
+ document.loginform.j_username.focus();
+ }
+ catch (e)
+ {
+ }
}
- catch (e) {
- }
- }
</script>
- <link rel="stylesheet" href="/portal-core/css/login.css" type="text/css" />
+ <link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/>
</head>
<body onload="setFocusOnLoginForm();">
@@ -67,44 +72,51 @@
<div class="login-header">
- <h2><%= rb.getString("LOGIN_TITLE") %></h2>
+ <h2><%= rb.getString("LOGIN_TITLE") %>
+ </h2>
</div>
<div class="login-content">
<div class="error-message"
style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus") ? "" : "display:none"))%>;">
- <%
+ <%
- if (UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
- {
- out.println(rb.getString("ACCOUNT_DISABLED"));
- }
- else if (UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus")) || UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus")))
- {
- out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD"));
- }
- else if (UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
- {
- out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE"));
- }
- %>
+ if (UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_DISABLED"));
+ }
+ else if (UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus")) || UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD"));
+ }
+ else if (UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE"));
+ }
+ %>
</div>
<form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm"
target="_parent">
<div class="form-field">
- <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %></label>
+ <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>
+ </label>
<input type="text" name="j_username" id="j_username" value=""/>
</div>
<div class="form-field">
- <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %></label>
+ <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>
+ </label>
<input type="password" name="j_password" id="j_password" value=""/>
</div>
<br class="clear"/>
+
<div class="button-container">
<br class="clear"/>
- <input style="<%=paramPresent ? "" : "display:none"%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=paramPresent ? "" : "display:none"%>;" type="button" name="cancel"
+ value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button"
+ onclick="window.parent.hideContentModal('login-modal');"/>
<br class="clear"/>
- <input style="<%=paramPresent ? "" : "right:10px"%>;" type="submit" name="login" value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/>
+ <input style="<%=paramPresent ? "" : "right:10px"%>;" type="submit" name="login"
+ value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/>
</div>
<br class="clear"/>
</form>
Copied: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/ParameterSanitizer.java (from rev 12498, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/util/ParameterSanitizer.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/ParameterSanitizer.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/ParameterSanitizer.java 2009-01-19 15:57:09 UTC (rev 12558)
@@ -0,0 +1,71 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.server;
+
+import org.jboss.portal.common.util.ParameterValidation;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * TODO
+ *
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ * @deprecated Should use {@link org.jboss.portal.common.util.ParameterValidation#sanitize*} instead starting with
+ * 2.7.2
+ */
+public class ParameterSanitizer
+{
+ public final static Pattern CSS_DISTANCE = Pattern.compile("\\d+\\W*(em|ex|px|in|cm|mm|pt|pc|%)?");
+
+ public static String sanitizeFromPattern(String value, Pattern regex, String defaultValue)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(regex, "expected value format");
+
+ if (value == null || !regex.matcher(value).matches())
+ {
+ return defaultValue;
+ }
+ else
+ {
+ return value;
+ }
+ }
+
+ public static String sanitizeFromValues(String value, String[] possibleValues, String defaultValue)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(possibleValues, "possible values");
+
+ List<String> values = Arrays.asList(possibleValues);
+ if (!values.contains(value))
+ {
+ return defaultValue;
+ }
+ else
+ {
+ return value;
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java 2009-01-19 15:54:33 UTC (rev 12557)
+++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java 2009-01-19 15:57:09 UTC (rev 12558)
@@ -23,7 +23,7 @@
package org.jboss.portal.theme.servlet;
-import org.jboss.logging.Logger;
+import org.jboss.portal.server.ParameterSanitizer;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -31,7 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
-import java.util.Enumeration;
/**
* @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a>
@@ -40,7 +39,9 @@
public class DynaAjaxServlet extends HttpServlet
{
- private final static Logger log = Logger.getLogger(DynaAjaxServlet.class);
+ private static final String ACTION = "action";
+ private static final String[] POSSIBLE_ACTION_VALUES = new String[]{"windowremove", "windowmove"};
+ private static final String DEFAULT_RESPONSE = "";
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException
@@ -48,79 +49,11 @@
doPost(req, resp);
}
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
- Enumeration paramNames = req.getParameterNames();
- String response = "";
- while (paramNames.hasMoreElements())
- {
- String name = (String)paramNames.nextElement();
- // action: windowremove|windowmove
- if ("action".equalsIgnoreCase(name))
- {
- response = req.getParameter(name);
- }
- System.out.println("Parameter: " + name + " = " + req.getParameter(name));
- }
-
+ String actionValue = req.getParameter(ACTION);
+ String response = ParameterSanitizer.sanitizeFromValues(actionValue, POSSIBLE_ACTION_VALUES, DEFAULT_RESPONSE);
sendResp(resp, response);
-
-/*
- if(req.getParameter("action") != null)
- {
- if(req.getParameter("action").equals(PERSIST))
- {
- if(req.getParameter("positionNo") == null
- || req.getParameter("windowId") == null
- || req.getParameter("oldRegionId") == null
- || req.getParameter("newRegionId") == null)
- {
- resp.sendError(400, "Not enought parameters");
- return;
- }
-
- if(!testMode)
- {
- persistance.persistPosition(req.getParameter("positionNo"),
- req.getParameter("windowId"), req
- .getParameter("oldRegionId"), req
- .getParameter("newRegionId"));
- }
-
- sendResp(resp, "Position persisted");
- }
- else if(req.getParameter("action").equals(TEST_MODE))
- {
- if(req.getParameter("mode") != null)
- {
- try
- {
- testMode = Boolean.valueOf(req.getParameter("mode"))
- .booleanValue();
- }
- catch(RuntimeException e)
- {
- resp.sendError(400, "Bad arguments");
- return;
- }
-
- sendResp(resp, ((testMode) ? "Test mode ON" : "Test mode OFF"));
-
- }
- else
- {
- resp.sendError(400, "Not enought parameters");
- return;
- }
- }
- else
- {
- resp.sendError(400, "Unknown ajax call");
- return;
- }
- }
-*/
}
private void sendResp(HttpServletResponse resp, String respData)
17 years, 3 months
JBoss Portal SVN: r12557 - in modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms: impl/jcr and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-19 10:54:33 -0500 (Mon, 19 Jan 2009)
New Revision: 12557
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java
Log:
JBPORTAL-2258 - Create file in CMS not working for several databases
* All setups work locally
* Oracle and Postgresql instance still breaking only in the QA lab. Something environmental probably that QA team will look into
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java 2009-01-19 15:51:22 UTC (rev 12556)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java 2009-01-19 15:54:33 UTC (rev 12557)
@@ -480,7 +480,9 @@
*/
public void prepare(Object tx, List modifications, boolean one_phase) throws Exception
{
+ Session session = HibernateUtil.getSessionFactory(this.cmsSessionFactory).getCurrentSession();
this.put(modifications);
+ session.flush();
}
/**
@@ -769,7 +771,6 @@
{
session.save(object);
}
- session.flush();
}
/**
@@ -784,7 +785,6 @@
{
Session session = HibernateUtil.getSessionFactory(this.cmsSessionFactory).getCurrentSession();
session.delete(removedValue);
- session.flush();
}
return removedValue;
}
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-01-19 15:51:22 UTC (rev 12556)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-01-19 15:54:33 UTC (rev 12557)
@@ -499,8 +499,15 @@
//Save the changes during this session
session.save();
tx.commit();
+
+ //Hibernate cleanup.........somehow this is needed due to jdbc drivers for oracle and postrgresql flaking
+ //out on BatchUpdate transactions issued by Hibernate session synchronization
+ org.hibernate.Session hibSession = HibernateUtil.getSessionFactory(this.cmsSessionFactory).getCurrentSession();
+ hibSession.flush();
+ hibSession.clear();
+
if(isStartedHere)
- {
+ {
tm.commit();
}
}
17 years, 3 months
JBoss Portal SVN: r12556 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-19 10:51:22 -0500 (Mon, 19 Jan 2009)
New Revision: 12556
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
Log:
- Forgot to commit added attribute.
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2009-01-19 15:30:28 UTC (rev 12555)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2009-01-19 15:51:22 UTC (rev 12556)
@@ -428,6 +428,9 @@
<name>user.name.nickName</name>
</user-attribute>
<user-attribute>
+ <name>user.login.id</name>
+ </user-attribute>
+ <user-attribute>
<name>user.business-info.online.email</name>
</user-attribute>
<user-attribute>
17 years, 3 months
JBoss Portal SVN: r12555 - modules/portlet/tags/JBP_PORTLET_2_0_5/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-19 10:30:28 -0500 (Mon, 19 Jan 2009)
New Revision: 12555
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_5/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java
Log:
minor
Modified: modules/portlet/tags/JBP_PORTLET_2_0_5/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_5/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2009-01-19 15:13:12 UTC (rev 12554)
+++ modules/portlet/tags/JBP_PORTLET_2_0_5/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2009-01-19 15:30:28 UTC (rev 12555)
@@ -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,63 @@
* @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("<br/><ul><li>");
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 +87,8 @@
writer.print("</ul></div></body></html>");
}
- private String createParentURL(PortletURL url) {
+ private String createParentURL(PortletURL url)
+ {
return "openLinkInParent('" + url + "')";
}
}
17 years, 3 months
JBoss Portal SVN: r12554 - modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-19 10:13:12 -0500 (Mon, 19 Jan 2009)
New Revision: 12554
Modified:
modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java
Log:
oups
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:48:36 UTC (rev 12553)
+++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2009-01-19 15:13:12 UTC (rev 12554)
@@ -76,6 +76,7 @@
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>");
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>");
17 years, 3 months
JBoss Portal SVN: r12553 - in modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/util and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-19 09:48:36 -0500 (Mon, 19 Jan 2009)
New Revision: 12553
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
Log:
- Renamed sanitize to sanitizeFromPattern.
- Added sanitizeFromValues and added test case.
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-01-19 14:16:43 UTC (rev 12552)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-01-19 14:48:36 UTC (rev 12553)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.common.util;
+import java.util.Arrays;
+import java.util.List;
import java.util.regex.Pattern;
/**
@@ -95,7 +97,7 @@
* @param defaultValue default value to use if the specified value does not conform to the specified format
* @return the specified value if it conforms to the expected format, the given default value otherwise.
*/
- public static String sanitize(String value, Pattern regex, String defaultValue)
+ public static String sanitizeFromPattern(String value, Pattern regex, String defaultValue)
{
throwIllegalArgExceptionIfNull(regex, "expected value format");
@@ -108,4 +110,28 @@
return value;
}
}
+
+ /**
+ * Checks if a given value matches one of the possible values. If yes, returns it as is. Otherwise, returns the
+ * default value.
+ *
+ * @param value value to sanitize if needed, <code>null</code> is considered as not matching
+ * @param possibleValues possible values
+ * @param defaultValue default value to use if the specified value does not conform to the specified format
+ * @return the specified value if it conforms to the expected format, the given default value otherwise.
+ */
+ public static String sanitizeFromValues(String value, String[] possibleValues, String defaultValue)
+ {
+ throwIllegalArgExceptionIfNullOrEmpty(possibleValues, "possible values");
+
+ List<String> values = Arrays.asList(possibleValues);
+ if (!values.contains(value))
+ {
+ return defaultValue;
+ }
+ else
+ {
+ return value;
+ }
+ }
}
Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-01-19 14:16:43 UTC (rev 12552)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-01-19 14:48:36 UTC (rev 12553)
@@ -33,11 +33,11 @@
*/
public class ParameterValidationTestCase extends TestCase
{
- public void testNullPattern()
+ public void testSanitizeFromPatternNullPattern()
{
try
{
- ParameterValidation.sanitize("foo", null, null);
+ ParameterValidation.sanitizeFromValues("foo", null, null);
fail("Should have thrown an IAE on null Pattern");
}
catch (IllegalArgumentException e)
@@ -46,38 +46,73 @@
}
}
- public void testNullValue()
+ public void testSanitizeFromPatternNullValue()
{
String defaultValue = "default";
- assertEquals(defaultValue, ParameterValidation.sanitize(null, Pattern.compile(""), defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern(null, Pattern.compile(""), defaultValue));
}
- public void testNullDefault()
+ public void testSanitizeFromPatternNullDefault()
{
- assertNull(ParameterValidation.sanitize(null, Pattern.compile(""), null));
+ assertNull(ParameterValidation.sanitizeFromPattern(null, Pattern.compile(""), null));
}
- public void testCSSDistance()
+ public void testSanitizeFromPatternCSSDistance()
{
String defaultValue = "300px";
assertEquals(defaultValue,
- ParameterValidation.sanitize("0%20;%20background-image:%20url(http://us.i1.yimg.com/us.yimg.com/i/us/we...",
+ ParameterValidation.sanitizeFromPattern("0%20;%20background-image:%20url(http://us.i1.yimg.com/us.yimg.com/i/us/we...",
ParameterValidation.CSS_DISTANCE, defaultValue));
- assertEquals(defaultValue, ParameterValidation.sanitize(defaultValue, ParameterValidation.CSS_DISTANCE, null));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern(defaultValue, ParameterValidation.CSS_DISTANCE, null));
String value = "0";
- assertEquals(value, ParameterValidation.sanitize(value, ParameterValidation.CSS_DISTANCE, null));
+ assertEquals(value, ParameterValidation.sanitizeFromPattern(value, ParameterValidation.CSS_DISTANCE, null));
value = "10%";
- assertEquals(value, ParameterValidation.sanitize(value, ParameterValidation.CSS_DISTANCE, null));
+ assertEquals(value, ParameterValidation.sanitizeFromPattern(value, ParameterValidation.CSS_DISTANCE, null));
value = "10 %";
- assertEquals(value, ParameterValidation.sanitize(value, ParameterValidation.CSS_DISTANCE, null));
+ assertEquals(value, ParameterValidation.sanitizeFromPattern(value, ParameterValidation.CSS_DISTANCE, null));
value = "100 \n\tin";
- assertEquals(value, ParameterValidation.sanitize(value, ParameterValidation.CSS_DISTANCE, null));
+ assertEquals(value, ParameterValidation.sanitizeFromPattern(value, ParameterValidation.CSS_DISTANCE, null));
- assertEquals(defaultValue, ParameterValidation.sanitize("", ParameterValidation.CSS_DISTANCE, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("", ParameterValidation.CSS_DISTANCE, defaultValue));
}
+
+ public void testSanitizeFromValuesNullValue()
+ {
+ String defaultValue = "default";
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromValues(null, new String[]{""}, defaultValue));
+ }
+
+ public void testSanitizeFromValuesNullValues()
+ {
+ try
+ {
+ ParameterValidation.sanitizeFromValues("foo", null, null);
+ fail("Should have thrown an IAE on null values");
+ }
+ catch (Exception e)
+ {
+ // expected
+ }
+ }
+
+ public void testSanitizeFromValuesNullDefault()
+ {
+ assertNull(ParameterValidation.sanitizeFromValues("foo", new String[]{"bar"}, null));
+ }
+
+ public void testSanitizeFromValues()
+ {
+ String defaultValue = "foo";
+ String[] possible = new String[]{"windowremove", "windowmove"};
+
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromValues("%3Cblink%3EH4XOR3D%3C/blink%3E", possible, defaultValue));
+
+ assertEquals("windowmove", ParameterValidation.sanitizeFromValues("windowmove", possible, defaultValue));
+ assertEquals("windowremove", ParameterValidation.sanitizeFromValues("windowremove", possible, defaultValue));
+ }
}
17 years, 3 months
JBoss Portal SVN: r12552 - in modules/portlet/trunk: samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller and 1 other directory.
by portal-commits＠lists.jboss.org
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 + "')";
}
}
17 years, 3 months
JBoss Portal SVN: r12551 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-19 09:11:24 -0500 (Mon, 19 Jan 2009)
New Revision: 12551
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
test tweaks
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-19 13:32:08 UTC (rev 12550)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-19 14:11:24 UTC (rev 12551)
@@ -13,14 +13,14 @@
@Test(groups = { "cms_archive_upload" }, enabled = true)
public class CMSArchiveUploadTestCase extends JBossPortalSeleniumTestCase {
- private static final String ARCHIVE_WAITING = "90000";
+ private static final String ARCHIVE_WAITING = "120000";
/* uncomment following lines and set the right path to the workspace in the case
* you want to use this test case locally from eclipse */
- /*
+
{
- System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/");
+ System.setProperty("workspace","/home/vrockai/workspace/p2.7tests/ui-tests/");
}
- */
+
private static final String SUB_CANCEL_ARCH_UPLOAD = "cancel";
private static final String LNK_ADMIN = "link=Admin";
private static final String LNK_CMS = "link=CMS";
@@ -79,9 +79,7 @@
selenium.click(SUB_SEND_ARCHIVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- //
- selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals(selenium.getText(DIV_ARCHIVE_STATUS),
"Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-19 13:32:08 UTC (rev 12550)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-19 14:11:24 UTC (rev 12551)
@@ -297,11 +297,13 @@
selenium.open("/portal/portal/default");
selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
selenium.click(LNK_EXPLORE);
selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Enteprise Portal Platform"));
Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
-
+
login("admin", "admin");
selenium.click(LNK_ADMIN);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -323,12 +325,14 @@
selenium.waitForPageToLoad(PAGE_LOAD);
logout();
+ Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
selenium.open("/portal/portal/default");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LNK_EXPLORE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
+ Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
+ Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-19 13:32:08 UTC (rev 12550)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-19 14:11:24 UTC (rev 12551)
@@ -68,9 +68,9 @@
int r = traversePortlets(NAME_COUNTPORT,0);
clickAndWait(MessageFormat.format(LNK_INSTANCE_BUTTON, r));
- safeSelect(SELECT_LANGUAGE, "Czech");
+ safeSelect(SELECT_LANGUAGE, "English");
- final String name = "Administracny";
+ final String name = "Administracning";
selenium.type(INPUT_NAME, name);
clickAndWait(SUBMIT_MODIFY_NAME);
Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0);
17 years, 3 months
){kind=link}