SmartDukaan – /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java

Rev 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5625 –

vikram.raghav — Wed, 18 Jul 2012 18:32:03 +0530

vikram.raghav – 62 file(s) modified

~ /trunk/Website/pom.xml
/trunk/Website/src/main/filters/dev/filters.properties
+ /trunk/Website/src/main/filters/hotspot
+ /trunk/Website/src/main/filters/hotspot/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/resources/templates/Hotspot-address.vm
+ /trunk/Website/src/main/resources/templates/Saholic-address.vm
+ /trunk/Website/src/main/webapp/images/Hotspot-logo.jpg
+ /trunk/Website/src/main/webapp/images/localhost-logo.jpg
+ /trunk/Website/src/main/webapp/images/Saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Shop2020-logo.jpg (copied from /trunk/Website/src/main/webapp/images/saholic-logo.jpg@5588)
~ /trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/banner.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/fblike-test-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 3565 – Expire source cookie if user comes from another source.

rajveer — Mon, 10 Oct 2011 17:53:15 +0530

rajveer – 1 file(s) modified
Expire source cookie if user comes from another source.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java

Rev 3561 – Support to display different prices for different sources.

rajveer — Mon, 10 Oct 2011 16:28:11 +0530

rajveer – 29 file(s) modified
Support to display different prices for different sources.

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceAware.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/struts.xml