shopizer-uncached
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-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java 2(+2 -0)
sm-shop/.classpath 3(+1 -2)
sm-shop/SALESMANAGER.h2.db 0(+0 -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 3d32d25..8210518 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
-#Tue Nov 01 15:05:10 EDT 2016
+#Wed Nov 02 09:09:45 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 b9d5025..fa296bd 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
-#Tue Nov 01 15:05:09 EDT 2016
+#Wed Nov 02 09:09:44 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
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 7c38236..d357fe7 100644
Binary files a/sm-core/SALESMANAGER-TEST.h2.db and b/sm-core/SALESMANAGER-TEST.h2.db differ
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
index 3177db2..530e082 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
@@ -2,12 +2,14 @@ package com.salesmanager.core.business.configuration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
@Configuration
@EnableAutoConfiguration
@EntityScan(basePackages = {"com.salesmanager.core.model"})
+@ComponentScan({"com.salesmanager.core.business.services","com.salesmanager.core.business.utils"})
@ImportResource("spring/shopizer-core-context.xml")
public class CoreApplicationConfiguration {
diff --git a/sm-core/src/main/resources/spring/shopizer-core-config.xml b/sm-core/src/main/resources/spring/shopizer-core-config.xml
index 654ecf3..91ceac8 100644
--- a/sm-core/src/main/resources/spring/shopizer-core-config.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-config.xml
@@ -20,10 +20,6 @@
<context:annotation-config />
- <!-- services -->
- <context:component-scan base-package="com.salesmanager.core.business.services" />
- <!-- utils - components -->
- <context:component-scan base-package="com.salesmanager.core.business.utils" />
<!-- repositories -->
<repositories base-package="com.salesmanager.core.business.repositories"/>
@@ -118,10 +114,11 @@
jndi-name="java:comp/env/secretKey" />
-->
- <!-- JDBC User -->
- <!--
- <beans:bean id="userService" class="com.salesmanager.core.business.user.service.UserServiceImpl"/>
- <beans:bean id="applicationContextListenerUtils" class="com.salesmanager.core.utils.ApplicationContextListenerUtils" />
- -->
+ <!-- JDBC User -->
+ <beans:bean id="userService" class="com.salesmanager.core.business.services.user.UserServiceImpl"/>
+
+ <!-- After app context init -->
+ <beans:bean id="applicationContextListenerUtils" class="com.salesmanager.core.business.utils.ApplicationContextListenerUtils" />
+
</beans:beans>
\ No newline at end of file
diff --git a/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java b/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
index 364cf31..913b635 100644
--- a/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
+++ b/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
@@ -48,7 +48,7 @@ import com.salesmanager.core.model.reference.language.Language;
import junit.framework.Assert;
-@Ignore
+//@Ignore
public class ProductTest extends com.salesmanager.test.common.AbstractSalesManagerCoreTestCase {
private static final Date date = new Date(System.currentTimeMillis());
diff --git a/sm-core/src/test/java/com/salesmanager/test/configuration/ConfigurationTest.java b/sm-core/src/test/java/com/salesmanager/test/configuration/ConfigurationTest.java
index f65a88d..5c7b062 100644
--- a/sm-core/src/test/java/com/salesmanager/test/configuration/ConfigurationTest.java
+++ b/sm-core/src/test/java/com/salesmanager/test/configuration/ConfigurationTest.java
@@ -2,12 +2,14 @@ package com.salesmanager.test.configuration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
@Configuration
@EnableAutoConfiguration
@EntityScan(basePackages = {"com.salesmanager.core.model"})
+@ComponentScan({"com.salesmanager.core.business.services","com.salesmanager.core.business.utils"})
@ImportResource("spring/test-shopizer-context.xml")
public class ConfigurationTest {
diff --git a/sm-core/target/classes/spring/shopizer-core-config.xml b/sm-core/target/classes/spring/shopizer-core-config.xml
index 654ecf3..91ceac8 100644
--- a/sm-core/target/classes/spring/shopizer-core-config.xml
+++ b/sm-core/target/classes/spring/shopizer-core-config.xml
@@ -20,10 +20,6 @@
<context:annotation-config />
- <!-- services -->
- <context:component-scan base-package="com.salesmanager.core.business.services" />
- <!-- utils - components -->
- <context:component-scan base-package="com.salesmanager.core.business.utils" />
<!-- repositories -->
<repositories base-package="com.salesmanager.core.business.repositories"/>
@@ -118,10 +114,11 @@
jndi-name="java:comp/env/secretKey" />
-->
- <!-- JDBC User -->
- <!--
- <beans:bean id="userService" class="com.salesmanager.core.business.user.service.UserServiceImpl"/>
- <beans:bean id="applicationContextListenerUtils" class="com.salesmanager.core.utils.ApplicationContextListenerUtils" />
- -->
+ <!-- JDBC User -->
+ <beans:bean id="userService" class="com.salesmanager.core.business.services.user.UserServiceImpl"/>
+
+ <!-- After app context init -->
+ <beans:bean id="applicationContextListenerUtils" class="com.salesmanager.core.business.utils.ApplicationContextListenerUtils" />
+
</beans:beans>
\ No newline at end of file
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 5558386..4b15cdf 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
-#Tue Nov 01 15:05:10 EDT 2016
+#Wed Nov 02 09:09:45 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
sm-shop/.classpath 3(+1 -2)
diff --git a/sm-shop/.classpath b/sm-shop/.classpath
index 6d3851d..fc5f96c 100644
--- a/sm-shop/.classpath
+++ b/sm-shop/.classpath
@@ -25,10 +25,9 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/sm-shop/files/repos/FilesRepository.dat b/sm-shop/files/repos/FilesRepository.dat
new file mode 100644
index 0000000..b2476e0
Binary files /dev/null and b/sm-shop/files/repos/FilesRepository.dat differ
diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
new file mode 100644
index 0000000..b2476e0
Binary files /dev/null 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 02da203..ffb3539 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java
index 1a13e79..3040565 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java
@@ -2,7 +2,6 @@ package com.salesmanager.shop.application;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
public class ShopApplication {
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 815344e..bf3e0ba 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
@@ -1,18 +1,18 @@
package com.salesmanager.shop.application;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+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.EnableWebMvc;
import com.salesmanager.core.business.configuration.CoreApplicationConfiguration;
@Configuration
-@EnableWebMvc
+@ComponentScan({"com.salesmanager.shop","com.salesmanager.core.business"})
@EnableAutoConfiguration
-@ImportResource({"spring/shopizer-shop-context.xml","spring/shopizer-core-context.xml"})
@Import(CoreApplicationConfiguration.class)//import sm-core configurations
+@ImportResource("spring/shopizer-shop-context.xml")
public class ShopApplicationConfiguration {
}
diff --git a/sm-shop/src/main/resources/spring/shopizer-controllers.xml b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
index 1dff1c4..f970fc9 100644
--- a/sm-shop/src/main/resources/spring/shopizer-controllers.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
@@ -9,38 +9,44 @@
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
- <context:annotation-config />
- <context:component-scan base-package="com.salesmanager.shop" />
- <context:component-scan base-package="com.salesmanager.core.business" />
- <!--
- <context:component-scan base-package="com.salesmanager.core.utils" />
- -->
<!-- Async -->
<bean id="executorService" class="java.util.concurrent.Executors"
factory-method="newFixedThreadPool">
- <constructor-arg value="10" />
+ <constructor-arg value="5" />
</bean>
- <task:executor id="threadPoolTaskExecutor" pool-size="10" />
+ <task:executor id="threadPoolTaskExecutor" pool-size="5" />
<task:annotation-driven executor="executorService" />
+ <!-- End ASYNCH -->
- <!-- Spring 3.2 content negociation 406 error issue (NOT WORKING) -->
- <!--
- <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager"/>
- <bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
- <property name="favorPathExtension" value="false" />
- <property name="mediaTypes" >
- <value>
- json=application/json
- </value>
- </property>
- </bean>
- -->
+ <!-- Enables the Spring MVC @Controller programming model, matrix variables are parameters containing
+ multiple values color=red,green,blue
+ -->
+ <mvc:annotation-driven enable-matrix-variables="true">
+
+ <!-- Device object in controller method -->
+ <mvc:argument-resolvers>
+ <bean class="org.springframework.mobile.device.DeviceWebArgumentResolver" />
+ </mvc:argument-resolvers>
+
+ <mvc:message-converters >
+ <bean class="org.springframework.http.converter.ByteArrayHttpMessageConverter">
+ <property name="supportedMediaTypes">
+ <list>
+ <value>image/jpeg</value>
+ <value>image/gif</value>
+ <value>image/png</value>
+ </list>
+ </property>
+ </bean>
+ </mvc:message-converters>
+
+ </mvc:annotation-driven>
+
<!-- Maps '/' requests to the 'home' view -->
<mvc:view-controller path="/" view-name="shop"/>
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 876ce65..4224150 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -10,29 +10,8 @@
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
- <!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
- <!-- Enables the Spring MVC @Controller programming model -->
- <annotation-driven>
- <!-- Device object in controller method -->
- <argument-resolvers>
- <beans:bean class="org.springframework.mobile.device.DeviceWebArgumentResolver" />
- </argument-resolvers>
-
- <message-converters >
- <beans:bean class="org.springframework.http.converter.ByteArrayHttpMessageConverter">
- <beans:property name="supportedMediaTypes">
- <beans:list>
- <beans:value>image/jpeg</beans:value>
- <beans:value>image/gif</beans:value>
- <beans:value>image/png</beans:value>
- </beans:list>
- </beans:property>
- </beans:bean>
- </message-converters>
-
- </annotation-driven>
<!-- Handles HTTP GET requests for /resources/** by efficiently serving up static resources in the ${webappRoot}/resources/ directory -->
<resources mapping="/resources/**" location="/resources/" />
diff --git a/sm-shop/src/main/resources/spring/shopizer-shop-context.xml b/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
index 57eca12..f8ed72d 100644
--- a/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:task="http://www.springframework.org/schema/task"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
- <!-- controllers -->
+
+ <context:annotation-config />
+
+ <!-- controllers -->
<beans:import resource="classpath:/spring/shopizer-controllers.xml" />
<!-- properties -->
<beans:import resource="classpath:/spring/shopizer-properties.xml" />
@@ -13,4 +22,8 @@
<!-- servlet-context -->
<beans:import resource="classpath:/spring/shopizer-servlet-context.xml" />
+
+
+
+
</beans:beans>
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 e7f1fb5..e494ceb 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
-#Tue Nov 01 15:05:12 EDT 2016
+#Wed Nov 02 12:45:59 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop