JBoss Portal SVN: r12526 - in modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-15 16:12:08 -0500 (Thu, 15 Jan 2009)
New Revision: 12526
Modified:
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml
Log:
oups it's 1.2.3
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml 2009-01-15 20:22:50 UTC (rev 12525)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml 2009-01-15 21:12:08 UTC (rev 12526)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
<packaging>pom</packaging>
<name>JBoss Portal CMS</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -29,7 +29,7 @@
<version.log4j>1.2.14</version.log4j>
<version.slf4j>1.3.0</version.slf4j>
<version.jboss.cache>1.4.1.SP3</version.jboss.cache>
- <version.jgroups>2.4.4</version.jgroups>
+ <version.jgroups>2.4.4.GA-brew</version.jgroups>
<version.jboss.hibernate>3.2.4.SP1</version.jboss.hibernate>
<version.jbpm>3.2.2</version.jbpm>
<version.jboss.jbossas>4.2.2.GA</version.jboss.jbossas>
@@ -46,8 +46,8 @@
<version.jackrabbit.core>1.4.5</version.jackrabbit.core>
<version.jboss.portal.common>1.2.3</version.jboss.portal.common>
<version.jboss.portal.identity>1.0.6</version.jboss.portal.identity>
- <version.jboss.portal.test>1.2.3</version.jboss.portal.test>
- <version.jboss.portal>2.7.1</version.jboss.portal>
+ <version.jboss.portal.test>1.2.2</version.jboss.portal.test>
+ <version.jboss.portal>2.7.1.GA</version.jboss.portal>
</properties>
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml 2009-01-15 20:22:50 UTC (rev 12525)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml 2009-01-15 21:12:08 UTC (rev 12526)
@@ -5,7 +5,7 @@
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-jackrabbit</artifactId>
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml 2009-01-15 20:22:50 UTC (rev 12525)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml 2009-01-15 21:12:08 UTC (rev 12526)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal CMS Module</name>
- <version>1.2.2</version>
+ <version>1.2.3</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
17 years, 3 months
JBoss Portal SVN: r12525 - branches/JBoss_Portal_Release_Branch_2_7_1/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-15 15:22:50 -0500 (Thu, 15 Jan 2009)
New Revision: 12525
Modified:
branches/JBoss_Portal_Release_Branch_2_7_1/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
2.7.1
Modified: branches/JBoss_Portal_Release_Branch_2_7_1/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Release_Branch_2_7_1/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-01-15 20:19:36 UTC (rev 12524)
+++ branches/JBoss_Portal_Release_Branch_2_7_1/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-01-15 20:22:50 UTC (rev 12525)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 7, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 7, 1, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Community");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
17 years, 3 months
JBoss Portal SVN: r12524 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-01-15 15:19:36 -0500 (Thu, 15 Jan 2009)
New Revision: 12524
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml
Log:
handle exceptions from bridge
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml 2009-01-15 20:18:48 UTC (rev 12523)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml 2009-01-15 20:19:36 UTC (rev 12524)
@@ -3,5 +3,5 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- Error yo
+ <!--Standard Error Page-->
</ui:composition>
\ No newline at end of file
17 years, 3 months
JBoss Portal SVN: r12522 - in modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-15 15:14:37 -0500 (Thu, 15 Jan 2009)
New Revision: 12522
Modified:
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml
Log:
CMS 1.2.2
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml 2009-01-15 20:14:06 UTC (rev 12521)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/build/pom.xml 2009-01-15 20:14:37 UTC (rev 12522)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.2</version>
<packaging>pom</packaging>
<name>JBoss Portal CMS</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -29,7 +29,7 @@
<version.log4j>1.2.14</version.log4j>
<version.slf4j>1.3.0</version.slf4j>
<version.jboss.cache>1.4.1.SP3</version.jboss.cache>
- <version.jgroups>2.4.1</version.jgroups>
+ <version.jgroups>2.4.4</version.jgroups>
<version.jboss.hibernate>3.2.4.SP1</version.jboss.hibernate>
<version.jbpm>3.2.2</version.jbpm>
<version.jboss.jbossas>4.2.2.GA</version.jboss.jbossas>
@@ -44,10 +44,10 @@
<version.ehcache>1.4.1</version.ehcache>
<version.javax.jcr>1.0</version.javax.jcr>
<version.jackrabbit.core>1.4.5</version.jackrabbit.core>
- <version.jboss.portal.common>1.2.0</version.jboss.portal.common>
- <version.jboss.portal.identity>1.0.2</version.jboss.portal.identity>
- <version.jboss.portal.test>1.2.1</version.jboss.portal.test>
- <version.jboss.portal>2.7.0.CR1</version.jboss.portal>
+ <version.jboss.portal.common>1.2.3</version.jboss.portal.common>
+ <version.jboss.portal.identity>1.0.6</version.jboss.portal.identity>
+ <version.jboss.portal.test>1.2.3</version.jboss.portal.test>
+ <version.jboss.portal>2.7.1</version.jboss.portal>
</properties>
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml 2009-01-15 20:14:06 UTC (rev 12521)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/cms-jackrabbit/pom.xml 2009-01-15 20:14:37 UTC (rev 12522)
@@ -5,7 +5,7 @@
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-jackrabbit</artifactId>
Modified: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml 2009-01-15 20:14:06 UTC (rev 12521)
+++ modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/pom.xml 2009-01-15 20:14:37 UTC (rev 12522)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal CMS Module</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.2</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
17 years, 3 months
JBoss Portal SVN: r12521 - branches.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-15 15:14:06 -0500 (Thu, 15 Jan 2009)
New Revision: 12521
Added:
branches/JBoss_Portal_Release_Branch_2_7_1/
Log:
Release Branch 2.7.1
Copied: branches/JBoss_Portal_Release_Branch_2_7_1 (from rev 12520, branches/JBoss_Portal_Branch_2_7)
17 years, 3 months
JBoss Portal SVN: r12520 - modules/cms/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-15 14:40:27 -0500 (Thu, 15 Jan 2009)
New Revision: 12520
Added:
modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2/
Log:
Tagging 1.2.2
Copied: modules/cms/tags/JBP_CMS_RELEASE_BRANCH_1_2_2 (from rev 12519, modules/cms/trunk)
17 years, 3 months
JBoss Portal SVN: r12519 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-15 10:56:49 -0500 (Thu, 15 Jan 2009)
New Revision: 12519
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/JBossPortalSeleniumTestCase.java
Log:
longer timeout
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-01-15 14:50:57 UTC (rev 12518)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-15 15:56:49 UTC (rev 12519)
@@ -309,6 +309,7 @@
}
// http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
+ // https://jira.jboss.org/jira/browse/JBPORTAL-2177
@Test(enabled = true)
public void testBugResetPortletSetting() {
final String pageName = "page1";
@@ -386,7 +387,7 @@
selenium.click("link=" + pageNameNew);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changes after renaming of portal page.");
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changed after renaming of portal page.");
}
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-01-15 14:50:57 UTC (rev 12518)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-01-15 15:56:49 UTC (rev 12519)
@@ -26,7 +26,7 @@
protected Selenium selenium;
// Generic timeout in miliseconds
- protected static final String PAGE_LOAD = "1200000";
+ protected static final String PAGE_LOAD = "2400000";
// Element timeout in seconds
protected static final int ELEM_TIMEOUT = 220;
17 years, 3 months