Prosoft Git

shopizer-developers

Compilation issue fixes Compilation issue fixes

10/28/2016 7:42:01 PM
Umesh Awasthi

Umesh Awasthi

Commit: b9dc853

Tree: d6c8f38

Parents: f6ee792

Changes

.gitignore 3(+2 -1)

.idea/workspace.xml 1078(+326 -752)

shopizer.iml 18(+18 -0)

sm-core/sm-core.iml 16(+16 -0)

sm-shop/sm-shop.iml 11(+11 -0)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java 48(+19 -29)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java 22(+11 -11)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java 49(+19 -30)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java 50(+22 -28)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java 47(+18 -29)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java 72(+30 -42)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java 54(+26 -28)

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java 48(+23 -25)

sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java 5(+2 -3)

sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java 6(+3 -3)

sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java 2(+1 -1)

sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java 2(+1 -1)

sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java 2(+1 -1)

sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java 2(+1 -1)

sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java 2(+1 -1)

sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java 14(+6 -8)

sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java 18(+9 -9)

sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java 8(+4 -4)

Details

.gitignore 3(+2 -1) 

diff --git a/.gitignore b/.gitignore
index c190924..8d39cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.lst
 */target/
 *.class
-*.idea/
\ No newline at end of file
+*.idea/
+*.iml

.idea/workspace.xml 1078(+326 -752) 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8923d8b..b88ba88 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,717 +2,27 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fcbb826d-6e02-4a83-94bd-4d2af42f8678" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-model/target/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-model/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core/target/classes/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/AdminController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Configuration.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Content.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$ContentFiles.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$ContentImages.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Customer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Order.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Payment.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Product.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Shipping.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Store.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Tax.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$User.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/categories/CategoryController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/CacheController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/ConfigurationController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentBoxesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentImageController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentPagesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/StaticContentController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/orders/OrderControler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/orders/OrdersController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/payments/PaymentsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/DigitalProductController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ManufacturerController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/OptionsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/OptionsValueController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductAttributeController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductImagesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductPriceController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductReviewController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/RelatedItemsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/tax/TaxClassController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/tax/TaxRatesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/GroupsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/LoginController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/PermissionController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/SecurityController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/UserController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/catalog/Keyword.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/catalog/Manufacturer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/catalog/Product.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/catalog/ProductPrice.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/content/ContentFiles.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/content/ProductImages.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/digital/ProductFiles.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/merchant/StoreLanding.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/orders/Order.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/orders/Refund.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/reference/Size.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/reference/Weight.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/secutity/Password.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/userpassword/UserReset.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/web/ConfigListWrapper.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/model/web/Menu.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/security/SecurityDataAccessException.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/security/SecurityQuestion.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/security/UserServicesImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/admin/security/WebUserServices.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/constants/ApplicationConstants.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/constants/Constants.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/constants/EmailConstants.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/controller/FilesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/controller/ImagesController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/controller/ReferenceController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/filter/AdminFilter.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/filter/StoreFilter.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/init/data/InitData.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/init/data/InitStoreData.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/init/data/InitializationLoader.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/Entity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/ServiceEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/ShopEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/CatalogEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/ProductList.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/ReadableImage.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/SearchProductList.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/Category.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/CategoryDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/CategoryEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/PersistableCategory.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/ReadableCategory.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/Manufacturer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableImage.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProductPrice.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProductReview.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/Product.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductPrice.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductPriceEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductList.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductPrice.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductReview.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/RelatedProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductAttributeEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValueDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValueEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ReadableProductAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/Address.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/AnonymousCustomer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/Customer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerPassword.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/DeliveryEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/PersistableCustomer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableCustomer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableDelivery.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredCustomer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/CartModificationException.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/Order.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProductEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderTotal.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrderProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderList.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderTotal.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShippingSummary.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShopOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/order/ShopOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/Breadcrumb.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItem.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItemType.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/ContactForm.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/MerchantStoreEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/PageInformation.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shop/ReadableMerchantStore.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerOptionPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/OrderProductPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/PersistableOrderPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/AbstractController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Category.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Checkout.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Content.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Customer.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Error.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Items.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Merchant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Pages.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Product.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Search.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$ShoppingCart.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views$Controllers$Registration.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views$Controllers.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/LandingController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/content/ShopContentController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerAccountController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerLoginController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/items/ListItemsController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/items/facade/ProductItemsFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/items/facade/ProductItemsFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderConfirmationController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderDownloadController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderPaymentController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/facade/OrderFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/product/ShopProductController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/product/facade/ProductFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/product/facade/ProductFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/search/SearchController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/search/facade/SearchFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/MiniCartController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacade.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/controller/store/ContactController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/catalog/Attribute.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/catalog/AttributeValue.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/filter/QueryFilter.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/filter/QueryFilterType.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/paging/PaginationData.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/model/search/AutoCompleteRequest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/security/CustomerServicesImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/security/ServicesAuthenticationEntryPoint.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/security/ServicesAuthenticationSuccessHandler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/category/ShoppingCategoryRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/customer/CustomerRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/order/OrderRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/product/ProductItemsRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/product/ShopProductRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/search/SearchRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/store/StoreContactRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/system/SystemRESTController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/store/services/utility/CallbackController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ActiveLinkTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/AdminProductDownloadUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/Computer - Shortcut.lnk" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ConfigurationTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ContentImageUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ManufacturerImageUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/OrderProductDownloadUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/PageContentTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ProductDescriptionUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ProductImageUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ShopProductImageUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ShopProductPriceFormatTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/ShopProductRelationshipTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/StoreBreadcrumbsTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/StoreFooterlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/tags/StoreLogoUrlTag.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/AbstractimageFilePath.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/AdminAccessDeniedHandler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/AppConfiguration.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/BeanUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/BreadcrumbsUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/CaptchaRequestUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/DateUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/EmailTemplatesUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/EmailUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch$List.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatchValidator.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/FilePathUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/GeoLocationUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/ImageFilePath.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/ImageFilePathUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/LabelUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/LanguageUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/LocalImageFilePathUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/LocaleUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/MerchantUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/PageBuilderUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/SessionUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/TokenizeTool.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/UserUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/classes/com/salesmanager/shop/utils/WebApplicationCacheUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/m2e-wtp/web-resources/.gitignore" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/com/salesmanager/test/shop/controller/system/rest/SystemAPITest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/log4j.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/sm-shop/target/test-classes/log4j.xml" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcAddressDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcAddressDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/LinkType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/LinkType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/Links.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/Links.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/ObjectFactory.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/ObjectFactory.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcAddressDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcAddressDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Link.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Link.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Links.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Links.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/NumberRangeType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/NumberRangeType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/ObjectFactory.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/ObjectFactory.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$ConflictingOptions.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$ConflictingOptions.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$PrerequisiteOptions.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$PrerequisiteOptions.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options$Option.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options$Option.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/RelType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/RelType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options$Option.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options$Option.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions$DimensionalRestrictions.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions$DimensionalRestrictions.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services$Service.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services$Service.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/package-info.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/package-info.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages$Message.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages$Message.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/ObjectFactory.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/ObjectFactory.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/package-info.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/package-info.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcAddressDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcAddressDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcDetailsType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcDetailsType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/Link.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/Link.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/Links.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/Links.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$Domestic.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$Domestic.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$International.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$International.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$UnitedStates.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$UnitedStates.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options$Option.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options$Option.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics$Dimensions.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics$Dimensions.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Services.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Services.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/ObjectFactory.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/ObjectFactory.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment$Qualifier.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment$Qualifier.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option$Qualifier.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option$Qualifier.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Taxes.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Taxes.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$ServiceStandard.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$ServiceStandard.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$WeightDetails.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$WeightDetails.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/TaxType.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/TaxType.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/package-info.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/package-info.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/classes/com/shopizer/modules/shipping/canadapost/CanadaPostQuoteModule.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/classes/com/shopizer/modules/shipping/canadapost/CanadaPostQuoteModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/shopizer-shipping-canadapost-module-2.5.0-SNAPSHOT.jar" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/shopizer-shipping-canadapost-module-2.5.0-SNAPSHOT.jar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/test-classes/com/shopizer/modules/shipping/canadapost/test/ShippingCanadaPostTestCase.class" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/test-classes/com/shopizer/modules/shipping/canadapost/test/ShippingCanadaPostTestCase.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/com/shopizer/modules/shipping/distance/ShippingDistancePreProcessorImpl.class" afterPath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/classes/com/shopizer/modules/shipping/distance/ShippingDistancePreProcessorImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT.jar" afterPath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT.jar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/test-classes/com/shopizer/modules/shipping/distance/test/ShippingDistanceProcessorTestCase.class" afterPath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/test-classes/com/shopizer/modules/shipping/distance/test/ShippingDistanceProcessorTestCase.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/constants/Constants.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/constants/Constants.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/Encryption.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/Encryption.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/GeoLocation.class" afterPath="$PROJECT_DIR$/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/GeoLocation.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/Constants.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/Constants.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/ShippingConstants.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/ShippingConstants.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/SystemConstants.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/constants/SystemConstants.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/ImageGet.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/ImageGet.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/ImageRemove.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/ImageRemove.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/StaticContentData.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/StaticContentData.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageGet.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageGet.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageRemove.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageRemove.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FileGet.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FileGet.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FilePut.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FilePut.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FileRemove.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/FileRemove.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ImagePut.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ImagePut.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManager.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManager.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/infinispan/CmsStaticContentFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/infinispan/CmsStaticContentFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/local/CmsStaticContentFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/local/CmsStaticContentFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/CacheManager.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/CacheManager.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/CacheManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/CacheManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/LocalCacheManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/LocalCacheManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StaticContentCacheManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StaticContentCacheManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StoreCacheManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StoreCacheManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/VendorCacheManager.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/VendorCacheManager.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManager.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManager.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageGet.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageGet.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImagePut.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImagePut.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageRemove.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageRemove.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/local/CmsImageFileManagerImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/local/CmsImageFileManagerImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/Email.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/Email.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/EmailConfig.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/EmailConfig.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSender.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSender.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$1.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$2.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/IntegrationException.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/IntegrationException.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/BeanStreamPayment.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/BeanStreamPayment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/MoneyOrderPayment.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/MoneyOrderPayment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalExpressCheckoutPayment.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalExpressCheckoutPayment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalRestPayment.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalRestPayment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/StripePayment.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/StripePayment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomShippingQuoteRules.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomShippingQuoteRules.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomWeightBasedShippingQuote.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomWeightBasedShippingQuote.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/DefaultPackagingImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/DefaultPackagingImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PackingBox.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PackingBox.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PriceByDistanceShippingQuoteRules.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PriceByDistanceShippingQuoteRules.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingDecisionPreProcessorImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingDecisionPreProcessorImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSParsedElements.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSParsedElements.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote$1.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSParsedElements.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSParsedElements.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote$1.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/order/InvoiceModule.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/order/InvoiceModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/order/ODSInvoiceModule.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/order/ODSInvoiceModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/utils/EncryptionImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/utils/EncryptionImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/utils/GeoLocationImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/modules/utils/GeoLocationImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductAttributeRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductAttributeRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionValueRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionValueRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/availability/ProductAvailabilityRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/availability/ProductAvailabilityRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/file/DigitalProductRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/file/DigitalProductRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/image/ProductImageRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/image/ProductImageRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/manufacturer/ManufacturerRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/manufacturer/ManufacturerRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/price/ProductPriceRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/price/ProductPriceRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/review/ProductReviewRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/review/ProductReviewRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/type/ProductTypeRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/type/ProductTypeRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerAttributeRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerAttributeRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionSetRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionSetRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionValueRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionValueRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/merchant/MerchantRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/merchant/MerchantRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderTotalRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderTotalRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderaccount/OrderAccountRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderaccount/OrderAccountRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductDownloadRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductDownloadRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/payments/TransactionRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/payments/TransactionRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/country/CountryRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/country/CountryRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/currency/CurrencyRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/currency/CurrencyRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/language/LanguageRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/language/LanguageRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/zone/ZoneRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/reference/zone/ZoneRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shipping/ShippingOriginRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shipping/ShippingOriginRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartAttributeRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartAttributeRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartItemRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartItemRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/CustomerOptinRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/CustomerOptinRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantLogRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantLogRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/ModuleConfigurationRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/ModuleConfigurationRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/OptinRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/OptinRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemConfigurationRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemConfigurationRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemNotificationRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemNotificationRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxClassRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxClassRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxRateRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxRateRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/GroupRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/GroupRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryCustom.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryCustom.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/UserRepository.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/repositories/user/UserRepository.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/TransactionalAspectAwareService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/common/generic/TransactionalAspectAwareService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/content/ContentService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/content/ContentService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/content/ContentServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/content/ContentServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/OrderService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/OrderService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/OrderServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/OrderServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabase.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabase.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ConfigurationModulesLoader.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ConfigurationModulesLoader.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/IntegrationModulesLoader.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/IntegrationModulesLoader.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ZonesLoader.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ZonesLoader.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneTransient.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneTransient.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/search/SearchService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/search/SearchService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/search/SearchServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/search/SearchServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/EmailService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/EmailService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/EmailServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/EmailServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxClassService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxClassService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxClassServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxClassServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxRateService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxRateService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxRateServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxRateServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/GroupService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/GroupService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/GroupServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/GroupServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserService.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserService.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserServiceImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserServiceImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserServiceLDAPImpl.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/services/user/UserServiceLDAPImpl.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/AbstractDataPopulator.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/AbstractDataPopulator.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ApplicationContextListenerUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ApplicationContextListenerUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CacheUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CacheUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CatalogServiceHelper.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CatalogServiceHelper.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CoreConfiguration.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CoreConfiguration.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CreditCardUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/CreditCardUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/DataPopulator.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/DataPopulator.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/DataUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/DataUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/EntityPopulator.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/EntityPopulator.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductImageCropUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductImageCropUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductImageSizeUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductImageSizeUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductPriceUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductPriceUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductUtils.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ProductUtils.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ajax/AjaxPageableResponse.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ajax/AjaxPageableResponse.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ajax/AjaxResponse.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/ajax/AjaxResponse.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/query/ProductQueryBuilder.class" afterPath="$PROJECT_DIR$/sm-core/target/classes/com/salesmanager/core/business/utils/query/ProductQueryBuilder.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/catalog/ProductTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/catalog/ProductTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/common/AbstractSalesManagerCoreTestCase.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/common/AbstractSalesManagerCoreTestCase.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/configuration/ConfigurationTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/configuration/ConfigurationTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/content/ContentImagesTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/content/ContentImagesTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/content/StaticContentTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/content/StaticContentTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/customer/CustomerTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/customer/CustomerTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/merchant/MerchantTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/merchant/MerchantTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/order/InvoiceTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/order/InvoiceTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/order/OrderTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/order/OrderTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/references/ReferencesTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/references/ReferencesTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shipping/ShippingMethodDecisionTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shipping/ShippingMethodDecisionTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shipping/ShippingQuoteByWeightTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shipping/ShippingQuoteByWeightTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shoppingcart/ShoppingCartTest.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/shoppingcart/ShoppingCartTest.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/utils/ImportIntegrationModule.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/utils/ImportIntegrationModule.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/utils/UtilsTestCase.class" afterPath="$PROJECT_DIR$/sm-core/target/test-classes/com/salesmanager/test/utils/UtilsTestCase.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-canadapost/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/shopizer-canadapost/target/maven-archiver/pom.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/shopizer-shipping-distance-module/target/maven-archiver/pom.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopizer.iml" afterPath="$PROJECT_DIR$/shopizer.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-core/sm-core.iml" afterPath="$PROJECT_DIR$/sm-core/sm-core.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/sm-shop.iml" afterPath="$PROJECT_DIR$/sm-shop/sm-shop.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java" />
     </list>
     <ignored path="shopizer.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -721,6 +31,7 @@
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/sm-core-model/target/" />
     <ignored path="$PROJECT_DIR$/sm-shop/target/" />
+    <ignored path=".idea/dataSources.local.xml" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -736,20 +47,7 @@
     <favorites_list name="shopizer" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="ContentBoxesController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
-              <folding>
-                <element signature="e#4646#4666#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -765,6 +63,24 @@
         <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java" />
         <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java" />
         <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java" />
+        <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java" />
       </list>
     </option>
   </component>
@@ -816,7 +132,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -1071,7 +388,49 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="content" />
+              <option name="myItemId" value="merchant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="shopizer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="shopizer" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sm-shop" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="shop" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="admin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controller" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="customers" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1119,8 +478,7 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -1128,7 +486,7 @@
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="LabelUtils&#9;PSI&#9;JAVA://com.salesmanager.web.utils.LabelUtils&#10;Menu.java&#9;FILE&#9;file:///Users/umesh/personal/git/shopizer/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java" />
+    <property name="SearchEverywhereHistoryKey" value="StoreLandingDescription&#9;PSI&#9;JAVA://com.salesmanager.web.admin.entity.merchant.StoreLandingDescription&#10;StoreLanding&#9;PSI&#9;JAVA://com.salesmanager.web.admin.entity.merchant.StoreLanding&#10;AjaxResponse&#9;PSI&#9;JAVA://com.salesmanager.core.business.utils.ajax.AjaxResponse&#10;UserUtils&#9;PSI&#9;JAVA://com.salesmanager.web.utils.UserUtils&#10;ApplicationConstants&#9;PSI&#9;JAVA://com.salesmanager.web.constants.ApplicationConstants&#10;FilePathUtils&#9;PSI&#9;JAVA://com.salesmanager.web.utils.FilePathUtils&#10;com.salesmanager.core.constants&#9;PSI&#9;JAVA://com.salesmanager.core.business.constants.Constants&#10;Constants&#9;PSI&#9;JAVA://com.salesmanager.shop.constants.Constants&#10;DateUtil&#9;PSI&#9;JAVA://com.salesmanager.web.utils.DateUtil&#10;Weight&#9;PSI&#9;JAVA://com.salesmanager.web.admin.entity.reference.Weight&#10;Size&#9;PSI&#9;JAVA://com.salesmanager.web.admin.entity.reference.Size&#10;EmailConstants&#9;PSI&#9;JAVA://com.salesmanager.web.constants.EmailConstants&#10;UserReset&#9;PSI&#9;JAVA://com.salesmanager.web.admin.entity.userpassword.UserReset&#10;LabelUtils&#9;PSI&#9;JAVA://com.salesmanager.web.utils.LabelUtils&#10;Menu.java&#9;FILE&#9;file:///Users/umesh/personal/git/shopizer/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
@@ -1237,44 +595,45 @@
       <option name="presentableId" value="Default" />
       <updated>1477686203176</updated>
       <workItem from="1477686206961" duration="538000" />
+      <workItem from="1477689503605" duration="1375000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="538000" />
+    <option name="totallyTimeSpent" value="1913000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1260" height="709" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30317461" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30317461" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -1293,6 +652,14 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
@@ -1341,12 +708,219 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-780">
+          <caret line="41" column="13" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="31" column="87" selection-start-line="31" selection-start-column="87" selection-end-line="31" selection-end-column="87" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#3857#3877#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
+          <folding>
+            <element signature="e#5653#5671#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="41" selection-start-line="0" selection-start-column="41" selection-end-line="0" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="29" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="58" column="53" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-60">
+          <caret line="5" column="61" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" />
+          <folding>
+            <element signature="e#3088#3115#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-525">
+          <caret line="5" column="56" selection-start-line="5" selection-start-column="56" selection-end-line="5" selection-end-column="56" />
+          <folding>
+            <element signature="e#3473#3505#0" expanded="true" />
+            <element signature="e#6479#6511#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="41" selection-start-line="0" selection-start-column="41" selection-end-line="0" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="41" selection-start-line="0" selection-start-column="41" selection-end-line="0" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/webapp/resources/smart-client/system/modules/ISC_Core.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="634" column="16" selection-start-line="634" selection-start-column="16" selection-end-line="634" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="39" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-core/src/main/java/com/salesmanager/core/business/constants/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="48" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="29" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="54" column="44" selection-start-line="54" selection-start-column="35" selection-end-line="54" selection-end-column="44" />
+          <folding>
+            <element signature="e#10262#10272#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="30" column="46" selection-start-line="30" selection-start-column="46" selection-end-line="30" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-core/src/main/java/com/salesmanager/core/business/utils/ajax/AjaxResponse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="49" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="40" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#241#266#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="26" column="16" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
           <folding>
-            <element signature="e#4646#4666#0" expanded="true" />
+            <element signature="e#5280#5300#0" expanded="true" />
           </folding>
         </state>
       </provider>

shopizer.iml 18(+18 -0) 

diff --git a/shopizer.iml b/shopizer.iml
index 9e16274..7ed82ea 100644
--- a/shopizer.iml
+++ b/shopizer.iml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/shopizer-canadapost/target/test-classes/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/shopizer-shipping-distance-module/target/test-classes/spring/processors/shopizer-core-shipping-processors.xml</file>
+          <file>file://$MODULE_DIR$/shopizer-shipping-distance-module/target/test-classes/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/shopizer-shipping-distance-module/src/test/resources/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/shopizer-shipping-distance-module/src/test/resources/spring/processors/shopizer-core-shipping-processors.xml</file>
+          <file>file://$MODULE_DIR$/shopizer-canadapost/src/test/resources/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/sm-search/src/test/resources/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/sm-search/target/test-classes/spring/spring-context-test.xml</file>
+          <file>file://$MODULE_DIR$/sm-search/src/test/resources/spring/shopizer-search.xml</file>
+          <file>file://$MODULE_DIR$/sm-search/target/test-classes/spring/shopizer-search.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />

sm-core/sm-core.iml 16(+16 -0) 

diff --git a/sm-core/sm-core.iml b/sm-core/sm-core.iml
index 2d07a20..078a9d0 100644
--- a/sm-core/sm-core.iml
+++ b/sm-core/sm-core.iml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/main/resources/spring/datasource-c3p0.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-search.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-core-modules.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-core-config.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-core-rules.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-context.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/shopizer-core-ehcache.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />

sm-shop/sm-shop.iml 11(+11 -0) 

diff --git a/sm-shop/sm-shop.iml b/sm-shop/sm-shop.iml
index cbed5a0..a5c0c65 100644
--- a/sm-shop/sm-shop.iml
+++ b/sm-shop/sm-shop.iml
@@ -15,6 +15,17 @@
         </sourceRoots>
       </configuration>
     </facet>
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring/appServlet/shopizer-security.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring/root-context.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring/appServlet/shopizer-properties.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java 48(+19 -29) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java
index 128304c..bf99176 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentPagesController.java
@@ -1,45 +1,35 @@
-package com.salesmanager.web.admin.controller.content;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.controller.content;
 
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.content.Content;
+import com.salesmanager.core.model.content.ContentDescription;
+import com.salesmanager.core.model.content.ContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
-import com.salesmanager.core.business.content.model.Content;
-import com.salesmanager.core.business.content.model.ContentDescription;
-import com.salesmanager.core.business.content.model.ContentType;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
 
 @Controller
 public class ContentPagesController {
 	
-	private static final Logger LOGGER = LoggerFactory.getLogger(StaticContentController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ContentPagesController.class);
 	
 	@Inject
 	private ContentService contentService;

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java 22(+11 -11) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java
index 2e0d20b..8c486ad 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/StaticContentController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.controller.content;
+package com.salesmanager.shop.admin.controller.content;
 
 import java.io.ByteArrayInputStream;
 import java.net.URLConnection;
@@ -11,7 +11,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-
+import javax.inject.Inject;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,16 +27,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.InputContentFile;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.InputContentFile;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
 import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.content.ContentFiles;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.shop.admin.model.content.ContentFiles;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.ImageFilePath;
 
 
 @Controller

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java 49(+19 -30) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java
index 1bb5c13..73352e4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.java
@@ -1,42 +1,31 @@
-package com.salesmanager.web.admin.controller.customers;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.customers;
+
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.attribute.CustomerOption;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
-import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
 
 @Controller
 public class CustomerOptionsController {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java 50(+22 -28) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
index 0c337d8..2f7543d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
@@ -1,18 +1,20 @@
-package com.salesmanager.web.admin.controller.customers;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.customers;
+
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionSetService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.attribute.*;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -23,22 +25,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionSetService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 @Controller
 public class CustomerOptionsSetController {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java 47(+18 -29) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java
index cf1a9c9..84be611 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.java
@@ -1,42 +1,31 @@
-package com.salesmanager.web.admin.controller.customers;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.controller.customers;
 
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
 
 @Controller
 public class CustomerOptionsValueController {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java 72(+30 -42) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
index e17b1f2..670a00a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
@@ -1,21 +1,31 @@
-package com.salesmanager.web.admin.controller.merchant;
-
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.merchant;
+
+
+import com.salesmanager.core.business.modules.email.Email;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.currency.CurrencyService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.currency.Currency;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.core.model.user.User;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.reference.Size;
+import com.salesmanager.shop.admin.model.reference.Weight;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.constants.EmailConstants;
+import com.salesmanager.shop.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -26,33 +36,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.currency.model.Currency;
-import com.salesmanager.core.business.reference.currency.service.CurrencyService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.reference.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.business.system.service.EmailService;
-import com.salesmanager.core.business.user.model.User;
-import com.salesmanager.core.business.user.service.UserService;
-import com.salesmanager.core.modules.email.Email;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.reference.Size;
-import com.salesmanager.web.admin.entity.reference.Weight;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.constants.EmailConstants;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.EmailUtils;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
-import com.salesmanager.web.utils.UserUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
 
 @Controller
 public class MerchantStoreController {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java 54(+26 -28) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
index 290f197..cb56557 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
@@ -1,20 +1,21 @@
-package com.salesmanager.web.admin.controller.merchant;
-
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.merchant;
+
+
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.currency.CurrencyService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.InputContentFile;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.admin.model.content.ContentFiles;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -24,19 +25,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.InputContentFile;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.currency.service.CurrencyService;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.content.ContentFiles;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 @Controller
 public class StoreBrandingController {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java 48(+23 -25) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java
index e214460..b013d7d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.java
@@ -1,16 +1,18 @@
-package com.salesmanager.web.admin.controller.merchant;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
+package com.salesmanager.shop.admin.controller.merchant;
+
+
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.model.content.Content;
+import com.salesmanager.core.model.content.ContentDescription;
+import com.salesmanager.core.model.content.ContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.model.merchant.StoreLanding;
+import com.salesmanager.shop.admin.model.merchant.StoreLandingDescription;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -19,18 +21,14 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.salesmanager.core.business.content.model.Content;
-import com.salesmanager.core.business.content.model.ContentDescription;
-import com.salesmanager.core.business.content.model.ContentType;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.web.admin.entity.merchant.StoreLanding;
-import com.salesmanager.web.admin.entity.merchant.StoreLandingDescription;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 public class StoreLandingController {

sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java 5(+2 -3) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java
index 803fed1..1e4a6b2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLanding.java
@@ -1,10 +1,9 @@
-package com.salesmanager.web.admin.entity.merchant;
+package com.salesmanager.shop.admin.model.merchant;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 public class StoreLanding {
 	
 	@Valid

sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java 6(+3 -3) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java
index f738285..8d6cecc 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.admin.entity.merchant;
+package com.salesmanager.shop.admin.model.merchant;
 
-import java.io.Serializable;
+import com.salesmanager.core.model.reference.language.Language;
 
-import com.salesmanager.core.business.reference.language.model.Language;
+import java.io.Serializable;
 
 public class StoreLandingDescription implements Serializable {

sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java 2(+1 -1) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java
index c9628d6..328077c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Size.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.reference;
+package com.salesmanager.shop.admin.model.reference;
 
 import java.io.Serializable;

sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java 2(+1 -1) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java
index 495f642..901f55b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/reference/Weight.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.reference;
+package com.salesmanager.shop.admin.model.reference;
 
 import java.io.Serializable;

sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java 2(+1 -1) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java
index 2cef668..3f4aeaf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/userpassword/UserReset.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.userpassword;
+package com.salesmanager.shop.admin.model.userpassword;
 
 import java.util.Random;

sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java 2(+1 -1) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java b/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java
index 9295bfc..8fd90b7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/constants/ApplicationConstants.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.constants;
+package com.salesmanager.shop.constants;
 
 public class ApplicationConstants {

sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java 2(+1 -1) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java b/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java
index fa60f3b..f593983 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/constants/EmailConstants.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.constants;
+package com.salesmanager.shop.constants;
 
 public class EmailConstants {

sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java 14(+6 -8) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java
index 2a70201..91a42d2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/DateUtil.java
@@ -12,20 +12,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
+import com.salesmanager.core.business.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.salesmanager.core.constants.Constants;
-
 
 
 public class DateUtil {

sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java 18(+9 -9) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java
index 879fbda..c2ca426 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/FilePathUtils.java
@@ -1,19 +1,19 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import javax.servlet.http.HttpServletRequest;
-
+import javax.inject.Inject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.web.constants.ApplicationConstants;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.order.ReadableOrderProductDownload;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.order.ReadableOrderProductDownload;
 
 @Component
 public class FilePathUtils {

sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java 8(+4 -4) 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java
index 60b5bb2..edd8bef 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/UserUtils.java
@@ -1,9 +1,9 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
-import java.util.List;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.User;
 
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.User;
+import java.util.List;
 
 public class UserUtils {

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github