shopizer-developers
Changes
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 2(+1 -1)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 2(+1 -1)
sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java 12(+12 -0)
sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java 6(+3 -3)
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
sm-shop/SALESMANAGER.trace.db 21(+21 -0)
Details
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 21ab413..67936fc 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 Jan 09 13:28:17 EST 2017
+#Tue Jan 10 13:06:45 EST 2017
version=2.0.5-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 69fc318..9a3a560 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 Jan 09 13:28:18 EST 2017
+#Tue Jan 10 13:23:14 EST 2017
version=2.0.5-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
index 5ebc895..d99ba66 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
@@ -6,6 +6,7 @@ import javax.persistence.Query;
import org.apache.commons.lang3.StringUtils;
+import com.salesmanager.core.model.common.CriteriaOrderBy;
import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.core.model.order.OrderCriteria;
import com.salesmanager.core.model.order.OrderList;
@@ -26,16 +27,27 @@ public class OrderRepositoryImpl implements OrderRepositoryCustom {
StringBuilder countBuilderSelect = new StringBuilder();
StringBuilder objectBuilderSelect = new StringBuilder();
+ String orderByCriteria = " order by o.id desc";
+
+ if(criteria.getOrderBy()!=null) {
+ if(CriteriaOrderBy.ASC.name().equals(criteria.getOrderBy().name())) {
+ orderByCriteria = " order by o.id asc";
+ }
+ }
+
String countBaseQuery = "select count(o) from Order as o";
String baseQuery = "select o from Order as o left join fetch o.orderTotal ot left join fetch o.orderProducts op left join fetch op.orderAttributes opo left join fetch op.prices opp";
countBuilderSelect.append(countBaseQuery);
objectBuilderSelect.append(baseQuery);
+
+
StringBuilder countBuilderWhere = new StringBuilder();
StringBuilder objectBuilderWhere = new StringBuilder();
String whereQuery = " where o.merchant.id=:mId";
countBuilderWhere.append(whereQuery);
objectBuilderWhere.append(whereQuery);
+ objectBuilderWhere.append(orderByCriteria);
if(!StringUtils.isBlank(criteria.getCustomerName())) {
String nameQuery =" and o.billing.firstName like:nm or o.billing.lastName like:nm";
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java
index dbe66f5..7294b29 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java
@@ -35,6 +35,7 @@ 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.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
import com.salesmanager.core.model.catalog.product.review.ProductReview;
import com.salesmanager.core.model.content.FileContentType;
import com.salesmanager.core.model.content.ImageContentFile;
@@ -231,11 +232,10 @@ public class ProductServiceImpl extends SalesManagerEntityServiceImpl<Long, Prod
}
//related - featured
- //TODO REVISE
-/* List<ProductRelationship> relationships = productRelationshipService.listByProduct(product);
+ List<ProductRelationship> relationships = productRelationshipService.listByProduct(product);
for(ProductRelationship relationship : relationships) {
productRelationshipService.delete(relationship);
- }*/
+ }
super.delete(product);
searchService.deleteIndex(product.getMerchantStore(), product);
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 92b6f54..6cee822 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 Jan 09 13:28:22 EST 2017
+#Tue Jan 10 13:23:20 EST 2017
version=2.0.5-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index e50d6da..f448230 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 17f7ffe..153d8ce 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index c34c800..0edb143 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
#FileLock
-#Mon Jan 09 13:29:58 EST 2017
-id=159847e72101e022f24e44d27ccb8396885264ed42f
+#Tue Jan 10 13:08:21 EST 2017
+id=15989910441e4ac7e447ecd1c5a4783f751dae0f87d
method=file
sm-shop/SALESMANAGER.trace.db 21(+21 -0)
diff --git a/sm-shop/SALESMANAGER.trace.db b/sm-shop/SALESMANAGER.trace.db
index a5739d9..c3afd10 100644
--- a/sm-shop/SALESMANAGER.trace.db
+++ b/sm-shop/SALESMANAGER.trace.db
@@ -7,3 +7,24 @@ org.h2.jdbc.JdbcSQLException: The object is already closed [90007-176]
2017-01-04 12:53:59 jdbc[6]: exception
org.h2.jdbc.JdbcSQLException: Timeout trying to lock table "PRODUCT_DIGITAL"; SQL statement:
select digitalpro0_.PRODUCT_DIGITAL_ID as PRODUCT_1_44_0_, product1_.PRODUCT_ID as PRODUCT_1_39_1_, merchantst2_.MERCHANT_ID as MERCHANT1_25_2_, digitalpro0_.PRODUCT_ID as PRODUCT_3_44_0_, digitalpro0_.FILE_NAME as FILE_NAM2_44_0_, product1_.DATE_CREATED as DATE_CRE2_39_1_, product1_.DATE_MODIFIED as DATE_MOD3_39_1_, product1_.UPDT_ID as UPDT_ID4_39_1_, product1_.AVAILABLE as AVAILABL5_39_1_, product1_.DATE_AVAILABLE as DATE_AVA6_39_1_, product1_.MANUFACTURER_ID as MANUFAC21_39_1_, product1_.MERCHANT_ID as MERCHAN22_39_1_, product1_.PREORDER as PREORDER7_39_1_, product1_.PRODUCT_HEIGHT as PRODUCT_8_39_1_, product1_.PRODUCT_FREE as PRODUCT_9_39_1_, product1_.PRODUCT_LENGTH as PRODUCT10_39_1_, product1_.QUANTITY_ORDERED as QUANTIT11_39_1_, product1_.REVIEW_AVG as REVIEW_12_39_1_, product1_.REVIEW_COUNT as REVIEW_13_39_1_, product1_.PRODUCT_SHIP as PRODUCT14_39_1_, product1_.PRODUCT_VIRTUAL as PRODUCT15_39_1_, product1_.PRODUCT_WEIGHT as PRODUCT16_39_1_, product1_.PRODUCT_WIDTH as PRODUCT17_39_1_, product1_.REF_SKU as REF_SKU18_39_1_, product1_.SKU as SKU19_39_1_, product1_.SORT_ORDER as SORT_OR20_39_1_, product1_.TAX_CLASS_ID as TAX_CLA23_39_1_, product1_.PRODUCT_TYPE_ID as PRODUCT24_39_1_, merchantst2_.STORE_CODE as STORE_CO2_25_2_, merchantst2_.CONTINUESHOPPINGURL as CONTINUE3_25_2_, merchantst2_.COUNTRY_ID as COUNTRY20_25_2_, merchantst2_.CURRENCY_ID as CURRENC21_25_2_, merchantst2_.CURRENCY_FORMAT_NATIONAL as CURRENCY4_25_2_, merchantst2_.LANGUAGE_ID as LANGUAG22_25_2_, merchantst2_.DOMAIN_NAME as DOMAIN_N5_25_2_, merchantst2_.IN_BUSINESS_SINCE as IN_BUSIN6_25_2_, merchantst2_.INVOICE_TEMPLATE as INVOICE_7_25_2_, merchantst2_.SEIZEUNITCODE as SEIZEUNI8_25_2_, merchantst2_.STORE_EMAIL as STORE_EM9_25_2_, merchantst2_.STORE_LOGO as STORE_L10_25_2_, merchantst2_.STORE_TEMPLATE as STORE_T11_25_2_, merchantst2_.STORE_ADDRESS as STORE_A12_25_2_, merchantst2_.STORE_CITY as STORE_C13_25_2_, merchantst2_.STORE_NAME as STORE_N14_25_2_, merchantst2_.STORE_PHONE as STORE_P15_25_2_, merchantst2_.STORE_POSTAL_CODE as STORE_P16_25_2_, merchantst2_.STORE_STATE_PROV as STORE_S17_25_2_, merchantst2_.USE_CACHE as USE_CAC18_25_2_, merchantst2_.WEIGHTUNITCODE as WEIGHTU19_25_2_, merchantst2_.ZONE_ID as ZONE_ID23_25_2_ from SALESMANAGER.PRODUCT_DIGITAL digitalpro0_ inner join SALESMANAGER.PRODUCT product1_ on digitalpro0_.PRODUCT_ID=product1_.PRODUCT_ID inner join SALESMANAGER.MERCHANT_STORE merchantst2_ on product1_.MERCHANT_ID=merchantst2_.MERCHANT_ID where digitalpro0_.PRODUCT_DIGITAL_ID=? [50200-191]
+01-09 14:52:36 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 14:53:35 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 14:54:00 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 14:55:11 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 14:57:24 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 14:59:34 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
+01-09 15:00:20 database: ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK
+org.h2.jdbc.JdbcSQLException: Unique index or primary key violation: "PRIMARY KEY ON """".PAGE_INDEX"; SQL statement:
+ALTER TABLE SALESMANAGER.CATEGORY ADD CONSTRAINT SALESMANAGER.FK_B5718WL9WILWJ9K8JE1K2JEO FOREIGN KEY(MERCHANT_ID) INDEX SALESMANAGER.UK_3MQ9I6QMGQUVOIESLX39PEJ6X_INDEX_3 REFERENCES SALESMANAGER.MERCHANT_STORE(MERCHANT_ID) NOCHECK [23505-176]
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/AdminController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/AdminController.java
index 5dc93d8..f24655e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/AdminController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/AdminController.java
@@ -61,9 +61,9 @@ public class AdminController {
model.addAttribute("country", country);
model.addAttribute("user", currentUser);
//get last 10 orders
- OrderCriteria orderCriteria = new OrderCriteria();
- orderCriteria.setMaxCount(10);
- orderCriteria.setOrderBy(CriteriaOrderBy.DESC);
+ //OrderCriteria orderCriteria = new OrderCriteria();
+ //orderCriteria.setMaxCount(10);
+ //orderCriteria.setOrderBy(CriteriaOrderBy.DESC);
return ControllerConstants.Tiles.adminDashboard;
}
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 8b4005c..019b8fc 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
@@ -6,6 +6,7 @@ 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.common.CriteriaOrderBy;
import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.core.model.order.Order;
import com.salesmanager.core.model.order.OrderCriteria;
@@ -95,6 +96,7 @@ public class OrdersController {
String customerName = request.getParameter("customer");
OrderCriteria criteria = new OrderCriteria();
+ criteria.setOrderBy(CriteriaOrderBy.DESC);
criteria.setStartIndex(startRow);
criteria.setMaxCount(endRow);
if(!StringUtils.isBlank(paymentModule)) {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
index 75d735e..cdbd5c3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
@@ -5,10 +5,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.AccessDeniedException;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@ControllerAdvice
public class ErrorController {
@@ -62,6 +64,8 @@ public class ErrorController {
return model;
}
+
+
/*
diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
index 7ec0a9e..a53e412 100644
--- a/sm-shop/src/main/resources/application.properties
+++ b/sm-shop/src/main/resources/application.properties
@@ -4,4 +4,8 @@ logging.level.org.springframework.security: DEBUG
#Default Spring white label error page
server.error.whitelabel.enabled=false
+multipart.max-file-size=10Mb
+multipart.max-request-size=10Mb
+
+
diff --git a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
index 0e4590f..d539a58 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -18,19 +18,10 @@
</beans:bean>
-<!-- <beans:bean id="jacksonMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"></beans:bean>
- <beans:bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
- <beans:property name="messageConverters">
- <beans:list>
- <beans:ref bean="jacksonMessageConverter"/>
- </beans:list>
- </beans:property>
- </beans:bean> -->
<!-- Only needed because we require fileupload in the org.springframework.samples.mvc.fileupload package -->
- <!--
- <beans:bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+<!-- <beans:bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<beans:property name="maxUploadSize" value="10000000"/>
</beans:bean> -->