JBoss Portal SVN: r13890 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-21 02:33:03 -0500 (Mon, 21 Dec 2009)
New Revision: 13890
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
Fix testcase
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-12-21 07:22:02 UTC (rev 13889)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-12-21 07:33:03 UTC (rev 13890)
@@ -55,7 +55,9 @@
"//body/div[2]/div/div/div[2]/div/div/div/div/div/div/table/tbody/tr/td[2]/div/div/div[2]/span/a");
private final String SUB_LAYOUT_UPDATE = getLoc(casePfx
+ "sub.layout.update",
- "//input[contains(@name,'dashboardLayoutForm:j_id12')]");
+// "//input[contains(@name,'dashboardLayoutForm:j_id12')]");
+ "//input[contains(@name,'dashboardLayoutForm') and @type='submit']");
+//
private final String SUB_PAGE_RENAME = getLoc(casePfx + "sub.page.rename",
"//form[contains(@id,'renameForm')]/input[@type='submit']");
private final String INP_PAGE_RENAME = getLoc(casePfx + "inp.page.rename",
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-12-21 07:22:02 UTC (rev 13889)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-12-21 07:33:03 UTC (rev 13890)
@@ -82,7 +82,7 @@
# DashboardTestCase
-dash.sub.layout.update=//input[contains(@name,'dashboardLayoutForm:j_id12')]
+dash.sub.layout.update=//input[contains(@name,'dashboardLayoutForm') and @type='submit' and @value='Select']
dash.sub.page.rename=//form[contains(@id,'renameForm')]/input[@type='submit']
dash.inp.page.rename=//input[contains(@id,'renameForm:newName')]
dash.link.weather.portlet=link=*WeatherPortlet*
14 years, 4 months
JBoss Portal SVN: r13889 - tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-21 02:22:02 -0500 (Mon, 21 Dec 2009)
New Revision: 13889
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
Testcase fix
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-12-16 17:10:31 UTC (rev 13888)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-12-21 07:22:02 UTC (rev 13889)
@@ -55,7 +55,9 @@
"//body/div[2]/div/div/div[2]/div/div/div/div/div/div/table/tbody/tr/td[2]/div/div/div[2]/span/a");
private final String SUB_LAYOUT_UPDATE = getLoc(casePfx
+ "sub.layout.update",
- "//input[contains(@name,'dashboardLayoutForm:j_id12')]");
+// "//input[contains(@name,'dashboardLayoutForm:j_id12')]");
+ "//input[contains(@name,'dashboardLayoutForm') and @type='submit']");
+//
private final String SUB_PAGE_RENAME = getLoc(casePfx + "sub.page.rename",
"//form[contains(@id,'renameForm')]/input[@type='submit']");
private final String INP_PAGE_RENAME = getLoc(casePfx + "inp.page.rename",
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-12-16 17:10:31 UTC (rev 13888)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP03/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-12-21 07:22:02 UTC (rev 13889)
@@ -82,7 +82,7 @@
# DashboardTestCase
-dash.sub.layout.update=//input[contains(@name,'dashboardLayoutForm:j_id12')]
+dash.sub.layout.update=//input[contains(@name,'dashboardLayoutForm') and @type='submit' and @value='Select']
dash.sub.page.rename=//form[contains(@id,'renameForm')]/input[@type='submit']
dash.inp.page.rename=//input[contains(@id,'renameForm:newName')]
dash.link.weather.portlet=link=*WeatherPortlet*
14 years, 4 months
JBoss Portal SVN: r13888 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-16 12:10:31 -0500 (Wed, 16 Dec 2009)
New Revision: 13888
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Oups
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-12-16 16:37:40 UTC (rev 13887)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-12-16 17:10:31 UTC (rev 13888)
@@ -65,7 +65,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.5"/>
<componentref name="jboss-portal/modules/web" version="1.2.4"/>
- <componentref name="jboss-portal/modules/test" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.5"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.9"/>
<componentref name="jboss-portal/modules/identity" version="1.1.1"/>
<componentref name="jboss-portal/modules/cms" version="1.2.7"/>
14 years, 4 months
JBoss Portal SVN: r13887 - tags/Enterprise_Portal_Platform_4_3_GA_CP03/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-16 11:37:40 -0500 (Wed, 16 Dec 2009)
New Revision: 13887
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml
Log:
Oups
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml 2009-12-16 10:41:25 UTC (rev 13886)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml 2009-12-16 16:37:40 UTC (rev 13887)
@@ -65,7 +65,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.5"/>
<componentref name="jboss-portal/modules/web" version="1.2.4"/>
- <componentref name="jboss-portal/modules/test" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.5"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.9"/>
<componentref name="jboss-portal/modules/identity" version="1.1.1"/>
<componentref name="jboss-portal/modules/cms" version="1.2.7"/>
14 years, 4 months
JBoss Portal SVN: r13886 - modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-16 05:41:25 -0500 (Wed, 16 Dec 2009)
New Revision: 13886
Modified:
modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java
Log:
fix to not require new options set in configuration
Modified: modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 09:07:48 UTC (rev 13885)
+++ modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 10:41:25 UTC (rev 13886)
@@ -136,7 +136,7 @@
}
attrs.put(attr);
- if(getUpdatePasswordAttributeValues().size() > 0)
+ if(getUpdatePasswordAttributeValues() != null && getUpdatePasswordAttributeValues().size() > 0)
{
Map<String, Set<String>> attributesToAdd = getUpdatePasswordAttributeValues();
for (Map.Entry<String, Set<String>> entry : attributesToAdd.entrySet())
@@ -522,37 +522,19 @@
protected String getPasswordEncoding() throws IdentityException
{
String encoding = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCODING);
- if (encoding == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCODING + " missing in configuration");
- }
- else
- {
- return encoding;
- }
+ return encoding;
}
protected Map getUpdatePasswordAttributeValues() throws IdentityException
{
Map attributesToAdd = getIdentityConfiguration().getOptions(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES);
- if (attributesToAdd == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES + " missing in configuration");
- }
return attributesToAdd;
}
protected String getEnclosePasswordWith() throws IdentityException
{
String enc = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH);
- if (enc == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH + " missing in configuration");
- }
- else
- {
- return enc;
- }
+ return enc;
}
}
14 years, 4 months
JBoss Portal SVN: r13885 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2009-12-16 04:07:48 -0500 (Wed, 16 Dec 2009)
New Revision: 13885
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java
Log:
fix to not require new options set in configuration
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 07:31:21 UTC (rev 13884)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 09:07:48 UTC (rev 13885)
@@ -136,7 +136,7 @@
}
attrs.put(attr);
- if(getUpdatePasswordAttributeValues().size() > 0)
+ if(getUpdatePasswordAttributeValues() != null && getUpdatePasswordAttributeValues().size() > 0)
{
Map<String, Set<String>> attributesToAdd = getUpdatePasswordAttributeValues();
for (Map.Entry<String, Set<String>> entry : attributesToAdd.entrySet())
@@ -522,37 +522,19 @@
protected String getPasswordEncoding() throws IdentityException
{
String encoding = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCODING);
- if (encoding == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCODING + " missing in configuration");
- }
- else
- {
- return encoding;
- }
+ return encoding;
}
protected Map getUpdatePasswordAttributeValues() throws IdentityException
{
Map attributesToAdd = getIdentityConfiguration().getOptions(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES);
- if (attributesToAdd == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES + " missing in configuration");
- }
return attributesToAdd;
}
protected String getEnclosePasswordWith() throws IdentityException
{
String enc = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH);
- if (enc == null)
- {
- throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH + " missing in configuration");
- }
- else
- {
- return enc;
- }
+ return enc;
}
}
14 years, 4 months
JBoss Portal SVN: r13884 - modules/portlet/tags/JBP_PORTLET_2_0_9/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-16 02:31:21 -0500 (Wed, 16 Dec 2009)
New Revision: 13884
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_9/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
Log:
oups
Modified: modules/portlet/tags/JBP_PORTLET_2_0_9/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_9/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-12-15 12:39:06 UTC (rev 13883)
+++ modules/portlet/tags/JBP_PORTLET_2_0_9/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-12-16 07:31:21 UTC (rev 13884)
@@ -47,7 +47,7 @@
{
/** . */
- private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+(|\\.SNAPSHOT)";
+ private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+(|\\.SNAPSHOT)(|\\.GA)";
/** . */
private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE);
14 years, 4 months
JBoss Portal SVN: r13883 - tags/Enterprise_Portal_Platform_4_3_GA_CP03/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-15 07:39:06 -0500 (Tue, 15 Dec 2009)
New Revision: 13883
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml
Log:
Updating deps
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml 2009-12-15 12:35:59 UTC (rev 13882)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP03/build/build-thirdparty.xml 2009-12-15 12:39:06 UTC (rev 13883)
@@ -64,11 +64,11 @@
-->
<componentref name="jboss-portal/modules/common" version="1.2.5"/>
- <componentref name="jboss-portal/modules/web" version="1.2.3"/>
+ <componentref name="jboss-portal/modules/web" version="1.2.4"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.8"/>
- <componentref name="jboss-portal/modules/identity" version="1.1.0"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.6"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.9"/>
+ <componentref name="jboss-portal/modules/identity" version="1.1.1"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.7"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
@@ -93,7 +93,7 @@
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
<componentref name="facelets" version="1.1.15-B1"/>
- <componentref name="jboss/portlet-bridge" version="1.0.0.CR2"/>
+ <componentref name="jboss/portlet-bridge" version="1.0.0.CR3"/>
<componentref name="hibernate" version="3.2.4.SP1_CP08-brew"/>
<componentref name="httpunit" version="1.6"/>
<componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
14 years, 4 months
JBoss Portal SVN: r13882 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-15 07:35:59 -0500 (Tue, 15 Dec 2009)
New Revision: 13882
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Update dep
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-12-15 09:50:25 UTC (rev 13881)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-12-15 12:35:59 UTC (rev 13882)
@@ -64,11 +64,11 @@
-->
<componentref name="jboss-portal/modules/common" version="1.2.5"/>
- <componentref name="jboss-portal/modules/web" version="1.2.3"/>
+ <componentref name="jboss-portal/modules/web" version="1.2.4"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.8"/>
- <componentref name="jboss-portal/modules/identity" version="1.1.0"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.6"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.9"/>
+ <componentref name="jboss-portal/modules/identity" version="1.1.1"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.7"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
@@ -93,7 +93,7 @@
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
<componentref name="facelets" version="1.1.15-B1"/>
- <componentref name="jboss/portlet-bridge" version="1.0.0.CR2"/>
+ <componentref name="jboss/portlet-bridge" version="1.0.0.CR3"/>
<componentref name="hibernate" version="3.2.4.SP1_CP08-brew"/>
<componentref name="httpunit" version="1.6"/>
<componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
14 years, 4 months
JBoss Portal SVN: r13881 - tags/Enterprise_Portal_Platform_4_3_GA_CP03/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-15 04:50:25 -0500 (Tue, 15 Dec 2009)
New Revision: 13881
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP03/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
Changing version number
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP03/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP03/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-12-15 09:29:01 UTC (rev 13880)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP03/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-12-15 09:50:25 UTC (rev 13881)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Enterprise Portal Platform", 4, 3, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Enterprise");
+ public static final Version VERSION = new Version("JBoss Enterprise Portal Platform", 4, 3, 0, new Version.Qualifier(Version.Qualifier.Prefix.CP, Version.Qualifier.Suffix.SUFFIX_3), "Enterprise");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
14 years, 4 months