shopizer-developers

Fixed favicon

3/6/2017 2:40:41 PM

Samson

Commit: 90b2c17

Tree: 196d847

Parents: 5898315

Changes

sm-shop/files/store/StoreRepository.dat 0(+0 -0)

sm-shop/SALESMANAGER.h2.db 0(+0 -0)

sm-shop/SALESMANAGER.lock.db 4(+2 -2)

sm-shop/src/main/resources/.gitignore 1(+1 -0)

sm-shop/src/main/resources/database.properties 20(+10 -10)

sm-shop/src/main/webapp/layout/admin/layout.jsp 1(+1 -0)

Details

sm-shop/files/store/StoreRepository.dat 0(+0 -0)

diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index 686d8b4..609ede9 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 d958345..c843a62 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 b4dc221..c028245 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Tue Feb 28 15:18:45 EST 2017
-id=15a8660025edccba1f5768c4ce45b0bf2dccff5db5f
+#Tue Feb 28 15:35:21 EST 2017
+id=15a866f35ae67795221c997e6eb71a74e599f68332f
 method=file

sm-shop/src/main/resources/.gitignore 1(+1 -0)

diff --git a/sm-shop/src/main/resources/.gitignore b/sm-shop/src/main/resources/.gitignore
new file mode 100644
index 0000000..16d8ff4
--- /dev/null
+++ b/sm-shop/src/main/resources/.gitignore
@@ -0,0 +1 @@
+/database.properties

sm-shop/src/main/resources/database.properties 20(+10 -10)

diff --git a/sm-shop/src/main/resources/database.properties b/sm-shop/src/main/resources/database.properties
index 4e63b8f..5dbfac5 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://localhost:3306/SALESMANAGER?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+db.user=root
+db.password=password
+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

sm-shop/src/main/webapp/layout/admin/layout.jsp 1(+1 -0)

diff --git a/sm-shop/src/main/webapp/layout/admin/layout.jsp b/sm-shop/src/main/webapp/layout/admin/layout.jsp
index fc21d73..42688e2 100644
--- a/sm-shop/src/main/webapp/layout/admin/layout.jsp
+++ b/sm-shop/src/main/webapp/layout/admin/layout.jsp
@@ -39,6 +39,7 @@ response.setDateHeader ("Expires", -1);
     			
     			<script src="<c:url value="/resources/js/bootstrap/jquery.js" />"></script>
     			<script src="<c:url value="/resources/js/jquery.friendurl.min.js" />"></script>
+    			<link rel="icon" href="<c:url value="/static/favicon.ico"/>"> 
  
   
                 <jsp:include page="/common/adminLinks.jsp" />