summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
Diffstat (limited to 'uitest')
-rw-r--r--uitest/integration-testscripts/Liferay-6/Liferay6-and-6EE-theme-deploy.html146
-rw-r--r--uitest/integration-testscripts/Liferay-6/Liferay6-theme.html384
-rw-r--r--uitest/integration_tests.xml15
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java1
-rw-r--r--uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java742
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java42
-rw-r--r--uitest/src/main/webapp/WEB-INF/liferay-display.xml1
-rw-r--r--uitest/src/main/webapp/WEB-INF/liferay-portlet.xml5
-rw-r--r--uitest/src/main/webapp/WEB-INF/portlet.xml34
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java23
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java5
11 files changed, 0 insertions, 1398 deletions
diff --git a/uitest/integration-testscripts/Liferay-6/Liferay6-and-6EE-theme-deploy.html b/uitest/integration-testscripts/Liferay-6/Liferay6-and-6EE-theme-deploy.html
deleted file mode 100644
index 50f71d992c..0000000000
--- a/uitest/integration-testscripts/Liferay-6/Liferay6-and-6EE-theme-deploy.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>integration-test-liferay-6.0.5</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-liferay-6.0.5</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/web/guest/</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>sign-in</td>
- <td>49,17</td>
-</tr>
-<tr>
- <td>enterCharacter</td>
- <td>_58_login</td>
- <td>test@liferay.com</td>
-</tr>
-<tr>
- <td>enterCharacter</td>
- <td>_58_password</td>
- <td>test</td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//input[@value='Sign In']</td>
- <td>43,18</td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//input[@type='submit']</td>
- <td>16,-1321</td>
-</tr>
-<tr>
- <td>type</td>
- <td>reminderQueryAnswer</td>
- <td>-</td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//input[@value='Save']</td>
- <td>86,13</td>
-</tr>
-<tr>
- <td>drag</td>
- <td>link=Add</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseOver</td>
- <td>link=Add</td>
- <td>60,15</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>addPage</td>
- <td>45,11</td>
-</tr>
-<tr>
- <td>enterCharacter</td>
- <td>//div/span[1]/span/input</td>
- <td>Vaadin Liferay Theme</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>save</td>
- <td>10,12</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//nav/ul/li[2]/a/span</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//nav/ul/li[2]/a/span</td>
- <td>26,7</td>
-</tr>
-<tr>
- <td>drag</td>
- <td>link=Add</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseOver</td>
- <td>link=Manage</td>
- <td>32,4</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>link=Page Layout</td>
- <td>78,17</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>//div[2]/img</td>
- <td>47,73</td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//div[5]/span/span/input</td>
- <td>32,14</td>
-</tr>
-<tr>
- <td>drag</td>
- <td>link=Add</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseOver</td>
- <td>link=Add</td>
- <td>56,23</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>link=Moreā€¦</td>
- <td>50,13</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@title='Vaadin Liferay Theme']/p/a</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>//div[@title='Vaadin Liferay Theme']/p/a</td>
- <td>10,10</td>
-</tr>
-</tbody></table>
-</body>
-</html> \ No newline at end of file
diff --git a/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html b/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
deleted file mode 100644
index 03f2d25120..0000000000
--- a/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>integration-test-liferay-6.0.5</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-liferay-6.0.5</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/web/guest/vaadin-liferay-theme</td>
- <td></td>
-</tr>
-<!--Start actual test-->
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>labels</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>33,-133</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>buttons</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>19,-131</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>textfields</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>34,-130</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>selects</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
- <td>6,-128</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>selects-openedcombobox</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>38,-129</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>datefields</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[1]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
- <td>5,-131</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>datefields-popup</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>23,-127</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>sliders</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>
- <td>9,-146</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>tabs</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>8,-145</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
- <td>5,-147</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]/domChild[0]/domChild[1]</td>
- <td>3,-147</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>tabs-scrolled-closabletabs-selectedtab</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>24,-144</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>accordions</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[4]/AbsolutePanel[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[3]/domChild[0]/domChild[0]</td>
- <td>148,-142</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>accordions-opensheet4</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[8]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>10,-147</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>panels</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[9]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>14,-148</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>tables</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[6]/AbsolutePanel[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[1]</td>
- <td>10,-139</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>tables-columnselection</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>6,-147</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>trees</td>
-</tr>
-<!--
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[7]/AbsolutePanel[0]/ChildComponentContainer[0]/VTree[0]/domChild[0]/domChild[0]</td>
- <td>5,-143</td>
-</tr>
-<tr>
- <td>contextmenu</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[7]/AbsolutePanel[0]/ChildComponentContainer[0]/VTree[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>trees-openednode-contextmenu</td>
-</tr>
--->
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[11]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>14,-146</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>windows</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>6,-146</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>6,-146</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
- <td>6,-146</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[12]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>20,-141</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>splitpanels</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[8]/AbsolutePanel[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
- <td>11,-145</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>splitpanels-locked</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[13]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>17,-147</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>notifications</td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>notifications-humanized</td>
-</tr>
-<tr>
- <td>closeNotification</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>notifications-warning</td>
-</tr>
-<tr>
- <td>closeNotification</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>notifications-error</td>
-</tr>
-<tr>
- <td>closeNotification</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>notifications-tray</td>
-</tr>
-<tr>
- <td>closeNotification</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
- <td>3,-146</td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>openedmenu</td>
-</tr>
-</tbody></table>
-</body>
-</html> \ No newline at end of file
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index 7838c28d7f..73261ccc51 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -205,20 +205,6 @@
</antcall>
</target>
- <target name="integration-test-liferay6-theme">
- <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/Liferay6-and-6EE-theme-deploy.html" />
- <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-
- <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" />
- <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />
-
- <antcall target="run-generic-integration-test">
- <param name="startDelay" value="300" />
- <param name="test_browsers" value="winxp-firefox17-esr" />
- <param name="target-server" value="liferay6" />
- </antcall>
- </target>
-
<target name="integration-test-weblogic12">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="360" />
@@ -239,7 +225,6 @@
<parallel>
<antcall target="integration-test-liferay6" />
- <antcall target="integration-test-liferay6-theme" />
<antcall target="integration-test-weblogic12" />
<antcall target="integration-test-glassfish4" />
<antcall target="integration-test-payara" />
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 324d1a63cf..529d743446 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
@@ -25,7 +25,6 @@ public class ColumnHeaderAlignments extends TestBase {
theme.addItem("reindeer");
theme.addItem("runo");
theme.addItem("base");
- theme.addItem("liferay");
theme.setValue("reindeer");
theme.setNullSelectionAllowed(false);
theme.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
deleted file mode 100644
index 8a8df93742..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ /dev/null
@@ -1,742 +0,0 @@
-package com.vaadin.tests.integration;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Locale;
-
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.event.Action;
-import com.vaadin.server.ExternalResource;
-import com.vaadin.server.LegacyApplication;
-import com.vaadin.server.Page;
-import com.vaadin.server.Resource;
-import com.vaadin.server.ThemeResource;
-import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.shared.ui.slider.SliderOrientation;
-import com.vaadin.ui.AbstractComponent;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.Accordion;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.DateField;
-import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.InlineDateField;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.MenuBar.Command;
-import com.vaadin.ui.MenuBar.MenuItem;
-import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.Notification;
-import com.vaadin.ui.Panel;
-import com.vaadin.ui.PopupView;
-import com.vaadin.ui.Slider;
-import com.vaadin.ui.Slider.ValueOutOfBoundsException;
-import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
-import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.TwinColSelect;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.ui.Window;
-import com.vaadin.ui.themes.LiferayTheme;
-
-@SuppressWarnings("serial")
-public class LiferayThemeDemo extends LegacyApplication {
-
- @SuppressWarnings("deprecation")
- private static final Date DATE = new Date(2009 - 1900, 6 - 1, 2);
-
- private static final Resource ICON_GLOBE = new ThemeResource(
- "../runo/icons/16/globe.png");
- private static final Resource ICON_OK = new ThemeResource(
- "../runo/icons/16/ok.png");
-
- private LegacyWindow main;
- private VerticalLayout mainLayout;
- private TabSheet tabs;
-
- private Action.Handler handler = new Action.Handler() {
-
- @Override
- public void handleAction(Action action, Object sender, Object target) {
- // NOP
- }
-
- @Override
- public Action[] getActions(Object target, Object sender) {
- return new Action[] {
- new Action("Open"),
- new Action("Delete", new ThemeResource(
- "../runo/icons/16/trash.png")) };
- }
- };
-
- @Override
- public void init() {
- main = new LegacyWindow("Vaadin Liferay Theme");
- mainLayout = (VerticalLayout) main.getContent();
- mainLayout.setMargin(false);
- setMainWindow(main);
-
- // setTheme("liferay");
-
- buildMainView();
- }
-
- void buildMainView() {
- mainLayout.setWidth("100%");
- mainLayout.setHeight("400px");
- mainLayout.addComponent(getTopMenu());
-
- CssLayout margin = new CssLayout();
- margin.setSizeFull();
- tabs = new TabSheet();
- tabs.setSizeFull();
- margin.addComponent(tabs);
- mainLayout.addComponent(margin);
- mainLayout.setExpandRatio(margin, 1);
-
- tabs.addComponent(buildLabels());
- tabs.addComponent(buildButtons());
- tabs.addComponent(buildTextFields());
- tabs.addComponent(buildSelects());
- tabs.addComponent(buildDateFields());
- tabs.addComponent(buildSliders());
- tabs.addComponent(buildTabSheets());
- tabs.addComponent(buildAccordions());
- tabs.addComponent(buildPanels());
- tabs.addComponent(buildTables());
- tabs.addComponent(buildTrees());
- tabs.addComponent(buildWindows());
- tabs.addComponent(buildSplitPanels());
- tabs.addComponent(buildNotifications());
- tabs.addComponent(buildPopupViews());
- }
-
- Layout buildLabels() {
- final GridLayout l = new GridLayout(2, 1);
- l.setWidth("560px");
- l.setSpacing(true);
- l.setMargin(true);
- l.setCaption("Labels");
-
- l.addComponent(new Label("Normal Label", ContentMode.HTML));
- l.addComponent(new Label(
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit."));
- return l;
- }
-
- Layout buildButtons() {
- GridLayout l = new GridLayout(3, 1);
- l.setCaption("Buttons");
- l.setMargin(true);
- l.setSpacing(true);
-
- AbstractComponent b = new Button("Normal Button");
- b.setDescription("This is a tooltip!");
- l.addComponent(b);
-
- b = new NativeButton("Native Button");
- b.setDescription("<h2><img src=\"/html/VAADIN/themes/runo/icons/16/globe.png\"/>A richtext tooltip</h2>"
- + "<ul>"
- + "<li>HTML formatting</li><li>Images<br/>"
- + "</li><li>etc...</li></ul>");
- l.addComponent(b);
-
- b = new CheckBox("Checkbox");
- l.addComponent(b);
-
- b = new Button("Disabled");
- b.setEnabled(false);
- l.addComponent(b);
-
- b = new NativeButton("Disabled");
- b.setEnabled(false);
- l.addComponent(b);
-
- b = new CheckBox("Disabled");
- b.setEnabled(false);
- l.addComponent(b);
-
- b = new Button("OK");
- b.setIcon(ICON_OK);
- l.addComponent(b);
-
- b = new NativeButton("OK");
- b.setIcon(ICON_OK);
- l.addComponent(b);
-
- b = new CheckBox("OK");
- b.setIcon(ICON_OK);
- l.addComponent(b);
-
- b = new Button("Link Button");
- b.setStyleName(LiferayTheme.BUTTON_LINK);
- l.addComponent(b);
-
- b = new NativeButton("Link Button");
- b.setStyleName(LiferayTheme.BUTTON_LINK);
- l.addComponent(b);
-
- l.newLine();
-
- b = new Button("Link Button");
- b.setIcon(ICON_OK);
- b.setStyleName(LiferayTheme.BUTTON_LINK);
- l.addComponent(b);
-
- b = new NativeButton("Link Button");
- b.setIcon(ICON_OK);
- b.setStyleName(LiferayTheme.BUTTON_LINK);
- l.addComponent(b);
-
- return l;
- }
-
- Layout buildTextFields() {
- GridLayout l = new GridLayout(2, 1);
- l.setCaption("Text fields");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("400px");
- l.setColumnExpandRatio(0, 1);
-
- l.addComponent(new Label("Normal TextField", ContentMode.HTML));
- TextField tf = new TextField();
- tf.setInputPrompt("Enter text");
- l.addComponent(tf);
-
- l.addComponent(new Label("Normal TextArea", ContentMode.HTML));
-
- TextArea ta = new TextArea();
- ta.setHeight("5em");
- ta.setInputPrompt("Enter text");
- l.addComponent(ta);
-
- return l;
- }
-
- Layout buildSelects() {
- VerticalLayout l = new VerticalLayout();
- l.setCaption("Selects");
- l.setMargin(true);
- l.setSpacing(true);
-
- HorizontalLayout hl = new HorizontalLayout();
- hl.setSpacing(true);
- hl.setMargin(new MarginInfo(true, false, false, false));
- l.addComponent(hl);
-
- AbstractSelect cb = new ComboBox();
- AbstractSelect nat = new NativeSelect();
- AbstractSelect list = new ListSelect();
- AbstractSelect twincol = new TwinColSelect();
-
- for (int i = 0; i < 50; i++) {
- cb.addItem("Item " + i);
- nat.addItem("Item " + i);
- list.addItem("Item " + i);
- twincol.addItem("Item " + i);
- }
-
- hl.addComponent(cb);
- hl.addComponent(nat);
- hl.addComponent(list);
- hl.addComponent(twincol);
-
- return l;
- }
-
- Layout buildDateFields() {
- VerticalLayout l = new VerticalLayout();
- l.setCaption("Date fields");
- l.setMargin(true);
- l.setSpacing(true);
-
- HorizontalLayout hl = new HorizontalLayout();
- hl.setSpacing(true);
- hl.setMargin(new MarginInfo(true, false, false, false));
- l.addComponent(hl);
-
- DateField df = new DateField();
- df.setValue(DATE);
- df.setResolution(DateField.RESOLUTION_MIN);
- hl.addComponent(df);
-
- df = new InlineDateField();
- df.setLocale(new Locale("fi", "FI"));
- df.setShowISOWeekNumbers(true);
- df.setValue(DATE);
- df.setResolution(DateField.RESOLUTION_DAY);
- hl.addComponent(df);
-
- df = new InlineDateField();
- df.setValue(DATE);
- df.setResolution(DateField.RESOLUTION_YEAR);
- hl.addComponent(df);
-
- return l;
- }
-
- Layout buildTabSheets() {
- VerticalLayout l = new VerticalLayout();
- l.setCaption("Tabs");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("400px");
-
- CheckBox closable = new CheckBox("Closable tabs");
- closable.setImmediate(true);
- l.addComponent(closable);
-
- final TabSheet ts = new TabSheet();
- ts.setHeight("100px");
- l.addComponent(ts);
-
- for (int i = 1; i < 10; i++) {
- Tab t = ts.addTab(new Label(), "Tab " + i);
- if (i % 2 == 0) {
- t.setIcon(ICON_GLOBE);
- }
- if (i == 2) {
- t.setEnabled(false);
- }
- }
-
- closable.addListener(new Property.ValueChangeListener() {
-
- @Override
- public void valueChange(ValueChangeEvent event) {
- Iterator<Component> it = ts.getComponentIterator();
- for (; it.hasNext();) {
- Component c = it.next();
- ts.getTab(c).setClosable(
- (Boolean) event.getProperty().getValue());
- }
- }
- });
-
- return l;
- }
-
- Layout buildPanels() {
- GridLayout l = new GridLayout(2, 1);
- l.setCaption("Panels");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("700px");
- l.setColumnExpandRatio(0, 2);
- l.setColumnExpandRatio(1, 5);
-
- l.addComponent(new Label("Normal Panel", ContentMode.HTML));
-
- VerticalLayout pl = new VerticalLayout();
- pl.setMargin(true);
- Panel p = new Panel("Normal Panel", pl);
- p.setHeight("100px");
- pl.addComponent(new Label("Panel content"));
- l.addComponent(p);
-
- l.addComponent(new Label(
- "Light Style (<code>LiferayTheme.PANEL_LIGHT</code>)",
- ContentMode.HTML));
-
- VerticalLayout p2l = new VerticalLayout();
- p2l.setMargin(true);
- Panel p2 = new Panel("Light Style Panel", p2l);
- p2.setStyleName(LiferayTheme.PANEL_LIGHT);
- p2l.addComponent(new Label("Panel content"));
- l.addComponent(p2);
-
- return l;
- }
-
- Layout buildTables() {
- GridLayout l = new GridLayout(1, 1);
- l.setCaption("Tables");
- l.setMargin(true);
- l.setSpacing(true);
-
- Table t = new Table();
- t.setWidth("700px");
- t.setPageLength(4);
- t.setSelectable(true);
- t.setColumnCollapsingAllowed(true);
- t.setColumnReorderingAllowed(true);
- t.addActionHandler(handler);
-
- t.addContainerProperty("First", String.class, null, "First",
- ICON_GLOBE, Table.ALIGN_RIGHT);
- t.addContainerProperty("Second", String.class, null);
- t.addContainerProperty("Third", String.class, null);
- t.addContainerProperty("Fourth", TextField.class, null);
- t.setColumnCollapsed("Fourth", true);
-
- int sum = 0;
- for (int j = 0; j < 100; j++) {
- t.addItem(new Object[] { "" + j, "Bar value " + j,
- "Last column value " + j, new TextField() }, j);
- sum += j;
- }
-
- t.setFooterVisible(true);
- t.setColumnFooter("First", "" + sum);
-
- l.addComponent(t);
-
- return l;
- }
-
- Layout buildWindows() {
- final CssLayout l = new CssLayout();
- l.setCaption("Windows");
-
- VerticalLayout layout = new VerticalLayout();
- layout.setMargin(true);
- final Window w = new Window("Normal window", layout);
- w.setWidth("280px");
- w.setHeight("180px");
- w.setPositionX(40);
- w.setPositionY(160);
-
- VerticalLayout layout2 = new VerticalLayout();
- layout2.setMargin(true);
- final Window w2 = new Window("Window, no resize", layout2);
- w2.setResizable(false);
- w2.setWidth("280px");
- w2.setHeight("180px");
- w2.setPositionX(350);
- w2.setPositionY(160);
- layout2.addComponent(new Label(
- "<code>Window.setResizable(false)</code>", ContentMode.HTML));
-
- tabs.addListener(new TabSheet.SelectedTabChangeListener() {
- @Override
- public void selectedTabChange(SelectedTabChangeEvent event) {
- if (event.getTabSheet().getSelectedTab() == l) {
- getMainWindow().addWindow(w);
- getMainWindow().addWindow(w2);
- } else {
- getMainWindow().removeWindow(w);
- getMainWindow().removeWindow(w2);
- }
- }
- });
-
- return l;
- }
-
- Layout buildSplitPanels() {
- final GridLayout l = new GridLayout(2, 1);
- l.setCaption("Split panels");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("700px");
- l.setHeight("100%");
- l.setColumnExpandRatio(1, 1);
-
- CheckBox lockCheckBox = new CheckBox("Lock SplitPanels");
- lockCheckBox.setImmediate(true);
- l.addComponent(lockCheckBox, 1, 0);
- l.newLine();
-
- Label label = new Label("Normal SplitPanel", ContentMode.HTML);
- label.setWidth(null);
- l.addComponent(label);
- final HorizontalSplitPanel sp = new HorizontalSplitPanel();
- sp.setWidth("100%");
- sp.setHeight("100px");
- final VerticalSplitPanel sp2 = new VerticalSplitPanel();
- sp2.setSizeFull();
- sp.setSecondComponent(sp2);
- l.addComponent(sp);
-
- label = new Label(
- "Small Style<br />(<code>LiferayTheme.SPLITPANEL_SMALL</code>)",
- ContentMode.HTML);
- label.setWidth(null);
- l.addComponent(label);
-
- final HorizontalSplitPanel sp3 = new HorizontalSplitPanel();
- sp3.setStyleName(LiferayTheme.SPLITPANEL_SMALL);
- sp3.setWidth("100%");
- sp3.setHeight("100px");
- final VerticalSplitPanel sp4 = new VerticalSplitPanel();
- sp4.setStyleName(LiferayTheme.SPLITPANEL_SMALL);
- sp4.setSizeFull();
- sp3.setSecondComponent(sp4);
- l.addComponent(sp3);
-
- lockCheckBox.addListener(new Property.ValueChangeListener() {
-
- @Override
- public void valueChange(ValueChangeEvent event) {
- sp.setLocked((Boolean) event.getProperty().getValue());
- sp2.setLocked((Boolean) event.getProperty().getValue());
- sp3.setLocked((Boolean) event.getProperty().getValue());
- sp4.setLocked((Boolean) event.getProperty().getValue());
- }
- });
-
- return l;
- }
-
- Layout buildAccordions() {
- final GridLayout l = new GridLayout(2, 1);
- l.setCaption("Accordions");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("700px");
-
- Accordion a = new Accordion();
- a.setWidth("100%");
- a.setHeight("170px");
- l.addComponent(a);
-
- for (int i = 1; i < 5; i++) {
- Tab t = a.addTab(new Label(), "Sheet " + i);
- if (i % 2 == 0) {
- t.setIcon(ICON_GLOBE);
- }
- if (i == 2) {
- t.setEnabled(false);
- }
- }
-
- return l;
- }
-
- Layout buildSliders() {
- final GridLayout l = new GridLayout(2, 1);
- l.setCaption("Sliders");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("400px");
- l.setColumnExpandRatio(0, 1);
-
- l.addComponent(new Label("Horizontal Slider", ContentMode.HTML));
- Slider s = new Slider();
- s.setWidth("200px");
- try {
- s.setValue(50.0);
- } catch (ValueOutOfBoundsException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- l.addComponent(s);
-
- l.addComponent(new Label("Vertical Slider", ContentMode.HTML));
- s = new Slider();
- s.setOrientation(SliderOrientation.VERTICAL);
- s.setHeight("200px");
- try {
- s.setValue(50.0);
- } catch (ValueOutOfBoundsException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- l.addComponent(s);
-
- return l;
- }
-
- Layout buildTrees() {
- final GridLayout l = new GridLayout(1, 1);
- l.setMargin(true);
- l.setCaption("Trees");
-
- Tree tree = new Tree();
- l.addComponent(tree);
- tree.addItem("Item 1");
- tree.setItemIcon("Item 1", ICON_GLOBE);
- tree.addItem("Child 1");
- tree.setItemIcon("Child 1", ICON_GLOBE);
- tree.setParent("Child 1", "Item 1");
- tree.addItem("Child 2");
- tree.setParent("Child 2", "Item 1");
- tree.addItem("Child 3");
- tree.setChildrenAllowed("Child 3", false);
- tree.setItemIcon("Child 3", ICON_GLOBE);
- tree.setParent("Child 3", "Item 1");
- tree.addItem("Child 4");
- tree.setChildrenAllowed("Child 4", false);
- tree.setParent("Child 4", "Item 1");
- tree.addItem("Item 2");
- tree.addItem("Item 3");
- tree.setItemIcon("Item 3", ICON_GLOBE);
- tree.setChildrenAllowed("Item 3", false);
- tree.addItem("Item 4");
- tree.setChildrenAllowed("Item 4", false);
-
- tree.addActionHandler(handler);
-
- return l;
- }
-
- Layout buildNotifications() {
- final GridLayout l = new GridLayout(2, 1);
- l.setCaption("Notifications");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("400px");
- l.setColumnExpandRatio(0, 1);
-
- final TextField title = new TextField("Notification caption");
- title.setValue("Brown Fox!");
- final TextField message = new TextField("Notification description");
- message.setValue("Jumped over the lazy dog.");
- message.setWidth("15em");
-
- l.addComponent(new Label("<h3>Type</h3>", ContentMode.HTML));
- l.addComponent(new Label("<h3>Preview</h3>", ContentMode.HTML));
-
- l.addComponent(new Label("Humanized", ContentMode.HTML));
- Button show = new Button("Humanized Notification",
- new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- Notification notification = new Notification(
- title.getValue(), message.getValue());
- notification.setHtmlContentAllowed(true);
- notification.show(Page.getCurrent());
- }
- });
- l.addComponent(show);
-
- l.addComponent(new Label("Warning", ContentMode.HTML));
- show = new Button("Warning Notification", new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- new Notification(title.getValue(), message.getValue(),
- Notification.TYPE_WARNING_MESSAGE, true).show(Page
- .getCurrent());
-
- }
- });
- l.addComponent(show);
-
- l.addComponent(new Label("Error", ContentMode.HTML));
- show = new Button("Error Notification", new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- new Notification(title.getValue(), message.getValue(),
- Notification.TYPE_ERROR_MESSAGE, true).show(Page
- .getCurrent());
-
- }
- });
- l.addComponent(show);
-
- l.addComponent(new Label("Tray", ContentMode.HTML));
- show = new Button("Tray Notification", new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- new Notification(title.getValue(), message.getValue(),
- Notification.TYPE_TRAY_NOTIFICATION, true).show(Page
- .getCurrent());
-
- }
- });
- l.addComponent(show);
-
- l.addComponent(title);
- l.addComponent(message);
-
- return l;
- }
-
- Layout buildPopupViews() {
- final GridLayout l = new GridLayout(1, 1);
- l.setCaption("PopupViews");
- l.setMargin(true);
- l.setSpacing(true);
- l.setWidth("400px");
-
- Label content = new Label(
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
- content.setWidth("200px");
-
- PopupView pw = new PopupView("Click me!", content);
- l.addComponent(pw);
-
- return l;
- }
-
- MenuBar getTopMenu() {
- MenuBar menubar = new MenuBar();
- menubar.setWidth("100%");
- final MenuBar.MenuItem file = menubar.addItem("File", null);
- final MenuBar.MenuItem newItem = file.addItem("New", null);
- file.addItem("Open file...", new ThemeResource(
- "../runo/icons/16/folder.png"), null);
- file.addSeparator();
-
- newItem.addItem("File", null);
- newItem.addItem("Folder", null);
- newItem.addItem("Project...", null);
-
- file.addItem("Close", null);
- file.addItem("Close All", null);
- file.addSeparator();
-
- file.addItem("Save", null);
- file.addItem("Save As...", null);
- file.addItem("Save All", null);
-
- final MenuBar.MenuItem edit = menubar.addItem("Edit", null);
- edit.addItem("Undo", null);
- edit.addItem("Redo", null).setEnabled(false);
- edit.addSeparator();
-
- edit.addItem("Cut", null);
- edit.addItem("Copy", null);
- edit.addItem("Paste", null);
- edit.addSeparator();
-
- final MenuBar.MenuItem find = edit.addItem("Find/Replace", null);
-
- find.addItem("Google Search", new Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- getMainWindow().open(
- new ExternalResource("http://www.google.com"));
- }
- });
- find.addSeparator();
- find.addItem("Find/Replace...", null);
- find.addItem("Find Next", null);
- find.addItem("Find Previous", null);
-
- final MenuBar.MenuItem view = menubar.addItem("View",
- new ThemeResource("../runo/icons/16/user.png"), null);
- MenuItem statusBarItem = view.addItem("Show/Hide Status Bar", null);
- statusBarItem.setCheckable(true);
- statusBarItem.setChecked(true);
- view.addItem("Customize Toolbar...", null);
- view.addSeparator();
-
- view.addItem("Actual Size", null);
- view.addItem("Zoom In", null);
- view.addItem("Zoom Out", null);
-
- menubar.addItem("Help", null).setEnabled(false);
-
- return menubar;
- }
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java b/uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java
deleted file mode 100644
index 0132a1a0aa..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vaadin.tests.themes;
-
-import com.vaadin.annotations.Theme;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Panel;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.LiferayTheme;
-
-@Theme("liferay")
-public class LiferayThemeTest extends AbstractTestUI {
-
- @Override
- protected void setup(VaadinRequest request) {
- VerticalLayout pl = new VerticalLayout();
- pl.setMargin(true);
- Panel p = new Panel("Panel", pl);
- addComponent(p);
- pl.addComponent(new Label("Panel content"));
-
- pl = new VerticalLayout();
- pl.setMargin(true);
- p = new Panel("Light Panel", pl);
- p.addStyleName(LiferayTheme.PANEL_LIGHT);
- addComponent(p);
- pl.addComponent(new Label("Panel content"));
- }
-
- @Override
- protected String getTestDescription() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- protected Integer getTicketNumber() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/uitest/src/main/webapp/WEB-INF/liferay-display.xml b/uitest/src/main/webapp/WEB-INF/liferay-display.xml
index 014ed31b47..9f1cd7b29b 100644
--- a/uitest/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/uitest/src/main/webapp/WEB-INF/liferay-display.xml
@@ -4,6 +4,5 @@
<display>
<category name="Vaadin">
<portlet id="JSR286TestPortlet" />
- <portlet id="Vaadin Liferay Theme Portlet" />
</category>
</display> \ No newline at end of file
diff --git a/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml b/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml
index ea060ce44a..184b0f0980 100644
--- a/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -7,11 +7,6 @@
<instanceable>false</instanceable>
<ajaxable>false</ajaxable>
</portlet>
- <portlet>
- <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
- <instanceable>false</instanceable>
- <ajaxable>false</ajaxable>
- </portlet>
<role-mapper>
<role-name>administrator</role-name>
diff --git a/uitest/src/main/webapp/WEB-INF/portlet.xml b/uitest/src/main/webapp/WEB-INF/portlet.xml
index 3a603c43ae..3886dc65e9 100644
--- a/uitest/src/main/webapp/WEB-INF/portlet.xml
+++ b/uitest/src/main/webapp/WEB-INF/portlet.xml
@@ -40,40 +40,6 @@
</security-role-ref>
</portlet>
- <portlet>
- <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
- <display-name>Vaadin Liferay Theme</display-name>
-
- <portlet-class>com.vaadin.server.LegacyVaadinPortlet</portlet-class>
- <init-param>
- <name>application</name>
- <value>com.vaadin.tests.integration.LiferayThemeDemo</value>
- </init-param>
-
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>view</portlet-mode>
- </supports>
-
- <portlet-info>
- <title>Vaadin Liferay Theme</title>
- <short-title>Vaadin Liferay Theme</short-title>
- </portlet-info>
-
- <security-role-ref>
- <role-name>administrator</role-name>
- </security-role-ref>
- <security-role-ref>
- <role-name>guest</role-name>
- </security-role-ref>
- <security-role-ref>
- <role-name>power-user</role-name>
- </security-role-ref>
- <security-role-ref>
- <role-name>user</role-name>
- </security-role-ref>
- </portlet>
-
<!-- This can be used to work around an issue in liferay 5.0-5.1.1 <container-runtime-option>
<name>javax.portlet.escapeXml</name> <value>false</value> </container-runtime-option> -->
</portlet-app> \ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
deleted file mode 100644
index 47c4c1baae..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.uitest;
-
-public class LiferayThemeTest extends ThemeTest {
- @Override
- protected String getTheme() {
- return "liferay";
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java
index 3ba86fd3e4..f718bd58b5 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java
@@ -19,11 +19,6 @@ public class FaviconTest extends SingleBrowserTest {
}
@Test
- public void liferayHasFavicon() {
- assertThatThemeHasFavicon("liferay");
- }
-
- @Test
public void runoHasFavicon() {
assertThatThemeHasFavicon("runo");
}