Prosoft Git

shopizer-developers

Fixed template engine

11/7/2016 5:14:59 PM
Samson

Samson

Commit: 6aa8bcb

Tree: ebca62d

Parents: 00f3235

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-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties 2(+1 -1)

sm-shop/pom.xml 8(+8 -0)

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

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

sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld 30(+15 -15)

sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties 2(+1 -1)

Details

shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 2(+1 -1) 

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 8c90811..5e16135 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 12:23:18 EST 2016
+#Mon Nov 07 14:03:40 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 2(+1 -1) 

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 9c2bf7b..72f224a 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 12:23:17 EST 2016
+#Mon Nov 07 14:03:39 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties 2(+1 -1) 

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 756b32e..05feb96 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 12:23:18 EST 2016
+#Mon Nov 07 14:03:40 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

sm-shop/pom.xml 8(+8 -0) 

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 8d3d264..80e9520 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -19,6 +19,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- testing properties -->
 		<!--<dbh2.version>1.4.187</dbh2.version>-->
+		<main.basedir>${basedir}/../..</main.basedir>
+        <m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 
 	<dependencies>
@@ -56,6 +58,12 @@
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-starter-security</artifactId>
 	    </dependency>
+	    
+	    <dependency>
+        	<groupId>org.apache.tomcat.embed</groupId>
+        	<artifactId>tomcat-embed-jasper</artifactId>
+        	<scope>provided</scope>
+    	</dependency>
 
 
 		<dependency>

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

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 6b0bebd..86eff13 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 0a859ec..2f2cbc7 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Mon Nov 07 13:05:54 EST 2016
-id=1583ff7c722aff5978fa2bdea91feef9112c871b4be
+#Mon Nov 07 14:06:47 EST 2016
+id=158402f84f50094e78f5ccb272427f1acf8a80cde09
 method=file

sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld 30(+15 -15) 

diff --git a/sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld b/sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld
index 0a4a56a..cb53dc7 100644
--- a/sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld
+++ b/sm-shop/src/main/webapp/WEB-INF/shopizer-tags.tld
@@ -10,7 +10,7 @@
 <tag>
  		 <!-- Builds the image URL (in admin section only)-->
          <name>contentImage</name>
-         <tag-class>com.salesmanager.web.tags.ContentImageUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ContentImageUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -40,7 +40,7 @@
 <tag>
  		 <!-- Builds a content block -->
          <name>pageContent</name>
-         <tag-class>com.salesmanager.web.tags.PageContentTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.PageContentTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -57,7 +57,7 @@
 <tag>
  		 <!-- Core configuration -->
          <name>config</name>
-         <tag-class>com.salesmanager.web.tags.ConfigurationTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ConfigurationTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -74,7 +74,7 @@
 <tag>
  		 <!-- Builds the manufacturer image URL -->
          <name>manufacturerImage</name>
-         <tag-class>com.salesmanager.web.tags.ManufacturerImageUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ManufacturerImageUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -98,7 +98,7 @@
 <tag>
  		 <!-- Builds the product image URL -->
          <name>productImage</name>
-         <tag-class>com.salesmanager.web.tags.ProductImageUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ProductImageUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -123,7 +123,7 @@
 <tag>
  		 <!-- Builds the product image URL -->
          <name>shopProductImage</name>
-         <tag-class>com.salesmanager.web.tags.ShopProductImageUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ShopProductImageUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -154,7 +154,7 @@
 <tag>
  		 <!-- Builds the product image URL -->
          <name>shopProductGroup</name>
-         <tag-class>com.salesmanager.web.tags.ShopProductRelationshipTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ShopProductRelationshipTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -173,7 +173,7 @@
 <tag>
  		 <!-- Product price utility -->
          <name>monetary</name>
-         <tag-class>com.salesmanager.web.tags.ShopProductPriceFormatTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ShopProductPriceFormatTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -197,7 +197,7 @@
 <tag>
  		 <!-- Builds the admin product download URL -->
          <name>adminProductDownload</name>
-         <tag-class>com.salesmanager.web.tags.AdminProductDownloadUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.AdminProductDownloadUrlTag</tag-class>
          <body-content>scriptless</body-content>
          
          <attribute>
@@ -213,7 +213,7 @@
 <tag>
  		 <!-- Builds the order product download URL -->
          <name>orderProductDownload</name>
-         <tag-class>com.salesmanager.web.tags.OrderProductDownloadUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.OrderProductDownloadUrlTag</tag-class>
          <body-content>scriptless</body-content>
          
          <attribute>
@@ -236,7 +236,7 @@
 <tag>
  		 <!-- Builds the store logo URL -->
          <name>storeLogo</name>
-         <tag-class>com.salesmanager.web.tags.StoreLogoUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.StoreLogoUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
 </tag>
@@ -244,7 +244,7 @@
 <tag>
  		 <!-- Builds breadcrumb parameter -->
          <name>breadcrumbParam</name>
-         <tag-class>com.salesmanager.web.tags.StoreBreadcrumbsTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.StoreBreadcrumbsTag</tag-class>
          <body-content>scriptless</body-content>
          <attribute>
                  <name>categoryId</name>
@@ -264,7 +264,7 @@
 <tag>
  		 <!-- Builds the copyright -->
          <name>storeCopy</name>
-         <tag-class>com.salesmanager.web.tags.StoreFooterlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.StoreFooterlTag</tag-class>
          <body-content>scriptless</body-content>
 
 </tag>
@@ -273,7 +273,7 @@
 <tag>
  		 <!-- Builds the product URL -->
          <name>productUrl</name>
-         <tag-class>com.salesmanager.web.tags.ProductDescriptionUrlTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ProductDescriptionUrlTag</tag-class>
          <body-content>scriptless</body-content>
 
  
@@ -291,7 +291,7 @@
 <tag>
  		 <!-- Decides if the link anlalyzed has to be handled as the active link -->
          <name>activeLink</name>
-         <tag-class>com.salesmanager.web.tags.ActiveLinkTag</tag-class>
+         <tag-class>com.salesmanager.shop.tags.ActiveLinkTag</tag-class>
          <body-content>scriptless</body-content>
          
          <attribute>

sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties 2(+1 -1) 

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 7d2e6cf..cdb472b 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 12:23:20 EST 2016
+#Mon Nov 07 14:03:43 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github