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-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 50fa5d0..3d32d25 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 12:30:39 EDT 2016
+#Tue Nov 01 15:05:10 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 e6c5da9..b9d5025 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 12:30:38 EDT 2016
+#Tue Nov 01 15:05:09 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
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 b3cf73f..5558386 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 12:00:24 EDT 2016
+#Tue Nov 01 15:05:10 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
new file mode 100644
index 0000000..02da203
Binary files /dev/null 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 93ad427..1a13e79 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
@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
-@ComponentScan("com.salesmanager.shop.*")
public class ShopApplication {
public static void main(String[] args) {
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 bb22908..815344e 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
@@ -2,13 +2,17 @@ package com.salesmanager.shop.application;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
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
@EnableAutoConfiguration
@ImportResource({"spring/shopizer-shop-context.xml","spring/shopizer-core-context.xml"})
+@Import(CoreApplicationConfiguration.class)//import sm-core configurations
public class ShopApplicationConfiguration {
}
diff --git a/sm-shop/src/main/resources/database.properties b/sm-shop/src/main/resources/database.properties
index c7a2e06..4e63b8f 100644
--- a/sm-shop/src/main/resources/database.properties
+++ b/sm-shop/src/main/resources/database.properties
@@ -11,7 +11,7 @@
#hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
#H2
-db.jdbcUrl=jdbc\:h2\:file\:SALESMANAGER;AUTOCOMMIT=OFF;INIT\=CREATE SCHEMA IF NOT EXISTS SALESMANAGER
+db.jdbcUrl=jdbc\:h2\:file\:./SALESMANAGER;AUTOCOMMIT=OFF;;mv_store=false;INIT\=CREATE SCHEMA IF NOT EXISTS SALESMANAGER
db.user=test
db.password=password
db.driverClass=org.h2.Driver
diff --git a/sm-shop/src/main/resources/spring/shopizer-controllers.xml b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
index e531001..1dff1c4 100644
--- a/sm-shop/src/main/resources/spring/shopizer-controllers.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
@@ -11,9 +11,10 @@
<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" />
-->
diff --git a/sm-shop/target/classes/database.properties b/sm-shop/target/classes/database.properties
index c7a2e06..4e63b8f 100644
--- a/sm-shop/target/classes/database.properties
+++ b/sm-shop/target/classes/database.properties
@@ -11,7 +11,7 @@
#hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
#H2
-db.jdbcUrl=jdbc\:h2\:file\:SALESMANAGER;AUTOCOMMIT=OFF;INIT\=CREATE SCHEMA IF NOT EXISTS SALESMANAGER
+db.jdbcUrl=jdbc\:h2\:file\:./SALESMANAGER;AUTOCOMMIT=OFF;;mv_store=false;INIT\=CREATE SCHEMA IF NOT EXISTS SALESMANAGER
db.user=test
db.password=password
db.driverClass=org.h2.Driver
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 dad2a1d..e7f1fb5 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 12:06:43 EDT 2016
+#Tue Nov 01 15:05:12 EDT 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop