JBoss Portal SVN: r13116 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-04-02 09:55:10 -0400 (Thu, 02 Apr 2009)
New Revision: 13116
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
Log:
- Oops, committed too fast, forgot import!
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-02 13:53:55 UTC (rev 13115)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-02 13:55:10 UTC (rev 13116)
@@ -44,6 +44,7 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
15 years, 3 months
JBoss Portal SVN: r13115 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-04-02 09:53:55 -0400 (Thu, 02 Apr 2009)
New Revision: 13115
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
- Make AuthorizationBean subclasses Serializable directly to be sure...
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-02 13:53:41 UTC (rev 13114)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-02 13:53:55 UTC (rev 13115)
@@ -20,6 +20,7 @@
* 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.admin.ui;
import org.jboss.portal.Mode;
@@ -433,7 +434,7 @@
}
};
- public class InstanceAuthorizationBean extends AuthorizationBean
+ public class InstanceAuthorizationBean extends AuthorizationBean implements Serializable
{
private static final long serialVersionUID = -6284936544525435559L;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-02 13:53:41 UTC (rev 13114)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-02 13:53:55 UTC (rev 13115)
@@ -740,7 +740,7 @@
getDomainConfigurator().setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints);
}
- public class PortalObjectAuthorizationBean extends AuthorizationBean
+ public class PortalObjectAuthorizationBean extends AuthorizationBean implements Serializable
{
private static final long serialVersionUID = 7281763204029034269L;
15 years, 3 months
JBoss Portal SVN: r13114 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-02 09:53:41 -0400 (Thu, 02 Apr 2009)
New Revision: 13114
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
Log:
[selenium] - max window before debug shot
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-04-02 13:03:59 UTC (rev 13113)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-04-02 13:53:41 UTC (rev 13114)
@@ -266,8 +266,10 @@
}
protected void debugScreenshot(String filename) {
- if (JBossSeleniumTestListener.debug)
+ if (JBossSeleniumTestListener.debug){
+ selenium.windowMaximize();
selenium.captureScreenshot(debugDir + "/" + filename);
+ }
}
}
15 years, 3 months
JBoss Portal SVN: r13113 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-02 09:03:59 -0400 (Thu, 02 Apr 2009)
New Revision: 13113
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
Log:
[selenium] - debug into end2end bea portlet creation
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-02 10:26:05 UTC (rev 13112)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-02 13:03:59 UTC (rev 13113)
@@ -12,7 +12,7 @@
*/
@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.")
public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase {
- public static long AJAX_TIMEOUT = 15000;
+
public static String casePfx = "e2e.wsrp.";
private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]";
@@ -102,6 +102,8 @@
public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]";
+ public static int c = 0;
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
logoutIfPossible();
@@ -123,14 +125,14 @@
String pageName = "default";
String defName= "BEA: Hello World";
String insName = "1BeaPor";
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
createConsumer(consName);
createInstance(defName, consName, insName);
addPortlet(portalName, pageName, insName, "portlet");
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
selenium.open(ADR_HOME);
selenium.waitForPageToLoad(PAGE_LOAD);
- waitFor(AJAX_TIMEOUT);
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow"));
Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP Demo."));
@@ -154,15 +156,18 @@
selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid)."));
Assert.assertTrue(selenium.isTextPresent("Missing value"));
selenium.type(INPUT_CONS_REGVALUE, "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
Assert.assertTrue(selenium.isTextPresent("Refresh was successful."));
selenium.click(SUBMIT_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
Assert.assertTrue(selenium.isTextPresent(consumerName));
}
@@ -178,12 +183,12 @@
selenium.select(SEL_CONS_TYPE, "label="+type);
selenium.click(SUB_VIEW_PORTLETS);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
int r = findTableRow(TABLE_PORTLET, defName, 0);
selenium.click(MessageFormat.format(T_LINK_CREATE,r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
- //selenium.setSpeed("5555");
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
selenium.type(INPUT_INSTANCE_NAME, insName);
selenium.click(SUBMIT_CREATE_INST);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -196,7 +201,7 @@
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LNK_PORTALS_ID);
clickIfVisible(LNK_PORTAL_HOME);
@@ -204,7 +209,7 @@
int r = findTableRow(TBL_PORTAL_ADMIN, portalName, 0) - 1;
selenium.click(MessageFormat.format(POR_TL_MAIN, r));
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
r = findTableRow(TBL_PORTALPAGE_ADMIN, pageName, 0) - 1;
// click on the page layout
@@ -215,7 +220,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
//hack
selenium.select(SEL_PORTLET_TYPE, "label=" + "cms");
try {
@@ -223,17 +228,17 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
selenium.select(SEL_PORTLET_TYPE, "label=" + type);
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
selenium.click("link=*"+portletName+"*");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ debugScreenshot("debug_e2e_bea_"+ c++ +".jpg");
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
15 years, 3 months
JBoss Portal SVN: r13112 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-02 06:26:05 -0400 (Thu, 02 Apr 2009)
New Revision: 13112
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
Log:
[selenium] debug into e2e portal
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-02 07:11:06 UTC (rev 13111)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-02 10:26:05 UTC (rev 13112)
@@ -17,11 +17,10 @@
@Test(groups = { "end2end" }, enabled = true, description = "Creating of new portal with content.")
public class EndtoEndPortalAdminTestCase extends JBossPortalSeleniumTestCase {
-
public static String casePfx = "portal.e2e.";
- private final String ADR_PORTAL = getProp(casePfx + "adr.home","/portal");
- public final String SEL_PORTLET_TYPE = getProp(casePfx + "sel.portlet.type","//select[contains(@id,'windowForm:instanceId')]");
+ private final String ADR_PORTAL = getProp(casePfx + "adr.home", "/portal");
+ public final String SEL_PORTLET_TYPE = getProp(casePfx + "sel.portlet.type", "//select[contains(@id,'windowForm:instanceId')]");
private final String SUB_LAYOUT_ADD_CENTER = getProp(casePfx + "sub.layout.add.center", "//input[contains(@id,'layoutForm:a_center')]");
private final String INP_WINDOW_NAME = getProp(casePfx + "inp.window.name", "//input[contains(@id,'windowForm:windowName')]");
private final String SUB_RENAME_PORTAL = getProp(casePfx + "sub.rename.portal", "//input[contains(@id,'renameForm:rename')]");
@@ -105,7 +104,7 @@
addPortlet(portalName, page1Name, PORTLET1, "portlet");
addPortlet(portalName, page2Name, PORTLET2, "widget/google");
addPortlet(portalName, page3Name, PORTLET3, "widget/netvibes");
- //addPortlet(portalName, page4Name, PORTLET4, "filesystem");
+ // addPortlet(portalName, page4Name, PORTLET4, "filesystem");
addPortlet(portalName, page5Name, PORTLET5, "cms");
makeDefaultPortal(portalName);
@@ -117,27 +116,32 @@
Assert.assertTrue(selenium.isElementPresent("link=" + page1Name));
Assert.assertTrue(selenium.isElementPresent("link=" + page2Name));
Assert.assertTrue(selenium.isElementPresent("link=" + page3Name));
- //Assert.assertTrue(selenium.isElementPresent("link=" + page4Name));
+ // Assert.assertTrue(selenium.isElementPresent("link=" + page4Name));
Assert.assertTrue(selenium.isElementPresent("link=" + page5Name));
// Assert pages contain what they should
assertPageContains(page1Name, por1str);
assertPageContains(page2Name, por2str);
assertPageContains(page3Name, por3str);
- //assertPageContains(page4Name, por4str);
+ // assertPageContains(page4Name, por4str);
assertPageContains(page5Name, por5str);
}
-
- public void testManagePortal(){
-
+
+ public void testManagePortal() {
+
}
private void assertPageContains(String pageName, String awaitStr) {
selenium.open(ADR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ if (selenium.isAlertPresent()) {
+ debugPrint("[selenium] debug alert before link: "+selenium.getAlert());
+ }
selenium.click("link=" + pageName);
+ if (selenium.isAlertPresent()) {
+ debugPrint("[selenium] debug alert before link: "+selenium.getAlert());
+ }
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(awaitStr));
@@ -245,21 +249,20 @@
selenium.waitForPageToLoad(PAGE_LOAD);
} else if ("cms".equals(type)) {
String[] links = portletName.split("/");
- selenium.click("link="+links[0]);
+ selenium.click("link=" + links[0]);
selenium.waitForPageToLoad(PAGE_LOAD);
portletName = links[1];
} else if ("filesystem".equals(type)) {
String[] links = portletName.split("/");
- selenium.click("link="+links[0]);
+ selenium.click("link=" + links[0]);
selenium.waitForPageToLoad(PAGE_LOAD);
portletName = links[1];
}
-
- selenium.click("link=*" + portletName+"*");
+
+ selenium.click("link=*" + portletName + "*");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
-
}
15 years, 3 months
JBoss Portal SVN: r13111 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-02 03:11:06 -0400 (Thu, 02 Apr 2009)
New Revision: 13111
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
Log:
[JBPORTAL-2361] - Added null checking and set headers if FragmentResponse too
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java 2009-04-01 15:38:23 UTC (rev 13110)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java 2009-04-02 07:11:06 UTC (rev 13111)
@@ -73,25 +73,35 @@
if (response instanceof UpdateNavigationalStateResponse)
{
UpdateNavigationalStateResponse unsr = (UpdateNavigationalStateResponse) response;
- for (Cookie cookie : unsr.getProperties().getCookies())
+ if (unsr.getProperties() != null)
{
- addCookie(invocation, cookie);
+ for (Cookie cookie : unsr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ for (String key: unsr.getProperties().getTransportHeaders().keySet())
+ {
+ String value = unsr.getProperties().getTransportHeaders().getValue(key);
+ ((AbstractServerContext) invocation.getServerContext()).getResponse().addHeader(key, value);
+ }
}
- for (String key: unsr.getProperties().getTransportHeaders().keySet())
- {
- String value = unsr.getProperties().getTransportHeaders().getValue(key);
- ((AbstractServerContext) invocation.getServerContext()).getResponse().addHeader(key, value);
- }
}
else if (response instanceof FragmentResponse)
{
FragmentResponse fr = (FragmentResponse) response;
- for (Cookie cookie : fr.getProperties().getCookies())
+ if (fr.getProperties() != null)
{
- addCookie(invocation, cookie);
+ for (Cookie cookie : fr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ for (String key: fr.getProperties().getTransportHeaders().keySet())
+ {
+ String value = fr.getProperties().getTransportHeaders().getValue(key);
+ ((AbstractServerContext) invocation.getServerContext()).getResponse().addHeader(key, value);
+ }
}
}
-
//
return response;
}
15 years, 3 months
JBoss Portal SVN: r13110 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-01 11:38:23 -0400 (Wed, 01 Apr 2009)
New Revision: 13110
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
Log:
[selenium] ajax timeout
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-01 15:34:23 UTC (rev 13109)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-01 15:38:23 UTC (rev 13110)
@@ -12,7 +12,7 @@
*/
@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.")
public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase {
-
+ public static long AJAX_TIMEOUT = 15000;
public static String casePfx = "e2e.wsrp.";
private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]";
@@ -130,7 +130,7 @@
selenium.open(ADR_HOME);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ waitFor(AJAX_TIMEOUT);
Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow"));
Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP Demo."));
15 years, 3 months
JBoss Portal SVN: r13109 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-01 11:34:23 -0400 (Wed, 01 Apr 2009)
New Revision: 13109
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
Log:
[selenium] - debug into archive tests
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-04-01 15:10:34 UTC (rev 13108)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-04-01 15:34:23 UTC (rev 13109)
@@ -61,7 +61,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPopUp("_top", PAGE_LOAD);
selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/archive.zip");
-
+ debugPrint("[selenium] : testArchiveUpload archive path: " + WORKSPACE + "/test_files/archive.zip");
selenium.click(SUB_CANCEL_ARCH_UPLOAD);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -83,7 +83,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPopUp("_top", PAGE_LOAD);
selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/archive.zip");
-
+ debugPrint("[selenium] : testArchiveUpload archive path2: " + WORKSPACE + "/test_files/archive.zip");
selenium.click(SUB_SEND_ARCHIVE);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -124,7 +124,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPopUp("_top", PAGE_LOAD);
selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/many_files.zip");
-
+ debugPrint("[selenium] : testManyFilesArchiveUpload archive path: " + WORKSPACE + "/test_files/many_files.zip");
selenium.click(SUB_SEND_ARCHIVE);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -166,7 +166,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPopUp("_top", PAGE_LOAD);
selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/big_archive.zip");
-
+ debugPrint("[selenium] : testBigArchiveUpload archive path: " + WORKSPACE + "/test_files/big_archive.zip");
selenium.click(SUB_SEND_ARCHIVE);
selenium.waitForPageToLoad(PAGE_LOAD);
15 years, 3 months
JBoss Portal SVN: r13108 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/aspects/portlet and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-01 11:10:34 -0400 (Wed, 01 Apr 2009)
New Revision: 13108
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-2361: Using PortletResponse.addProperty(javax.servlet.http.Cookie) does not set the cookie in the response
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-04-01 14:37:38 UTC (rev 13107)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-04-01 15:10:34 UTC (rev 13108)
@@ -67,7 +67,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.4"/>
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.5"/>
+ <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.8"/>
<componentref name="jboss-portal/modules/cms" version="1.2.4"/>
<componentref name="antlr" version="2.7.6-brew"/>
Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java 2009-04-01 15:10:34 UTC (rev 13108)
@@ -0,0 +1,107 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.aspects.portlet;
+
+import java.util.List;
+
+import org.jboss.portal.common.util.MultiValuedPropertyMap;
+import org.jboss.portal.core.metadata.portlet.MarkupElement;
+import org.jboss.portal.core.portlet.info.MarkupHeaderInfo;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
+import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
+import org.w3c.dom.Element;
+
+import javax.portlet.MimeResponse;
+import javax.servlet.http.Cookie;
+
+/**
+ * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a>
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision: 11068 $
+ */
+public class HttpHeaderInterceptor extends CorePortletInterceptor
+{
+
+ private String defaultCookiePath = null;
+
+ /**
+ * Cookie path to set when none has been defined
+ */
+ public String getDefaultCookiePath()
+ {
+ return defaultCookiePath;
+ }
+
+ public void setDefaultCookiePath(String defaultCookiePath)
+ {
+ this.defaultCookiePath = defaultCookiePath;
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException,
+ PortletInvokerException
+ {
+
+ PortletInvocationResponse response = super.invoke(invocation);
+
+ if (response instanceof UpdateNavigationalStateResponse)
+ {
+ UpdateNavigationalStateResponse unsr = (UpdateNavigationalStateResponse) response;
+ for (Cookie cookie : unsr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ for (String key: unsr.getProperties().getTransportHeaders().keySet())
+ {
+ String value = unsr.getProperties().getTransportHeaders().getValue(key);
+ ((AbstractServerContext) invocation.getServerContext()).getResponse().addHeader(key, value);
+ }
+ }
+ else if (response instanceof FragmentResponse)
+ {
+ FragmentResponse fr = (FragmentResponse) response;
+ for (Cookie cookie : fr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ }
+
+ //
+ return response;
+ }
+
+ private void addCookie(PortletInvocation invocation, Cookie cookie)
+ {
+ if ((cookie.getPath() == null || "".equals(cookie.getPath().trim())) && defaultCookiePath != null)
+ {
+ cookie.setPath(defaultCookiePath);
+ }
+ ((AbstractServerContext) invocation.getServerContext()).getResponse().addCookie(cookie);
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-04-01 14:37:38 UTC (rev 13107)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-04-01 15:10:34 UTC (rev 13108)
@@ -345,6 +345,12 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
+ <mbean code="org.jboss.portal.core.aspects.portlet.HttpHeaderInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=HttpHeader" xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="DefaultCookiePath">/</attribute>
+ </mbean>
<mbean code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Header" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -380,6 +386,7 @@
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=HttpHeader</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
15 years, 3 months
JBoss Portal SVN: r13107 - in modules/portlet/trunk: portlet/src/main/java/org/jboss/portal/portlet/impl/spi and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-01 10:37:38 -0400 (Wed, 01 Apr 2009)
New Revision: 13107
Modified:
modules/portlet/trunk/.classpath
modules/portlet/trunk/.project
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
Log:
Opening up the API a bit :-/
Modified: modules/portlet/trunk/.classpath
===================================================================
--- modules/portlet/trunk/.classpath 2009-04-01 14:18:09 UTC (rev 13106)
+++ modules/portlet/trunk/.classpath 2009-04-01 14:37:38 UTC (rev 13107)
@@ -1,15 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="portlet/src/main/java"/>
- <classpathentry kind="src" path="bridge/src/main/java"/>
- <classpathentry kind="src" path="controller/src/main/java"/>
- <classpathentry kind="src" path="federation/src/main/java"/>
- <classpathentry kind="src" path="management/src/main/java"/>
- <classpathentry kind="src" path="test/src/main/java"/>
- <classpathentry kind="src" path="samples/src/main/java"/>
- <classpathentry kind="src" path="portlet/src/test/java"/>
- <classpathentry kind="src" path="mc/src/main/java"/>
+ <classpathentry kind="src" output="portlet/target/classes" path="portlet/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="portlet/target/classes" path="portlet/src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="portlet/target/test-classes" path="portlet/src/test/resources"/>
+ <classpathentry kind="src" output="controller/target/classes" path="controller/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="controller/target/test-classes" path="controller/src/test/resources"/>
+ <classpathentry kind="src" output="bridge/target/classes" path="bridge/src/main/java"/>
+ <classpathentry kind="src" output="federation/target/classes" path="federation/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="federation/target/test-classes" path="federation/src/test/resources"/>
+ <classpathentry kind="src" output="management/target/classes" path="management/src/main/java"/>
+ <classpathentry kind="src" output="mc/target/classes" path="mc/src/main/java"/>
+ <classpathentry kind="src" output="mc/target/test-classes" path="mc/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="mc/target/test-classes" path="mc/src/test/resources"/>
+ <classpathentry kind="src" output="test/target/classes" path="test/src/main/java"/>
+ <classpathentry kind="src" output="test/target/test-classes" path="test/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="test/target/test-classes" path="test/src/test/resources"/>
+ <classpathentry kind="src" output="portal/target/classes" path="portal/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="portal/target/classes" path="portal/src/main/resources"/>
+ <classpathentry kind="src" output="portal/target/test-classes" path="portal/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="portal/target/test-classes" path="portal/src/test/resources"/>
+ <classpathentry kind="src" output="samples/target/classes" path="samples/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: modules/portlet/trunk/.project
===================================================================
--- modules/portlet/trunk/.project 2009-04-01 14:18:09 UTC (rev 13106)
+++ modules/portlet/trunk/.project 2009-04-01 14:37:38 UTC (rev 13107)
@@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-01 14:18:09 UTC (rev 13106)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-01 14:37:38 UTC (rev 13107)
@@ -68,4 +68,11 @@
{
return servletContainer.include(targetServletContext, clientRequest, clientResponse, callback, handback);
}
+
+ public HttpServletResponse getResponse()
+ {
+ return clientResponse;
+ }
+
+
}
15 years, 3 months