Branch: refs/heads/master Home: https://github.com/gatein/gatein-portal Commit: 8a1d1d1767f683871b926eb8967172eb981fd659 https://github.com/gatein/gatein-portal/commit/8a1d1d1767f683871b926eb896... Author: nscavell <nick.scavelli(a)gmail.com&gt; Date: 2012-10-17 (Wed, 17 Oct 2012) Changed paths: M component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/AbstractMarshaller.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshaller.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageExportTask.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageExportResource.java R component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageKey.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageReadConfigAsXml.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageReadResource.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageUtils.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteLayoutExportResource.java M component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshallerTest.java M component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java M component/portal/src/test/resources/org/exoplatform/portal/mop/management/pages-empty.xml Log Message: ----------- GTNPORTAL-2658: Fix export/import to use new page service Commit: e5c9a7cce4274b026858690e4e6fd209e187ca13 https://github.com/gatein/gatein-portal/commit/e5c9a7cce4274b026858690e4e... Author: nscavell <nick.scavelli(a)gmail.com&gt; Date: 2012-10-17 (Wed, 17 Oct 2012) Changed paths: M component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutImportTask.java A component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MOPSiteProvider.java M component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java M component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java Log Message: ----------- GTNPORTAL-2658: Fix export/import to use new page service - Try and improve performance by not calling loadPages unless import mode is overwrite. Compare: https://github.com/gatein/gatein-portal/compare/0418924c69d9...e5c9a7cce427