shopizer-aplcache

changed to mysql database, wait until it is ready, env to trace

5/19/2019 10:12:08 PM

Details

docker-compose.yml 27(+25 -2)

diff --git a/docker-compose.yml b/docker-compose.yml
index 586c0e1..a3b3021 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,17 @@ services:
   application:
     build: .
     container_name: shopizer
+    depends_on:
+      - "database"
+    links:
+      - database
     environment:
+      - JAVA_OPTS="-Xms4096m -Xmx6124m"
+      - TRACER_ENABLE=true
       - TRACER_SERIALISE_INTERNALS=false
       - TRACER_VERBOSE=true
-      - TRACER_ENABLE=true
       - TRACER_TRACES=/caching-approaches-comparison/applications/traces/shopizer
+      - TRACER_LOG=/caching-approaches-comparison/applications/output/shopizer-tracer.log
     volumes:
       - application:/application
       - /root/.m2:/root/.m2
@@ -19,6 +25,22 @@ services:
       options:
         max-size: "10m"
         max-file: "10"
+  database:
+    image: mysql:5.7.22
+    expose:
+      - 3306
+    volumes:
+      - ../../dumps/shopizer.sql:/docker-entrypoint-initdb.d/init.sql
+      - database:/var/lib/mysql
+    environment:
+      MYSQL_USER: root
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: SALESMANAGER
+    restart: unless-stopped
+    logging:
+      options:
+        max-size: "10m"
+        max-file: "10"
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.5.2
     expose:
@@ -32,4 +54,5 @@ services:
         max-size: "10m"
         max-file: "10"
 volumes:
-  application:
\ No newline at end of file
+  application:
+  database:
\ No newline at end of file

sm-core/ignored 88(+44 -44)

diff --git a/sm-core/ignored b/sm-core/ignored
index 8dd1ecf..446ef1e 100644
--- a/sm-core/ignored
+++ b/sm-core/ignored
@@ -1,44 +1,44 @@
-com.fasterxml.jackson.core.
-com.google.code.gson.
-com.google.guava.
-com.google.maps.
-com.googlecode.json-simple.
-com.h2database.
-com.itextpdf.
-com.maxmind.geoip2.
-com.mchange.
-com.paypal.sdk.
-com.stripe.
-com.sun.jersey.
-commons-collections.
-commons-configuration.
-commons-fileupload.
-commons-io.
-commons-logging.
-commons-validator.
-io.searchbox.
-javax.
-javax.el.
-javax.inject.
-javax.mail.
-javax.servlet.
-javax.validation.
-junit.
-log4j.
-mysql.
-net.sf.ehcache.
-org.apache.commons.
-org.apache.httpcomponents.
-org.apache.tiles.
-org.apache.tomcat.embed.
-org.aspectj.
-org.codehaus.jackson.
-org.drools.
-org.elasticsearch.
-org.freemarker.
-org.glassfish.web.
-org.hibernate.
-org.infinispan.
-org.jopendocument.
-org.slf4j.
-org.springframework.
\ No newline at end of file
+com.fasterxml.jackson.core
+com.google.code.gson
+com.google.guava
+com.google.maps
+com.googlecode.json-simple
+com.h2database
+com.itextpdf
+com.maxmind.geoip2
+com.mchange
+com.paypal.sdk
+com.stripe
+com.sun.jersey
+commons-collections
+commons-configuration
+commons-fileupload
+commons-io
+commons-logging
+commons-validator
+io.searchbox
+javax
+javax.el
+javax.inject
+javax.mail
+javax.servlet
+javax.validation
+junit
+log4j
+mysql
+net.sf.ehcache
+org.apache.commons
+org.apache.httpcomponents
+org.apache.tiles
+org.apache.tomcat.embed
+org.aspectj
+org.codehaus.jackson
+org.drools
+org.elasticsearch
+org.freemarker
+org.glassfish.web
+org.hibernate
+org.infinispan
+org.jopendocument
+org.slf4j
+org.springframework
\ No newline at end of file

sm-shop/ignored 88(+44 -44)

diff --git a/sm-shop/ignored b/sm-shop/ignored
index 8dd1ecf..446ef1e 100644
--- a/sm-shop/ignored
+++ b/sm-shop/ignored
@@ -1,44 +1,44 @@
-com.fasterxml.jackson.core.
-com.google.code.gson.
-com.google.guava.
-com.google.maps.
-com.googlecode.json-simple.
-com.h2database.
-com.itextpdf.
-com.maxmind.geoip2.
-com.mchange.
-com.paypal.sdk.
-com.stripe.
-com.sun.jersey.
-commons-collections.
-commons-configuration.
-commons-fileupload.
-commons-io.
-commons-logging.
-commons-validator.
-io.searchbox.
-javax.
-javax.el.
-javax.inject.
-javax.mail.
-javax.servlet.
-javax.validation.
-junit.
-log4j.
-mysql.
-net.sf.ehcache.
-org.apache.commons.
-org.apache.httpcomponents.
-org.apache.tiles.
-org.apache.tomcat.embed.
-org.aspectj.
-org.codehaus.jackson.
-org.drools.
-org.elasticsearch.
-org.freemarker.
-org.glassfish.web.
-org.hibernate.
-org.infinispan.
-org.jopendocument.
-org.slf4j.
-org.springframework.
\ No newline at end of file
+com.fasterxml.jackson.core
+com.google.code.gson
+com.google.guava
+com.google.maps
+com.googlecode.json-simple
+com.h2database
+com.itextpdf
+com.maxmind.geoip2
+com.mchange
+com.paypal.sdk
+com.stripe
+com.sun.jersey
+commons-collections
+commons-configuration
+commons-fileupload
+commons-io
+commons-logging
+commons-validator
+io.searchbox
+javax
+javax.el
+javax.inject
+javax.mail
+javax.servlet
+javax.validation
+junit
+log4j
+mysql
+net.sf.ehcache
+org.apache.commons
+org.apache.httpcomponents
+org.apache.tiles
+org.apache.tomcat.embed
+org.aspectj
+org.codehaus.jackson
+org.drools
+org.elasticsearch
+org.freemarker
+org.glassfish.web
+org.hibernate
+org.infinispan
+org.jopendocument
+org.slf4j
+org.springframework
\ No newline at end of file
diff --git a/sm-shop/src/main/resources/database.properties b/sm-shop/src/main/resources/database.properties
index c142b2f..4cf6d82 100644
--- a/sm-shop/src/main/resources/database.properties
+++ b/sm-shop/src/main/resources/database.properties
@@ -4,18 +4,18 @@
 
 
 #MYSQL
-#db.jdbcUrl=jdbc:mysql://localhost:3306/SALESMANAGER?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
-#db.user=username
-#db.password=password
-#db.driverClass=com.mysql.jdbc.Driver
-#hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+db.jdbcUrl=jdbc:mysql://database:3306/SALESMANAGER?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+db.user=root
+db.password=root
+db.driverClass=com.mysql.jdbc.Driver
+hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 #H2
-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
-hibernate.dialect=org.hibernate.dialect.H2Dialect
+# 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
+# hibernate.dialect=org.hibernate.dialect.H2Dialect
 
 
 db.preferredTestQuery=SELECT 1