Updated locators for portlets due to #5912

svn changeset:16955/svn branch:6.5

3 files changed, 90 insertions, 90 deletions

diff --git a/tests/integration-testscripts/Liferay6-theme.html b/tests/integration-testscripts/Liferay6-theme.html
index 65dce7bbaa..6d0811f85b 100644
--- a/tests/integration-testscripts/Liferay6-theme.html
+++ b/tests/integration-testscripts/Liferay6-theme.html
@@ -26,7 +26,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -46,7 +46,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -56,7 +56,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -76,7 +76,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -96,7 +96,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -106,72 +106,72 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -181,7 +181,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -191,7 +191,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -201,7 +201,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -211,7 +211,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -221,7 +221,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -231,7 +231,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -242,12 +242,12 @@
 <!--
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -258,7 +258,7 @@
 -->
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -268,22 +268,22 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -293,7 +293,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -303,7 +303,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/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>
@@ -313,7 +313,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -328,7 +328,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -343,7 +343,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -365,7 +365,7 @@
 -->
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -380,7 +380,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11357::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
 	<td>3,-146</td>
 </tr>
 <tr>
diff --git a/tests/integration-testscripts/Liferay6EE-theme.html b/tests/integration-testscripts/Liferay6EE-theme.html
index 091f969a7e..14546fc5b4 100644
--- a/tests/integration-testscripts/Liferay6EE-theme.html
+++ b/tests/integration-testscripts/Liferay6EE-theme.html
@@ -27,7 +27,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -37,7 +37,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -67,7 +67,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -77,7 +77,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -87,7 +87,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -97,7 +97,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -107,72 +107,72 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -182,7 +182,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -192,7 +192,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -202,7 +202,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -212,7 +212,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -222,7 +222,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -232,7 +232,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -243,12 +243,12 @@
 <!--
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -259,7 +259,7 @@
 -->
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -269,22 +269,22 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -294,7 +294,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -304,7 +304,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/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>
@@ -314,7 +314,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -329,7 +329,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -344,7 +344,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -366,7 +366,7 @@
 -->
 <tr>
 	<td>click</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -381,7 +381,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10418::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
 	<td>3,-146</td>
 </tr>
 <tr>
diff --git a/tests/integration-testscripts/integration-test-liferay-5.2.3-portlet2.html b/tests/integration-testscripts/integration-test-liferay-5.2.3-portlet2.html
index 1a079e8ea8..349c6fe806 100644
--- a/tests/integration-testscripts/integration-test-liferay-5.2.3-portlet2.html
+++ b/tests/integration-testscripts/integration-test-liferay-5.2.3-portlet2.html
@@ -93,32 +93,32 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
 	<td>24,10</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>9,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8</td>
 	<td>158,17</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0]</td>
+	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0]</td>
 	<td>New York</td>
 </tr>