LPS-26901 SOS-1020
LPS-26901 SOS-1020 Source formatting
LPS-26701
LPS-26701
LPS-26701
LPS-26701

Conflicts:

	portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/bookmarks/bookmarksfolder/AddPortletBookmarksFolderTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/bookmarks/bookmarksfolder/AddPortletBookmarksFolderTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/shopping/category/ViewCategoryTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/shopping/category/ViewCategoryTest.java
LPS-26701

Conflicts:

	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage1BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage1BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage1PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage1PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage2BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage2BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage2PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage2PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage3BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage3BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage3PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/AddPage3PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/ConfigurePortlet2BlogsScopeLayoutCurrentPageTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/ConfigurePortlet2BlogsScopeLayoutCurrentPageTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/ConfigurePortlet3BlogsScopeLayoutPage2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarcp/ConfigurePortlet3BlogsScopeLayoutPage2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage1BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage1BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage1PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage1PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage2BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage2BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage2PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage2PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage3BlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage3BlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage3PortletBlogsPageScopeTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/AddPage3PortletBlogsPageScopeTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/ConfigurePortlet2BlogsScopeLayoutCurrentPageTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/ConfigurePortlet2BlogsScopeLayoutCurrentPageTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/ConfigurePortlet3BlogsScopeLayoutPage2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/blogs/pagescopelarportlet/ConfigurePortlet3BlogsScopeLayoutPage2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage1DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage1DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage1PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage1PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage2DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage2DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage2PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage2PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage3DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage3DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage3PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/AddPage3PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/ConfigurePage3PortletDLScopeLayoutPage2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarcp/ConfigurePage3PortletDLScopeLayoutPage2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage1DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage1DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage1PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage1PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage2DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage2DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage2PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage2PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage3DLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage3DLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage3PortletDLTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/AddPage3PortletDLTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/ConfigurePage3PortletDLScopeLayoutPage2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/documentlibrary/pagescopelarportlet/ConfigurePage3PortletDLScopeLayoutPage2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcommunity/AddCustomSiteWikiUseCaseTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcommunity/AddCustomSiteWikiUseCaseTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddCustomSiteWikiUseCaseTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddCustomSiteWikiUseCaseTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddPageWikiTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddPageWikiTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddPortletWikiTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarcp/AddPortletWikiTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddCustomSiteWikiUseCaseTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddCustomSiteWikiUseCaseTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddPageWikiTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddPageWikiTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddPortletWikiTest.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/transfersampledatalatest/wiki/usecaselarportlet/AddPortletWikiTest.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/Guest_ViewConfigurePortlet2MaximumItemsToDisplay1Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/Guest_ViewConfigurePortlet2MaximumItemsToDisplay1Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/PageScopeTests.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/PageScopeTests.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/ViewConfigurePortlet2MaximumItemsToDisplay1Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/blogs/pagescope/ViewConfigurePortlet2MaximumItemsToDisplay1Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/PageScopeTests.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/PageScopeTests.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/UseCaseTests.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/UseCaseTests.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/ViewWikiFrontPageChildPageTag1Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/ViewWikiFrontPageChildPageTag1Test.java
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/ViewWikiFrontPageChildPageTag2Test.html
	portal-web/test/com/liferay/portalweb/portal/dbupgrade/viewsampledatalatest/wiki/usecase/ViewWikiFrontPageChildPageTag2Test.java
Test Fixes - plugins/kaleo/mysubmisisons
Test Fixes - socialofficehome/activities
Test Fixes - socialofficehome/microblogs
Test Fixes - socialofficehome/privatemessaging
Test Fixes - socialofficehome/sites
Test Fixes - socialofficehome/privatemessaging
Test Fixes - socialofficehome
Test Fixes - socialoffice/privatemessaging
Test Fixes - portlet/messageboards
Test Fixes - portal/controlpanel/bookmarks

Conflicts:
Test Fixes - portal/controlpanel/calendar
LPS-25684 Remove the duplicated prepare call in MonitoringPortlet
LPS-25716 Refactor InvokerPortlet to use factory pattern rather than prototype pattern to simplify the interface