JBoss Portal SVN: r13292 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-05-05 08:58:29 -0400 (Tue, 05 May 2009)
New Revision: 13292
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java
Log:
JBPORTAL-2386: Response.setProperty is not resetting the value as per the api doc
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2009-05-05 11:05:26 UTC (rev 13291)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2009-05-05 12:58:29 UTC (rev 13292)
@@ -91,7 +91,7 @@
}
//
- getProperties().getTransportHeaders().addValue(key, value);
+ getProperties().getTransportHeaders().setValue(key, value);
}
public void setProperty(String key, String value) throws IllegalArgumentException
14 years, 12 months
JBoss Portal SVN: r13291 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-05 07:05:26 -0400 (Tue, 05 May 2009)
New Revision: 13291
Added:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms.xml
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
[selenium] - cms fs target and suite
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-05 10:35:17 UTC (rev 13290)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-05 11:05:26 UTC (rev 13291)
@@ -204,6 +204,29 @@
<antcall target="cleanup" />
</target>
+ <target name="selenium-cms-test" depends="init, compile, run-src, copyApps">
+ <echo message="Runing TestNG" />
+
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
+
+ <xmlfileset dir="." includes="${test.suite}" />
+
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+
+ <jvmarg value="-ea" />
+
+ </testng>
+ <antcall target="cleanup" />
+ </target>
+
<target name="selenium-usecase" depends="init, compile, run-src, copyApps">
<echo message="Runing TestNG" />
Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms.xml 2009-05-05 11:05:26 UTC (rev 13291)
@@ -0,0 +1,37 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="SeleniumTest">
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSSecureTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSSecureTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSDirectoryTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSDirectoryTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSFileUploadTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSFileUploadTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes>
+ </test>
+
+<listeners>
+ <listener class-name="org.jboss.portal.test.selenium.JBossSeleniumTestListener"/>
+</listeners>
+</suite>
14 years, 12 months
JBoss Portal SVN: r13290 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-05 06:35:17 -0400 (Tue, 05 May 2009)
New Revision: 13290
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java
Log:
[JBPORTAL-2385] - cms workflow fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2009-05-04 11:20:54 UTC (rev 13289)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2009-05-05 10:35:17 UTC (rev 13290)
@@ -168,7 +168,10 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Pending Approval Queue"));
+
+ selenium.selectFrame(WYSIWYG_EDITOR_LOCATOR);
Assert.assertTrue(selenium.isTextPresent("vivat!"));
+ selenium.selectFrame("relative=top");
}
@@ -292,6 +295,7 @@
Assert.assertTrue(selenium.isElementPresent("link=file2copy"));
}
+
@Test(enabled = true, dependsOnMethods = "testCreateFileApprove", description="File Creation and editing.")
public void testEditFile(){
@@ -355,8 +359,9 @@
row = findTableRow(CMS_FV_TABLE, "1.3", 2) + 1;
selenium.click(MessageFormat.format(CMS_T_VER, row));
selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.selectFrame(WYSIWYG_EDITOR_LOCATOR);
Assert.assertTrue(selenium.isTextPresent("contentstring2"));
-
+ selenium.selectFrame("relative=top");
}
14 years, 12 months
JBoss Portal SVN: r13289 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: impl/model and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-05-04 07:20:54 -0400 (Mon, 04 May 2009)
New Revision: 13289
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/CustomizationManager.java
Log:
JBPORTAL-2384: Avoid creating dashboard objects if dashboard isn't used
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2009-05-04 11:12:39 UTC (rev 13288)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2009-05-04 11:20:54 UTC (rev 13289)
@@ -248,9 +248,9 @@
else
{
//
- if (user != null)
+ CustomizationManager cm = controller.getCustomizationManager();
+ if ((user != null) && (cm.hasDashboard(user)))
{
- CustomizationManager cm = controller.getCustomizationManager();
Portal dashboard = cm.getDashboard(user);
if (dashboard.getChild(pageName) == null)
{
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2009-05-04 11:12:39 UTC (rev 13288)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2009-05-04 11:20:54 UTC (rev 13289)
@@ -264,6 +264,19 @@
// return false;
}
+ public boolean hasDashboard(User user)
+ {
+ Context dashboardContext = portalObjectContainer.getContext(dashboardContextId);
+
+ //
+ String userId = getUserId(user);
+
+ //
+ Portal dashboardPortal = dashboardContext.getPortal(userId);
+
+ return dashboardPortal != null;
+ }
+
public Portal getDashboard(User user) throws IllegalArgumentException
{
//
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/CustomizationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2009-05-04 11:12:39 UTC (rev 13288)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2009-05-04 11:20:54 UTC (rev 13289)
@@ -74,6 +74,11 @@
boolean isDashboard(PortalObject object, User user);
/**
+ * Returns true if a dashboard exists for the user
+ */
+ boolean hasDashboard(User user);
+
+ /**
* Destroys the dashboard of a specified user.
*
* @param userId
14 years, 12 months
JBoss Portal SVN: r13288 - in branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core: impl/model and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-05-04 07:12:39 -0400 (Mon, 04 May 2009)
New Revision: 13288
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/CustomizationManager.java
Log:
JBPORTAL-2384: Avoid creating dashboard objects if dashboard isn't used
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2009-05-01 19:35:27 UTC (rev 13287)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2009-05-04 11:12:39 UTC (rev 13288)
@@ -248,9 +248,9 @@
else
{
//
- if (user != null)
+ CustomizationManager cm = controller.getCustomizationManager();
+ if ((user != null) && (cm.hasDashboard(user)))
{
- CustomizationManager cm = controller.getCustomizationManager();
Portal dashboard = cm.getDashboard(user);
if (dashboard.getChild(pageName) == null)
{
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2009-05-01 19:35:27 UTC (rev 13287)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2009-05-04 11:12:39 UTC (rev 13288)
@@ -264,6 +264,19 @@
// return false;
}
+ public boolean hasDashboard(User user)
+ {
+ Context dashboardContext = portalObjectContainer.getContext(dashboardContextId);
+
+ //
+ String userId = getUserId(user);
+
+ //
+ Portal dashboardPortal = dashboardContext.getPortal(userId);
+
+ return dashboardPortal != null;
+ }
+
public Portal getDashboard(User user) throws IllegalArgumentException
{
//
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/CustomizationManager.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2009-05-01 19:35:27 UTC (rev 13287)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2009-05-04 11:12:39 UTC (rev 13288)
@@ -74,6 +74,11 @@
boolean isDashboard(PortalObject object, User user);
/**
+ * Returns true if a dashboard exists for the user
+ */
+ boolean hasDashboard(User user);
+
+ /**
* Destroys the dashboard of a specified user.
*
* @param userId
14 years, 12 months
JBoss Portal SVN: r13287 - modules/cms/trunk/cms-jackrabbit.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-05-01 15:35:27 -0400 (Fri, 01 May 2009)
New Revision: 13287
Modified:
modules/cms/trunk/cms-jackrabbit/pom.xml
Log:
adding db2 info
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2009-04-30 10:08:58 UTC (rev 13286)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2009-05-01 19:35:27 UTC (rev 13287)
@@ -232,6 +232,18 @@
<artifactId>jtds</artifactId>
<version>1.2.2</version>
</dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
15 years