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/SALESMANAGER-TEST.h2.db 0(+0 -0)
sm-shop/pom.xml 5(+5 -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 5e16135..4c9c382 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 Nov 07 14:03:40 EST 2016
+#Tue Nov 08 12:57:42 EST 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 72f224a..56347fc 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 Nov 07 14:03:39 EST 2016
+#Tue Nov 08 12:57:41 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
diff --git a/sm-core/files/store/StoreRepository.dat b/sm-core/files/store/StoreRepository.dat
index 819e524..8da2fe1 100644
Binary files a/sm-core/files/store/StoreRepository.dat and b/sm-core/files/store/StoreRepository.dat differ
sm-core/SALESMANAGER-TEST.h2.db 0(+0 -0)
diff --git a/sm-core/SALESMANAGER-TEST.h2.db b/sm-core/SALESMANAGER-TEST.h2.db
index dd1b2f2..bcbab22 100644
Binary files a/sm-core/SALESMANAGER-TEST.h2.db and b/sm-core/SALESMANAGER-TEST.h2.db differ
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/customer/Customer.java b/sm-core-model/src/main/java/com/salesmanager/core/model/customer/Customer.java
index edff602..5d64bac 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/customer/Customer.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/customer/Customer.java
@@ -80,7 +80,7 @@ public class Customer extends SalesManagerEntity<Long, Customer> {
private String company;
- @Column(name="CUSTOMER_PASSWORD", length=50)
+ @Column(name="CUSTOMER_PASSWORD", length=60)
private String password;
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/user/User.java b/sm-core-model/src/main/java/com/salesmanager/core/model/user/User.java
index e334699..d9fb065 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/user/User.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/user/User.java
@@ -85,7 +85,7 @@ public class User extends SalesManagerEntity<Long, User> implements Auditable {
private String adminEmail;
@NotEmpty
- @Column(name="ADMIN_PASSWORD", length=50)
+ @Column(name="ADMIN_PASSWORD", length=60)
private String adminPassword;
@ManyToOne(fetch = FetchType.LAZY)
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 05feb96..02d95cf 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 Nov 07 14:03:40 EST 2016
+#Tue Nov 08 12:57:42 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
sm-shop/pom.xml 5(+5 -0)
diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 80e9520..859754c 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -60,6 +60,11 @@
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope>
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 48dd2cf..e5dd133 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
@@ -18,6 +18,7 @@ public class LoginController {
@RequestMapping(value="/admin/logon.html", method=RequestMethod.GET)
public String displayLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ //WEB-INF/views/admin/logon.jsp
return "admin/logon";
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
index 7490a68..c47f067 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ImportResource;
-import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
import org.springframework.web.servlet.view.tiles3.TilesView;
@@ -36,12 +35,7 @@ public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
/**
* Configure ViewResolvers to deliver preferred views.
*/
-/* @Override
- public void configureViewResolvers(ViewResolverRegistry registry) {
- TilesViewResolver viewResolver = new TilesViewResolver();
- registry.viewResolver(viewResolver);
- }*/
-
+
@Bean
public TilesViewResolver tilesViewResolver() {
final TilesViewResolver resolver = new TilesViewResolver();
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 76e50c0..ad248fc 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
@@ -422,6 +422,25 @@ public class InitStoreData implements InitData {
product.setType(generalType);
product.setMerchantStore(store);
product.setProductShipeable(true);
+
+ // Availability
+ ProductAvailability availability = new ProductAvailability();
+ availability.setProductDateAvailable(date);
+ availability.setProductQuantity(100);
+ availability.setRegion("*");
+ availability.setProduct(product);// associate with product
+
+ ProductPrice dprice = new ProductPrice();
+ dprice.setDefaultPrice(true);
+ dprice.setProductPriceAmount(new BigDecimal(39.99));
+ dprice.setProductAvailability(availability);
+
+ ProductPriceDescription dpd = new ProductPriceDescription();
+ dpd.setName("Base price");
+ dpd.setProductPrice(dprice);
+ dpd.setLanguage(en);
+
+ dprice.getDescriptions().add(dpd);
// Product description
ProductDescription description = new ProductDescription();
@@ -446,29 +465,6 @@ public class InitStoreData implements InitData {
}
- // Availability
- ProductAvailability availability = new ProductAvailability();
- availability.setProductDateAvailable(date);
- availability.setProductQuantity(100);
- availability.setRegion("*");
- availability.setProduct(product);// associate with product
-
- productAvailabilityService.create(availability);
-
- ProductPrice dprice = new ProductPrice();
- dprice.setDefaultPrice(true);
- dprice.setProductPriceAmount(new BigDecimal(39.99));
- dprice.setProductAvailability(availability);
-
- ProductPriceDescription dpd = new ProductPriceDescription();
- dpd.setName("Base price");
- dpd.setProductPrice(dprice);
- dpd.setLanguage(en);
-
- dprice.getDescriptions().add(dpd);
-
- productPriceService.create(dprice);
-
// PRODUCT 2
Product product2 = new Product();
@@ -493,15 +489,6 @@ public class InitStoreData implements InitData {
product2.getCategories().add(tech);
product2.getCategories().add(web);
- productService.create(product2);
-
- try {
- InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/node.jpg");
- this.saveFile(inStream, "node.jpg", product2);
- } catch(Exception e) {
- LOGGER.error("Error while reading demo file node.jpg",e);
- }
-
// Availability
ProductAvailability availability2 = new ProductAvailability();
availability2.setProductDateAvailable(date);
@@ -509,8 +496,6 @@ public class InitStoreData implements InitData {
availability2.setRegion("*");
availability2.setProduct(product2);// associate with product
- productAvailabilityService.create(availability2);
-
ProductPrice dprice2 = new ProductPrice();
dprice2.setDefaultPrice(true);
dprice2.setProductPriceAmount(new BigDecimal(29.99));
@@ -522,8 +507,17 @@ public class InitStoreData implements InitData {
dpd.setLanguage(en);
dprice2.getDescriptions().add(dpd);
+
+ productService.create(product2);
+
+ try {
+ InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/node.jpg");
+ this.saveFile(inStream, "node.jpg", product2);
+ } catch(Exception e) {
+ LOGGER.error("Error while reading demo file node.jpg",e);
+ }
+
- productPriceService.create(dprice2);
// PRODUCT 3
@@ -547,8 +541,7 @@ public class InitStoreData implements InitData {
product3.getDescriptions().add(description);
product3.getCategories().add(cloud);
- productService.create(product3);
-
+
// Availability
ProductAvailability availability3 = new ProductAvailability();
availability3.setProductDateAvailable(date);
@@ -556,8 +549,6 @@ public class InitStoreData implements InitData {
availability3.setRegion("*");
availability3.setProduct(product3);// associate with product
- productAvailabilityService.create(availability3);
-
ProductPrice dprice3 = new ProductPrice();
dprice3.setDefaultPrice(true);
dprice3.setProductPriceAmount(new BigDecimal(19.99));
@@ -569,8 +560,10 @@ public class InitStoreData implements InitData {
dpd.setLanguage(en);
dprice3.getDescriptions().add(dpd);
+
+
+ productService.create(product3);
- productPriceService.create(dprice3);
try {
InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/paas.JPG");
@@ -600,8 +593,7 @@ public class InitStoreData implements InitData {
product4.getDescriptions().add(description);
product4.getCategories().add(tech);
- productService.create(product4);
-
+
// Availability
ProductAvailability availability4 = new ProductAvailability();
availability4.setProductDateAvailable(date);
@@ -609,7 +601,6 @@ public class InitStoreData implements InitData {
availability4.setRegion("*");
availability4.setProduct(product4);// associate with product
- productAvailabilityService.create(availability4);
ProductPrice dprice4 = new ProductPrice();
dprice4.setDefaultPrice(true);
@@ -622,8 +613,10 @@ public class InitStoreData implements InitData {
dpd.setLanguage(en);
dprice4.getDescriptions().add(dpd);
+
+ productService.create(product4);
+
- productPriceService.create(dprice4);
try {
InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/android.jpg");
@@ -653,8 +646,8 @@ public class InitStoreData implements InitData {
product5.getDescriptions().add(description);
product5.getCategories().add(tech);
- productService.create(product5);
-
+
+
// Availability
ProductAvailability availability5 = new ProductAvailability();
availability5.setProductDateAvailable(date);
@@ -662,7 +655,7 @@ public class InitStoreData implements InitData {
availability5.setRegion("*");
availability5.setProduct(product5);// associate with product
- productAvailabilityService.create(availability5);
+ // productAvailabilityService.create(availability5);
ProductPrice dprice5 = new ProductPrice();
dprice5.setDefaultPrice(true);
@@ -676,7 +669,11 @@ public class InitStoreData implements InitData {
dprice5.getDescriptions().add(dpd);
- productPriceService.create(dprice5);
+ //productPriceService.create(dprice5);
+
+ productService.create(product5);
+
+
try {
InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/android2.jpg");
@@ -707,8 +704,7 @@ public class InitStoreData implements InitData {
product6.getDescriptions().add(description);
product6.getCategories().add(business);
- productService.create(product6);
-
+
// Availability
ProductAvailability availability6 = new ProductAvailability();
availability6.setProductDateAvailable(date);
@@ -716,7 +712,7 @@ public class InitStoreData implements InitData {
availability6.setRegion("*");
availability6.setProduct(product6);// associate with product
- productAvailabilityService.create(availability6);
+ //productAvailabilityService.create(availability6);
ProductPrice dprice6 = new ProductPrice();
dprice6.setDefaultPrice(true);
@@ -730,7 +726,11 @@ public class InitStoreData implements InitData {
dprice6.getDescriptions().add(dpd);
- productPriceService.create(dprice6);
+ //productPriceService.create(dprice6);
+
+ productService.create(product6);
+
+
try {
InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/google.jpg");
diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
index 25795b4..e4fc12a 100644
--- a/sm-shop/src/main/resources/application.properties
+++ b/sm-shop/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-spring.view.prefix: /WEB-INF/jsp/
-spring.view.suffix: .jsp
\ No newline at end of file
+#spring.view.prefix: /WEB-INF/jsp/
+#spring.view.suffix: .jsp
\ No newline at end of file
diff --git a/sm-shop/src/main/resources/spring/shopizer-properties.xml b/sm-shop/src/main/resources/spring/shopizer-properties.xml
index 7926fed..e230139 100644
--- a/sm-shop/src/main/resources/spring/shopizer-properties.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-properties.xml
@@ -32,7 +32,7 @@
<prop key="PRODUCT_IMAGE_MAX_SIZE">9000000</prop>
<prop key="IMAGE_FORMATS">jpg|png|gif</prop>
- <prop key="POPULATE_TEST_DATA">false</prop>
+ <prop key="POPULATE_TEST_DATA">true</prop>
<prop key="SHOP_SCHEME">http</prop>
<!-- when removing the context path from the url put that value to blank (nothing) -->
<prop key="CONTEXT_PATH">/sm-shop</prop>
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 44f1a2c..3fa0e7e 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -12,10 +12,10 @@
<!-- Resolves views selected for rendering by @Controllers to .jsp resources in the /WEB-INF/views directory -->
-<!-- <beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<beans:property name="prefix" value="/WEB-INF/views/" />
<beans:property name="suffix" value=".jsp" />
- </beans:bean> -->
+ </beans:bean>
<!-- Only needed because we require fileupload in the org.springframework.samples.mvc.fileupload package -->
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 cdb472b..af93470 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 Nov 07 14:03:43 EST 2016
+#Tue Nov 08 12:57:45 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop