shopizer-developers
Changes
.gitignore 10(+10 -0)
.idea/artifacts/sm_shop_war.xml 8(+8 -0)
.idea/compiler.xml 39(+39 -0)
.idea/encodings.xml 10(+10 -0)
.idea/libraries/Maven__antlr_antlr_2_7_7.xml 13(+13 -0)
.idea/libraries/Maven__com_shopizer_shopizer_shipping_canadapost_module_2_5_0_SNAPSHOT.xml 13(+13 -0)
.idea/libraries/Maven__com_shopizer_shopizer_shipping_distance_processor_2_5_0_SNAPSHOT.xml 13(+13 -0)
.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml 13(+13 -0)
.idea/libraries/Maven__junit_junit_4_12.xml 13(+13 -0)
.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml 13(+13 -0)
.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml 13(+13 -0)
.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_1_Final.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_3_5_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_security_spring_security_config_4_0_4_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_security_spring_security_core_4_0_4_RELEASE.xml 13(+13 -0)
.idea/libraries/Maven__org_springframework_security_spring_security_web_4_0_4_RELEASE.xml 13(+13 -0)
.idea/misc.xml 83(+83 -0)
.idea/modules.xml 12(+12 -0)
.idea/vcs.xml 6(+6 -0)
.idea/workspace.xml 996(+996 -0)
shopizer.iml 30(+30 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcAddressDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/CcType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/LinkType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/common/ObjectFactory.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcAddressDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/CcType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Link.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Links.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/NumberRangeType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/ObjectFactory.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$ConflictingOptions.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option$PrerequisiteOptions.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Option.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options$Option.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Options.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/package-info.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/RelType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options$Option.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Options.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions$DimensionalRestrictions.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service$Restrictions.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Service.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services$Service.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/discovery/Services.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages$Message.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/Messages.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/ObjectFactory.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/messages/package-info.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcAddressDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcDetailsType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/CcType.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$Domestic.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$International.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination$UnitedStates.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Destination.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options$Option.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Options.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics$Dimensions.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$ParcelCharacteristics.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario$Services.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/MailingScenario.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/ObjectFactory.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/package-info.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment$Qualifier.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments$Adjustment.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Adjustments.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option$Qualifier.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options$Option.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Options.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails$Taxes.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$PriceDetails.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$ServiceStandard.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote$WeightDetails.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes$PriceQuote.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/PriceQuotes.class 0(+0 -0)
shopizer-canadapost/target/classes/ca/canadapost/cpcdp/rating/generated/rating/TaxType.class 0(+0 -0)
shopizer-canadapost/target/classes/com/shopizer/modules/shipping/canadapost/CanadaPostQuoteModule.class 0(+0 -0)
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 2(+1 -1)
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.xml 203(+0 -203)
shopizer-canadapost/target/test-classes/com/shopizer/modules/shipping/canadapost/test/ShippingCanadaPostTestCase.class 0(+0 -0)
shopizer-shipping-distance-module/target/classes/com/shopizer/modules/shipping/distance/ShippingDistancePreProcessorImpl.class 0(+0 -0)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 2(+1 -1)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.xml 225(+0 -225)
shopizer-shipping-distance-module/target/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT.jar 0(+0 -0)
shopizer-shipping-distance-module/target/test-classes/com/shopizer/modules/shipping/distance/test/ShippingDistanceProcessorTestCase.class 0(+0 -0)
sm-core/sm-core.iml 185(+185 -0)
sm-core/target/classes/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/common/StaticContentData.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageGet.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/ContentImageRemove.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/infinispan/CmsStaticContentFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/local/CmsStaticContentFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManager.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/content/StaticContentFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/CacheManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/LocalCacheManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StaticContentCacheManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/StoreCacheManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/impl/VendorCacheManager.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/local/CmsImageFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManager.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductFileManagerImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageGet.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImagePut.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/cms/product/ProductImageRemove.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$1.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1$2.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl$1.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/email/HtmlEmailSenderImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/IntegrationException.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/BeanStreamPayment.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/MoneyOrderPayment.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalExpressCheckoutPayment.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/PayPalRestPayment.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/payment/impl/StripePayment.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomShippingQuoteRules.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/CustomWeightBasedShippingQuote.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/DefaultPackagingImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PackingBox.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/PriceByDistanceShippingQuoteRules.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingDecisionPreProcessorImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSParsedElements.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote$1.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSParsedElements.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote$1.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/modules/integration/shipping/impl/USPSShippingQuote.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/category/CategoryRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductAttributeRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/attribute/ProductOptionValueRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/availability/ProductAvailabilityRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/file/DigitalProductRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/image/ProductImageRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/manufacturer/ManufacturerRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/price/ProductPriceRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/review/ProductReviewRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/catalog/product/type/ProductTypeRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerAttributeRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionSetRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/attribute/CustomerOptionValueRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/customer/CustomerRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/merchant/MerchantRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderaccount/OrderAccountRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductDownloadRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/orderproduct/OrderProductRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/order/OrderTotalRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/payments/TransactionRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/reference/country/CountryRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/reference/currency/CurrencyRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/reference/language/LanguageRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/reference/zone/ZoneRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/shipping/ShippingOriginRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartAttributeRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartItemRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/shoppingcart/ShoppingCartRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/CustomerOptinRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/MerchantLogRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/ModuleConfigurationRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/OptinRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemConfigurationRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/system/SystemNotificationRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxClassRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/tax/TaxRateRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/user/GroupRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryCustom.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/user/PermissionRepositoryImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/repositories/user/UserRepository.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductAttributeServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/attribute/ProductOptionValueServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/availability/ProductAvailabilityServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/file/DigitalProductServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/image/ProductImageServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/manufacturer/ManufacturerServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/price/ProductPriceServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/PricingServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/review/ProductReviewServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/catalog/product/type/ProductTypeServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/common/generic/TransactionalAspectAwareService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/content/ContentService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/content/ContentServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerAttributeServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionSetServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/attribute/CustomerOptionValueServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/customer/CustomerServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/order/orderproduct/OrderProductDownloadServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/order/OrderServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/payments/PaymentServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/payments/TransactionServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/currency/CurrencyServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabase.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ConfigurationModulesLoader.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/IntegrationModulesLoader.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/loader/ZonesLoader.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/reference/zone/ZoneTransient.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/search/SearchServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingOriginServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartCalculationServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/EmailServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/MerchantLogServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/system/SystemConfigurationServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxClassServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/tax/TaxRateServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionService.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/user/PermissionServiceImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/services/user/UserServiceLDAPImpl.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/utils/ajax/AjaxPageableResponse.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/utils/ApplicationContextListenerUtils.class 0(+0 -0)
sm-core/target/classes/com/salesmanager/core/business/utils/query/ProductQueryBuilder.class 0(+0 -0)
sm-core/target/test-classes/com/salesmanager/test/common/AbstractSalesManagerCoreTestCase.class 0(+0 -0)
sm-core/target/test-classes/com/salesmanager/test/shipping/ShippingMethodDecisionTest.class 0(+0 -0)
sm-core-model/sm-core-model.iml 66(+66 -0)
sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 0(+0 -0)
sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 152(+0 -152)
sm-core-modules/sm-core-modules.iml 67(+67 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class 0(+0 -0)
sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class 0(+0 -0)
sm-search/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 43(+0 -43)
sm-search/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 43(+0 -43)
sm-search/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst 5(+0 -5)
sm-search/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst 5(+0 -5)
sm-shop/sm-shop.iml 210(+210 -0)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java 40(+17 -23)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java 40(+17 -23)
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/controller/orders/OrderActionsControler.java 66(+30 -36)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java 52(+25 -27)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/payments/PaymentsController.java 48(+21 -27)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java 56(+23 -33)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/DigitalProductController.java 50(+20 -30)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.java 48(+23 -25)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ManufacturerController.java 68(+28 -40)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsController.java 47(+18 -29)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsValueController.java 74(+32 -42)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductAttributeController.java 63(+24 -39)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java 110(+48 -62)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductImagesController.java 53(+21 -32)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.java 51(+19 -32)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductPriceController.java 75(+31 -44)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java 44(+19 -25)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java 46(+20 -26)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/RelatedItemsController.java 48(+23 -25)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.java 65(+29 -36)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java 24(+12 -12)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.java 45(+19 -26)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.java 20(+10 -10)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.java 41(+19 -22)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.java 18(+9 -9)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java 40(+19 -21)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.java 28(+13 -15)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java 54(+26 -28)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/PermissionController.java 32(+15 -17)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/SecurityController.java 24(+11 -13)
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/security/SecurityDataAccessException.java 2(+1 -1)
sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java 16(+7 -9)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java 1(+1 -0)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java 9(+9 -0)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java 10(+10 -0)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java 14(+14 -0)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.java 14(+7 -7)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.java 27(+13 -14)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.java 27(+13 -14)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.java 16(+8 -8)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.java 16(+8 -8)
sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.java 29(+14 -15)
sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.java 27(+13 -14)
sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.java 22(+11 -11)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderPopulator.java 65(+32 -33)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.java 43(+21 -22)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java 14(+7 -7)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java 41(+20 -21)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java 23(+11 -12)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java 18(+9 -9)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java 20(+10 -10)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java 28(+14 -14)
sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java 60(+29 -31)
sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java 75(+37 -38)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.java 12(+6 -6)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java 96(+42 -54)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java 50(+24 -26)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerLoginController.java 53(+24 -29)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.java 48(+23 -25)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.java 64(+31 -33)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java 87(+43 -44)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.java 25(+12 -13)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java 105(+51 -54)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacade.java 39(+19 -20)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/categories/CategoryController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/CacheController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/ConfigurationController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentBoxesController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentImageController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/ContentPagesController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/content/StaticContentController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Configuration.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Content.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$ContentFiles.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$ContentImages.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Customer.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Order.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Payment.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Product.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Shipping.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Store.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$Tax.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles$User.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/ControllerConstants$Tiles.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/customers/CustomerOptionsValueController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/merchant/StoreLandingController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/orders/OrdersController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/payments/PaymentsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/DigitalProductController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ManufacturerController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/OptionsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/OptionsValueController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductAttributeController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductImagesController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductPriceController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductReviewController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/ProductsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/products/RelatedItemsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/PermissionController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/controller/user/SecurityController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/model/merchant/StoreLandingDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/security/SecurityDataAccessException.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/CategoryDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/category/PersistableCategory.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductOption.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/PersistableProductOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductAttributeEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOption.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValueDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ProductOptionValueEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/attribute/ReadableProductAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProductPrice.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProductReview.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductPriceEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductList.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductPrice.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/ReadableProductReview.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerOptionPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/PersistableOrderPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/content/ShopContentController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Category.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Checkout.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Content.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Customer.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Error.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Items.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Merchant.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Pages.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Product.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$Search.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles$ShoppingCart.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Tiles.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views$Controllers$Registration.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views$Controllers.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/ControllerConstants$Views.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerAccountController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerLoginController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/items/facade/ProductItemsFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/items/facade/ProductItemsFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/items/ListItemsController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/facade/OrderFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderConfirmationController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderDownloadController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/order/ShoppingOrderPaymentController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/product/facade/ProductFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/product/facade/ProductFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/product/ShopProductController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/search/facade/SearchFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/search/SearchController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacade.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/MiniCartController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/controller/store/ContactController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/security/ServicesAuthenticationEntryPoint.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/security/ServicesAuthenticationSuccessHandler.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/category/ShoppingCategoryRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/customer/CustomerRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/order/OrderRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/product/ProductItemsRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/product/ShopProductRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/search/SearchRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/store/StoreContactRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/system/SystemRESTController.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/store/services/utility/CallbackController.class 0(+0 -0)
sm-shop/target/test-classes/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.class 0(+0 -0)
sm-shop/target/test-classes/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.class 0(+0 -0)
sm-shop/target/test-classes/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.class 0(+0 -0)
sm-shop/target/test-classes/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.class 0(+0 -0)
Details
.gitignore 10(+10 -0)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1f34ffb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+# Ignored files
+*.class
+*.jar
+*.lst
+*/target/
+*.class
+*.idea/
+*.iml
+
+.idea/workspace.xml
.idea/artifacts/sm_shop_war.xml 8(+8 -0)
diff --git a/.idea/artifacts/sm_shop_war.xml b/.idea/artifacts/sm_shop_war.xml
new file mode 100644
index 0000000..9909669
--- /dev/null
+++ b/.idea/artifacts/sm_shop_war.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+ <artifact type="war" name="sm-shop:war">
+ <output-path>$PROJECT_DIR$/sm-shop/target</output-path>
+ <root id="archive" name="sm-shop-2.5.0-SNAPSHOT.war">
+ <element id="artifact" artifact-name="sm-shop:war exploded" />
+ </root>
+ </artifact>
+</component>
\ No newline at end of file
.idea/compiler.xml 39(+39 -0)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..1d866c4
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ <entry name="!?*.aj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ <profile default="false" name="Maven default annotation processors profile" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <processorPath useClasspath="true" />
+ <module name="sm-core" />
+ <module name="sm-core-model" />
+ <module name="sm-core-modules" />
+ <module name="sm-shop" />
+ </profile>
+ </annotationProcessing>
+ <bytecodeTargetLevel>
+ <module name="shopizer" target="1.8" />
+ <module name="sm-core" target="1.8" />
+ <module name="sm-core-model" target="1.8" />
+ <module name="sm-core-modules" target="1.8" />
+ <module name="sm-shop" target="1.8" />
+ </bytecodeTargetLevel>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
.idea/encodings.xml 10(+10 -0)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..1c6d2b8
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/sm-core" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/sm-core-model" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/sm-core-modules" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/sm-shop" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
.idea/libraries/Maven__antlr_antlr_2_7_7.xml 13(+13 -0)
diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
new file mode 100644
index 0000000..b8d93d8
--- /dev/null
+++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: antlr:antlr:2.7.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
new file mode 100644
index 0000000..30ff5cb
--- /dev/null
+++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: aopalliance:aopalliance:1.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
new file mode 100644
index 0000000..cdd7959
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-classic:1.1.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
new file mode 100644
index 0000000..6c2a760
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-core:1.1.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml
new file mode 100644
index 0000000..c693e24
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml:classmate:1.0.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.0.0/classmate-1.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.0.0/classmate-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml
new file mode 100644
index 0000000..727b8fe
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml:classmate:1.1.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_6.xml
new file mode 100644
index 0000000..2a45fe5
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.6.6/jackson-annotations-2.6.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.6.6/jackson-annotations-2.6.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.6.6/jackson-annotations-2.6.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_4.xml
new file mode 100644
index 0000000..dadae6a
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.4/jackson-annotations-2.7.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.4/jackson-annotations-2.7.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.4/jackson-annotations-2.7.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_6.xml
new file mode 100644
index 0000000..be12369
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.6.6/jackson-core-2.6.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.6.6/jackson-core-2.6.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.6.6/jackson-core-2.6.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_4.xml
new file mode 100644
index 0000000..c220a5f
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.4/jackson-core-2.7.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.4/jackson-core-2.7.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.4/jackson-core-2.7.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_6.xml
new file mode 100644
index 0000000..c49f705
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.6/jackson-databind-2.6.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.6/jackson-databind-2.6.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.6/jackson-databind-2.6.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_4.xml
new file mode 100644
index 0000000..e1d9217
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.4/jackson-databind-2.7.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.4/jackson-databind-2.7.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.4/jackson-databind-2.7.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 0000000..0e66824
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.google.code.findbugs:jsr305:1.3.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml
new file mode 100644
index 0000000..d7b5038
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.google.code.gson:gson:2.3.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_19_0.xml b/.idea/libraries/Maven__com_google_guava_guava_19_0.xml
new file mode 100644
index 0000000..68e23cc
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_19_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.google.guava:guava:19.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_21_0.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_21_0.xml
new file mode 100644
index 0000000..016f7dc
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_21_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.google.http-client:google-http-client:1.21.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.21.0/google-http-client-1.21.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.21.0/google-http-client-1.21.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.21.0/google-http-client-1.21.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_maps_google_maps_services_0_1_6.xml b/.idea/libraries/Maven__com_google_maps_google_maps_services_0_1_6.xml
new file mode 100644
index 0000000..fc4a446
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_maps_google_maps_services_0_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.google.maps:google-maps-services:0.1.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/maps/google-maps-services/0.1.6/google-maps-services-0.1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/maps/google-maps-services/0.1.6/google-maps-services-0.1.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/maps/google-maps-services/0.1.6/google-maps-services-0.1.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
new file mode 100644
index 0000000..f3f3738
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.googlecode.json-simple:json-simple:1.1.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_h2database_h2_1_4_191.xml b/.idea/libraries/Maven__com_h2database_h2_1_4_191.xml
new file mode 100644
index 0000000..583961a
--- /dev/null
+++ b/.idea/libraries/Maven__com_h2database_h2_1_4_191.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.h2database:h2:1.4.191">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.191/h2-1.4.191.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.191/h2-1.4.191-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.191/h2-1.4.191-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_6.xml b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_6.xml
new file mode 100644
index 0000000..2cff543
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.itextpdf:itextpdf:5.5.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.6/itextpdf-5.5.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.6/itextpdf-5.5.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.6/itextpdf-5.5.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_1.xml b/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_1.xml
new file mode 100644
index 0000000..35d72ae
--- /dev/null
+++ b/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.maxmind.db:maxmind-db:1.2.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.1/maxmind-db-1.2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.1/maxmind-db-1.2.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.1/maxmind-db-1.2.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_7_0.xml b/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_7_0.xml
new file mode 100644
index 0000000..a9551d9
--- /dev/null
+++ b/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_7_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.maxmind.geoip2:geoip2:2.7.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.7.0/geoip2-2.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.7.0/geoip2-2.7.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.7.0/geoip2-2.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_paypal_sdk_merchantsdk_2_6_109.xml b/.idea/libraries/Maven__com_paypal_sdk_merchantsdk_2_6_109.xml
new file mode 100644
index 0000000..d828ae7
--- /dev/null
+++ b/.idea/libraries/Maven__com_paypal_sdk_merchantsdk_2_6_109.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.paypal.sdk:merchantsdk:2.6.109">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/merchantsdk/2.6.109/merchantsdk-2.6.109.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/merchantsdk/2.6.109/merchantsdk-2.6.109-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/merchantsdk/2.6.109/merchantsdk-2.6.109-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_paypal_sdk_paypal_core_1_5_1.xml b/.idea/libraries/Maven__com_paypal_sdk_paypal_core_1_5_1.xml
new file mode 100644
index 0000000..49c64b6
--- /dev/null
+++ b/.idea/libraries/Maven__com_paypal_sdk_paypal_core_1_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.paypal.sdk:paypal-core:1.5.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/paypal-core/1.5.1/paypal-core-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/paypal-core/1.5.1/paypal-core-1.5.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/paypal/sdk/paypal-core/1.5.1/paypal-core-1.5.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_shopizer_shopizer_shipping_canadapost_module_2_5_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_shopizer_shopizer_shipping_canadapost_module_2_5_0_SNAPSHOT.xml
new file mode 100644
index 0000000..d5e6ff3
--- /dev/null
+++ b/.idea/libraries/Maven__com_shopizer_shopizer_shipping_canadapost_module_2_5_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.shopizer:shopizer-shipping-canadapost-module:2.5.0-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-canadapost-module/2.5.0-SNAPSHOT/shopizer-shipping-canadapost-module-2.5.0-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-canadapost-module/2.5.0-SNAPSHOT/shopizer-shipping-canadapost-module-2.5.0-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-canadapost-module/2.5.0-SNAPSHOT/shopizer-shipping-canadapost-module-2.5.0-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_shopizer_shopizer_shipping_distance_processor_2_5_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_shopizer_shopizer_shipping_distance_processor_2_5_0_SNAPSHOT.xml
new file mode 100644
index 0000000..c28085e
--- /dev/null
+++ b/.idea/libraries/Maven__com_shopizer_shopizer_shipping_distance_processor_2_5_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.shopizer:shopizer-shipping-distance-processor:2.5.0-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-distance-processor/2.5.0-SNAPSHOT/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-distance-processor/2.5.0-SNAPSHOT/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/shopizer-shipping-distance-processor/2.5.0-SNAPSHOT/shopizer-shipping-distance-processor-2.5.0-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_shopizer_sm_search_2_5_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_shopizer_sm_search_2_5_0_SNAPSHOT.xml
new file mode 100644
index 0000000..27bfe25
--- /dev/null
+++ b/.idea/libraries/Maven__com_shopizer_sm_search_2_5_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.shopizer:sm-search:2.5.0-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/sm-search/2.5.0-SNAPSHOT/sm-search-2.5.0-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/sm-search/2.5.0-SNAPSHOT/sm-search-2.5.0-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/shopizer/sm-search/2.5.0-SNAPSHOT/sm-search-2.5.0-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml b/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml
new file mode 100644
index 0000000..e70d84d
--- /dev/null
+++ b/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.spatial4j:spatial4j:0.4.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_0_0.xml b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_0_0.xml
new file mode 100644
index 0000000..dedcc46
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.squareup.okhttp:okhttp:2.0.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp/okhttp/2.0.0/okhttp-2.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp/okhttp/2.0.0/okhttp-2.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp/okhttp/2.0.0/okhttp-2.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_0_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_0_0.xml
new file mode 100644
index 0000000..9e67fa3
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okio_okio_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.squareup.okio:okio:1.0.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.0.0/okio-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.0.0/okio-1.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.0.0/okio-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_stripe_stripe_java_1_33_0.xml b/.idea/libraries/Maven__com_stripe_stripe_java_1_33_0.xml
new file mode 100644
index 0000000..4b7e720
--- /dev/null
+++ b/.idea/libraries/Maven__com_stripe_stripe_java_1_33_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.stripe:stripe-java:1.33.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/stripe/stripe-java/1.33.0/stripe-java-1.33.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/stripe/stripe-java/1.33.0/stripe-java-1.33.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/stripe/stripe-java/1.33.0/stripe-java-1.33.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml
new file mode 100644
index 0000000..015dbda
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.sun.jersey:jersey-bundle:1.19">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19/jersey-bundle-1.19.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19/jersey-bundle-1.19-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19/jersey-bundle-1.19-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_1.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_1.xml
new file mode 100644
index 0000000..30a25a3
--- /dev/null
+++ b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.thoughtworks.xstream:xstream:1.4.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.1/xstream-1.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.1/xstream-1.4.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.1/xstream-1.4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml
new file mode 100644
index 0000000..9c245b9
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-beanutils:commons-beanutils:1.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
new file mode 100644
index 0000000..3fda2c0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-beanutils:commons-beanutils-core:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
new file mode 100644
index 0000000..a66d039
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-codec:commons-codec:1.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 0000000..13afda2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-collections:commons-collections:3.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
new file mode 100644
index 0000000..ae96781
--- /dev/null
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-configuration:commons-configuration:1.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.6/commons-configuration-1.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.6/commons-configuration-1.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml
new file mode 100644
index 0000000..f116060
--- /dev/null
+++ b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-digester:commons-digester:2.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml
new file mode 100644
index 0000000..f180407
--- /dev/null
+++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-fileupload:commons-fileupload:1.3.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
new file mode 100644
index 0000000..67c2ad2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-io:commons-io:2.5">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
new file mode 100644
index 0000000..5e8b8d3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-lang:commons-lang:2.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file mode 100644
index 0000000..eab40b3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-logging:commons-logging:1.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_validator_commons_validator_1_5_1.xml b/.idea/libraries/Maven__commons_validator_commons_validator_1_5_1.xml
new file mode 100644
index 0000000..fedc861
--- /dev/null
+++ b/.idea/libraries/Maven__commons_validator_commons_validator_1_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-validator:commons-validator:1.5.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.5.1/commons-validator-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.5.1/commons-validator-1.5.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.5.1/commons-validator-1.5.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml 13(+13 -0)
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
new file mode 100644
index 0000000..14681ee
--- /dev/null
+++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: dom4j:dom4j:1.6.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_searchbox_jest_2_0_2.xml b/.idea/libraries/Maven__io_searchbox_jest_2_0_2.xml
new file mode 100644
index 0000000..ed5a240
--- /dev/null
+++ b/.idea/libraries/Maven__io_searchbox_jest_2_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.searchbox:jest:2.0.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest/2.0.2/jest-2.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest/2.0.2/jest-2.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest/2.0.2/jest-2.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_searchbox_jest_common_2_0_2.xml b/.idea/libraries/Maven__io_searchbox_jest_common_2_0_2.xml
new file mode 100644
index 0000000..f2f183e
--- /dev/null
+++ b/.idea/libraries/Maven__io_searchbox_jest_common_2_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.searchbox:jest-common:2.0.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest-common/2.0.2/jest-common-2.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest-common/2.0.2/jest-common-2.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/searchbox/jest-common/2.0.2/jest-common-2.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_el_javax_el_api_2_2_4.xml b/.idea/libraries/Maven__javax_el_javax_el_api_2_2_4.xml
new file mode 100644
index 0000000..d26a019
--- /dev/null
+++ b/.idea/libraries/Maven__javax_el_javax_el_api_2_2_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.el:javax.el-api:2.2.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
new file mode 100644
index 0000000..93cf65a
--- /dev/null
+++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.inject:javax.inject:1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_mail_javax_mail_api_1_5_5.xml b/.idea/libraries/Maven__javax_mail_javax_mail_api_1_5_5.xml
new file mode 100644
index 0000000..fe1a298
--- /dev/null
+++ b/.idea/libraries/Maven__javax_mail_javax_mail_api_1_5_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.mail:javax.mail-api:1.5.5">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.5.5/javax.mail-api-1.5.5.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.5.5/javax.mail-api-1.5.5-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.5.5/javax.mail-api-1.5.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml
new file mode 100644
index 0000000..f329893
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.servlet:jstl:1.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml
new file mode 100644
index 0000000..5f032d2
--- /dev/null
+++ b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.transaction:javax.transaction-api:1.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
new file mode 100644
index 0000000..940ce73
--- /dev/null
+++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.validation:validation-api:1.1.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
new file mode 100644
index 0000000..a0c4d76
--- /dev/null
+++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_8_2.xml b/.idea/libraries/Maven__joda_time_joda_time_2_8_2.xml
new file mode 100644
index 0000000..f09fdbd
--- /dev/null
+++ b/.idea/libraries/Maven__joda_time_joda_time_2_8_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: joda-time:joda-time:2.8.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8.2/joda-time-2.8.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8.2/joda-time-2.8.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8.2/joda-time-2.8.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
.idea/libraries/Maven__junit_junit_4_12.xml 13(+13 -0)
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: junit:junit:4.12">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
new file mode 100644
index 0000000..e383c1b
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: log4j:log4j:1.2.17">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2.xml
new file mode 100644
index 0000000..8f60174
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: net.sf.ehcache:ehcache:2.10.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2/ehcache-2.10.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2/ehcache-2.10.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2/ehcache-2.10.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_3_3.xml b/.idea/libraries/Maven__org_antlr_antlr_3_3.xml
new file mode 100644
index 0000000..78eb2a2
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.antlr:antlr:3.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr/3.3/antlr-3.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr/3.3/antlr-3.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr/3.3/antlr-3.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5.xml
new file mode 100644
index 0000000..6d3a0f6
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.antlr:antlr-runtime:3.5">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5/antlr-runtime-3.5.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5/antlr-runtime-3.5-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5/antlr-runtime-3.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
new file mode 100644
index 0000000..6998bac
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.antlr:stringtemplate:3.2.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml
new file mode 100644
index 0000000..28cee2a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-collections4:4.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml
new file mode 100644
index 0000000..de0cf71
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-lang3:3.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.0/commons-lang3-3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.0/commons-lang3-3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.0/commons-lang3-3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_1.xml
new file mode 100644
index 0000000..8484ecb
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.1/httpasyncclient-4.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.1/httpasyncclient-4.1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.1/httpasyncclient-4.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
new file mode 100644
index 0000000..fdb7ead
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.httpcomponents:httpclient:4.5.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
new file mode 100644
index 0000000..3a5aa19
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.httpcomponents:httpcore:4.4.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_4.xml
new file mode 100644
index 0000000..1dab39e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.4/httpcore-nio-4.4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.4/httpcore-nio-4.4.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.4/httpcore-nio-4.4.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_4_10_4.xml
new file mode 100644
index 0000000..a3b8895
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/4.10.4/lucene-analyzers-common-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/4.10.4/lucene-analyzers-common-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/4.10.4/lucene-analyzers-common-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_core_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_core_4_10_4.xml
new file mode 100644
index 0000000..554d84d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_core_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-core:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/4.10.4/lucene-core-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/4.10.4/lucene-core-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/4.10.4/lucene-core-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_4_10_4.xml
new file mode 100644
index 0000000..e2ec51b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-grouping:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/4.10.4/lucene-grouping-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/4.10.4/lucene-grouping-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/4.10.4/lucene-grouping-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_4_10_4.xml
new file mode 100644
index 0000000..c66d97e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-highlighter:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/4.10.4/lucene-highlighter-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/4.10.4/lucene-highlighter-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/4.10.4/lucene-highlighter-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_join_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_join_4_10_4.xml
new file mode 100644
index 0000000..d57eaa1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_join_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-join:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/4.10.4/lucene-join-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/4.10.4/lucene-join-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/4.10.4/lucene-join-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_memory_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_memory_4_10_4.xml
new file mode 100644
index 0000000..117f701
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_memory_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-memory:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/4.10.4/lucene-memory-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/4.10.4/lucene-memory-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/4.10.4/lucene-memory-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_misc_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_misc_4_10_4.xml
new file mode 100644
index 0000000..5cb45d4
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_misc_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-misc:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/4.10.4/lucene-misc-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/4.10.4/lucene-misc-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/4.10.4/lucene-misc-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_queries_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_queries_4_10_4.xml
new file mode 100644
index 0000000..f309de5
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_queries_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-queries:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/4.10.4/lucene-queries-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/4.10.4/lucene-queries-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/4.10.4/lucene-queries-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_4_10_4.xml
new file mode 100644
index 0000000..ecc8ec2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-queryparser:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/4.10.4/lucene-queryparser-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/4.10.4/lucene-queryparser-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/4.10.4/lucene-queryparser-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_4_10_4.xml
new file mode 100644
index 0000000..d1e7fb1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-sandbox:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/4.10.4/lucene-sandbox-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/4.10.4/lucene-sandbox-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/4.10.4/lucene-sandbox-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_4_10_4.xml
new file mode 100644
index 0000000..9a1850b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-spatial:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/4.10.4/lucene-spatial-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/4.10.4/lucene-spatial-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/4.10.4/lucene-spatial-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_4_10_4.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_4_10_4.xml
new file mode 100644
index 0000000..e093d7d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_4_10_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.lucene:lucene-suggest:4.10.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/4.10.4/lucene-suggest-4.10.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/4.10.4/lucene-suggest-4.10.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/4.10.4/lucene-suggest-4.10.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml
new file mode 100644
index 0000000..a0ffd89
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi:3.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.9/poi-3.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.9/poi-3.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.9/poi-3.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml
new file mode 100644
index 0000000..f18b9bf
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi-ooxml:3.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.9/poi-ooxml-3.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.9/poi-ooxml-3.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.9/poi-ooxml-3.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml
new file mode 100644
index 0000000..6a50614
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi-ooxml-schemas:3.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.9/poi-ooxml-schemas-3.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.9/poi-ooxml-schemas-3.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.9/poi-ooxml-schemas-3.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_0_33.xml
new file mode 100644
index 0000000..1f39bc6
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.0.33/tomcat-embed-core-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.0.33/tomcat-embed-core-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.0.33/tomcat-embed-core-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_0_33.xml
new file mode 100644
index 0000000..540ff1c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.0.33/tomcat-embed-el-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.0.33/tomcat-embed-el-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.0.33/tomcat-embed-el-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_logging_juli_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_logging_juli_8_0_33.xml
new file mode 100644
index 0000000..75fb174
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_logging_juli_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-logging-juli/8.0.33/tomcat-embed-logging-juli-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-logging-juli/8.0.33/tomcat-embed-logging-juli-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-logging-juli/8.0.33/tomcat-embed-logging-juli-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_0_33.xml
new file mode 100644
index 0000000..2cebe67
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.0.33/tomcat-embed-websocket-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.0.33/tomcat-embed-websocket-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.0.33/tomcat-embed-websocket-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_0_33.xml
new file mode 100644
index 0000000..a722ce9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.0.33/tomcat-jdbc-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.0.33/tomcat-jdbc-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.0.33/tomcat-jdbc-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_0_33.xml
new file mode 100644
index 0000000..88f159d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat:tomcat-juli:8.0.33">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.0.33/tomcat-juli-8.0.33.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.0.33/tomcat-juli-8.0.33-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.0.33/tomcat-juli-8.0.33-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml
new file mode 100644
index 0000000..466c52c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml
new file mode 100644
index 0000000..112f7ca
--- /dev/null
+++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.aspectj:aspectjrt:1.8.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml
new file mode 100644
index 0000000..687b798
--- /dev/null
+++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.aspectj:aspectjweaver:1.8.9">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.9/aspectjweaver-1.8.9.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.9/aspectjweaver-1.8.9-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.9/aspectjweaver-1.8.9-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
new file mode 100644
index 0000000..98eb549
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
new file mode 100644
index 0000000..77f3bad
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_drools_compiler_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_drools_compiler_5_6_0_Final.xml
new file mode 100644
index 0000000..928afa6
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_drools_compiler_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:drools-compiler:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-compiler/5.6.0.Final/drools-compiler-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-compiler/5.6.0.Final/drools-compiler-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-compiler/5.6.0.Final/drools-compiler-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_drools_core_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_drools_core_5_6_0_Final.xml
new file mode 100644
index 0000000..e252e78
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_drools_core_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:drools-core:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-core/5.6.0.Final/drools-core-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-core/5.6.0.Final/drools-core-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-core/5.6.0.Final/drools-core-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_drools_decisiontables_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_drools_decisiontables_5_6_0_Final.xml
new file mode 100644
index 0000000..37f219f
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_drools_decisiontables_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:drools-decisiontables:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-decisiontables/5.6.0.Final/drools-decisiontables-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-decisiontables/5.6.0.Final/drools-decisiontables-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-decisiontables/5.6.0.Final/drools-decisiontables-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_drools_spring_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_drools_spring_5_6_0_Final.xml
new file mode 100644
index 0000000..ece12b1
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_drools_spring_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:drools-spring:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-spring/5.6.0.Final/drools-spring-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-spring/5.6.0.Final/drools-spring-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-spring/5.6.0.Final/drools-spring-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_drools_templates_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_drools_templates_5_6_0_Final.xml
new file mode 100644
index 0000000..4b6f56c
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_drools_templates_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:drools-templates:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-templates/5.6.0.Final/drools-templates-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-templates/5.6.0.Final/drools-templates-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/drools-templates/5.6.0.Final/drools-templates-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_knowledge_api_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_knowledge_api_5_6_0_Final.xml
new file mode 100644
index 0000000..dd7b656
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_knowledge_api_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:knowledge-api:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-api/5.6.0.Final/knowledge-api-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-api/5.6.0.Final/knowledge-api-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-api/5.6.0.Final/knowledge-api-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_drools_knowledge_internal_api_5_6_0_Final.xml b/.idea/libraries/Maven__org_drools_knowledge_internal_api_5_6_0_Final.xml
new file mode 100644
index 0000000..de2b9cc
--- /dev/null
+++ b/.idea/libraries/Maven__org_drools_knowledge_internal_api_5_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.drools:knowledge-internal-api:5.6.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-internal-api/5.6.0.Final/knowledge-internal-api-5.6.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-internal-api/5.6.0.Final/knowledge-internal-api-5.6.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/drools/knowledge-internal-api/5.6.0.Final/knowledge-internal-api-5.6.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_5_1.xml b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_5_1.xml
new file mode 100644
index 0000000..4e14e00
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.eclipse.jdt.core.compiler:ecj:3.5.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_elasticsearch_elasticsearch_1_5_2.xml b/.idea/libraries/Maven__org_elasticsearch_elasticsearch_1_5_2.xml
new file mode 100644
index 0000000..463c5e4
--- /dev/null
+++ b/.idea/libraries/Maven__org_elasticsearch_elasticsearch_1_5_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.elasticsearch:elasticsearch:1.5.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/1.5.2/elasticsearch-1.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/1.5.2/elasticsearch-1.5.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/1.5.2/elasticsearch-1.5.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_23.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_23.xml
new file mode 100644
index 0000000..fc3280a
--- /dev/null
+++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_23.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.freemarker:freemarker:2.3.23">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
new file mode 100644
index 0000000..78dbe45
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hamcrest:hamcrest-library:1.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml
new file mode 100644
index 0000000..9ed6d29
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/4.0.5.Final/hibernate-commons-annotations-4.0.5.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/4.0.5.Final/hibernate-commons-annotations-4.0.5.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/4.0.5.Final/hibernate-commons-annotations-4.0.5.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml
new file mode 100644
index 0000000..33a8479
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate:hibernate-core:4.3.11.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.11.Final/hibernate-core-4.3.11.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.11.Final/hibernate-core-4.3.11.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.11.Final/hibernate-core-4.3.11.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_3_11_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_3_11_Final.xml
new file mode 100644
index 0000000..cad1ea9
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_3_11_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/4.3.11.Final/hibernate-entitymanager-4.3.11.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/4.3.11.Final/hibernate-entitymanager-4.3.11.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/4.3.11.Final/hibernate-entitymanager-4.3.11.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_3_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_3_Final.xml
new file mode 100644
index 0000000..e7710b6
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_3_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate:hibernate-validator:5.1.3.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.1.3.Final/hibernate-validator-5.1.3.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.1.3.Final/hibernate-validator-5.1.3.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.1.3.Final/hibernate-validator-5.1.3.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
new file mode 100644
index 0000000..6c5e17f
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate:hibernate-validator:5.2.4.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
new file mode 100644
index 0000000..6492b2b
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_infinispan_infinispan_cachestore_jdbc_6_0_2_Final.xml b/.idea/libraries/Maven__org_infinispan_infinispan_cachestore_jdbc_6_0_2_Final.xml
new file mode 100644
index 0000000..985a534
--- /dev/null
+++ b/.idea/libraries/Maven__org_infinispan_infinispan_cachestore_jdbc_6_0_2_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.infinispan:infinispan-cachestore-jdbc:6.0.2.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-cachestore-jdbc/6.0.2.Final/infinispan-cachestore-jdbc-6.0.2.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-cachestore-jdbc/6.0.2.Final/infinispan-cachestore-jdbc-6.0.2.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-cachestore-jdbc/6.0.2.Final/infinispan-cachestore-jdbc-6.0.2.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_infinispan_infinispan_commons_6_0_2_Final.xml b/.idea/libraries/Maven__org_infinispan_infinispan_commons_6_0_2_Final.xml
new file mode 100644
index 0000000..496f86a
--- /dev/null
+++ b/.idea/libraries/Maven__org_infinispan_infinispan_commons_6_0_2_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.infinispan:infinispan-commons:6.0.2.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-commons/6.0.2.Final/infinispan-commons-6.0.2.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-commons/6.0.2.Final/infinispan-commons-6.0.2.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-commons/6.0.2.Final/infinispan-commons-6.0.2.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_infinispan_infinispan_core_6_0_2_Final.xml b/.idea/libraries/Maven__org_infinispan_infinispan_core_6_0_2_Final.xml
new file mode 100644
index 0000000..a924b91
--- /dev/null
+++ b/.idea/libraries/Maven__org_infinispan_infinispan_core_6_0_2_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.infinispan:infinispan-core:6.0.2.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-core/6.0.2.Final/infinispan-core-6.0.2.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-core/6.0.2.Final/infinispan-core-6.0.2.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-core/6.0.2.Final/infinispan-core-6.0.2.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_infinispan_infinispan_tree_6_0_2_Final.xml b/.idea/libraries/Maven__org_infinispan_infinispan_tree_6_0_2_Final.xml
new file mode 100644
index 0000000..5c97be1
--- /dev/null
+++ b/.idea/libraries/Maven__org_infinispan_infinispan_tree_6_0_2_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.infinispan:infinispan-tree:6.0.2.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-tree/6.0.2.Final/infinispan-tree-6.0.2.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-tree/6.0.2.Final/infinispan-tree-6.0.2.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-tree/6.0.2.Final/infinispan-tree-6.0.2.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml
new file mode 100644
index 0000000..1f90730
--- /dev/null
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.javassist:javassist:3.18.1-GA">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml
new file mode 100644
index 0000000..d3cd089
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss:jandex:1.1.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/1.1.0.Final/jandex-1.1.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/1.1.0.Final/jandex-1.1.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/1.1.0.Final/jandex-1.1.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
new file mode 100644
index 0000000..186d87f
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml
new file mode 100644
index 0000000..715be29
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging-annotations/1.2.0.Beta1/jboss-logging-annotations-1.2.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging-annotations/1.2.0.Beta1/jboss-logging-annotations-1.2.0.Beta1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging-annotations/1.2.0.Beta1/jboss-logging-annotations-1.2.0.Beta1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_1_4_4_Final.xml b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_1_4_4_Final.xml
new file mode 100644
index 0000000..950114d
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_1_4_4_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss.marshalling:jboss-marshalling:1.4.4.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/1.4.4.Final/jboss-marshalling-1.4.4.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/1.4.4.Final/jboss-marshalling-1.4.4.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/1.4.4.Final/jboss-marshalling-1.4.4.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_1_4_4_Final.xml b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_1_4_4_Final.xml
new file mode 100644
index 0000000..ce20626
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_1_4_4_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss.marshalling:jboss-marshalling-river:1.4.4.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/1.4.4.Final/jboss-marshalling-river-1.4.4.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/1.4.4.Final/jboss-marshalling-river-1.4.4.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/1.4.4.Final/jboss-marshalling-river-1.4.4.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_1_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_1_Final.xml
new file mode 100644
index 0000000..ed44624
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_1_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.1.Final/jboss-transaction-api_1.1_spec-1.0.1.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.1.Final/jboss-transaction-api_1.1_spec-1.0.1.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.1.Final/jboss-transaction-api_1.1_spec-1.0.1.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jgroups_jgroups_3_4_1_Final.xml b/.idea/libraries/Maven__org_jgroups_jgroups_3_4_1_Final.xml
new file mode 100644
index 0000000..339dd18
--- /dev/null
+++ b/.idea/libraries/Maven__org_jgroups_jgroups_3_4_1_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jgroups:jgroups:3.4.1.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jgroups/jgroups/3.4.1.Final/jgroups-3.4.1.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jgroups/jgroups/3.4.1.Final/jgroups-3.4.1.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jgroups/jgroups/3.4.1.Final/jgroups-3.4.1.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jopendocument_jOpenDocument_1_3b1.xml b/.idea/libraries/Maven__org_jopendocument_jOpenDocument_1_3b1.xml
new file mode 100644
index 0000000..9619782
--- /dev/null
+++ b/.idea/libraries/Maven__org_jopendocument_jOpenDocument_1_3b1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.jopendocument:jOpenDocument:1.3b1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jopendocument/jOpenDocument/1.3b1/jOpenDocument-1.3b1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jopendocument/jOpenDocument/1.3b1/jOpenDocument-1.3b1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jopendocument/jOpenDocument/1.3b1/jOpenDocument-1.3b1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
new file mode 100644
index 0000000..a523703
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.mockito:mockito-core:1.10.19">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mvel_mvel2_2_1_8_Final.xml b/.idea/libraries/Maven__org_mvel_mvel2_2_1_8_Final.xml
new file mode 100644
index 0000000..0886b86
--- /dev/null
+++ b/.idea/libraries/Maven__org_mvel_mvel2_2_1_8_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.mvel:mvel2:2.1.8.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mvel/mvel2/2.1.8.Final/mvel2-2.1.8.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mvel/mvel2/2.1.8.Final/mvel2-2.1.8.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mvel/mvel2/2.1.8.Final/mvel2-2.1.8.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
new file mode 100644
index 0000000..7ab319b
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.objenesis:objenesis:2.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_4_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_4_1.xml
new file mode 100644
index 0000000..8c0d835
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.ow2.asm:asm:4.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.1/asm-4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.1/asm-4.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.1/asm-4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_4_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_4_1.xml
new file mode 100644
index 0000000..b0fac6d
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_commons_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.ow2.asm:asm-commons:4.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/4.1/asm-commons-4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/4.1/asm-commons-4.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/4.1/asm-commons-4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
new file mode 100644
index 0000000..2f93a63
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml
new file mode 100644
index 0000000..dd05efc
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:jul-to-slf4j:1.7.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml
new file mode 100644
index 0000000..0f9744a
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:log4j-over-slf4j:1.7.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..1b644dd
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:slf4j-api:1.7.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml
new file mode 100644
index 0000000..5ca45bb
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:slf4j-log4j12:1.7.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..669c80c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.5.RELEASE/spring-boot-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.5.RELEASE/spring-boot-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.5.RELEASE/spring-boot-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..cb88e82
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.3.5.RELEASE/spring-boot-autoconfigure-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.3.5.RELEASE/spring-boot-autoconfigure-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.3.5.RELEASE/spring-boot-autoconfigure-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..bacecea
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.3.5.RELEASE/spring-boot-starter-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.3.5.RELEASE/spring-boot-starter-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.3.5.RELEASE/spring-boot-starter-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..d2ef5d5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/1.3.5.RELEASE/spring-boot-starter-aop-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/1.3.5.RELEASE/spring-boot-starter-aop-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/1.3.5.RELEASE/spring-boot-starter-aop-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..2762ce7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/1.3.5.RELEASE/spring-boot-starter-data-jpa-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/1.3.5.RELEASE/spring-boot-starter-data-jpa-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/1.3.5.RELEASE/spring-boot-starter-data-jpa-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..5705e16
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.3.5.RELEASE/spring-boot-starter-jdbc-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.3.5.RELEASE/spring-boot-starter-jdbc-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.3.5.RELEASE/spring-boot-starter-jdbc-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..94055d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.3.5.RELEASE/spring-boot-starter-logging-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.3.5.RELEASE/spring-boot-starter-logging-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.3.5.RELEASE/spring-boot-starter-logging-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..693f55b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-security:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/1.3.5.RELEASE/spring-boot-starter-security-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/1.3.5.RELEASE/spring-boot-starter-security-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/1.3.5.RELEASE/spring-boot-starter-security-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..e8de5dd
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.3.5.RELEASE/spring-boot-starter-test-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.3.5.RELEASE/spring-boot-starter-test-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.3.5.RELEASE/spring-boot-starter-test-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..c6893fd
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.3.5.RELEASE/spring-boot-starter-tomcat-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.3.5.RELEASE/spring-boot-starter-tomcat-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.3.5.RELEASE/spring-boot-starter-tomcat-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..c892f58
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/1.3.5.RELEASE/spring-boot-starter-validation-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/1.3.5.RELEASE/spring-boot-starter-validation-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/1.3.5.RELEASE/spring-boot-starter-validation-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_3_5_RELEASE.xml
new file mode 100644
index 0000000..fc4227a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.3.5.RELEASE/spring-boot-starter-web-1.3.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.3.5.RELEASE/spring-boot-starter-web-1.3.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.3.5.RELEASE/spring-boot-starter-web-1.3.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_11_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_11_4_RELEASE.xml
new file mode 100644
index 0000000..b9459d1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_11_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.11.4.RELEASE/spring-data-commons-1.11.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.11.4.RELEASE/spring-data-commons-1.11.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.11.4.RELEASE/spring-data-commons-1.11.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_9_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_9_4_RELEASE.xml
new file mode 100644
index 0000000..d60bdee
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_9_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.9.4.RELEASE/spring-data-jpa-1.9.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.9.4.RELEASE/spring-data-jpa-1.9.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.9.4.RELEASE/spring-data-jpa-1.9.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_0_4_RELEASE.xml
new file mode 100644
index 0000000..c0f5e88
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_0_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.security:spring-security-config:4.0.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/4.0.4.RELEASE/spring-security-config-4.0.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/4.0.4.RELEASE/spring-security-config-4.0.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/4.0.4.RELEASE/spring-security-config-4.0.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_0_4_RELEASE.xml
new file mode 100644
index 0000000..4b9d7e8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_0_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.security:spring-security-core:4.0.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/4.0.4.RELEASE/spring-security-core-4.0.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/4.0.4.RELEASE/spring-security-core-4.0.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/4.0.4.RELEASE/spring-security-core-4.0.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_0_4_RELEASE.xml
new file mode 100644
index 0000000..cf3144c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_0_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.security:spring-security-web:4.0.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/4.0.4.RELEASE/spring-security-web-4.0.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/4.0.4.RELEASE/spring-security-web-4.0.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/4.0.4.RELEASE/spring-security-web-4.0.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..1e366cf
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-aop:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.6.RELEASE/spring-aop-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.6.RELEASE/spring-aop-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.6.RELEASE/spring-aop-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..d899fba
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aspects_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-aspects:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/4.2.6.RELEASE/spring-aspects-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/4.2.6.RELEASE/spring-aspects-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/4.2.6.RELEASE/spring-aspects-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..908b5d4
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-beans:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.6.RELEASE/spring-beans-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.6.RELEASE/spring-beans-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.6.RELEASE/spring-beans-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..1cebb6a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-context:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.2.6.RELEASE/spring-context-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.2.6.RELEASE/spring-context-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.2.6.RELEASE/spring-context-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..10ea318
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-context-support:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.2.6.RELEASE/spring-context-support-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.2.6.RELEASE/spring-context-support-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.2.6.RELEASE/spring-context-support-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..152b67e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-core:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.6.RELEASE/spring-core-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.6.RELEASE/spring-core-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.6.RELEASE/spring-core-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..4ab7bf1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-expression:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.2.6.RELEASE/spring-expression-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.2.6.RELEASE/spring-expression-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.2.6.RELEASE/spring-expression-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..95dbebb
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-jdbc:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.2.6.RELEASE/spring-jdbc-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.2.6.RELEASE/spring-jdbc-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.2.6.RELEASE/spring-jdbc-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..893ca9a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-orm:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.2.6.RELEASE/spring-orm-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.2.6.RELEASE/spring-orm-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.2.6.RELEASE/spring-orm-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..5064cda
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_test_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-test:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.2.6.RELEASE/spring-test-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.2.6.RELEASE/spring-test-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.2.6.RELEASE/spring-test-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..b6f067a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-tx:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.2.6.RELEASE/spring-tx-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.2.6.RELEASE/spring-tx-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.2.6.RELEASE/spring-tx-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..7981b8b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-web:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.2.6.RELEASE/spring-web-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.2.6.RELEASE/spring-web-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.2.6.RELEASE/spring-web-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_2_6_RELEASE.xml
new file mode 100644
index 0000000..985838b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-webmvc:4.2.6.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.2.6.RELEASE/spring-webmvc-4.2.6.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.2.6.RELEASE/spring-webmvc-4.2.6.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.2.6.RELEASE/spring-webmvc-4.2.6.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_16.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_16.xml
new file mode 100644
index 0000000..3fbdbce
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_16.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.yaml:snakeyaml:1.16">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.16/snakeyaml-1.16.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.16/snakeyaml-1.16-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.16/snakeyaml-1.16-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
new file mode 100644
index 0000000..0b13335
--- /dev/null
+++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: stax:stax-api:1.0.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
new file mode 100644
index 0000000..c36e717
--- /dev/null
+++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: xml-apis:xml-apis:1.0.b2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
new file mode 100644
index 0000000..0f2d9ef
--- /dev/null
+++ b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: xmlpull:xmlpull:1.1.3.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
new file mode 100644
index 0000000..6726a2d
--- /dev/null
+++ b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: xpp3:xpp3_min:1.1.4c">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
.idea/misc.xml 83(+83 -0)
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..20f47b4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ClientPropertiesManager">
+ <properties class="javax.swing.AbstractButton">
+ <property name="hideActionText" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JComponent">
+ <property name="html.disable" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JEditorPane">
+ <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+ <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+ <property name="charset" class="java.lang.String" />
+ </properties>
+ <properties class="javax.swing.JList">
+ <property name="List.isFileList" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JPasswordField">
+ <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JSlider">
+ <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+ <property name="JSlider.isFilled" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JTable">
+ <property name="Table.isFileList" class="java.lang.Boolean" />
+ <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+ <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JToolBar">
+ <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+ </properties>
+ <properties class="javax.swing.JTree">
+ <property name="JTree.lineStyle" class="java.lang.String" />
+ </properties>
+ <properties class="javax.swing.text.JTextComponent">
+ <property name="caretAspectRatio" class="java.lang.Double" />
+ <property name="caretWidth" class="java.lang.Integer" />
+ </properties>
+ </component>
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="FrameworkDetectionExcludesConfiguration">
+ <file type="web" url="file://$PROJECT_DIR$/sm-shop" />
+ </component>
+ <component name="MavenProjectsManager">
+ <option name="originalFiles">
+ <list>
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
+</project>
\ No newline at end of file
.idea/modules.xml 12(+12 -0)
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6775c5c
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/shopizer.iml" filepath="$PROJECT_DIR$/shopizer.iml" />
+ <module fileurl="file://$PROJECT_DIR$/sm-core/sm-core.iml" filepath="$PROJECT_DIR$/sm-core/sm-core.iml" />
+ <module fileurl="file://$PROJECT_DIR$/sm-core-model/sm-core-model.iml" filepath="$PROJECT_DIR$/sm-core-model/sm-core-model.iml" />
+ <module fileurl="file://$PROJECT_DIR$/sm-core-modules/sm-core-modules.iml" filepath="$PROJECT_DIR$/sm-core-modules/sm-core-modules.iml" />
+ <module fileurl="file://$PROJECT_DIR$/sm-shop/sm-shop.iml" filepath="$PROJECT_DIR$/sm-shop/sm-shop.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
.idea/vcs.xml 6(+6 -0)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
.idea/workspace.xml 996(+996 -0)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..be40dc0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,996 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="fcbb826d-6e02-4a83-94bd-4d2af42f8678" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java" afterPath="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java" />
+ </list>
+ <ignored path="shopizer.iws" />
+ <ignored path=".idea/workspace.xml" />
+ <ignored path="$PROJECT_DIR$/sm-core/target/" />
+ <ignored path="$PROJECT_DIR$/sm-core-modules/target/" />
+ <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" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="CreatePatchCommitExecutor">
+ <option name="PATCH_PATH" value="" />
+ </component>
+ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+ <component name="FavoritesManager">
+ <favorites_list name="shopizer" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="OrdersController.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="GradleLocalSettings">
+ <option name="externalProjectsViewState">
+ <projects_view />
+ </option>
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <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" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java" />
+ <option value="$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java" />
+ </list>
+ </option>
+ </component>
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsGulpfileManager">
+ <detection-done>true</detection-done>
+ <sorting>DEFINITION_ORDER</sorting>
+ </component>
+ <component name="MavenImportPreferences">
+ <option name="generalSettings">
+ <MavenGeneralSettings>
+ <option name="mavenHome" value="Bundled (Maven 3)" />
+ </MavenGeneralSettings>
+ </option>
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="createModuleGroups" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="y" value="23" />
+ <option name="width" value="1260" />
+ <option name="height" value="709" />
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="1" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="" version="1">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ <manualOrder />
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="Scope" />
+ <pane id="Scratches" />
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopizer" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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="orders" />
+ <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="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>
+ <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="categories" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+ <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="om.salesmanager.web.admin.entity.orders.Order	PSI	JAVA://com.salesmanager.web.admin.entity.orders.Order EmailService	PSI	JAVA://com.salesmanager.core.business.services.system.EmailService EmailTemplatesUtils	PSI	JAVA://com.salesmanager.web.utils.EmailTemplatesUtils Refund	PSI	JAVA://com.salesmanager.web.admin.entity.orders.Refund StoreLandingDescription	PSI	JAVA://com.salesmanager.web.admin.entity.merchant.StoreLandingDescription StoreLanding	PSI	JAVA://com.salesmanager.web.admin.entity.merchant.StoreLanding AjaxResponse	PSI	JAVA://com.salesmanager.core.business.utils.ajax.AjaxResponse UserUtils	PSI	JAVA://com.salesmanager.web.utils.UserUtils ApplicationConstants	PSI	JAVA://com.salesmanager.web.constants.ApplicationConstants FilePathUtils	PSI	JAVA://com.salesmanager.web.utils.FilePathUtils com.salesmanager.core.constants	PSI	JAVA://com.salesmanager.core.business.constants.Constants Constants	PSI	JAVA://com.salesmanager.shop.constants.Constants DateUtil	PSI	JAVA://com.salesmanager.web.utils.DateUtil Weight	PSI	JAVA://com.salesmanager.web.admin.entity.reference.Weight Size	PSI	JAVA://com.salesmanager.web.admin.entity.reference.Size EmailConstants	PSI	JAVA://com.salesmanager.web.constants.EmailConstants UserReset	PSI	JAVA://com.salesmanager.web.admin.entity.userpassword.UserReset LabelUtils	PSI	JAVA://com.salesmanager.web.utils.LabelUtils Menu.java	FILE	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">
+ <module name="" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" />
+ <method />
+ </configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <module />
+ <method />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ <method />
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ <method />
+ </configuration>
+ </component>
+ <component name="SbtLocalSettings">
+ <option name="externalProjectsViewState">
+ <projects_view />
+ </option>
+ </component>
+ <component name="ShelveChangesManager" show_recycled="false">
+ <option name="remove_strategy" value="false" />
+ </component>
+ <component name="SvnConfiguration">
+ <configuration />
+ </component>
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="fcbb826d-6e02-4a83-94bd-4d2af42f8678" name="Default" comment="" />
+ <created>1477686203176</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1477686203176</updated>
+ <workItem from="1477686206961" duration="538000" />
+ <workItem from="1477689503605" duration="2489000" />
+ </task>
+ <servers />
+ </component>
+ <component name="TimeTrackingManager">
+ <option name="totallyTimeSpent" value="3027000" />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="23" width="1260" height="709" extended-state="0" />
+ <editor active="true" />
+ <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="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	" 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="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="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="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="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="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="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="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">
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager />
+ <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">
+ <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.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/categories/CategoryController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="45">
+ <caret line="37" column="45" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="45" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/ConfigurationController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-600">
+ <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+ <folding />
+ </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#5280#5300#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.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-core/src/main/java/com/salesmanager/core/business/services/system/EmailService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="54" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="54" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="166">
+ <caret line="363" column="7" selection-start-line="363" selection-start-column="7" selection-end-line="363" selection-end-column="7" />
+ <folding>
+ <element signature="imports" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="300">
+ <caret line="42" column="54" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="54" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="431">
+ <caret line="71" column="58" selection-start-line="71" selection-start-column="58" selection-end-line="71" selection-end-column="58" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-660">
+ <caret line="285" column="41" selection-start-line="285" selection-start-column="41" selection-end-line="285" selection-end-column="41" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#7753#7767#0" expanded="true" />
+ <element signature="e#7813#7825#0" expanded="true" />
+ <element signature="e#7881#7901#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </component>
+</project>
\ No newline at end of file
shopizer.iml 30(+30 -0)
diff --git a/shopizer.iml b/shopizer.iml
new file mode 100644
index 0000000..7ed82ea
--- /dev/null
+++ b/shopizer.iml
@@ -0,0 +1,30 @@
+<?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" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index bc05658..9a52b55 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Oct 31 08:50:52 EDT 2016
+#Mon Oct 31 09:23:12 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-canadapost
diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 5cc9c03..7e25819 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Oct 31 08:50:52 EDT 2016
+#Mon Oct 31 09:23:16 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
sm-core/sm-core.iml 185(+185 -0)
diff --git a/sm-core/sm-core.iml b/sm-core/sm-core.iml
new file mode 100644
index 0000000..078a9d0
--- /dev/null
+++ b/sm-core/sm-core.iml
@@ -0,0 +1,185 @@
+<?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" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="sm-core-model" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.0" level="project" />
+ <orderEntry type="module" module-name="sm-core-modules" />
+ <orderEntry type="library" name="Maven: com.shopizer:sm-search:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:4.1" level="project" />
+ <orderEntry type="library" name="Maven: io.searchbox:jest:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: io.searchbox:jest-common:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: com.shopizer:shopizer-shipping-distance-processor:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+ <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.maps:google-maps-services:0.1.6" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.8.2" level="project" />
+ <orderEntry type="library" name="Maven: com.shopizer:shopizer-shipping-canadapost-module:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey:jersey-bundle:1.19" level="project" />
+ <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.el:javax.el-api:2.2.4" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-spring:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:knowledge-api:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-core:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.mvel:mvel2:2.1.8.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:knowledge-internal-api:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-compiler:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr:3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-decisiontables:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-templates:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-core:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-commons:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jgroups:jgroups:3.4.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:1.4.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:1.4.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-cachestore-jdbc:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-tree:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-test:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.h2database:h2:1.4.191" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.23" level="project" />
+ <orderEntry type="library" name="Maven: javax.mail:javax.mail-api:1.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: com.paypal.sdk:merchantsdk:2.6.109" level="project" />
+ <orderEntry type="library" name="Maven: com.paypal.sdk:paypal-core:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.stripe:stripe-java:1.33.0" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.6" level="project" />
+ <orderEntry type="library" name="Maven: org.jopendocument:jOpenDocument:1.3b1" level="project" />
+ <orderEntry type="library" name="Maven: com.maxmind.geoip2:geoip2:2.7.0" level="project" />
+ <orderEntry type="library" name="Maven: com.maxmind.db:maxmind-db:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.21.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
index c610e4b..186292b 100644
--- a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
+++ b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Oct 31 08:50:51 EDT 2016
+#Mon Oct 31 09:23:21 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-core
sm-core-model/sm-core-model.iml 66(+66 -0)
diff --git a/sm-core-model/sm-core-model.iml b/sm-core-model/sm-core-model.iml
new file mode 100644
index 0000000..fc810e6
--- /dev/null
+++ b/sm-core-model/sm-core-model.iml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <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" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.0" level="project" />
+ </component>
+</module>
\ No newline at end of file
sm-core-modules/sm-core-modules.iml 67(+67 -0)
diff --git a/sm-core-modules/sm-core-modules.iml b/sm-core-modules/sm-core-modules.iml
new file mode 100644
index 0000000..3b8d2ac
--- /dev/null
+++ b/sm-core-modules/sm-core-modules.iml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <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" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="sm-core-model" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.0" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
index a7f3db7..73eb72d 100644
--- a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
+++ b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Fri Oct 28 08:24:24 EDT 2016
+#Mon Oct 31 09:23:27 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-core-modules
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index c23384b..0014196 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Oct 31 08:50:53 EDT 2016
+#Mon Oct 31 09:23:32 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
sm-shop/sm-shop.iml 210(+210 -0)
diff --git a/sm-shop/sm-shop.iml b/sm-shop/sm-shop.iml
new file mode 100644
index 0000000..a5c0c65
--- /dev/null
+++ b/sm-shop/sm-shop.iml
@@ -0,0 +1,210 @@
+<?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="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </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" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="sm-core" />
+ <orderEntry type="module" module-name="sm-core-modules" />
+ <orderEntry type="library" name="Maven: com.shopizer:shopizer-shipping-distance-processor:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+ <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.maps:google-maps-services:0.1.6" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.8.2" level="project" />
+ <orderEntry type="library" name="Maven: com.shopizer:shopizer-shipping-canadapost-module:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey:jersey-bundle:1.19" level="project" />
+ <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-spring:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:knowledge-api:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-core:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.mvel:mvel2:2.1.8.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:knowledge-internal-api:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-compiler:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr:3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-decisiontables:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.drools:drools-templates:5.6.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-core:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-commons:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jgroups:jgroups:3.4.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:1.4.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:1.4.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-cachestore-jdbc:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.infinispan:infinispan-tree:6.0.2.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-test:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.23" level="project" />
+ <orderEntry type="library" name="Maven: javax.mail:javax.mail-api:1.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: com.paypal.sdk:merchantsdk:2.6.109" level="project" />
+ <orderEntry type="library" name="Maven: com.paypal.sdk:paypal-core:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.stripe:stripe-java:1.33.0" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.6" level="project" />
+ <orderEntry type="library" name="Maven: org.jopendocument:jOpenDocument:1.3b1" level="project" />
+ <orderEntry type="library" name="Maven: com.maxmind.geoip2:geoip2:2.7.0" level="project" />
+ <orderEntry type="library" name="Maven: com.maxmind.db:maxmind-db:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.21.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="module" module-name="sm-core-model" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.0" level="project" />
+ <orderEntry type="library" name="Maven: com.shopizer:sm-search:2.5.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.4" level="project" />
+ <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:4.1" level="project" />
+ <orderEntry type="library" name="Maven: io.searchbox:jest:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: io.searchbox:jest-common:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: javax.el:javax.el-api:2.2.4" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.0.33" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.6.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.0.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.h2database:h2:1.4.191" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java
index 68a4153..7d11177 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentBoxesController.java
@@ -1,18 +1,17 @@
-package com.salesmanager.web.admin.controller.content;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-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.content;
+
+import com.salesmanager.core.business.services.content.ContentService;
+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.controller.ControllerConstants;
+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;
@@ -22,16 +21,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-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.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 ContentBoxesController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java
index 7b60508..f1e301f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/content/ContentImageController.java
@@ -1,20 +1,18 @@
-package com.salesmanager.web.admin.controller.content;
-
-import java.io.ByteArrayInputStream;
-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.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.controller.ControllerConstants;
+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;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
@@ -26,16 +24,12 @@ 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.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 javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.ByteArrayInputStream;
+import java.util.*;
/**
* Manage static content type image
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;
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
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 {
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 {
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 {
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 {
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 {
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java
index 756d86e..452054a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderActionsControler.java
@@ -1,19 +1,29 @@
-package com.salesmanager.web.admin.controller.orders;
-
-import java.io.ByteArrayOutputStream;
-import java.math.BigDecimal;
-import java.util.HashMap;
-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;
-
+package com.salesmanager.shop.admin.controller.orders;
+
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.order.OrderService;
+import com.salesmanager.core.business.services.payments.PaymentService;
+import com.salesmanager.core.business.services.payments.TransactionService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.model.payments.Transaction;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.modules.integration.IntegrationException;
+import com.salesmanager.shop.admin.model.orders.Refund;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.DateUtil;
+import com.salesmanager.shop.utils.EmailTemplatesUtils;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.LocaleUtils;
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.web.bind.annotation.RequestBody;
@@ -21,28 +31,12 @@ 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.catalog.product.service.PricingService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.business.order.service.OrderService;
-import com.salesmanager.core.business.payments.model.Transaction;
-import com.salesmanager.core.business.payments.service.PaymentService;
-import com.salesmanager.core.business.payments.service.TransactionService;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.business.system.service.EmailService;
-import com.salesmanager.core.modules.integration.IntegrationException;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.orders.Refund;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.EmailTemplatesUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
+import java.util.*;
/**
* Manage order details
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java
index 83c15db..48fe56c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrderControler.java
@@ -1,23 +1,39 @@
-package com.salesmanager.web.admin.controller.orders;
-
-import java.util.Date;
-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 java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.controller.orders;
+import com.salesmanager.core.business.modules.email.Email;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.order.OrderService;
+import com.salesmanager.core.business.services.order.orderproduct.OrderProductDownloadService;
+import com.salesmanager.core.business.services.payments.PaymentService;
+import com.salesmanager.core.business.services.payments.TransactionService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.model.payments.PaymentType;
+import com.salesmanager.core.model.payments.Transaction;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+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.constants.EmailConstants;
+import com.salesmanager.shop.utils.DateUtil;
+import com.salesmanager.shop.utils.EmailUtils;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.LocaleUtils;
import org.apache.commons.collections.CollectionUtils;
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;
@@ -28,36 +44,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.business.order.service.OrderService;
-import com.salesmanager.core.business.order.service.orderproduct.OrderProductDownloadService;
-import com.salesmanager.core.business.payments.model.PaymentType;
-import com.salesmanager.core.business.payments.model.Transaction;
-import com.salesmanager.core.business.payments.service.PaymentService;
-import com.salesmanager.core.business.payments.service.TransactionService;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-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.modules.email.Email;
-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.constants.EmailConstants;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.EmailUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
+import java.util.regex.Pattern;
/**
* Manage order details
@@ -119,7 +111,7 @@ private static final Logger LOGGER = LoggerFactory.getLogger(OrderControler.clas
//display menu
setMenu(model,request);
- com.salesmanager.web.admin.entity.orders.Order order = new com.salesmanager.web.admin.entity.orders.Order();
+ com.salesmanager.shop.admin.model.orders.Order order = new com.salesmanager.shop.admin.model.orders.Order();
Language language = (Language)request.getAttribute("LANGUAGE");
List<Country> countries = countryService.getCountries(language);
if(orderId!=null && orderId!=0) { //edit mode
@@ -212,7 +204,7 @@ private static final Logger LOGGER = LoggerFactory.getLogger(OrderControler.clas
@PreAuthorize("hasRole('ORDER')")
@RequestMapping(value="/admin/orders/save.html", method=RequestMethod.POST)
- public String saveOrder(@Valid @ModelAttribute("order") com.salesmanager.web.admin.entity.orders.Order entityOrder, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
+ public String saveOrder(@Valid @ModelAttribute("order") com.salesmanager.shop.admin.model.orders.Order entityOrder, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
String email_regEx = "\\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}\\b";
Pattern pattern = Pattern.compile(email_regEx);
@@ -291,7 +283,7 @@ private static final Logger LOGGER = LoggerFactory.getLogger(OrderControler.clas
result.addError(error);
}
- com.salesmanager.core.business.order.model.Order newOrder = orderService.getById(entityOrder.getOrder().getId() );
+ com.salesmanager.core.model.order.Order newOrder = orderService.getById(entityOrder.getOrder().getId() );
//get capturable
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
index abc39a6..e5994fe 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
@@ -1,17 +1,24 @@
-package com.salesmanager.web.admin.controller.orders;
-
-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;
-
+package com.salesmanager.shop.admin.controller.orders;
+
+import com.salesmanager.core.business.services.order.OrderService;
+import com.salesmanager.core.business.services.system.ModuleConfigurationService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderCriteria;
+import com.salesmanager.core.model.order.OrderList;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.system.IntegrationModule;
+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.DateUtil;
+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;
@@ -19,22 +26,13 @@ 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.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderCriteria;
-import com.salesmanager.core.business.order.model.OrderList;
-import com.salesmanager.core.business.order.service.OrderService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.system.model.IntegrationModule;
-import com.salesmanager.core.business.system.service.ModuleConfigurationService;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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.DateUtil;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
/**
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/payments/PaymentsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/payments/PaymentsController.java
index c461bf8..4f860d8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/payments/PaymentsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/payments/PaymentsController.java
@@ -1,15 +1,15 @@
-package com.salesmanager.web.admin.controller.payments;
-
-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 org.springframework.beans.factory.annotation.Autowired;
+package com.salesmanager.shop.admin.controller.payments;
+
+import com.salesmanager.core.business.modules.integration.IntegrationException;
+import com.salesmanager.core.business.services.payments.PaymentService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.payments.TransactionType;
+import com.salesmanager.core.model.system.IntegrationConfiguration;
+import com.salesmanager.core.model.system.IntegrationModule;
+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.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -19,16 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.payments.model.TransactionType;
-import com.salesmanager.core.business.payments.service.PaymentService;
-import com.salesmanager.core.business.system.model.IntegrationConfiguration;
-import com.salesmanager.core.business.system.model.IntegrationModule;
-import com.salesmanager.core.modules.integration.IntegrationException;
-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 java.util.*;
@Controller
public class PaymentsController {
@@ -78,7 +72,7 @@ public class PaymentsController {
IntegrationConfiguration configuration = paymentService.getPaymentConfiguration(code, store);
if(configuration==null) {
configuration = new IntegrationConfiguration();
- configuration.setEnvironment(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ configuration.setEnvironment(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
Map<String,String> keys = new HashMap<String,String>();
keys.put("transaction", TransactionType.AUTHORIZECAPTURE.name());
@@ -90,8 +84,8 @@ public class PaymentsController {
configuration.setModuleCode(code);
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.TEST_ENVIRONMENT);
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.TEST_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
model.addAttribute("configuration", configuration);
model.addAttribute("environments", environments);
@@ -111,8 +105,8 @@ public class PaymentsController {
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.TEST_ENVIRONMENT);
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.TEST_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
model.addAttribute("environments", environments);
model.addAttribute("configuration", configuration);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
index b71bb5b..c97ec08 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
@@ -1,45 +1,35 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.HashMap;
-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;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+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.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;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
-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 com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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 org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
@Controller
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/DigitalProductController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/DigitalProductController.java
index 17eb3c5..563aea0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/DigitalProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/DigitalProductController.java
@@ -1,43 +1,33 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.io.ByteArrayInputStream;
-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.products;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.file.DigitalProductService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
+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.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.digital.ProductFiles;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
import org.apache.commons.collections.CollectionUtils;
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 org.springframework.web.multipart.MultipartFile;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.file.DigitalProductService;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.InputContentFile;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.digital.ProductFiles;
-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.io.ByteArrayInputStream;
+import java.util.*;
@Controller
public class DigitalProductController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.java
index 97c6421..d394019 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/FeaturedItemsController.java
@@ -1,16 +1,21 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationshipType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+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;
@@ -18,20 +23,13 @@ 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.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
@Controller
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ManufacturerController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ManufacturerController.java
index 5ef0b8b..b31db83 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ManufacturerController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ManufacturerController.java
@@ -1,48 +1,36 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-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.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription;
+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.controller.customers.CustomerController;
+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 com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
-import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
-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.CoreConfiguration;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.controller.customers.CustomerController;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LabelUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.awt.image.BufferedImage;
+import java.util.*;
@Controller
public class ManufacturerController {
@@ -95,7 +83,7 @@ public class ManufacturerController {
List<Language> languages = store.getLanguages();
- com.salesmanager.web.admin.entity.catalog.Manufacturer manufacturer = new com.salesmanager.web.admin.entity.catalog.Manufacturer();
+ com.salesmanager.shop.admin.model.catalog.Manufacturer manufacturer = new com.salesmanager.shop.admin.model.catalog.Manufacturer();
List<ManufacturerDescription> descriptions = new ArrayList<ManufacturerDescription>();
@@ -167,7 +155,7 @@ public class ManufacturerController {
@PreAuthorize("hasRole('PRODUCTS')")
@RequestMapping(value="/admin/catalogue/manufacturer/save.html", method=RequestMethod.POST)
- public String saveManufacturer( @Valid @ModelAttribute("manufacturer") com.salesmanager.web.admin.entity.catalog.Manufacturer manufacturer, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
+ public String saveManufacturer( @Valid @ModelAttribute("manufacturer") com.salesmanager.shop.admin.model.catalog.Manufacturer manufacturer, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
this.setMenu(model, request);
//save or edit a manufacturer
@@ -389,7 +377,7 @@ public class ManufacturerController {
return resp.toJSONString();
}
- int count = manufacturerService.getCountManufAttachedProducts( delManufacturer );
+ int count = manufacturerService.getCountManufAttachedProducts( delManufacturer ).intValue();
//IF already attached to products it can't be deleted
if ( count > 0 ){
resp.setStatusMessage(messages.getMessage("message.product.association", locale));
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsController.java
index 65649cb..b49314a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsController.java
@@ -1,41 +1,30 @@
-package com.salesmanager.web.admin.controller.products;
-
-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.products;
+
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOption;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+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.catalog.product.model.attribute.ProductOption;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionService;
-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.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 OptionsController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsValueController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsValueController.java
index 19e014a..3c54ea4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsValueController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/OptionsValueController.java
@@ -1,47 +1,34 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.io.InputStream;
-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.products;
+
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionValueService;
+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.catalog.product.attribute.ProductOptionValue;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.ImageFilePath;
+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.beans.factory.annotation.Qualifier;
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 com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionValueService;
-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.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.ImageFilePath;
-import com.salesmanager.web.utils.LabelUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
@Controller
public class OptionsValueController {
@@ -109,7 +96,8 @@ public class OptionsValueController {
if(optionId!=null && optionId!=0) {//edit mode
- option = productOptionValueService.getById(store, optionId);
+ //option = productOptionValueService.getById(store, optionId);
+ option = productOptionValueService.getByCode(store, optionId.toString());
if(option==null) {
@@ -183,7 +171,8 @@ public class OptionsValueController {
if(optionValue.getId() != null && optionValue.getId() >0) { //edit entry
//get from DB
- dbEntity = productOptionValueService.getById(store,optionValue.getId());
+ dbEntity = productOptionValueService.getByCode(store, optionValue.getId().toString());
+ //productOptionValueService.getById(store,optionValue.getId());
if(dbEntity==null) {
return "redirect:/admin/options/optionsvalues.html";
@@ -249,7 +238,7 @@ public class OptionsValueController {
}
- if(optionValue.getImage()!=null && !optionValue.getImage().isEmpty()) {
+ /*if(optionValue.getImage()!=null && !optionValue.getImage().isEmpty()) {
String imageName = optionValue.getImage().getOriginalFilename();
InputStream inputStream = optionValue.getImage().getInputStream();
@@ -261,7 +250,7 @@ public class OptionsValueController {
optionValue.setProductOptionValueImage(imageName);
- }
+ }*/
productOptionValueService.saveOrUpdate(optionValue);
@@ -352,7 +341,8 @@ public class OptionsValueController {
Long id = Long.parseLong(sid);
- ProductOptionValue entity = productOptionValueService.getById(store, id);
+ //ProductOptionValue entity = productOptionValueService.getById(store, id);
+ ProductOptionValue entity = productOptionValueService.getByCode(store,id.toString());
if(entity==null || entity.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
@@ -392,9 +382,9 @@ public class OptionsValueController {
Long id = Long.parseLong(optionValueId);
- ProductOptionValue optionValue = productOptionValueService.getById(store, id);
-
+ //ProductOptionValue optionValue = productOptionValueService.getById(store, id);
+ ProductOptionValue optionValue = productOptionValueService.getByCode(store, id.toString());
contentService.removeFile(store.getCode(), FileContentType.PROPERTY, optionValue.getProductOptionValueImage());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductAttributeController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductAttributeController.java
index 6cc0be8..80c87cb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductAttributeController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductAttributeController.java
@@ -1,50 +1,35 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.math.BigDecimal;
-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.products;
+
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionValueService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.*;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+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.RandomStringUtils;
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 com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionValueService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LabelUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.*;
@Controller
public class ProductAttributeController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
index fab1f66..d1304c8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
@@ -1,67 +1,53 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.awt.image.BufferedImage;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-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 java.util.UUID;
-
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.image.ProductImageService;
+import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.services.catalog.product.type.ProductTypeService;
+import com.salesmanager.core.business.services.tax.TaxClassService;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.category.CategoryDescription;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.image.ProductImageDescription;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceDescription;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.catalog.product.type.ProductType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.tax.taxclass.TaxClass;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.DateUtil;
+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 com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImageDescription;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.model.type.ProductType;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.image.ProductImageService;
-import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
-import com.salesmanager.core.business.catalog.product.service.type.ProductTypeService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
-import com.salesmanager.core.business.tax.service.TaxClassService;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.LabelUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.awt.image.BufferedImage;
+import java.math.BigDecimal;
+import java.util.*;
@Controller
public class ProductController {
@@ -135,7 +121,7 @@ public class ProductController {
- com.salesmanager.web.admin.entity.catalog.Product product = new com.salesmanager.web.admin.entity.catalog.Product();
+ com.salesmanager.shop.admin.model.catalog.Product product = new com.salesmanager.shop.admin.model.catalog.Product();
List<ProductDescription> descriptions = new ArrayList<ProductDescription>();
if(productId!=null && productId!=0) {//edit mode
@@ -187,7 +173,7 @@ public class ProductController {
if(availabilities!=null && availabilities.size()>0) {
for(ProductAvailability availability : availabilities) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {
productAvailability = availability;
Set<ProductPrice> prices = availability.getPrices();
for(ProductPrice price : prices) {
@@ -256,7 +242,7 @@ public class ProductController {
@PreAuthorize("hasRole('PRODUCTS')")
@RequestMapping(value="/admin/products/save.html", method=RequestMethod.POST)
- public String saveProduct(@Valid @ModelAttribute("product") com.salesmanager.web.admin.entity.catalog.Product product, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
+ public String saveProduct(@Valid @ModelAttribute("product") com.salesmanager.shop.admin.model.catalog.Product product, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
Language language = (Language)request.getAttribute("LANGUAGE");
@@ -398,7 +384,7 @@ public class ProductController {
if(avails !=null && avails.size()>0) {
for(ProductAvailability availability : avails) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {
newProductAvailability = availability;
@@ -572,7 +558,7 @@ public class ProductController {
}
//Make a copy of the product
- com.salesmanager.web.admin.entity.catalog.Product product = new com.salesmanager.web.admin.entity.catalog.Product();
+ com.salesmanager.shop.admin.model.catalog.Product product = new com.salesmanager.shop.admin.model.catalog.Product();
Set<ProductAvailability> availabilities = new HashSet<ProductAvailability>();
//availability - price
@@ -626,7 +612,7 @@ public class ProductController {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {
product.setAvailability(availability);
}
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductImagesController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductImagesController.java
index eae9139..78dc013 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductImagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductImagesController.java
@@ -1,47 +1,36 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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.products;
+
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.image.ProductImageService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.content.ProductImages;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.ImageFilePath;
+import com.salesmanager.shop.utils.LabelUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
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.FieldError;
-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 org.springframework.web.multipart.MultipartFile;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.image.ProductImageService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.content.ProductImages;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.ImageFilePath;
-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 ProductImagesController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.java
index 46317a1..d6bcd3d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductKeywordsController.java
@@ -1,45 +1,32 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-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.products;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+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.catalog.Keyword;
+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.FieldError;
-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.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.web.admin.entity.catalog.Keyword;
-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 ProductKeywordsController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductPriceController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductPriceController.java
index dee0a7f..e7397e6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductPriceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductPriceController.java
@@ -1,51 +1,38 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-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.products;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.price.ProductPriceService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceDescription;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceType;
+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.DateUtil;
+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.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceType;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.price.ProductPriceService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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.DateUtil;
-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.math.BigDecimal;
+import java.util.*;
@Controller
public class ProductPriceController {
@@ -85,7 +72,7 @@ public class ProductPriceController {
ProductAvailability productAvailability = null;
for(ProductAvailability availability : product.getAvailabilities()) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {
productAvailability = availability;
}
}
@@ -147,7 +134,7 @@ public class ProductPriceController {
//get default availability
for(ProductAvailability availability : availabilities) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {
defaultAvailability = availability;
break;
}
@@ -252,7 +239,7 @@ public class ProductPriceController {
MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
- com.salesmanager.web.admin.entity.catalog.ProductPrice pprice = new com.salesmanager.web.admin.entity.catalog.ProductPrice();
+ com.salesmanager.shop.admin.model.catalog.ProductPrice pprice = new com.salesmanager.shop.admin.model.catalog.ProductPrice();
ProductPrice productPrice = null;
ProductAvailability productAvailability = null;
@@ -263,7 +250,7 @@ public class ProductPriceController {
//get default availability
for(ProductAvailability availability : availabilities) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {//TODO to be updated when multiple regions is implemented
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {//TODO to be updated when multiple regions is implemented
productAvailability = availability;
Set<ProductPrice> prices = availability.getPrices();
for(ProductPrice price : prices) {
@@ -318,7 +305,7 @@ public class ProductPriceController {
if(productAvailability==null) {
Set<ProductAvailability> availabilities = product.getAvailabilities();
for(ProductAvailability availability : availabilities) {
- if(availability.getRegion().equals(com.salesmanager.core.constants.Constants.ALL_REGIONS)) {//TODO to be updated when multiple regions is implemented
+ if(availability.getRegion().equals(com.salesmanager.core.business.constants.Constants.ALL_REGIONS)) {//TODO to be updated when multiple regions is implemented
productAvailability = availability;
break;
}
@@ -343,7 +330,7 @@ public class ProductPriceController {
@PreAuthorize("hasRole('PRODUCTS')")
@RequestMapping(value="/admin/products/price/save.html", method=RequestMethod.POST)
- public String saveProductPrice(@Valid @ModelAttribute("price") com.salesmanager.web.admin.entity.catalog.ProductPrice price, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
+ public String saveProductPrice(@Valid @ModelAttribute("price") com.salesmanager.shop.admin.model.catalog.ProductPrice price, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
//dates after save
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java
index 70631a5..310a566 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java
@@ -1,18 +1,21 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.HashMap;
-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;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.review.ProductReviewService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.review.ProductReview;
+import com.salesmanager.core.model.catalog.product.review.ProductReviewDescription;
+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.collections.CollectionUtils;
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;
@@ -21,19 +24,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReviewDescription;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.review.ProductReviewService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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 java.util.*;
@Controller
public class ProductReviewController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
index d1d8095..3a07c5a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
@@ -1,18 +1,22 @@
-package com.salesmanager.web.admin.controller.products;
-
-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;
-
+package com.salesmanager.shop.admin.controller.products;
+
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.ProductCriteria;
+import com.salesmanager.core.model.catalog.product.ProductList;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+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;
@@ -20,20 +24,10 @@ 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.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.ProductCriteria;
-import com.salesmanager.core.business.catalog.product.model.ProductList;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-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 java.util.*;
@Controller
public class ProductsController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/RelatedItemsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/RelatedItemsController.java
index cf94b0f..b78db60 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/RelatedItemsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/RelatedItemsController.java
@@ -1,16 +1,22 @@
-package com.salesmanager.web.admin.controller.products;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.admin.controller.products;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationshipType;
+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.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;
@@ -19,21 +25,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
@Controller
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.java
index d0e7bc1..631fa3e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/CustomShippingMethodsController.java
@@ -1,21 +1,28 @@
-package com.salesmanager.web.admin.controller.shipping;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-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;
-
+package com.salesmanager.shop.admin.controller.shipping;
+
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.shipping.ShippingService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+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.language.Language;
+import com.salesmanager.core.model.shipping.ShippingConfiguration;
+import com.salesmanager.core.model.shipping.ShippingType;
+import com.salesmanager.core.model.system.IntegrationConfiguration;
+import com.salesmanager.core.modules.integration.IntegrationException;
+import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuoteWeightItem;
+import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesConfiguration;
+import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesRegion;
+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.beanutils.BeanComparator;
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,25 +33,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.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
-import com.salesmanager.core.business.shipping.model.ShippingType;
-import com.salesmanager.core.business.shipping.service.ShippingService;
-import com.salesmanager.core.business.system.model.IntegrationConfiguration;
-import com.salesmanager.core.modules.integration.IntegrationException;
-import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuoteWeightItem;
-import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesConfiguration;
-import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesRegion;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-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 java.math.BigDecimal;
+import java.util.*;
@Controller
public class CustomShippingMethodsController {
@@ -195,8 +188,8 @@ public class CustomShippingMethodsController {
LOGGER.debug("Saving module code " + moduleCode);
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.TEST_ENVIRONMENT);
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.TEST_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
model.addAttribute("environments", environments);
model.addAttribute("configuration", configuration);
@@ -735,7 +728,7 @@ public class CustomShippingMethodsController {
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);//only production
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);//only production
model.addAttribute("environments", environments);
model.addAttribute("configuration", configuration);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
index ad1e0cb..669a2b4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.controller.shipping;
+package com.salesmanager.shop.admin.controller.shipping;
import java.util.HashMap;
import java.util.List;
@@ -7,7 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
+import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
@@ -21,16 +21,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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
-import com.salesmanager.core.business.shipping.model.ShippingType;
-import com.salesmanager.core.business.shipping.service.ShippingService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shipping.ShippingConfiguration;
+import com.salesmanager.core.model.shipping.ShippingType;
+import com.salesmanager.core.business.services.shipping.ShippingService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
@Controller
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.java
index 51d4770..8f70651 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingMethodsController.java
@@ -1,17 +1,17 @@
-package com.salesmanager.web.admin.controller.shipping;
-
-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;
+package com.salesmanager.shop.admin.controller.shipping;
+import com.salesmanager.core.business.services.shipping.ShippingService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.system.IntegrationConfiguration;
+import com.salesmanager.core.model.system.IntegrationModule;
+import com.salesmanager.core.modules.integration.IntegrationException;
+import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesConfiguration;
+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.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;
@@ -21,16 +21,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.shipping.service.ShippingService;
-import com.salesmanager.core.business.system.model.IntegrationConfiguration;
-import com.salesmanager.core.business.system.model.IntegrationModule;
-import com.salesmanager.core.modules.integration.IntegrationException;
-import com.salesmanager.core.modules.integration.shipping.model.CustomShippingQuotesConfiguration;
-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 java.util.*;
@Controller
public class ShippingMethodsController {
@@ -48,7 +42,6 @@ public class ShippingMethodsController {
* Configures the shipping shows shipping methods
* @param request
* @param response
- * @param locale
* @return
* @throws Exception
*/
@@ -94,8 +87,8 @@ public class ShippingMethodsController {
configuration.setModuleCode(code);
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.TEST_ENVIRONMENT);
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.TEST_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
model.addAttribute("configuration", configuration);
model.addAttribute("environments", environments);
@@ -115,8 +108,8 @@ public class ShippingMethodsController {
LOGGER.debug("Saving module code " + moduleCode);
List<String> environments = new ArrayList<String>();
- environments.add(com.salesmanager.core.constants.Constants.TEST_ENVIRONMENT);
- environments.add(com.salesmanager.core.constants.Constants.PRODUCTION_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.TEST_ENVIRONMENT);
+ environments.add(com.salesmanager.core.business.constants.Constants.PRODUCTION_ENVIRONMENT);
model.addAttribute("environments", environments);
model.addAttribute("configuration", configuration);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.java
index 2116cf7..1782c90 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOptionsController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.controller.shipping;
+package com.salesmanager.shop.admin.controller.shipping;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -7,7 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
+import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,15 +21,15 @@ 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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
-import com.salesmanager.core.business.shipping.model.ShippingType;
-import com.salesmanager.core.business.shipping.service.ShippingService;
-import com.salesmanager.core.utils.ProductPriceUtils;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.shipping.ShippingConfiguration;
+import com.salesmanager.core.model.shipping.ShippingType;
+import com.salesmanager.core.business.services.shipping.ShippingService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
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 com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
@Controller
public class ShippingOptionsController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.java
index aa31c54..1381135 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingOriginController.java
@@ -1,17 +1,17 @@
-package com.salesmanager.web.admin.controller.shipping;
-
-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.shipping;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.shipping.ShippingOriginService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.core.model.shipping.ShippingOrigin;
+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;
@@ -19,16 +19,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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.business.shipping.model.ShippingOrigin;
-import com.salesmanager.core.business.shipping.service.ShippingOriginService;
-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.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
@Controller
@@ -50,7 +48,6 @@ public class ShippingOriginController {
* Configures the shipping mode, shows shipping countries
* @param request
* @param response
- * @param locale
* @return
* @throws Exception
*/
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.java
index c20055b..0a27849 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingPackagingController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.controller.shipping;
+package com.salesmanager.shop.admin.controller.shipping;
import java.text.DecimalFormat;
import java.util.HashMap;
@@ -7,7 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
+import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +19,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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
-import com.salesmanager.core.business.shipping.model.ShippingType;
-import com.salesmanager.core.business.shipping.service.ShippingService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.shipping.ShippingConfiguration;
+import com.salesmanager.core.model.shipping.ShippingType;
+import com.salesmanager.core.business.services.shipping.ShippingService;
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 com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
@Controller
public class ShippingPackagingController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
index 0d0ccfa..b6260cb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
@@ -1,17 +1,17 @@
-package com.salesmanager.web.admin.controller.tax;
-
-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.tax;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.tax.TaxClassService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.tax.taxclass.TaxClass;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LabelUtils;
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;
@@ -22,16 +22,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.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
-import com.salesmanager.core.business.tax.service.TaxClassService;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-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 TaxClassController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.java
index 6e0c8ef..9798c45 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxConfigurationController.java
@@ -1,14 +1,10 @@
-package com.salesmanager.web.admin.controller.tax;
+package com.salesmanager.shop.admin.controller.tax;
-import java.util.HashMap;
-import java.util.Locale;
-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;
+import com.salesmanager.core.business.services.tax.TaxService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.tax.TaxConfiguration;
+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;
@@ -17,11 +13,13 @@ 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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.tax.model.TaxConfiguration;
-import com.salesmanager.core.business.tax.service.TaxService;
-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.HashMap;
+import java.util.Locale;
+import java.util.Map;
@Controller
public class TaxConfigurationController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
index ac78d85..36e95b6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
@@ -1,19 +1,22 @@
-package com.salesmanager.web.admin.controller.tax;
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-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.tax;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.tax.TaxClassService;
+import com.salesmanager.core.business.services.tax.TaxRateService;
+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.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.core.model.tax.taxclass.TaxClass;
+import com.salesmanager.core.model.tax.taxrate.TaxRate;
+import com.salesmanager.core.model.tax.taxrate.TaxRateDescription;
+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;
@@ -24,21 +27,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.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
-import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
-import com.salesmanager.core.business.tax.model.taxrate.TaxRateDescription;
-import com.salesmanager.core.business.tax.service.TaxClassService;
-import com.salesmanager.core.business.tax.service.TaxRateService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-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.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
@Controller
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/GroupsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/GroupsController.java
index fd3f77c..91b8b94 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/GroupsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/GroupsController.java
@@ -1,16 +1,17 @@
-package com.salesmanager.web.admin.controller.user;
-
-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;
-
+package com.salesmanager.shop.admin.controller.user;
+
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.utils.LabelUtils;
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;
@@ -19,16 +20,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
@Controller
public class GroupsController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/LoginController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/LoginController.java
index 5c65fc7..48dd2cf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/LoginController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/LoginController.java
@@ -1,7 +1,4 @@
-package com.salesmanager.web.admin.controller.user;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.admin.controller.user;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -11,6 +8,9 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
@Controller
public class LoginController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/PermissionController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/PermissionController.java
index b322d03..bda6cc9 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/PermissionController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/PermissionController.java
@@ -1,15 +1,14 @@
-package com.salesmanager.web.admin.controller.user;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.admin.controller.user;
+
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.user.Permission;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.utils.LabelUtils;
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;
@@ -17,13 +16,12 @@ 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.reference.country.service.CountryService;
-import com.salesmanager.core.business.user.model.Permission;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Controller
public class PermissionController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/SecurityController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/SecurityController.java
index ab37143..ac8b280 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/SecurityController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/SecurityController.java
@@ -1,22 +1,20 @@
-package com.salesmanager.web.admin.controller.user;
+package com.salesmanager.shop.admin.controller.user;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.shop.admin.model.web.Menu;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.web.admin.entity.web.Menu;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Controller
public class SecurityController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
index 59745f1..a8a4118 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
@@ -1,22 +1,30 @@
-package com.salesmanager.web.admin.controller.user;
-
-import java.util.ArrayList;
-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.servlet.http.HttpSession;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.admin.controller.user;
+
+import com.salesmanager.core.business.exception.ServiceException;
+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.language.LanguageService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.business.services.user.GroupService;
+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.language.Language;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.core.model.user.User;
+import com.salesmanager.shop.admin.controller.ControllerConstants;
+import com.salesmanager.shop.admin.model.secutity.Password;
+import com.salesmanager.shop.admin.model.userpassword.UserReset;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.admin.security.SecurityQuestion;
+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.security.authentication.encoding.PasswordEncoder;
import org.springframework.stereotype.Controller;
@@ -28,32 +36,12 @@ 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.generic.exception.ServiceException;
-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.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.system.service.EmailService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.model.User;
-import com.salesmanager.core.business.user.service.GroupService;
-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.secutity.Password;
-import com.salesmanager.web.admin.entity.userpassword.UserReset;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.admin.security.SecurityQuestion;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.constants.EmailConstants;
-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.servlet.http.HttpSession;
+import javax.validation.Valid;
+import java.util.*;
@Controller
public class UserController {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Keyword.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Keyword.java
index 1182e6a..2fccfbf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Keyword.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Keyword.java
@@ -1,10 +1,9 @@
-package com.salesmanager.web.admin.entity.catalog;
-
-import java.io.Serializable;
-
+package com.salesmanager.shop.admin.model.catalog;
import org.hibernate.validator.constraints.NotEmpty;
+import java.io.Serializable;
+
/**
* Post keyword from the admin
* @author Carl Samson
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Manufacturer.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Manufacturer.java
index d348163..ea5c35c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Manufacturer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Manufacturer.java
@@ -1,16 +1,14 @@
-package com.salesmanager.web.admin.entity.catalog;
+package com.salesmanager.shop.admin.model.catalog;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
public class Manufacturer implements Serializable {
@@ -25,7 +23,7 @@ public class Manufacturer implements Serializable {
*/
//provides wrapping to the main Manufacturer entity
- private com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer manufacturer;
+ private com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer manufacturer;
@Valid
private List<ManufacturerDescription> descriptions = new ArrayList<ManufacturerDescription>();
@@ -62,12 +60,12 @@ public class Manufacturer implements Serializable {
this.productImage = productImage;
}
- public com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer getManufacturer() {
+ public com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer getManufacturer() {
return manufacturer;
}
public void setManufacturer(
- com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer manufacturer) {
+ com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer manufacturer) {
this.manufacturer = manufacturer;
}
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Product.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Product.java
index 93cd0a9..2a00485 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Product.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/Product.java
@@ -1,19 +1,16 @@
-package com.salesmanager.web.admin.entity.catalog;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.model.catalog;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile;
-
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
public class Product implements Serializable {
@@ -28,7 +25,7 @@ public class Product implements Serializable {
//provides wrapping to the main product entity
@Valid
- private com.salesmanager.core.business.catalog.product.model.Product product;
+ private com.salesmanager.core.model.catalog.product.Product product;
@Valid
private List<ProductDescription> descriptions = new ArrayList<ProductDescription>();
@@ -56,10 +53,10 @@ public class Product implements Serializable {
public void setDateAvailable(String dateAvailable) {
this.dateAvailable = dateAvailable;
}
- public com.salesmanager.core.business.catalog.product.model.Product getProduct() {
+ public com.salesmanager.core.model.catalog.product.Product getProduct() {
return product;
}
- public void setProduct(com.salesmanager.core.business.catalog.product.model.Product product) {
+ public void setProduct(com.salesmanager.core.model.catalog.product.Product product) {
this.product = product;
}
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/ProductPrice.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/ProductPrice.java
index fc828bb..7edc9c5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/ProductPrice.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/catalog/ProductPrice.java
@@ -1,17 +1,16 @@
-package com.salesmanager.web.admin.entity.catalog;
+package com.salesmanager.shop.admin.model.catalog;
-import java.util.ArrayList;
-import java.util.List;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceDescription;
import javax.validation.Valid;
-
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
+import java.util.ArrayList;
+import java.util.List;
public class ProductPrice {
@Valid
- private com.salesmanager.core.business.catalog.product.model.price.ProductPrice price = null;
+ private com.salesmanager.core.model.catalog.product.price.ProductPrice price = null;
@Valid
private List <ProductPriceDescription> descriptions = new ArrayList<ProductPriceDescription>();
private String priceText;
@@ -23,7 +22,7 @@ public class ProductPrice {
private String productPriceSpecialStartDate;
private String productPriceSpecialEndDate;
- private com.salesmanager.core.business.catalog.product.model.Product product;
+ private com.salesmanager.core.model.catalog.product.Product product;
@@ -47,10 +46,10 @@ public class ProductPrice {
public void setPriceText(String priceText) {
this.priceText = priceText;
}
- public com.salesmanager.core.business.catalog.product.model.price.ProductPrice getPrice() {
+ public com.salesmanager.core.model.catalog.product.price.ProductPrice getPrice() {
return price;
}
- public void setPrice(com.salesmanager.core.business.catalog.product.model.price.ProductPrice price) {
+ public void setPrice(com.salesmanager.core.model.catalog.product.price.ProductPrice price) {
this.price = price;
}
public String getSpecialPriceText() {
@@ -60,10 +59,10 @@ public class ProductPrice {
this.specialPriceText = specialPriceText;
}
- public com.salesmanager.core.business.catalog.product.model.Product getProduct() {
+ public com.salesmanager.core.model.catalog.product.Product getProduct() {
return product;
}
- public void setProduct(com.salesmanager.core.business.catalog.product.model.Product product) {
+ public void setProduct(com.salesmanager.core.model.catalog.product.Product product) {
this.product = product;
}
public String getProductPriceSpecialStartDate() {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ContentFiles.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ContentFiles.java
index 240f2aa..e5ca080 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ContentFiles.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ContentFiles.java
@@ -1,16 +1,15 @@
/**
*
*/
-package com.salesmanager.web.admin.entity.content;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.model.content;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile;
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
/**
* A bean class responsible for getting form data from shop Admin for uploading
* content files for a given merchant and validating the provided data.
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ProductImages.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ProductImages.java
index c6393f1..55a1136 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ProductImages.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/content/ProductImages.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.content;
+package com.salesmanager.shop.admin.model.content;
public class ProductImages extends ContentFiles {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/digital/ProductFiles.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/digital/ProductFiles.java
index b813be0..722b533 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/digital/ProductFiles.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/digital/ProductFiles.java
@@ -1,18 +1,16 @@
/**
*
*/
-package com.salesmanager.web.admin.entity.digital;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.validation.Valid;
+package com.salesmanager.shop.admin.model.digital;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
/**
* A bean class responsible for getting form data from shop Admin for uploading
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
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java
index ee2f596..93dcc56 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Order.java
@@ -1,16 +1,14 @@
-package com.salesmanager.web.admin.entity.orders;
+package com.salesmanager.shop.admin.model.orders;
+import com.salesmanager.core.model.common.Billing;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.order.orderstatus.OrderStatus;
+
+import javax.persistence.Embedded;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.Embedded;
-
-import com.salesmanager.core.business.common.model.Billing;
-import com.salesmanager.core.business.common.model.Delivery;
-
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
-
public class Order implements Serializable {
@@ -24,13 +22,13 @@ public class Order implements Serializable {
List<OrderStatus> orderStatusList = Arrays.asList(OrderStatus.values());
private String datePurchased = "";
- private com.salesmanager.core.business.order.model.Order order;
+ private com.salesmanager.core.model.order.Order order;
@Embedded
- private com.salesmanager.core.business.common.model.Delivery delivery = null;
+ private com.salesmanager.core.model.common.Delivery delivery = null;
@Embedded
- private com.salesmanager.core.business.common.model.Billing billing = null;
+ private com.salesmanager.core.model.common.Billing billing = null;
@@ -67,11 +65,11 @@ public class Order implements Serializable {
this.orderStatusList = orderStatusList;
}
- public com.salesmanager.core.business.order.model.Order getOrder() {
+ public com.salesmanager.core.model.order.Order getOrder() {
return order;
}
- public void setOrder(com.salesmanager.core.business.order.model.Order order) {
+ public void setOrder(com.salesmanager.core.model.order.Order order) {
this.order = order;
}
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java
index b0e2d0e..225a658 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/orders/Refund.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.orders;
+package com.salesmanager.shop.admin.model.orders;
import java.io.Serializable;
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;
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;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/secutity/Password.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/secutity/Password.java
index 4947df3..43adc8e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/secutity/Password.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/secutity/Password.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.admin.entity.secutity;
+package com.salesmanager.shop.admin.model.secutity;
-import java.io.Serializable;
+import com.salesmanager.core.model.user.User;
-import com.salesmanager.core.business.user.model.User;
+import java.io.Serializable;
/**
* Entity used in the cahange passord page
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;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
index fe3f863..ed5b2fb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.admin.entity.web;
+package com.salesmanager.shop.admin.model.web;
+
+import org.codehaus.jackson.annotate.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.codehaus.jackson.annotate.JsonProperty;
-
public class Menu implements Serializable {
/**
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
index df64b57..9c095a5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.security;
+package com.salesmanager.shop.admin.security;
import org.springframework.dao.DataAccessException;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityQuestion.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityQuestion.java
index 7968c35..9014b8c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityQuestion.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityQuestion.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.security;
+package com.salesmanager.shop.admin.security;
import java.io.Serializable;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
index 16863cd..6ebcac9 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
@@ -1,18 +1,16 @@
-package com.salesmanager.web.admin.security;
-
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.admin.security;
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.model.user.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import com.salesmanager.core.business.user.model.User;
-import com.salesmanager.core.business.user.service.UserService;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
public class UserAuthenticationSuccessHandler extends
SavedRequestAwareAuthenticationSuccessHandler {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
index 1567a42..1ee8242 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
@@ -1,30 +1,29 @@
-package com.salesmanager.web.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
+package com.salesmanager.shop.admin.security;
+
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.core.model.user.Permission;
+import com.salesmanager.shop.constants.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.security.authentication.encoding.PasswordEncoder;
import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.model.Permission;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.core.business.user.service.UserService;
-import com.salesmanager.web.constants.Constants;
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
/**
@@ -62,7 +61,7 @@ public class UserServicesImpl implements WebUserServices{
public UserDetails loadUserByUsername(String userName)
throws UsernameNotFoundException, DataAccessException {
- com.salesmanager.core.business.user.model.User user = null;
+ com.salesmanager.core.model.user.User user = null;
Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
try {
@@ -73,7 +72,7 @@ public class UserServicesImpl implements WebUserServices{
return null;
}
- GrantedAuthority role = new GrantedAuthorityImpl(Constants.PERMISSION_AUTHENTICATED);//required to login
+ GrantedAuthority role = new SimpleGrantedAuthority(Constants.PERMISSION_AUTHENTICATED);//required to login
authorities.add(role);
List<Integer> groupsId = new ArrayList<Integer>();
@@ -89,7 +88,7 @@ public class UserServicesImpl implements WebUserServices{
List<Permission> permissions = permissionService.getPermissions(groupsId);
for(Permission permission : permissions) {
- GrantedAuthority auth = new GrantedAuthorityImpl(permission.getPermissionName());
+ GrantedAuthority auth = new SimpleGrantedAuthority(permission.getPermissionName());
authorities.add(auth);
}
@@ -119,7 +118,7 @@ public class UserServicesImpl implements WebUserServices{
List<Group> groups = groupService.listGroup(GroupType.ADMIN);
//creation of the super admin admin:password)
- com.salesmanager.core.business.user.model.User user = new com.salesmanager.core.business.user.model.User("admin",password,"admin@shopizer.com");
+ com.salesmanager.core.model.user.User user = new com.salesmanager.core.model.user.User("admin",password,"admin@shopizer.com");
user.setFirstName("Administrator");
user.setLastName("User");
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
index 81f738f..47e4fd7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.security;
+package com.salesmanager.shop.admin.security;
import org.springframework.security.core.userdetails.UserDetailsService;
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 {
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
index 58f8f74..e3f4851 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
@@ -1,25 +1,23 @@
-package com.salesmanager.web.files;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.controller;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.OutputContentFile;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.store.controller.AbstractController;
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.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.OutputContentFile;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.shop.controller.AbstractController;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
@Controller
public class FilesController extends AbstractController {
@@ -35,7 +33,6 @@ public class FilesController extends AbstractController {
/**
* Serves static files (css, js ...) the repository is a single node by merchant
* @param storeCode
- * @param imageName
* @param extension
* @return
* @throws IOException
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
index aa77d15..88161d7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
@@ -1,7 +1,7 @@
-package com.salesmanager.web.images;
+package com.salesmanager.shop.controller;
import java.io.IOException;
-
+import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.catalog.product.model.file.ProductImageSize;
-import com.salesmanager.core.business.catalog.product.service.image.ProductImageService;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.OutputContentFile;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.model.catalog.product.file.ProductImageSize;
+import com.salesmanager.core.business.services.catalog.product.image.ProductImageService;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.OutputContentFile;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.exception.ServiceException;
/**
* When handling images and files from the application server
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
index 9c4ca26..6fe7bfe 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
@@ -1,41 +1,31 @@
-package com.salesmanager.web.reference;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.controller;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.utils.CacheUtils;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.DateUtil;
+import com.salesmanager.shop.utils.LanguageUtils;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-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 com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-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.utils.CacheUtils;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.LanguageUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
/**
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
index 9afdd5a..d17a474 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
@@ -1,32 +1,30 @@
-package com.salesmanager.web.filter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.filter;
+
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.business.utils.CacheUtils;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.user.User;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-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.core.business.user.model.User;
-import com.salesmanager.core.business.user.service.UserService;
-import com.salesmanager.core.utils.CacheUtils;
-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 java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
public class AdminFilter extends HandlerInterceptorAdapter {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index 4070f7a..a7da273 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -1,61 +1,55 @@
-package com.salesmanager.web.filter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.filter;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.system.MerchantConfigurationService;
+import com.salesmanager.core.business.utils.CacheUtils;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.category.CategoryDescription;
+import com.salesmanager.core.model.catalog.product.Product;
+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.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.system.MerchantConfig;
+import com.salesmanager.core.model.system.MerchantConfiguration;
+import com.salesmanager.core.model.system.MerchantConfigurationType;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.AnonymousCustomer;
+import com.salesmanager.shop.model.shop.Breadcrumb;
+import com.salesmanager.shop.model.shop.BreadcrumbItem;
+import com.salesmanager.shop.model.shop.BreadcrumbItemType;
+import com.salesmanager.shop.model.shop.PageInformation;
+import com.salesmanager.shop.populator.catalog.ReadableCategoryPopulator;
+import com.salesmanager.shop.store.controller.category.facade.CategoryFacade;
+import com.salesmanager.shop.utils.GeoLocationUtils;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.LanguageUtils;
+import com.salesmanager.shop.utils.WebApplicationCacheUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-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.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-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.core.business.system.model.MerchantConfig;
-import com.salesmanager.core.business.system.model.MerchantConfiguration;
-import com.salesmanager.core.business.system.model.MerchantConfigurationType;
-import com.salesmanager.core.business.system.service.MerchantConfigurationService;
-import com.salesmanager.core.utils.CacheUtils;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.category.ReadableCategory;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.AnonymousCustomer;
-import com.salesmanager.web.entity.shop.Breadcrumb;
-import com.salesmanager.web.entity.shop.BreadcrumbItem;
-import com.salesmanager.web.entity.shop.BreadcrumbItemType;
-import com.salesmanager.web.entity.shop.PageInformation;
-import com.salesmanager.web.populator.catalog.ReadableCategoryPopulator;
-import com.salesmanager.web.shop.controller.category.facade.CategoryFacade;
-import com.salesmanager.web.utils.GeoLocationUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LanguageUtils;
-import com.salesmanager.web.utils.WebApplicationCacheUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Servlet Filter implementation class StoreFilter
@@ -207,7 +201,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
try {
String ipAddress = GeoLocationUtils.getClientIpAddress(request);
- com.salesmanager.core.business.common.model.Address geoAddress = customerService.getCustomerAddress(store, ipAddress);
+ com.salesmanager.core.model.common.Address geoAddress = customerService.getCustomerAddress(store, ipAddress);
if(geoAddress!=null) {
address = new Address();
address.setCountry(geoAddress.getCountry());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitData.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitData.java
index 3341882..2f03c6d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitData.java
@@ -1,6 +1,6 @@
-package com.salesmanager.web.init.data;
+package com.salesmanager.shop.init.data;
-import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.exception.ServiceException;
public interface InitData {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
index 38e0928..8aad5c2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
@@ -1,27 +1,26 @@
-package com.salesmanager.web.init.data;
-
-import javax.annotation.PostConstruct;
-
+package com.salesmanager.shop.init.data;
+
+import com.salesmanager.core.business.constants.SystemConstants;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.reference.init.InitializationDatabase;
+import com.salesmanager.core.business.services.system.SystemConfigurationService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.model.system.SystemConfiguration;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.core.model.user.Permission;
+import com.salesmanager.shop.admin.security.WebUserServices;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import com.salesmanager.shop.utils.AppConfiguration;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.reference.init.service.InitializationDatabase;
-import com.salesmanager.core.business.system.model.SystemConfiguration;
-import com.salesmanager.core.business.system.service.SystemConfigurationService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.model.Permission;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.core.constants.SystemConstants;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.web.admin.security.WebUserServices;
-import com.salesmanager.web.constants.ApplicationConstants;
-import com.salesmanager.web.utils.AppConfiguration;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
@@ -38,7 +37,7 @@ public class InitializationLoader {
private InitializationDatabase initializationDatabase;
@Inject
- private com.salesmanager.web.init.data.InitData initData;
+ private com.salesmanager.shop.init.data.InitData initData;
@Inject
private SystemConfigurationService systemConfigurationService;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
index 4306693..5aa96ee 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
@@ -1,5 +1,68 @@
-package com.salesmanager.web.init.data;
+package com.salesmanager.shop.init.data;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionValueService;
+import com.salesmanager.core.business.services.catalog.product.availability.ProductAvailabilityService;
+import com.salesmanager.core.business.services.catalog.product.image.ProductImageService;
+import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.services.catalog.product.price.ProductPriceService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.services.catalog.product.type.ProductTypeService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.order.OrderService;
+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.user.GroupService;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.category.CategoryDescription;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceDescription;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationshipType;
+import com.salesmanager.core.model.catalog.product.type.ProductType;
+import com.salesmanager.core.model.common.Billing;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.ImageContentFile;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.CustomerGender;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.order.orderproduct.OrderProductPrice;
+import com.salesmanager.core.model.order.orderstatus.OrderStatus;
+import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.model.payments.PaymentType;
+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.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.LocaleUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.stereotype.Component;
+import javax.inject.Inject;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -7,70 +70,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
-import com.salesmanager.core.business.catalog.product.model.type.ProductType;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionValueService;
-import com.salesmanager.core.business.catalog.product.service.availability.ProductAvailabilityService;
-import com.salesmanager.core.business.catalog.product.service.image.ProductImageService;
-import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
-import com.salesmanager.core.business.catalog.product.service.price.ProductPriceService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.catalog.product.service.type.ProductTypeService;
-import com.salesmanager.core.business.common.model.Billing;
-import com.salesmanager.core.business.common.model.Delivery;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.ImageContentFile;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.CustomerGender;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductPrice;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.business.order.service.OrderService;
-import com.salesmanager.core.business.payments.model.PaymentType;
-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.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.LocaleUtils;
-
@Component
public class InitStoreData implements InitData {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/ProductList.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/ProductList.java
index 9523f0b..146a660 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/ProductList.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/ProductList.java
@@ -1,12 +1,12 @@
-package com.salesmanager.web.entity.catalog;
+package com.salesmanager.shop.model.catalog;
+
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-
public class ProductList implements Serializable {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
index 7dfa300..64dac20 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
@@ -1,12 +1,13 @@
package com.salesmanager.shop.model.order;
-import java.io.Serializable;
-import java.util.List;
-
import com.salesmanager.core.model.reference.currency.Currency;
+import com.salesmanager.shop.model.customer.Address;
import com.salesmanager.shop.model.customer.ReadableCustomer;
import com.salesmanager.shop.model.customer.ReadableDelivery;
+import java.io.Serializable;
+import java.util.List;
+
public class ReadableOrder extends OrderEntity implements Serializable {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
index 5b7fe52..fe550b1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
@@ -1,14 +1,15 @@
package com.salesmanager.shop.model.order;
+import com.salesmanager.core.model.shipping.ShippingOption;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.salesmanager.core.model.shipping.ShippingOption;
-import com.salesmanager.shop.model.customer.ReadableDelivery;
-
public class ReadableShippingSummary implements Serializable {
/**
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
index 8bbb6fa..4108d5d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
@@ -3,6 +3,7 @@
*/
package com.salesmanager.shop.populator.customer;
+
import com.salesmanager.core.business.exception.ConversionException;
import com.salesmanager.core.business.utils.AbstractDataPopulator;
import com.salesmanager.core.model.customer.Customer;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
index 3d4ccbe..f0be15b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
@@ -5,6 +5,7 @@ package com.salesmanager.shop.populator.customer;
import org.apache.commons.lang.StringUtils;
+<<<<<<< HEAD
import com.salesmanager.core.business.exception.ConversionException;
import com.salesmanager.core.business.utils.AbstractDataPopulator;
import com.salesmanager.core.model.customer.Customer;
@@ -12,6 +13,14 @@ import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.core.model.reference.language.Language;
import com.salesmanager.shop.model.customer.Address;
+=======
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
/**
* @author Admin
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
index fb59fa2..3618c15 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
@@ -5,6 +5,7 @@ package com.salesmanager.shop.populator.customer;
import org.apache.commons.lang.StringUtils;
+<<<<<<< HEAD
import com.salesmanager.core.business.exception.ConversionException;
import com.salesmanager.core.business.utils.AbstractDataPopulator;
import com.salesmanager.core.model.customer.Customer;
@@ -13,6 +14,15 @@ import com.salesmanager.core.model.reference.language.Language;
import com.salesmanager.shop.model.customer.Address;
import com.salesmanager.shop.model.customer.CustomerEntity;
+=======
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
/**
* <p>
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
index 576bcf1..05cdcc8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
@@ -1,8 +1,20 @@
package com.salesmanager.shop.populator.customer;
+<<<<<<< HEAD
+=======
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOption;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
import java.util.ArrayList;
import java.util.List;
+<<<<<<< HEAD
import com.salesmanager.core.business.exception.ConversionException;
import com.salesmanager.core.business.utils.AbstractDataPopulator;
import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
@@ -17,6 +29,8 @@ import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
* @author c.samson
*
*/
+=======
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
public class CustomerOptionPopulator extends
AbstractDataPopulator<com.salesmanager.core.model.customer.attribute.CustomerOption, com.salesmanager.shop.admin.model.customer.attribute.CustomerOption> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
index 89d24b5..28e0e12 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
@@ -1,12 +1,36 @@
package com.salesmanager.shop.populator.customer;
+<<<<<<< HEAD
import java.util.Map;
+=======
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.common.Billing;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+import com.salesmanager.core.model.customer.attribute.CustomerOption;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.attribute.PersistableCustomerAttribute;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+<<<<<<< HEAD
import com.salesmanager.core.business.exception.ConversionException;
import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
@@ -29,6 +53,9 @@ import com.salesmanager.shop.model.customer.PersistableCustomer;
import com.salesmanager.shop.model.customer.attribute.PersistableCustomerAttribute;
+=======
+import java.util.Map;
+>>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
public class CustomerPopulator extends
AbstractDataPopulator<PersistableCustomer, Customer> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.java
index ee21133..cfaaf23 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerBillingAddressPopulator.java
@@ -1,13 +1,13 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
import org.apache.commons.lang.StringUtils;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
public class PersistableCustomerBillingAddressPopulator extends AbstractDataPopulator<Address, Customer>
{
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.java
index 2455834..4cf2f3e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionPopulator.java
@@ -1,20 +1,19 @@
-package com.salesmanager.web.populator.customer;
-
-import java.util.HashSet;
-import java.util.Set;
+package com.salesmanager.shop.populator.customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.attribute.CustomerOption;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.attribute.CustomerOptionDescription;
+import com.salesmanager.shop.model.customer.attribute.PersistableCustomerOption;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.StringUtils;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-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.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.attribute.CustomerOptionDescription;
-import com.salesmanager.web.entity.customer.attribute.PersistableCustomerOption;
+import java.util.HashSet;
+import java.util.Set;
public class PersistableCustomerOptionPopulator extends
AbstractDataPopulator<PersistableCustomerOption, CustomerOption> {
@@ -44,9 +43,9 @@ public class PersistableCustomerOptionPopulator extends
target.setPublicOption(true);
if(!CollectionUtils.isEmpty(source.getDescriptions())) {
- Set<com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription> descriptions = new HashSet<com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription>();
+ Set<com.salesmanager.core.model.customer.attribute.CustomerOptionDescription> descriptions = new HashSet<com.salesmanager.core.model.customer.attribute.CustomerOptionDescription>();
for(CustomerOptionDescription desc : source.getDescriptions()) {
- com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription description = new com.salesmanager.core.business.customer.model.attribute.CustomerOptionDescription();
+ com.salesmanager.core.model.customer.attribute.CustomerOptionDescription description = new com.salesmanager.core.model.customer.attribute.CustomerOptionDescription();
Language lang = languageService.getByCode(desc.getLanguage());
if(lang==null) {
throw new ConversionException("Language is null for code " + description.getLanguage() + " use language ISO code [en, fr ...]");
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.java
index 221115b..a02ace1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerOptionValuePopulator.java
@@ -1,19 +1,18 @@
-package com.salesmanager.web.populator.customer;
-
-import java.util.HashSet;
-import java.util.Set;
+package com.salesmanager.shop.populator.customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.attribute.CustomerOptionValueDescription;
+import com.salesmanager.shop.model.customer.attribute.PersistableCustomerOptionValue;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.Validate;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-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.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.attribute.CustomerOptionValueDescription;
-import com.salesmanager.web.entity.customer.attribute.PersistableCustomerOptionValue;
+import java.util.HashSet;
+import java.util.Set;
public class PersistableCustomerOptionValuePopulator extends
AbstractDataPopulator<PersistableCustomerOptionValue, CustomerOptionValue> {
@@ -37,9 +36,9 @@ public class PersistableCustomerOptionValuePopulator extends
target.setSortOrder(source.getOrder());
if(!CollectionUtils.isEmpty(source.getDescriptions())) {
- Set<com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription> descriptions = new HashSet<com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription>();
+ Set<com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription> descriptions = new HashSet<com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription>();
for(CustomerOptionValueDescription desc : source.getDescriptions()) {
- com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription description = new com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription();
+ com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription description = new com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription();
Language lang = languageService.getByCode(desc.getLanguage());
if(lang==null) {
throw new ConversionException("Language is null for code " + description.getLanguage() + " use language ISO code [en, fr ...]");
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.java
index c1d9d77..253585a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerPopulator.java
@@ -1,12 +1,12 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
public class PersistableCustomerPopulator extends
AbstractDataPopulator<Customer, PersistableCustomer> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.java
index 5c8c081..35975da 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/PersistableCustomerShippingAddressPopulator.java
@@ -1,14 +1,14 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
import org.apache.commons.lang.StringUtils;
-import com.salesmanager.core.business.common.model.Delivery;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
public class PersistableCustomerShippingAddressPopulator extends AbstractDataPopulator<Address, Customer>
{
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.java
index dbee394..7ec0c48 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerDeliveryAddressPopulator.java
@@ -1,23 +1,22 @@
/**
*
*/
-package com.salesmanager.web.populator.customer;
-
-import java.util.Map;
-
+package com.salesmanager.shop.populator.customer;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
import org.apache.commons.lang.StringUtils;
-import com.salesmanager.core.business.common.model.Delivery;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
+import java.util.Map;
/**
* @author Carl Samson
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.java
index 8735d6b..fa8e0d5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/PersistableManufacturerPopulator.java
@@ -1,20 +1,19 @@
-package com.salesmanager.web.populator.manufacturer;
-
-import java.util.HashSet;
-import java.util.Set;
+package com.salesmanager.shop.populator.manufacturer;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.manufacturer.ManufacturerDescription;
+import com.salesmanager.shop.model.catalog.manufacturer.PersistableManufacturer;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.Validate;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-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.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.manufacturer.ManufacturerDescription;
-import com.salesmanager.web.entity.catalog.manufacturer.PersistableManufacturer;
+import java.util.HashSet;
+import java.util.Set;
/**
@@ -43,9 +42,9 @@ public class PersistableManufacturerPopulator extends AbstractDataPopulator<Pers
if(!CollectionUtils.isEmpty(source.getDescriptions())) {
- Set<com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription> descriptions = new HashSet<com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription>();
+ Set<com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription> descriptions = new HashSet<com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription>();
for(ManufacturerDescription description : source.getDescriptions()) {
- com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription desc = new com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription();
+ com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription desc = new com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription();
desc.setManufacturer(target);
desc.setDescription(description.getDescription());
desc.setName(description.getName());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.java
index c5770c3..921d97a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/manufacturer/ReadableManufacturerPopulator.java
@@ -1,15 +1,15 @@
-package com.salesmanager.web.populator.manufacturer;
+package com.salesmanager.shop.populator.manufacturer;
-import java.util.Set;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.manufacturer.ReadableManufacturer;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.manufacturer.ReadableManufacturer;
+import java.util.Set;
-public class ReadableManufacturerPopulator extends AbstractDataPopulator<com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer,ReadableManufacturer>
+public class ReadableManufacturerPopulator extends AbstractDataPopulator<com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer,ReadableManufacturer>
{
@@ -17,7 +17,7 @@ public class ReadableManufacturerPopulator extends AbstractDataPopulator<com.sal
@Override
public ReadableManufacturer populate(
- com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer source,
+ com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer source,
ReadableManufacturer target, MerchantStore store, Language language) throws ConversionException {
target.setId(source.getId());
if(source.getDescriptions()!=null && source.getDescriptions().size()>0) {
@@ -36,7 +36,7 @@ public class ReadableManufacturerPopulator extends AbstractDataPopulator<com.sal
target.setCode(source.getCode());
if (description != null) {
- com.salesmanager.web.entity.catalog.manufacturer.ManufacturerDescription d = new com.salesmanager.web.entity.catalog.manufacturer.ManufacturerDescription();
+ com.salesmanager.shop.model.catalog.manufacturer.ManufacturerDescription d = new com.salesmanager.shop.model.catalog.manufacturer.ManufacturerDescription();
d.setName(description.getName());
d.setDescription(description.getDescription());
target.setDescription(d);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/OrderProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/OrderProductPopulator.java
index c978eef..a8bd03c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/OrderProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/OrderProductPopulator.java
@@ -1,32 +1,31 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.catalog.product.file.DigitalProductService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
+import com.salesmanager.core.model.catalog.product.price.FinalPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductAttribute;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.order.orderproduct.OrderProductPrice;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem;
+import com.salesmanager.core.model.shoppingcart.ShoppingCartItem;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.Validate;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.Validate;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
-import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.catalog.product.service.file.DigitalProductService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductAttribute;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductPrice;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.constants.ApplicationConstants;
-
public class OrderProductPopulator extends
AbstractDataPopulator<ShoppingCartItem, OrderProduct> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderPopulator.java
index 874d1f9..01fd317 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderPopulator.java
@@ -1,39 +1,38 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.catalog.product.file.DigitalProductService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+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.zone.ZoneService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.business.utils.CreditCardUtils;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderstatus.OrderStatus;
+import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.model.order.payment.CreditCard;
+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.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.order.OrderTotal;
+import com.salesmanager.shop.model.order.PersistableOrder;
+import com.salesmanager.shop.model.order.PersistableOrderProduct;
+import com.salesmanager.shop.utils.LocaleUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.Validate;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.Validate;
-
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.catalog.product.service.file.DigitalProductService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.business.order.model.payment.CreditCard;
-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.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.core.utils.CreditCardUtils;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.order.OrderTotal;
-import com.salesmanager.web.entity.order.PersistableOrder;
-import com.salesmanager.web.entity.order.PersistableOrderProduct;
-import com.salesmanager.web.utils.LocaleUtils;
-
public class PersistableOrderPopulator extends
AbstractDataPopulator<PersistableOrder, Order> {
@@ -131,7 +130,7 @@ public class PersistableOrderPopulator extends
if(CollectionUtils.isEmpty(products)) {
throw new ConversionException("Requires at least 1 PersistableOrderProduct");
}
- PersistableOrderProductPopulator orderProductPopulator = new PersistableOrderProductPopulator();
+ com.salesmanager.shop.populator.order.PersistableOrderProductPopulator orderProductPopulator = new PersistableOrderProductPopulator();
orderProductPopulator.setProductAttributeService(productAttributeService);
orderProductPopulator.setProductService(productService);
orderProductPopulator.setDigitalProductService(digitalProductService);
@@ -145,7 +144,7 @@ public class PersistableOrderPopulator extends
List<OrderTotal> orderTotals = source.getTotals();
if(CollectionUtils.isNotEmpty(orderTotals)) {
for(OrderTotal total : orderTotals) {
- com.salesmanager.core.business.order.model.OrderTotal totalModel = new com.salesmanager.core.business.order.model.OrderTotal();
+ com.salesmanager.core.model.order.OrderTotal totalModel = new com.salesmanager.core.model.order.OrderTotal();
totalModel.setModule(total.getModule());
totalModel.setOrder(target);
totalModel.setOrderTotalCode(total.getCode());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.java
index 48331c8..3890524 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/PersistableOrderProductPopulator.java
@@ -1,29 +1,28 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.catalog.product.file.DigitalProductService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductAttribute;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.order.orderproduct.OrderProductPrice;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import com.salesmanager.shop.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.shop.model.order.PersistableOrderProduct;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.Validate;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.Validate;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.catalog.product.service.file.DigitalProductService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductAttribute;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductPrice;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.constants.ApplicationConstants;
-import com.salesmanager.web.entity.catalog.product.attribute.ProductAttribute;
-import com.salesmanager.web.entity.order.PersistableOrderProduct;
-
public class PersistableOrderProductPopulator extends
AbstractDataPopulator<PersistableOrderProduct, OrderProduct> {
@@ -119,7 +118,7 @@ public class PersistableOrderProductPopulator extends
OrderProductAttribute orderProductAttribute = new OrderProductAttribute();
orderProductAttribute.setOrderProduct(target);
Long id = attribute.getId();
- com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute attr = productAttributeService.getById(id);
+ com.salesmanager.core.model.catalog.product.attribute.ProductAttribute attr = productAttributeService.getById(id);
if(attr==null) {
throw new ConversionException("Attribute id " + id + " does not exists");
}
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
index 83b4d1d..b1b71be 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
@@ -1,20 +1,20 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.order.OrderTotalType;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+import com.salesmanager.shop.model.order.ReadableOrder;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.order.model.OrderTotalType;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
-import com.salesmanager.web.entity.order.ReadableOrder;
-
public class ReadableOrderPopulator extends
AbstractDataPopulator<Order, ReadableOrder> {
@@ -36,8 +36,8 @@ public class ReadableOrderPopulator extends
target.setConfirmedAddress(source.getConfirmedAddress());
}
- com.salesmanager.web.entity.order.OrderTotal taxTotal = null;
- com.salesmanager.web.entity.order.OrderTotal shippingTotal = null;
+ com.salesmanager.shop.model.order.OrderTotal taxTotal = null;
+ com.salesmanager.shop.model.order.OrderTotal shippingTotal = null;
if(source.getBilling()!=null) {
@@ -78,18 +78,18 @@ public class ReadableOrderPopulator extends
target.setDelivery(address);
}
- List<com.salesmanager.web.entity.order.OrderTotal> totals = new ArrayList<com.salesmanager.web.entity.order.OrderTotal>();
+ List<com.salesmanager.shop.model.order.OrderTotal> totals = new ArrayList<com.salesmanager.shop.model.order.OrderTotal>();
for(OrderTotal t : source.getOrderTotal()) {
if(t.getOrderTotalType()==null) {
continue;
}
if(t.getOrderTotalType().name().equals(OrderTotalType.TOTAL.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
target.setTotal(totalTotal);
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.TAX.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(taxTotal==null) {
taxTotal = totalTotal;
} else {
@@ -101,7 +101,7 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.SHIPPING.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(shippingTotal==null) {
shippingTotal = totalTotal;
} else {
@@ -113,7 +113,7 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.HANDLING.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(shippingTotal==null) {
shippingTotal = totalTotal;
} else {
@@ -125,12 +125,12 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.SUBTOTAL.name())) {
- com.salesmanager.web.entity.order.OrderTotal subTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal subTotal = createTotal(t);
totals.add(subTotal);
}
else {
- com.salesmanager.web.entity.order.OrderTotal otherTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal otherTotal = createTotal(t);
totals.add(otherTotal);
}
}
@@ -140,8 +140,8 @@ public class ReadableOrderPopulator extends
return target;
}
- private com.salesmanager.web.entity.order.OrderTotal createTotal(OrderTotal t) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = new com.salesmanager.web.entity.order.OrderTotal();
+ private com.salesmanager.shop.model.order.OrderTotal createTotal(OrderTotal t) {
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = new com.salesmanager.shop.model.order.OrderTotal();
totalTotal.setCode(t.getOrderTotalCode());
totalTotal.setId(t.getId());
totalTotal.setModule(t.getModule());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
index 8a8d0e2..978ca50 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.ReadableOrderProductDownload;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.order.ReadableOrderProductDownload;
public class ReadableOrderProductDownloadPopulator extends
AbstractDataPopulator<OrderProductDownload, ReadableOrderProductDownload> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
index c0d353c..895ca69 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
@@ -1,30 +1,29 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductAttribute;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.order.ReadableOrderProduct;
+import com.salesmanager.shop.model.order.ReadableOrderProductAttribute;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.utils.ImageFilePath;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductAttribute;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.order.ReadableOrderProduct;
-import com.salesmanager.web.entity.order.ReadableOrderProductAttribute;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.utils.ImageFilePath;
-
public class ReadableOrderProductPopulator extends
AbstractDataPopulator<OrderProduct, ReadableOrderProduct> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
index eabf946..b3edd7e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
@@ -1,18 +1,17 @@
-package com.salesmanager.web.populator.order;
-
-import java.util.Locale;
+package com.salesmanager.shop.populator.order;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.order.ReadableOrderTotal;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.LocaleUtils;
import org.apache.commons.lang.Validate;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.ReadableOrderTotal;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import java.util.Locale;
public class ReadableOrderTotalPopulator extends
AbstractDataPopulator<OrderTotal, ReadableOrderTotal> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
index 9d61443..c730851 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
@@ -1,15 +1,15 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
import org.apache.commons.lang.Validate;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shipping.model.ShippingSummary;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
-import com.salesmanager.web.entity.order.ReadableShippingSummary;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shipping.ShippingSummary;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+import com.salesmanager.shop.model.order.ReadableShippingSummary;
public class ReadableShippingSummaryPopulator extends
AbstractDataPopulator<ShippingSummary, ReadableShippingSummary> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
index b499c77..5051a75 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
@@ -1,14 +1,14 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.entity.order.ReadableShopOrder;
-import com.salesmanager.web.entity.order.ShopOrder;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.model.order.ReadableShopOrder;
+import com.salesmanager.shop.model.order.ShopOrder;
public class ReadableShopOrderPopulator extends
AbstractDataPopulator<ShopOrder, ReadableShopOrder> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
index 578bb85..fda655c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
@@ -1,19 +1,19 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
import org.apache.commons.lang3.Validate;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.PersistableOrderProduct;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCartItem;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.order.PersistableOrderProduct;
public class ShoppingCartItemPopulator extends
AbstractDataPopulator<PersistableOrderProduct, ShoppingCartItem> {
@@ -34,7 +34,7 @@ public class ShoppingCartItemPopulator extends
Product product = productService.getById(source.getProduct().getId());
if(source.getAttributes()!=null) {
- for(com.salesmanager.web.entity.catalog.product.attribute.ProductAttribute attr : source.getAttributes()) {
+ for(com.salesmanager.shop.model.catalog.product.attribute.ProductAttribute attr : source.getAttributes()) {
ProductAttribute attribute = productAttributeService.getById(attr.getId());
if(attribute==null) {
throw new ConversionException("ProductAttribute with id " + attr.getId() + " is null");
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
index 148841c..b2f76f4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
@@ -1,36 +1,34 @@
/**
*
*/
-package com.salesmanager.web.populator.shoppingCart;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
+package com.salesmanager.shop.populator.shoppingCart;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartCalculationService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.OrderSummary;
+import com.salesmanager.core.model.order.OrderTotalSummary;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.order.OrderTotal;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartAttribute;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartItem;
+import com.salesmanager.shop.utils.ImageFilePath;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration.ConversionException;
-import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.OrderSummary;
-import com.salesmanager.core.business.order.model.OrderTotalSummary;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartCalculationService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.OrderTotal;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartAttribute;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartItem;
-import com.salesmanager.web.utils.ImageFilePath;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
/**
@@ -90,12 +88,12 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
//Validate.notNull(imageUtils, "Requires to set imageUtils");
int cartQuantity = 0;
cart.setCode(shoppingCart.getShoppingCartCode());
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> items = shoppingCart.getLineItems();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> items = shoppingCart.getLineItems();
List<ShoppingCartItem> shoppingCartItemsList=Collections.emptyList();
try{
if(items!=null) {
shoppingCartItemsList=new ArrayList<ShoppingCartItem>();
- for(com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem item : items) {
+ for(com.salesmanager.core.model.shoppingcart.ShoppingCartItem item : items) {
ShoppingCartItem shoppingCartItem = new ShoppingCartItem();
shoppingCartItem.setCode(cart.getCode());
@@ -119,10 +117,10 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
String imagePath = imageUtils.buildProductimageUtils(store, item.getProduct().getSku(), image.getProductImage());
shoppingCartItem.setImage(imagePath);
}
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> attributes = item.getAttributes();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> attributes = item.getAttributes();
if(attributes!=null) {
List<ShoppingCartAttribute> cartAttributes = new ArrayList<ShoppingCartAttribute>();
- for(com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem attribute : attributes) {
+ for(com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem attribute : attributes) {
ShoppingCartAttribute cartAttribute = new ShoppingCartAttribute();
cartAttribute.setId(attribute.getId());
cartAttribute.setAttributeId(attribute.getProductAttributeId());
@@ -146,14 +144,14 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
}
OrderSummary summary = new OrderSummary();
- List<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> productsList = new ArrayList<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ List<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> productsList = new ArrayList<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
productsList.addAll(shoppingCart.getLineItems());
summary.setProducts(productsList);
OrderTotalSummary orderSummary = shoppingCartCalculationService.calculate(shoppingCart,store, language );
if(CollectionUtils.isNotEmpty(orderSummary.getTotals())) {
List<OrderTotal> totals = new ArrayList<OrderTotal>();
- for(com.salesmanager.core.business.order.model.OrderTotal t : orderSummary.getTotals()) {
+ for(com.salesmanager.core.model.order.OrderTotal t : orderSummary.getTotals()) {
OrderTotal total = new OrderTotal();
total.setCode(t.getOrderTotalCode());
total.setValue(t.getValue());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
index b77ce03..4d13464 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
@@ -1,12 +1,22 @@
/**
*
*/
-package com.salesmanager.web.populator.shoppingCart;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+package com.salesmanager.shop.populator.shoppingCart;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartAttribute;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartItem;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration.ConversionException;
import org.apache.commons.lang3.StringUtils;
@@ -14,20 +24,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartAttribute;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartItem;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* @author Umesh A
@@ -114,33 +113,33 @@ public class ShoppingCartModelPopulator
}
List<ShoppingCartItem> items = shoppingCart.getShoppingCartItems();
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> newItems =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> newItems =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
if ( items != null && items.size() > 0 )
{
for ( ShoppingCartItem item : items )
{
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> cartItems = cartMdel.getLineItems();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> cartItems = cartMdel.getLineItems();
if ( cartItems != null && cartItems.size() > 0 )
{
- for ( com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem dbItem : cartItems )
+ for ( com.salesmanager.core.model.shoppingcart.ShoppingCartItem dbItem : cartItems )
{
if ( dbItem.getId().longValue() == item.getId() )
{
dbItem.setQuantity( item.getQuantity() );
// compare attributes
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> attributes =
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> attributes =
dbItem.getAttributes();
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> newAttributes =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> newAttributes =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem>();
List<ShoppingCartAttribute> cartAttributes = item.getShoppingCartAttributes();
if ( !CollectionUtils.isEmpty( cartAttributes ) )
{
for ( ShoppingCartAttribute attribute : cartAttributes )
{
- for ( com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem dbAttribute : attributes )
+ for ( com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem dbAttribute : attributes )
{
if ( dbAttribute.getId().longValue() == attribute.getId() )
{
@@ -161,13 +160,13 @@ public class ShoppingCartModelPopulator
}
else
{// create new item
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem cartItem =
+ com.salesmanager.core.model.shoppingcart.ShoppingCartItem cartItem =
createCartItem( cartMdel, item, store );
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> lineItems =
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> lineItems =
cartMdel.getLineItems();
if ( lineItems == null )
{
- lineItems = new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ lineItems = new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
cartMdel.setLineItems( lineItems );
}
lineItems.add( cartItem );
@@ -188,7 +187,7 @@ public class ShoppingCartModelPopulator
}
- private com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem createCartItem( com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart,
+ private com.salesmanager.core.model.shoppingcart.ShoppingCartItem createCartItem( com.salesmanager.core.model.shoppingcart.ShoppingCart cart,
ShoppingCartItem shoppingCartItem,
MerchantStore store )
throws Exception
@@ -207,8 +206,8 @@ public class ShoppingCartModelPopulator
+ store.getId() );
}
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem item =
- new com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem( cart, product );
+ com.salesmanager.core.model.shoppingcart.ShoppingCartItem item =
+ new com.salesmanager.core.model.shoppingcart.ShoppingCartItem( cart, product );
item.setQuantity( shoppingCartItem.getQuantity() );
item.setItemPrice( shoppingCartItem.getProductPrice() );
item.setShoppingCart( cart );
@@ -217,16 +216,16 @@ public class ShoppingCartModelPopulator
List<ShoppingCartAttribute> cartAttributes = shoppingCartItem.getShoppingCartAttributes();
if ( !CollectionUtils.isEmpty( cartAttributes ) )
{
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> newAttributes =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> newAttributes =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem>();
for ( ShoppingCartAttribute attribute : cartAttributes )
{
ProductAttribute productAttribute = productAttributeService.getById( attribute.getAttributeId() );
if ( productAttribute != null
&& productAttribute.getProduct().getId().longValue() == product.getId().longValue() )
{
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem attributeItem =
- new com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem( item,
+ com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem attributeItem =
+ new com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem( item,
productAttribute );
if ( attribute.getAttributeId() > 0 )
{
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
index e679b70..5bca523 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
@@ -1,22 +1,19 @@
/**
*
*/
-package com.salesmanager.web.shop.controller;
-
-import javax.servlet.http.HttpServletRequest;
+package com.salesmanager.shop.store.controller;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.store.model.paging.PaginationData;
import org.jopendocument.util.ExceptionUtils;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.servlet.ModelAndView;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.shop.model.paging.PaginationData;
+import javax.servlet.http.HttpServletRequest;
/**
* @author Umesh A
@@ -33,17 +30,17 @@ public abstract class AbstractController {
*/
@SuppressWarnings( "unchecked" )
protected <T> T getSessionAttribute(final String key, HttpServletRequest request) {
- return (T) com.salesmanager.web.utils.SessionUtil.getSessionAttribute(key, request);
+ return (T) com.salesmanager.shop.utils.SessionUtil.getSessionAttribute(key, request);
}
protected void setSessionAttribute(final String key, final Object value, HttpServletRequest request) {
- com.salesmanager.web.utils.SessionUtil.setSessionAttribute(key, value, request);
+ com.salesmanager.shop.utils.SessionUtil.setSessionAttribute(key, value, request);
}
protected void removeAttribute(final String key, HttpServletRequest request) {
- com.salesmanager.web.utils.SessionUtil.removeSessionAttribute(key, request);
+ com.salesmanager.shop.utils.SessionUtil.removeSessionAttribute(key, request);
}
protected Language getLanguage(HttpServletRequest request) {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.java
index 1d79df1..74dc6e4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacade.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.shop.controller.category.facade;
+package com.salesmanager.shop.store.controller.category.facade;
-import java.util.List;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.category.PersistableCategory;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.entity.catalog.category.PersistableCategory;
-import com.salesmanager.web.entity.catalog.category.ReadableCategory;
+import java.util.List;
public interface CategoryFacade {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/ControllerConstants.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/ControllerConstants.java
index 47427b4..8524520 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/ControllerConstants.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/ControllerConstants.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.salesmanager.web.shop.controller;
+package com.salesmanager.shop.store.controller;
/**
* Interface contain constant for Controller.These constant will be used throughout
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
index da53175..9bbb02c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
@@ -1,20 +1,39 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import java.util.Collections;
-import java.util.Enumeration;
-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.store.controller.customer;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerAttributeService;
+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.order.OrderService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+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.customer.Customer;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+import com.salesmanager.shop.model.customer.CustomerPassword;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.populator.customer.ReadableCustomerPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.ControllerConstants;
+import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
+import com.salesmanager.shop.store.controller.order.facade.OrderFacade;
+import com.salesmanager.shop.utils.EmailTemplatesUtils;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.LanguageUtils;
+import com.salesmanager.shop.utils.LocaleUtils;
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.security.authentication.encoding.PasswordEncoder;
import org.springframework.security.core.Authentication;
@@ -23,44 +42,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-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 com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionType;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerAttributeService;
-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.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.service.OrderService;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-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.service.ZoneService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.CustomerEntity;
-import com.salesmanager.web.entity.customer.CustomerPassword;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.populator.customer.ReadableCustomerPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.ControllerConstants;
-import com.salesmanager.web.shop.controller.customer.facade.CustomerFacade;
-import com.salesmanager.web.shop.controller.order.facade.OrderFacade;
-import com.salesmanager.web.utils.EmailTemplatesUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LanguageUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.*;
//import com.salesmanager.web.shop.controller.data.CountryData;
/**
@@ -349,8 +337,8 @@ public class CustomerAccountController extends AbstractController {
try {
String[] parameterKey = parameterName.split("-");
- com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption = null;
- com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue = null;
+ com.salesmanager.core.model.customer.attribute.CustomerOption customerOption = null;
+ com.salesmanager.core.model.customer.attribute.CustomerOptionValue customerOptionValue = null;
if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
index 93b99e0..ab9d501 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
@@ -1,15 +1,20 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.store.controller.customer;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionSetService;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionType;
+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.model.customer.attribute.CustomerOption;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.populator.customer.ReadableCustomerOptionPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.ControllerConstants;
import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.stereotype.Controller;
@@ -17,20 +22,13 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionType;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionSetService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOption;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOptionValue;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.populator.customer.CustomerOptionPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.ControllerConstants;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Entry point for logged in customers
@@ -85,7 +83,7 @@ public class CustomerDashboardController extends AbstractController {
for(CustomerOptionSet optSet : optionSet) {
- com.salesmanager.core.business.customer.model.attribute.CustomerOption custOption = optSet.getCustomerOption();
+ com.salesmanager.core.model.customer.attribute.CustomerOption custOption = optSet.getCustomerOption();
if(!custOption.isActive() || !custOption.isPublicOption()) {
continue;
}
@@ -110,7 +108,7 @@ public class CustomerDashboardController extends AbstractController {
for(CustomerAttribute customerAttribute : customerAttributes) {
if(customerAttribute.getCustomerOption().getId().longValue()==customerOption.getId()){
CustomerOptionValue selectedValue = new CustomerOptionValue();
- com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue attributeValue = customerAttribute.getCustomerOptionValue();
+ com.salesmanager.core.model.customer.attribute.CustomerOptionValue attributeValue = customerAttribute.getCustomerOptionValue();
selectedValue.setId(attributeValue.getId());
CustomerOptionValueDescription optValue = attributeValue.getDescriptionsSettoList().get(0);
selectedValue.setName(optValue.getName());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerLoginController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerLoginController.java
index 1ade681..e60b8e8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerLoginController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerLoginController.java
@@ -1,39 +1,34 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.store.controller.customer;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartCalculationService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.customer.SecuredCustomer;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.populator.shoppingCart.ShoppingCartDataPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
+import com.salesmanager.shop.utils.ImageFilePath;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.AuthenticationException;
import org.springframework.stereotype.Controller;
-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 com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartCalculationService;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.customer.SecuredCustomer;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.populator.shoppingCart.ShoppingCartDataPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.customer.facade.CustomerFacade;
-import com.salesmanager.web.utils.ImageFilePath;
+import org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Custom Spring Security authentication
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.java
index bb75d6a..e355790 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerOrdersController.java
@@ -1,16 +1,26 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.store.controller.customer;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.order.orderproduct.OrderProductDownloadService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.order.ReadableOrder;
+import com.salesmanager.shop.model.order.ReadableOrderList;
+import com.salesmanager.shop.model.order.ReadableOrderProductDownload;
+import com.salesmanager.shop.populator.order.ReadableOrderProductDownloadPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.ControllerConstants;
+import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
+import com.salesmanager.shop.store.controller.order.facade.OrderFacade;
+import com.salesmanager.shop.store.model.paging.PaginationData;
import org.apache.commons.collections.CollectionUtils;
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.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -20,23 +30,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.order.service.orderproduct.OrderProductDownloadService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.order.ReadableOrder;
-import com.salesmanager.web.entity.order.ReadableOrderList;
-import com.salesmanager.web.entity.order.ReadableOrderProductDownload;
-import com.salesmanager.web.populator.order.ReadableOrderProductDownloadPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.ControllerConstants;
-import com.salesmanager.web.shop.controller.customer.facade.CustomerFacade;
-import com.salesmanager.web.shop.controller.order.facade.OrderFacade;
-import com.salesmanager.web.shop.model.paging.PaginationData;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
@Controller
@RequestMapping(Constants.SHOP_URI + "/customer")
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.java
index 9bdc49b..2b46b81 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerProductReviewController.java
@@ -1,14 +1,29 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+package com.salesmanager.shop.store.controller.customer;
+
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.review.ProductReviewService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.review.ProductReview;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.product.PersistableProductReview;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.catalog.product.ReadableProductReview;
+import com.salesmanager.shop.populator.catalog.PersistableProductReviewPopulator;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.populator.catalog.ReadableProductReviewPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.ControllerConstants;
+import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
+import com.salesmanager.shop.utils.DateUtil;
+import com.salesmanager.shop.utils.ImageFilePath;
+import com.salesmanager.shop.utils.LabelUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
@@ -20,29 +35,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.review.ProductReviewService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-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.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.product.PersistableProductReview;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.catalog.product.ReadableProductReview;
-import com.salesmanager.web.populator.catalog.PersistableProductReviewPopulator;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.populator.catalog.ReadableProductReviewPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.ControllerConstants;
-import com.salesmanager.web.shop.controller.customer.facade.CustomerFacade;
-import com.salesmanager.web.utils.DateUtil;
-import com.salesmanager.web.utils.ImageFilePath;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
/**
* Entry point for logged in customers
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
index 8ffe286..fb014cb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
@@ -1,18 +1,37 @@
-package com.salesmanager.web.shop.controller.customer;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+package com.salesmanager.shop.store.controller.customer;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartCalculationService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.customer.AnonymousCustomer;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+import com.salesmanager.shop.model.customer.SecuredShopPersistableCustomer;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.populator.shoppingCart.ShoppingCartDataPopulator;
+import com.salesmanager.shop.store.controller.AbstractController;
+import com.salesmanager.shop.store.controller.ControllerConstants;
+import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
+import com.salesmanager.shop.utils.CaptchaRequestUtils;
+import com.salesmanager.shop.utils.EmailTemplatesUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
+import com.salesmanager.shop.utils.LabelUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.encoding.PasswordEncoder;
@@ -25,36 +44,16 @@ 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.catalog.product.service.PricingService;
-import com.salesmanager.core.business.customer.CustomerRegistrationException;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-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.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartCalculationService;
-import com.salesmanager.core.business.system.service.EmailService;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.web.constants.ApplicationConstants;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.customer.AnonymousCustomer;
-import com.salesmanager.web.entity.customer.CustomerEntity;
-import com.salesmanager.web.entity.customer.SecuredShopPersistableCustomer;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.populator.shoppingCart.ShoppingCartDataPopulator;
-import com.salesmanager.web.shop.controller.AbstractController;
-import com.salesmanager.web.shop.controller.ControllerConstants;
-import com.salesmanager.web.shop.controller.customer.facade.CustomerFacade;
-import com.salesmanager.web.utils.CaptchaRequestUtils;
-import com.salesmanager.web.utils.EmailTemplatesUtils;
-import com.salesmanager.web.utils.ImageFilePath;
-import com.salesmanager.web.utils.LabelUtils;
+import javax.inject.Inject;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+//import com.salesmanager.core.business.customer.CustomerRegistrationException;
/**
* Registration of a new customer
@@ -209,7 +208,7 @@ public class CustomerRegistrationController extends AbstractController {
customer.setClearPassword(password);
customerData = customerFacade.registerCustomer( customer, merchantStore, language );
}
- catch ( CustomerRegistrationException cre )
+ /* catch ( CustomerRegistrationException cre )
{
LOGGER.error( "Error while registering customer.. ", cre);
ObjectError error = new ObjectError("registration",messages.getMessage("registration.failed", locale));
@@ -217,7 +216,7 @@ public class CustomerRegistrationController extends AbstractController {
StringBuilder template =
new StringBuilder().append( ControllerConstants.Tiles.Customer.register ).append( "." ).append( merchantStore.getStoreTemplate() );
return template.toString();
- }
+ }*/
catch ( Exception e )
{
LOGGER.error( "Error while registering customer.. ", e);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.java
index 4f42431..fdf3518 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacade.java
@@ -1,17 +1,17 @@
/**
*
*/
-package com.salesmanager.web.shop.controller.customer.facade;
+package com.salesmanager.shop.store.controller.customer.facade;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.CustomerEntity;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
/**
* <p>Customer facade working as a bridge between {@link CustomerService} and Controller
@@ -31,7 +31,7 @@ public interface CustomerFacade
* Customer username is unique to each store.
*
* @param userName
- * @param storeCode
+ * @param store
* @param store
* @param language
* @throws Exception
@@ -55,8 +55,7 @@ public interface CustomerFacade
* <li> Convert Customer to {@link CustomerEntity} </li>
* </p>
*
- * @param userName username of Customer
- * @param storeCode storeCode to which user is associated/
+ * @param customer username of Customer
* @param sessionShoppingCartId session shopping cart, if user already have few items in Cart.
* @throws Exception
*/
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
index 262a645..ac204ed 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
@@ -1,67 +1,61 @@
/**
*
*/
-package com.salesmanager.web.shop.controller.customer.facade;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
+package com.salesmanager.shop.store.controller.customer.facade;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartCalculationService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.core.model.user.Permission;
+import com.salesmanager.shop.admin.model.userpassword.UserReset;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.populator.customer.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.authentication.encoding.PasswordEncoder;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.customer.CustomerRegistrationException;
-import com.salesmanager.core.business.customer.exception.CustomerNotFoundException;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-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.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartCalculationService;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.business.system.service.EmailService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.model.Permission;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.web.admin.entity.userpassword.UserReset;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.CustomerEntity;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.populator.customer.CustomerBillingAddressPopulator;
-import com.salesmanager.web.populator.customer.CustomerDeliveryAddressPopulator;
-import com.salesmanager.web.populator.customer.CustomerEntityPopulator;
-import com.salesmanager.web.populator.customer.CustomerPopulator;
-import com.salesmanager.web.populator.customer.PersistableCustomerBillingAddressPopulator;
-import com.salesmanager.web.populator.customer.PersistableCustomerShippingAddressPopulator;
-import com.salesmanager.web.populator.customer.ReadableCustomerPopulator;
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+//import com.salesmanager.core.business.customer.CustomerRegistrationException;
+//import com.salesmanager.core.business.customer.exception.CustomerNotFoundException;
/**
@@ -138,7 +132,7 @@ public class CustomerFacadeImpl implements CustomerFacade
* Customer username is unique to each store.
*
* @param userName
- * @param storeCode
+ * @param store
* @throws ConversionException
*/
@Override
@@ -292,7 +286,8 @@ public class CustomerFacadeImpl implements CustomerFacade
Customer customerModel= getCustomerModel(customer,merchantStore,language);
if(customerModel == null){
LOG.equals( "Unable to create customer in system" );
- throw new CustomerRegistrationException( "Unable to register customer" );
+ //throw new CustomerRegistrationException( "Unable to register customer" );
+ throw new Exception( "Unable to register customer" );
}
LOG.info( "About to persist customer to database." );
@@ -395,7 +390,7 @@ public class CustomerFacadeImpl implements CustomerFacade
Validate.notNull(customer, "Customer cannot be null");
Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
- GrantedAuthority role = new GrantedAuthorityImpl(Constants.PERMISSION_CUSTOMER_AUTHENTICATED);//required to login
+ GrantedAuthority role = new SimpleGrantedAuthority(Constants.PERMISSION_CUSTOMER_AUTHENTICATED);//required to login
authorities.add(role);
List<Integer> groupsId = new ArrayList<Integer>();
List<Group> groups = customer.getGroups();
@@ -407,7 +402,7 @@ public class CustomerFacadeImpl implements CustomerFacade
if(groupsId!=null && groupsId.size()>0) {
List<Permission> permissions = permissionService.getPermissions(groupsId);
for(Permission permission : permissions) {
- GrantedAuthority auth = new GrantedAuthorityImpl(permission.getPermissionName());
+ GrantedAuthority auth = new SimpleGrantedAuthority(permission.getPermissionName());
authorities.add(auth);
}
}
@@ -433,7 +428,8 @@ public class CustomerFacadeImpl implements CustomerFacade
if(customerModel == null){
LOG.error( "Customer with ID {} does not exists..", userId);
- throw new CustomerNotFoundException( "customer with given id does not exists" );
+ //throw new CustomerNotFoundException( "customer with given id does not exists" );
+ throw new Exception( "customer with given id does not exists" );
}
if(isBillingAddress){
@@ -462,7 +458,8 @@ public class CustomerFacadeImpl implements CustomerFacade
if(customerModel ==null){
LOG.error( "Customer with ID {} does not exists..", userId);
- throw new CustomerNotFoundException( "customer with given id does not exists" );
+ //throw new CustomerNotFoundException( "customer with given id does not exists" );
+ throw new Exception( "customer with given id does not exists" );
}
if(address.isBillingAddress()){
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacade.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacade.java
index 7785b9b..4eccd84 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacade.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacade.java
@@ -1,28 +1,27 @@
-package com.salesmanager.web.shop.controller.order.facade;
+package com.salesmanager.shop.store.controller.order.facade;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotalSummary;
+import com.salesmanager.core.model.payments.Transaction;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shipping.ShippingQuote;
+import com.salesmanager.core.model.shipping.ShippingSummary;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.order.PersistableOrder;
+import com.salesmanager.shop.model.order.ReadableOrder;
+import com.salesmanager.shop.model.order.ReadableOrderList;
+import com.salesmanager.shop.model.order.ShopOrder;
+import org.springframework.validation.BindingResult;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.springframework.validation.BindingResult;
-
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotalSummary;
-import com.salesmanager.core.business.payments.model.Transaction;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shipping.model.ShippingQuote;
-import com.salesmanager.core.business.shipping.model.ShippingSummary;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.order.PersistableOrder;
-import com.salesmanager.web.entity.order.ReadableOrder;
-import com.salesmanager.web.entity.order.ReadableOrderList;
-import com.salesmanager.web.entity.order.ShopOrder;
-
public interface OrderFacade {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/paging/PaginationData.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/paging/PaginationData.java
index ded9a7a..9c9dd61 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/paging/PaginationData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/paging/PaginationData.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.salesmanager.web.shop.model.paging;
+package com.salesmanager.shop.store.model.paging;
import java.io.Serializable;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/AppConfiguration.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/AppConfiguration.java
index 5b1dadc..acc2a3b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/AppConfiguration.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/AppConfiguration.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.utils;
-
-import java.util.Properties;
+package com.salesmanager.shop.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import java.util.Properties;
+
@Component
public class AppConfiguration {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/CaptchaRequestUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/CaptchaRequestUtils.java
index bea06d6..c1a286b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/CaptchaRequestUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/CaptchaRequestUtils.java
@@ -1,20 +1,28 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.PostMethod;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.shop.constants.ApplicationConstants;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Component;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.salesmanager.core.utils.CoreConfiguration;
-import com.salesmanager.web.constants.ApplicationConstants;
+import javax.inject.Inject;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Creates a request to reCaptcha 2
@@ -33,33 +41,40 @@ public class CaptchaRequestUtils {
private static final String SUCCESS_INDICATOR = "success";
public boolean checkCaptcha(String gRecaptchaResponse) throws Exception {
-
- HttpClient client = new HttpClient();
+
+ HttpClient client = HttpClientBuilder.create().build();
String url = configuration.getProperty(ApplicationConstants.RECAPTCHA_URL);;
- NameValuePair[] data = {
+ List<NameValuePair> data = new ArrayList<NameValuePair>();
+ data.add(new BasicNameValuePair("secret", configuration.getProperty(ApplicationConstants.RECAPTCHA_PRIVATE_KEY)));
+ data.add(new BasicNameValuePair("response", gRecaptchaResponse));
+
+ /* NameValuePair[] data = {
new NameValuePair("secret", configuration.getProperty(ApplicationConstants.RECAPTCHA_PRIVATE_KEY)),
new NameValuePair("response", gRecaptchaResponse)
- };
+ };*/
// Create a method instance.
- PostMethod post = new PostMethod(url);
- post.setRequestBody(data);
+ HttpPost post = new HttpPost(url);
+ post.setEntity(new UrlEncodedFormEntity(data,StandardCharsets.UTF_8));
boolean checkCaptcha = false;
try {
// Execute the method.
- int statusCode = client.executeMethod(post);
+ HttpResponse httpResponse = client.execute(post);
+ int statusCode = httpResponse.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
- throw new Exception("Got an invalid response from reCaptcha " + url + " [" + post.getStatusLine() + "]");
+ throw new Exception("Got an invalid response from reCaptcha " + url + " [" + httpResponse.getStatusLine() + "]");
}
// Read the response body.
- byte[] responseBody = post.getResponseBody();
+ HttpEntity entity = httpResponse.getEntity();
+ byte[] responseBody =EntityUtils.toByteArray(entity);
+
// Deal with the response.
// Use caution: ensure correct character encoding and is not binary data
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java
index 5814706..f07f290 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailTemplatesUtils.java
@@ -1,37 +1,36 @@
-package com.salesmanager.web.utils;
-
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-
+package com.salesmanager.shop.utils;
+
+import com.salesmanager.core.business.modules.email.Email;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.services.system.EmailService;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.shop.constants.ApplicationConstants;
+import com.salesmanager.shop.constants.EmailConstants;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.shop.ContactForm;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.impl.cookie.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-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.modules.email.Email;
-import com.salesmanager.web.constants.ApplicationConstants;
-import com.salesmanager.web.constants.EmailConstants;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.shop.ContactForm;
+import javax.inject.Inject;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
@Component
@@ -275,7 +274,6 @@ public class EmailTemplatesUtils {
/**
* Sends an email to the customer after registration
- * @param request
* @param customer
* @param merchantStore
* @param customerLocale
@@ -362,7 +360,6 @@ public class EmailTemplatesUtils {
/**
* Send an email to the customer with last order status
- * @param request
* @param customer
* @param order
* @param merchantStore
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/GeoLocationUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/GeoLocationUtils.java
index 6ed7937..5a7d033 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/GeoLocationUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/GeoLocationUtils.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
import javax.servlet.http.HttpServletRequest;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java
index abe464e..11f2bb3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/LabelUtils.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.utils;
-
-import java.util.Locale;
+package com.salesmanager.shop.utils;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import java.util.Locale;
+
public class LabelUtils implements ApplicationContextAware {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/LanguageUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/LanguageUtils.java
index a8f5ad4..4ae453e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/LanguageUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/LanguageUtils.java
@@ -1,20 +1,18 @@
-package com.salesmanager.web.utils;
-
-import java.util.Locale;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.utils;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.support.RequestContextUtils;
-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.web.constants.Constants;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
@Component
public class LanguageUtils {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/SessionUtil.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/SessionUtil.java
index 23b5a21..1f681e2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/SessionUtil.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/SessionUtil.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
import javax.servlet.http.HttpServletRequest;
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 {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
index 913dbf3..a5505e2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
@@ -1,9 +1,9 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.salesmanager.core.business.utils.CacheUtils;
import org.springframework.stereotype.Component;
-import com.salesmanager.core.utils.CacheUtils;
+import javax.inject.Inject;
@Component
public class WebApplicationCacheUtils {
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class
index 6a43bd9..8f1d36d 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class
index 1fa509e..3d43a94 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class
index 987c0e5..b909b93 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class
index 7190cf0..46a8696 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class
index 6c03b04..0632da3 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class differ
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 796fc90..fdd8705 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Oct 31 08:50:57 EDT 2016
+#Mon Oct 31 09:23:38 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop