JBoss Portal SVN: r13037 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-16 10:23:44 -0400 (Mon, 16 Mar 2009)
New Revision: 13037
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
Log:
test fixes
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 14:21:17 UTC (rev 13036)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 14:23:44 UTC (rev 13037)
@@ -123,7 +123,7 @@
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10103"));
}
- @Test(enabled = true)
+ @Test(enabled = true, dependsOnMethods ={"testDefaultPageCoordination"})
public void testPageCoordination(){
String portalName = "default";
String pageName = "Coordination Samples";
@@ -162,7 +162,7 @@
}
- @Test(enabled = true)
+ @Test(enabled = true, dependsOnMethods ={"testDefaultPageCoordination"})
public void testDeleteAlias(){
String portalName = "default";
String pageName = "Coordination Samples";
@@ -214,7 +214,7 @@
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
}
- @Test(enabled = true)
+ @Test(enabled = true, dependsOnMethods ={"testDefaultPageCoordination"})
public void testRenameAlias(){
String portalName = "default";
String pageName = "Coordination Samples";
@@ -272,7 +272,7 @@
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
}
- @Test(enabled = true)
+ @Test(enabled = true, dependsOnMethods ={"testDefaultPageCoordination"})
public void testParamBinding(){
String portalName = "default";
String pageName = "Coordination Samples";
@@ -317,7 +317,7 @@
Assert.assertTrue(selenium.isChecked(CHK_PARAM_BIND));
}
- @Test(enabled = true)
+ @Test(enabled = true, dependsOnMethods ={"testDefaultPageCoordination"})
public void testExplicitWiring(){
String portalName = "default";
String pageName = "Coordination Samples";
17 years, 1 month
JBoss Portal SVN: r13036 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-16 10:21:17 -0400 (Mon, 16 Mar 2009)
New Revision: 13036
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
Log:
test fixes
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-03-16 11:30:02 UTC (rev 13035)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-03-16 14:21:17 UTC (rev 13036)
@@ -19,8 +19,6 @@
private final String LINK_WEATHER_PORTLET = getProp(casePfx + "link.weather.portlet", "link=*WeatherPortlet*");
private final String LINK_PORTL2 = getProp(casePfx + "link.portl2", "link=*Who's online portlet*");
private final String LINK_PORTL1 = getProp(casePfx + "link.portl1", "link=*Welcome portlet*");
- // private final String OPT_PORTL2 =
- // getProp(casePfx+"opt.portl2","CurrentUsersPortletWindow");
private final String OPT_PORTL1 = getProp(casePfx + "opt.portl1", "JSPPortletWindow");
private final String SEL_CONTENT_TYPE = getProp(casePfx + "sel.content.type", "//select[contains(@id,'contentTypesForm:instanceId')]");
private final String SUB_DEL_FROM_CENTER_REGION = getProp(casePfx + "sub.del.from.center.region", "//input[contains(@id,'layoutForm:l_center')]");
@@ -35,7 +33,6 @@
private final String INP_PAGENAME = getProp(casePfx + "inp.pagename", "//input[contains(@id,':pageName')]");
private final String SUB_CREATEPAGE = getProp(casePfx + "sub.createpage", "//form[contains(@id,'j_id3')]/input[@type='submit']");
private final String SEL_LAYOUT = getProp(casePfx + "sel.layout", "//select[contains(@id,'dashboardLayoutForm:layoutSelector')]");
-
private final String SEL_THEME = getProp(casePfx + "sel.theme", "//select[contains(@id,'dashboardThemeForm:themeSelector')]");
private final String SUB_THEMESEL = getProp(casePfx + "sub.themesel", "//form[contains(@id,'dashboardThemeForm')]/input[@type='submit']");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-03-16 11:30:02 UTC (rev 13035)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-03-16 14:21:17 UTC (rev 13036)
@@ -13,12 +13,10 @@
@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.")
public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase {
-
- private static final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]";
-
- private static final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]";
-
public static String casePfx = "e2e.wsrp.";
+
+ private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]";
+ public final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]";
private final String ADR_HOME = getProp(casePfx+"adr.home","portal/auth/portal/default");
private final String INP_CONSUMER_NAME = getProp(casePfx+"inp.consumer.name","//input[contains(@id,'edit-cons-form:id')]");
@@ -89,20 +87,21 @@
/// def
- private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]";
- private static final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]";
- private static final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]";
- private static final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]";
- private static final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]";
- private static final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]";
- private static final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table";
- private static final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]";
- private static final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]";
- private static final String LINK_ADMIN = "link=Admin";
- private static final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]";
- private static final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]";
+ private final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]";
+ private final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]";
+ private final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]";
+ private final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]";
+ private final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]";
+ private final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]";
+ private final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table";
+ private final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]";
+ private final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]";
+ private final String LINK_ADMIN = "link=Admin";
+ private final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]";
+ private final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]";
public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]";
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
logoutIfPossible();
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-03-16 11:30:02 UTC (rev 13035)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-03-16 14:21:17 UTC (rev 13036)
@@ -366,6 +366,7 @@
# EndToEndBeaPortlet
+e2e.wsrp.adr.home=portal/auth/portal/default
e2e.wsrp.inp.consumer.name=//input[contains(@id,'edit-cons-form:id')]
e2e.wsrp.submit.refresh.cancel=//a[contains(@id,'edit-cons-form:list-cons-link')]
e2e.wsrp.submit.prod.save=//input[contains(@id,'producer-form:save-producer')]
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 11:30:02 UTC (rev 13035)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-16 14:21:17 UTC (rev 13036)
@@ -119,7 +119,7 @@
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10102"));
openAndWait("/portal/auth/portal/default/Coordination+Samples?zipcode=10103");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):10102"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10103"));
}
@@ -210,8 +210,8 @@
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333"));
openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBindDelete=222334");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222333"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
+ Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
}
@Test(enabled = true)
@@ -263,9 +263,13 @@
Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222333"));
Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333"));
+ openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBingRename=222334");
+ Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
+ Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
+
openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBindWasRenamed=222334");
Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):222334"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333"));
+ Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
}
@Test(enabled = true)
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-03-16 11:30:02 UTC (rev 13035)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-03-16 14:21:17 UTC (rev 13036)
@@ -88,16 +88,16 @@
<class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes>
</test>
- <test name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"
+ <test name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"
verbose="2" annotations="JDK">
<classes>
- <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"></class></classes>
+ <class name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"></class></classes>
</test>
- <test name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"
+ <test name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"
verbose="2" annotations="JDK">
<classes>
- <class name="org.jboss.portal.test.selenium.EndToEndBeaPortlet"></class></classes>
+ <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"></class></classes>
</test>
<listeners>
17 years, 1 month
JBoss Portal SVN: r13035 - branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-16 07:30:02 -0400 (Mon, 16 Mar 2009)
New Revision: 13035
Modified:
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
Log:
JBEPP-47: User profile portlet shows JSF auto generated id in password field error message
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-16 11:27:02 UTC (rev 13034)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-16 11:30:02 UTC (rev 13035)
@@ -21,6 +21,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+javax.faces.validator.LengthValidator.MINIMUM= Entry is too short ({0} chars. minimum).
+
IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet not available. Please check your configuration and the error log for further information.
IDENTITY_WELCOME=Welcome
17 years, 1 month
JBoss Portal SVN: r13034 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-16 07:27:02 -0400 (Mon, 16 Mar 2009)
New Revision: 13034
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
Log:
JBPORTAL-2345: User profile portlet shows JSF auto generated id in password field error message
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-16 02:59:37 UTC (rev 13033)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-16 11:27:02 UTC (rev 13034)
@@ -21,6 +21,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+javax.faces.validator.LengthValidator.MINIMUM= Entry is too short ({0} chars. minimum).
+
IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet not available. Please check your configuration and the error log for further information.
IDENTITY_WELCOME=Welcome
@@ -184,4 +186,4 @@
javax.portlet.title=User profile
javax.portlet.keywords=management,user
-javax.faces.component.UIInput.REQUIRED=Value is required
\ No newline at end of file
+javax.faces.component.UIInput.REQUIRED=Value is required
17 years, 1 month
JBoss Portal SVN: r13033 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-03-15 22:59:37 -0400 (Sun, 15 Mar 2009)
New Revision: 13033
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml
Log:
minor clarification on coord
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml 2009-03-16 02:50:31 UTC (rev 13032)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml 2009-03-16 02:59:37 UTC (rev 13033)
@@ -83,7 +83,7 @@
both configuration options for each type of coordination entities.
<note>
- Explicit coordination is currently scoped only at the page level. More specificially, explicit
+ Similar to Implicit coordination, Explicit coordination is currently scoped only at the page level. More specificially, explicit
coordination between portlets is only supported between portlets located on the same page.
</note>
</para>
@@ -650,4 +650,4 @@
<filename>portal-coordination-samples.war/WEB-INF/default-object.xml</filename> file.
</para>
</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
17 years, 1 month
JBoss Portal SVN: r13032 - docs/enterprise/trunk/Reference_Guide/en-US.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-03-15 22:50:31 -0400 (Sun, 15 Mar 2009)
New Revision: 13032
Modified:
docs/enterprise/trunk/Reference_Guide/en-US/Coordination.xml
Log:
minor coord fix
Modified: docs/enterprise/trunk/Reference_Guide/en-US/Coordination.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/Coordination.xml 2009-03-13 14:38:33 UTC (rev 13031)
+++ docs/enterprise/trunk/Reference_Guide/en-US/Coordination.xml 2009-03-16 02:50:31 UTC (rev 13032)
@@ -25,7 +25,7 @@
model, it is the well known principle of convention over configuration.
</para>
<para>
- Currently all explicit coordination happens only in the scope of the same page.
+ Similar to implicit Coordination, currently all explicit coordination happens only in the scope of the same page.
</para>
</section>
<section>
@@ -200,4 +200,4 @@
portal-coordination-samples.war/WEB-INF/default-object.xml
</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
17 years, 1 month
JBoss Portal SVN: r13031 - in branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core: model/portal and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-13 10:38:33 -0400 (Fri, 13 Mar 2009)
New Revision: 13031
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
Log:
JBEPP-45: Partial refresh and Drag and drop aren't always working correctly
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2009-03-13 13:49:31 UTC (rev 13030)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2009-03-13 14:38:33 UTC (rev 13031)
@@ -53,7 +53,7 @@
int toPosInt = Integer.parseInt(toPos);
//
- PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectPath.LEGACY_BASE64_FORMAT);
+ PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectPath.SAFEST_FORMAT);
//
return new MoveWindowCommand(tmp, fromPosInt, fromRegion, toPosInt, toRegion);
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2009-03-13 13:49:31 UTC (rev 13030)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2009-03-13 14:38:33 UTC (rev 13031)
@@ -562,4 +562,38 @@
}
}
};
+
+ /**
+ * Should only use a-z0-9_
+ */
+ public static final Format SAFEST_FORMAT = new PortalObjectPath.LegacyFormat()
+ {
+
+ private final String EQUALS = "_e";
+ private final String SLASH = "_s";
+ private final String DOT = "_d";
+ private final String PLUS = "_p";
+
+ @Override
+ public String[] parse(String value)
+ {
+ String uncoded = value.replace(EQUALS, "=");
+ uncoded = uncoded.replace(SLASH, "/");
+ uncoded = uncoded.replace(DOT, ".");
+ uncoded = uncoded.replace(PLUS, "+");
+ return LEGACY_BASE64_FORMAT.parse(uncoded);
+ }
+
+ @Override
+ public String toString(String[] names, int from, int to)
+ {
+ String encoded = LEGACY_BASE64_FORMAT.toString(names, from, to);
+ encoded = encoded.replace("=", EQUALS);
+ encoded = encoded.replace("/", SLASH);
+ encoded = encoded.replace(".", DOT);
+ encoded = encoded.replace("+", PLUS);
+ return encoded;
+ }
+ };
+
}
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-03-13 13:49:31 UTC (rev 13030)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-03-13 14:38:33 UTC (rev 13031)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2009, Red Hat Middleware, LLC, and individual *
+ * 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. *
@@ -25,11 +25,11 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.core.controller.ControllerContext;
+import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.response.MarkupResponse;
import org.jboss.portal.core.model.portal.content.WindowRendition;
-import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
@@ -84,7 +84,7 @@
//
return new WindowContext(
- PortletUtils.generateNamespaceFrom(window.getId().toString()),
+ window.getId().toString(PortalObjectPath.SAFEST_FORMAT),
region,
order,
windowResult);
17 years, 1 month
JBoss Portal SVN: r13030 - branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/listener.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-13 09:49:31 -0400 (Fri, 13 Mar 2009)
New Revision: 13030
Modified:
branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/listener/SessionListener.java
Log:
JBEPP-44: NullPointerException may happen when destroying a session
Modified: branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/listener/SessionListener.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/listener/SessionListener.java 2009-03-13 13:42:10 UTC (rev 13029)
+++ branches/Enterprise_Portal_Platform_4_3/server/src/main/org/jboss/portal/server/listener/SessionListener.java 2009-03-13 13:49:31 UTC (rev 13030)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, 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. *
@@ -22,18 +22,10 @@
******************************************************************************/
package org.jboss.portal.server.listener;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.portal.server.aspects.server.SignOutInterceptor.Invalidation;
+import org.jboss.portal.web.ServletContainer;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -47,16 +39,22 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.portal.server.aspects.server.SignOutInterceptor.Invalidation;
-import org.jboss.portal.web.ServletContainer;
-
/**
- * This listener listens to the main portal session events.
- * When the portal session timesout, all web applications' sessions referenced
- * by org.jboss.portal.server.aspects.server.SignOutInterceptor are destroyed
+ * This listener listens to the main portal session events. When the portal session timesout, all web applications'
+ * sessions referenced by org.jboss.portal.server.aspects.server.SignOutInterceptor are destroyed
+ *
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
@@ -67,10 +65,10 @@
/** . */
private Logger log = Logger.getLogger(SessionListener.class);
-
+
/** . */
private static final String KEY = "org.jboss.portal.session.contexts";
-
+
public void sessionCreated(HttpSessionEvent arg0)
{
// Nothing to do
@@ -79,50 +77,51 @@
public void sessionDestroyed(HttpSessionEvent arg0)
{
Set<String> contexts = (Set<String>)arg0.getSession().getAttribute(KEY);
-
- MBeanServer server = MBeanServerLocator.locateJBoss();
- ObjectName objectName = null;
- ServletContainer servletContainer = null;
- try
+ if (contexts != null)
{
- objectName = new ObjectName("portal:service=ServletContainerFactory");
- servletContainer = (ServletContainer)server.getAttribute(objectName, "ServletContainer");
- }
- catch (Exception e1)
- {
- log.error("Error while destroying portlet webapp sessions");
- }
-
- // Iterate over all the context that have been used
- for (Iterator<String> i = contexts.iterator(); i.hasNext();)
- {
- String dispatchContextName = (String)i.next();
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ObjectName objectName = null;
+ ServletContainer servletContainer = null;
- // Get the context
- ServletContext dispatchContext = arg0.getSession().getServletContext().getContext(dispatchContextName);
-
- // The context could be null if the web app has been removed after the web app has been tracked
- if (dispatchContext != null)
+ try
{
- try
+ objectName = new ObjectName("portal:service=ServletContainerFactory");
+ servletContainer = (ServletContainer)server.getAttribute(objectName, "ServletContainer");
+ }
+ catch (Exception e1)
+ {
+ log.error("Error while destroying portlet webapp sessions");
+ }
+
+ // Iterate over all the context that have been used
+ for (String dispatchContextName : contexts)
+ {
+ // Get the context
+ ServletContext dispatchContext = arg0.getSession().getServletContext().getContext(dispatchContextName);
+
+ // The context could be null if the web app has been removed after the web app has been tracked
+ if (dispatchContext != null)
{
- // Execute the command that invalidates the session
- servletContainer.include(dispatchContext, new TestHttpServletRequest(arg0.getSession()), new TestHttpServletResponse(), invalidator, null);
+ try
+ {
+ // Execute the command that invalidates the session
+ servletContainer.include(dispatchContext, new TestHttpServletRequest(arg0.getSession()), new TestHttpServletResponse(), invalidator, null);
+ }
+ catch (Exception e)
+ {
+ log.error("An error occured when trying to invalidate the sessions");
+ }
}
- catch (Exception e)
- {
- log.error("An error occured when trying to invalidate the sessions");
- }
}
}
}
-
+
// request
private static class TestHttpServletRequest implements HttpServletRequest
{
private Map attributes;
-
+
private HttpSession session;
public TestHttpServletRequest(HttpSession session)
17 years, 1 month
JBoss Portal SVN: r13029 - branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-13 09:42:10 -0400 (Fri, 13 Mar 2009)
New Revision: 13029
Modified:
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
Log:
JBEPP-43: Identity portlet english resrource file typo
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-13 13:36:38 UTC (rev 13028)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-13 13:42:10 UTC (rev 13029)
@@ -21,7 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet not available. Please check your configuration and the error log for further information.
+IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet not available. Please check your configuration and the error log for further information.
IDENTITY_WELCOME=Welcome
IDENTITY_REGISTER=Register
17 years, 1 month