WIP

src/main/java/com/jh/boot/JhBootApplication.java

+package com.jh.boot;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+import com.jh.boot.email.LocalEmailService;
+import com.jh.boot.security.utils.TemplateEmailAuthServiceListener;
+
+public class JhBootApplication {
+
+	@Bean
+    @ConditionalOnProperty(value = "email.local.enabled", havingValue = "true", matchIfMissing = true)
+	public LocalEmailService emailService() {
+		return new LocalEmailService();
+	}
+
+	
+    @Bean
+    @ConditionalOnProperty(value = "security.auth.listener.email.enabled", havingValue = "true", matchIfMissing = true)
+    public TemplateEmailAuthServiceListener authServiceListener() {
+    	return new TemplateEmailAuthServiceListener();
+    }
+    
+    
+
+}

src/main/java/com/jh/common/domain/DateType.java → src/main/java/com/jh/boot/domain/DateType.java

-package com.jh.common.domain;
+package com.jh.boot.domain;
 
 public enum DateType {
 

src/main/java/com/jh/common/domain/NamedValue.java → src/main/java/com/jh/boot/domain/NamedValue.java

-package com.jh.common.domain;
+package com.jh.boot.domain;
 
 public class NamedValue<T> {
 

src/main/java/com/jh/common/email/Email.java → src/main/java/com/jh/boot/email/Email.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import java.util.Set;
 
@@ -8,7 +8,7 @@ import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 
 /**

src/main/java/com/jh/common/email/EmailAttachment.java → src/main/java/com/jh/boot/email/EmailAttachment.java

@@ -2,7 +2,7 @@
  * Created on 8. 8. 2017 8:36:15
  *
  */
-package com.jh.common.email;
+package com.jh.boot.email;
 
 import java.util.Base64;
 import java.util.Base64.Encoder;
@@ -14,7 +14,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 /**
  * The Class EmailAttachment.

src/main/java/com/jh/common/email/EmailConfig.java → src/main/java/com/jh/boot/email/EmailConfig.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;

src/main/java/com/jh/common/email/EmailRecipient.java → src/main/java/com/jh/boot/email/EmailRecipient.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 /**
  * The Class EmailRecipient.

src/main/java/com/jh/common/email/EmailRepository.java → src/main/java/com/jh/boot/email/EmailRepository.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,7 +10,7 @@ import javax.persistence.Query;
 import org.hibernate.query.NativeQuery;
 import org.springframework.stereotype.Repository;
 
-import com.jh.common.jpa.AbstractHibernateRepository;
+import com.jh.boot.jpa.AbstractHibernateRepository;
 
 /**
  * The Class EmailRepository.

src/main/java/com/jh/common/email/EmailService.java → src/main/java/com/jh/boot/email/EmailService.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 /**
  * The Interface EmailService.

src/main/java/com/jh/common/email/JhMailConfig.java → src/main/java/com/jh/boot/email/JhMailConfig.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import org.springframework.context.annotation.Bean;
 

src/main/java/com/jh/common/email/LocalEmailService.java → src/main/java/com/jh/boot/email/LocalEmailService.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import java.util.ArrayList;
 import java.util.Base64;

src/main/java/com/jh/common/email/RecipientType.java → src/main/java/com/jh/boot/email/RecipientType.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 /**
  * The Enum RecipientType.

src/main/java/com/jh/common/email/RestEmailService.java → src/main/java/com/jh/boot/email/RestEmailService.java

-package com.jh.common.email;
+package com.jh.boot.email;
 
 import java.net.URI;
 

src/main/java/com/jh/common/i18n/I18nContext.java → src/main/java/com/jh/boot/i18n/I18nContext.java

-package com.jh.common.i18n;
+package com.jh.boot.i18n;
 
 
 

src/main/java/com/jh/common/i18n/I18nUtils.java → src/main/java/com/jh/boot/i18n/I18nUtils.java

-package com.jh.common.i18n;
+package com.jh.boot.i18n;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -261,4 +261,78 @@ public class I18nUtils {
     public static I18nUtils getInstance() {
         return instance;
     }
+    
+    
+    class NumberFormatKey {
+    	
+    	/** The thousand delimiter. */
+    	private String thousandDelimiter;
+    	
+    	/** The decimal delimiter. */
+    	private String decimalDelimiter;
+    	
+    	/** The fixed. */
+    	private int fixed;
+    	
+    	/**
+    	 * Instantiates a new number format key.
+    	 *
+    	 * @param decimalDelimiter the decimal delimiter
+    	 * @param thousandDelimiter the thousand delimiter
+    	 * @param fixed the fixed
+    	 */
+    	public NumberFormatKey(String decimalDelimiter, String thousandDelimiter, int fixed) {
+    		super();
+    		this.thousandDelimiter = thousandDelimiter;
+    		this.decimalDelimiter = decimalDelimiter;
+    		this.fixed = fixed;
+    	}
+
+    	/**
+    	 * @return
+    	 * @see java.lang.Object#hashCode()
+    	 */
+    	@Override
+    	public int hashCode() {
+    		final int prime = 31;
+    		int result = 1;
+    		result = prime * result + ((decimalDelimiter == null) ? 0 : decimalDelimiter.hashCode());
+    		result = prime * result + fixed;
+    		result = prime * result + ((thousandDelimiter == null) ? 0 : thousandDelimiter.hashCode());
+    		return result;
+    	}
+
+    	/**
+    	 * @param obj
+    	 * @return
+    	 * @see java.lang.Object#equals(java.lang.Object)
+    	 */
+    	@Override
+    	public boolean equals(Object obj) {
+    		if (this == obj)
+    			return true;
+    		if (obj == null)
+    			return false;
+    		if (getClass() != obj.getClass())
+    			return false;
+    		NumberFormatKey other = (NumberFormatKey) obj;
+    		if (decimalDelimiter == null) {
+    			if (other.decimalDelimiter != null)
+    				return false;
+    		} else if (!decimalDelimiter.equals(other.decimalDelimiter))
+    			return false;
+    		if (fixed != other.fixed)
+    			return false;
+    		if (thousandDelimiter == null) {
+    			if (other.thousandDelimiter != null)
+    				return false;
+    		} else if (!thousandDelimiter.equals(other.thousandDelimiter))
+    			return false;
+    		return true;
+    	}
+    	
+    	
+    }
+    
+    
 }

src/main/java/com/jh/common/jpa/AbstractHibernateRepository.java → src/main/java/com/jh/boot/jpa/AbstractHibernateRepository.java

-package com.jh.common.jpa;
+package com.jh.boot.jpa;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,10 +25,10 @@ import org.hibernate.criterion.Restrictions;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.transform.Transformers;
 
-import com.jh.common.web.list.Page;
-import com.jh.common.web.list.PagingInfo;
-import com.jh.common.web.list.SortTrend;
-import com.jh.common.web.list.SortingInfo;
+import com.jh.boot.web.list.Page;
+import com.jh.boot.web.list.PagingInfo;
+import com.jh.boot.web.list.SortTrend;
+import com.jh.boot.web.list.SortingInfo;
 
 
 /**

src/main/java/com/jh/common/jpa/AbstractIdEntity.java → src/main/java/com/jh/boot/jpa/AbstractIdEntity.java

-package com.jh.common.jpa;
+package com.jh.boot.jpa;
 
 import java.io.Serializable;
 

src/main/java/com/jh/common/jpa/LocalDateConverter.java → src/main/java/com/jh/boot/jpa/LocalDateConverter.java

-package com.jh.common.jpa;
+package com.jh.boot.jpa;
 
 import java.time.LocalDate;
 import java.sql.Date;

src/main/java/com/jh/common/security/AuthError.java → src/main/java/com/jh/boot/security/AuthError.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 /**
  * The Class AuthError.

src/main/java/com/jh/common/security/AuthService.java → src/main/java/com/jh/boot/security/AuthService.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;

src/main/java/com/jh/common/security/AuthServiceAuthenticationProvider.java → src/main/java/com/jh/boot/security/AuthServiceAuthenticationProvider.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;

src/main/java/com/jh/boot/security/AuthServiceListener.java

+package com.jh.boot.security;
+
+import com.jh.boot.security.model.AppUser;
+
+public interface AuthServiceListener {
+
+	
+	void registerUser(AppUser user);
+	
+	void generateResetToken(AppUser user);
+	
+}

src/main/java/com/jh/common/security/GrantedRole.java → src/main/java/com/jh/boot/security/GrantedRole.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 import org.springframework.security.core.GrantedAuthority;
 

src/main/java/com/jh/common/security/JhSecurityConfig.java → src/main/java/com/jh/boot/security/JhSecurityConfig.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 import java.io.IOException;
 
@@ -14,8 +14,8 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 
-import com.jh.common.security.repository.AppUserRepository;
-import com.jh.common.security.service.AppUserAuthService;
+import com.jh.boot.security.repository.AppUserRepository;
+import com.jh.boot.security.service.AppUserAuthService;
 
 /**
  * The Class ReactApplicationSecurityContext.

src/main/java/com/jh/common/security/PasswordHash.java → src/main/java/com/jh/boot/security/PasswordHash.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 /**
  * The Class PasswordHash.

src/main/java/com/jh/common/security/PasswordUtils.java → src/main/java/com/jh/boot/security/PasswordUtils.java

-package com.jh.common.security;
+package com.jh.boot.security;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

src/main/java/com/jh/common/security/api/AuthApiController.java → src/main/java/com/jh/boot/security/api/AuthApiController.java

@@ -2,7 +2,7 @@
  * Created on 28. 7. 2017 9:44:08
  *
  */
-package com.jh.common.security.api;
+package com.jh.boot.security.api;
 
 import java.util.ArrayList;
 import java.util.Base64;
@@ -26,14 +26,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.jh.common.security.AuthError;
-import com.jh.common.security.AuthService;
-import com.jh.common.security.PasswordUtils;
-import com.jh.common.utils.Utils;
-import com.jh.common.web.error.BadRequestException;
-import com.jh.common.web.error.ErrorMessage;
-import com.jh.common.web.error.NotFoundException;
-import com.jh.common.web.error.RestApiException;
+import com.jh.boot.security.AuthError;
+import com.jh.boot.security.AuthService;
+import com.jh.boot.security.PasswordUtils;
+import com.jh.boot.utils.Utils;
+import com.jh.boot.web.error.BadRequestException;
+import com.jh.boot.web.error.ErrorMessage;
+import com.jh.boot.web.error.NotFoundException;
+import com.jh.boot.web.error.RestApiException;
 
 /**
  * The Class AuthController.

src/main/java/com/jh/common/security/api/LoginRequest.java → src/main/java/com/jh/boot/security/api/LoginRequest.java

-package com.jh.common.security.api;
+package com.jh.boot.security.api;
 
 public class LoginRequest {
 	

src/main/java/com/jh/common/security/api/LoginResponse.java → src/main/java/com/jh/boot/security/api/LoginResponse.java

-package com.jh.common.security.api;
+package com.jh.boot.security.api;
 
 public class LoginResponse {
 	

src/main/java/com/jh/common/security/api/ResetPassword.java → src/main/java/com/jh/boot/security/api/ResetPassword.java

-package com.jh.common.security.api;
+package com.jh.boot.security.api;
 
 public class ResetPassword {
 

src/main/java/com/jh/common/security/api/Signup.java → src/main/java/com/jh/boot/security/api/Signup.java

-package com.jh.common.security.api;
+package com.jh.boot.security.api;
 
 public class Signup {
 

src/main/java/com/jh/common/security/model/AppRole.java → src/main/java/com/jh/boot/security/model/AppRole.java

@@ -2,13 +2,13 @@
  * Created on 24. 1. 2018 9:08:52
  *
  */
-package com.jh.common.security.model;
+package com.jh.boot.security.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 /**
  * The Class AppRole.

src/main/java/com/jh/common/security/model/AppUser.java → src/main/java/com/jh/boot/security/model/AppUser.java

@@ -2,7 +2,7 @@
  * Created on 27. 7. 2017 15:46:57
  *
  */
-package com.jh.common.security.model;
+package com.jh.boot.security.model;
 
 import java.util.Set;
 
@@ -14,7 +14,7 @@ import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 import javax.persistence.Version;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 
 /**

src/main/java/com/jh/common/security/model/ResetPasswordToken.java → src/main/java/com/jh/boot/security/model/ResetPasswordToken.java

-package com.jh.common.security.model;
+package com.jh.boot.security.model;
 
 import java.util.Date;
 
@@ -6,7 +6,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 @Entity
 @Table(name = "RESET_PASSWORD_TOKEN")

src/main/java/com/jh/common/security/repository/AppUserRepository.java → src/main/java/com/jh/boot/security/repository/AppUserRepository.java

-package com.jh.common.security.repository;
+package com.jh.boot.security.repository;
 
 import javax.persistence.Query;
 
 import org.springframework.util.StringUtils;
 
-import com.jh.common.jpa.AbstractHibernateRepository;
-import com.jh.common.security.PasswordHash;
-import com.jh.common.security.PasswordUtils;
-import com.jh.common.security.model.AppUser;
-import com.jh.common.security.model.ResetPasswordToken;
+import com.jh.boot.jpa.AbstractHibernateRepository;
+import com.jh.boot.security.PasswordHash;
+import com.jh.boot.security.PasswordUtils;
+import com.jh.boot.security.model.AppUser;
+import com.jh.boot.security.model.ResetPasswordToken;
 
 
 public class AppUserRepository extends AbstractHibernateRepository {

src/main/java/com/jh/common/security/service/AppUserAuthService.java → src/main/java/com/jh/boot/security/service/AppUserAuthService.java

-package com.jh.common.security.service;
+package com.jh.boot.security.service;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -15,14 +16,14 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import com.jh.common.email.EmailService;
-import com.jh.common.security.AuthService;
-import com.jh.common.security.GrantedRole;
-import com.jh.common.security.PasswordHash;
-import com.jh.common.security.PasswordUtils;
-import com.jh.common.security.model.AppUser;
-import com.jh.common.security.model.ResetPasswordToken;
-import com.jh.common.security.repository.AppUserRepository;
+import com.jh.boot.security.AuthService;
+import com.jh.boot.security.AuthServiceListener;
+import com.jh.boot.security.GrantedRole;
+import com.jh.boot.security.PasswordHash;
+import com.jh.boot.security.PasswordUtils;
+import com.jh.boot.security.model.AppUser;
+import com.jh.boot.security.model.ResetPasswordToken;
+import com.jh.boot.security.repository.AppUserRepository;
 
 
 
@@ -32,7 +33,7 @@ public class AppUserAuthService implements AuthService {
 	
 	private AppUserRepository appUserRepository;
 	
-	private EmailService emailService;
+	private Collection<AuthServiceListener> authListeners;
 	
 
 	@Override
@@ -62,7 +63,11 @@ public class AppUserAuthService implements AuthService {
 		if (!StringUtils.hasText(login) || !StringUtils.hasText(password)) {
 			throw new BadCredentialsException("Bad username or password");
 		}
-		appUserRepository.registerUser(login, password);
+		AppUser appUser = appUserRepository.registerUser(login, password);
+		
+		if (authListeners != null) {
+			authListeners.forEach(al -> al.registerUser(appUser));
+		}
 	}
 
 	@Override
@@ -76,11 +81,8 @@ public class AppUserAuthService implements AuthService {
 		ResetPasswordToken token = new ResetPasswordToken(login, new Date(), UUID.randomUUID().toString());
 		appUserRepository.saveResetPasswordToken(token);
 		
-		//TODO send email
-		if (emailService == null) {
-			LOG.warn("Reset password email cannot be sent: no email service configured");
-		} else {
-			
+		if (authListeners != null) {
+			authListeners.forEach(al -> al.generateResetToken(user));
 		}
 		
 		return token.getToken();
@@ -112,8 +114,8 @@ public class AppUserAuthService implements AuthService {
 	}
 
 	@Autowired(required = false)
-	public void setEmailService(EmailService emailService) {
-		this.emailService = emailService;
+	public void setAuthListeners(Collection<AuthServiceListener> authListeners) {
+		this.authListeners = authListeners;
 	}
 	
 }

src/main/java/com/jh/boot/security/utils/TemplateEmailAuthServiceListener.java

+package com.jh.boot.security.utils;
+
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.Locale;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import com.jh.boot.email.Email;
+import com.jh.boot.email.EmailService;
+import com.jh.boot.security.AuthServiceListener;
+import com.jh.boot.security.model.AppUser;
+import com.jh.boot.template.TemplateService;
+
+
+//TODO make it configurable
+public class TemplateEmailAuthServiceListener implements AuthServiceListener {
+
+	@Autowired
+	private EmailService emailService;
+	
+	@Autowired
+	private TemplateService templateService;
+	
+	@Value("${security.auth.template.signup:security.auth.signup}")
+	private String signupTemplateCode;
+
+	@Value("${security.auth.template.signup.html:security.auth.signup.html}")
+	private String signupTemplateHtmlCode;
+
+	@Value("${security.auth.template.resetPassword:security.auth.resetPassword}")
+	private String resetPasswordTemplateCode;
+	
+	
+	@Override
+	public void registerUser(AppUser user) {
+		StringWriter sw = new StringWriter();
+		templateService.evaluate(sw, signupTemplateCode, Collections.singletonMap("user", user), Locale.ENGLISH);
+		
+		Email email = new Email();
+		email.setText(sw.toString());
+		emailService.sendEmail(email);
+	}
+
+	
+	@Override
+	public void generateResetToken(AppUser user) {
+		StringWriter sw = new StringWriter();
+		templateService.evaluate(sw, resetPasswordTemplateCode, Collections.singletonMap("user", user), Locale.ENGLISH);
+	}
+
+}

src/main/java/com/jh/common/template/JhTemplateConfig.java → src/main/java/com/jh/boot/template/JhTemplateConfig.java

-package com.jh.common.template;
+package com.jh.boot.template;
 
 import org.springframework.context.annotation.Bean;
 

src/main/java/com/jh/common/template/Template.java → src/main/java/com/jh/boot/template/Template.java

-package com.jh.common.template;
+package com.jh.boot.template;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 @Entity
 @Table(name = "CUSTOMIZABLE_TEMPLATE")

src/main/java/com/jh/boot/template/TemplateEngine.java

+package com.jh.boot.template;
+
+import java.io.Writer;
+import java.util.Map;
+
+public interface TemplateEngine {
+
+	void evaluate(Writer writer, String templateCode, Map<String, Object> data);
+	
+	void evaluateInline(Writer writer, String template, Map<String, Object> data);
+}
\ No newline at end of file

src/main/java/com/jh/common/template/TemplateLoader.java → src/main/java/com/jh/boot/template/TemplateLoader.java

-package com.jh.common.template;
+package com.jh.boot.template;
 
 
 public interface TemplateLoader {
 
-	
+	String loadTemplate(String code);
 	
 }

src/main/java/com/jh/common/template/TemplateService.java → src/main/java/com/jh/boot/template/TemplateService.java

-package com.jh.common.template;
+package com.jh.boot.template;
 
 import java.io.Writer;
 import java.util.Locale;
@@ -8,6 +8,4 @@ public interface TemplateService {
 	
 	void evaluate(Writer writer, String templateCode, Map<String, Object> data, Locale locale);
 	
-	void evaluateInline(Writer writer, String template, Map<String, Object> data, Locale locale);
-	
 }

src/main/java/com/jh/common/template/customizable/CustomizableLabelsRepository.java → src/main/java/com/jh/boot/template/customizable/CustomizableLabelsRepository.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import java.util.Collection;
 import java.util.List;
@@ -7,8 +7,8 @@ import javax.persistence.Query;
 
 import org.springframework.stereotype.Repository;
 
-import com.jh.common.jpa.AbstractHibernateRepository;
-import com.jh.common.template.Template;
+import com.jh.boot.jpa.AbstractHibernateRepository;
+import com.jh.boot.template.Template;
 
 
 @Repository
@@ -25,10 +25,10 @@ public class CustomizableLabelsRepository extends AbstractHibernateRepository {
 
 
 	@SuppressWarnings("unchecked")
-	public List<CustomizableTemplateLabel> findCustomizedTemplateLabels(Long templateId, Long unitId) {
-		Query q = entityManager.createQuery("select tl from TemplateLabel tl left join tl.template t where t.id = :templateId and tl.unitId = :unitId order by tl.position asc");
+	public List<CustomizableTemplateLabel> findCustomizedTemplateLabels(String templateCode, Long unitId) {
+		Query q = entityManager.createQuery("select tl from TemplateLabel tl left join tl.template t where t.code = :templateCode and tl.unitId = :unitId order by tl.position asc");
 		
-		q.setParameter("template.id", templateId);
+		q.setParameter("templateCode", templateCode);
 		q.setParameter("unitId", unitId);
 		
 		return q.getResultList();
@@ -36,9 +36,9 @@ public class CustomizableLabelsRepository extends AbstractHibernateRepository {
 
 
 	@SuppressWarnings("unchecked")
-	public List<CustomizableTemplateLabel> findDefaultTemplateLabels(Long templateId) {
-		Query q = entityManager.createQuery("select tl from TemplateLabel tl left join tl.template t where t.id = :templateId and tl.unitId is null");
-		q.setParameter("template.id", templateId);
+	public List<CustomizableTemplateLabel> findDefaultTemplateLabels(String templateCode) {
+		Query q = entityManager.createQuery("select tl from TemplateLabel tl left join tl.template t where t.code = :templateCode and tl.unitId is null");
+		q.setParameter("templateCode", templateCode);
 		return q.getResultList();
 	}
 

src/main/java/com/jh/common/template/customizable/CustomizableLabelsService.java → src/main/java/com/jh/boot/template/customizable/CustomizableLabelsService.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -13,29 +13,21 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.jh.common.template.Template;
-
 
 @Service
 public class CustomizableLabelsService {
 
 	private CustomizableLabelsRepository repo;
 	
-	private Map<Long, CustomizableTemplateLabels> templateLabelsCache = new HashMap<>();
+	private Map<String, CustomizableTemplateLabels> templateLabelsCache = new HashMap<>();
 	
 	private boolean useCache;
 	
 
 	@Transactional
-	public Template getTemplateContent(String code) {
-		return repo.fetchTemplate(code);
-	}
-	
-	
-	@Transactional
-	public Map<String, CustomizableTemplateLabel> getCustomizationTemplateLabels(Long templateId, Long unitId, String defaultLanguage) {
-		TemplateLabels templateLabels = getTemplateDefaultLabels(templateId);
-		List<CustomizableTemplateLabel> labels = repo.findCustomizedTemplateLabels(templateId, unitId);
+	public Map<String, CustomizableTemplateLabel> getCustomizationTemplateLabels(String templateCode, Long unitId, String defaultLanguage) {
+		TemplateLabels templateLabels = getTemplateDefaultLabels(templateCode);
+		List<CustomizableTemplateLabel> labels = repo.findCustomizedTemplateLabels(templateCode, unitId);
 		
 		Map<String, CustomizableTemplateLabel> defaultMap = templateLabels.getLanguages().get(defaultLanguage);
 		if (defaultMap == null) {
@@ -70,9 +62,9 @@ public class CustomizableLabelsService {
 	}	
 	
 	@Transactional
-	public Map<String, String> getTranslatedTemplateLabels(Long templateId, Long unitId, String defaultLanguage) {
-		TemplateLabels templateLabels = getTemplateDefaultLabels(templateId);
-		List<CustomizableTemplateLabel> labels = repo.findCustomizedTemplateLabels(templateId, unitId);
+	public Map<String, String> getTranslatedTemplateLabels(String templateCode, Long unitId, String defaultLanguage) {
+		TemplateLabels templateLabels = getTemplateDefaultLabels(templateCode);
+		List<CustomizableTemplateLabel> labels = repo.findCustomizedTemplateLabels(templateCode, unitId);
 		
 		Map<String, CustomizableTemplateLabel> defaultMap = templateLabels.getLanguages().get(defaultLanguage);
 		if (defaultMap == null) {
@@ -98,14 +90,14 @@ public class CustomizableLabelsService {
 	}
 	
 	@Transactional
-	public List<CustomizableTemplateLabel> fetchLabels(Long templateId, Long unitId) {
-		return repo.findCustomizedTemplateLabels(templateId, unitId);
+	public List<CustomizableTemplateLabel> fetchLabels(String templateCode, Long unitId) {
+		return repo.findCustomizedTemplateLabels(templateCode, unitId);
 	}
 	
 	
 	@Transactional
-	public TemplateLabels getTemplateDefaultLabels(Long templateId) {
-		CustomizableTemplateLabels labels = useCache ? templateLabelsCache.get(templateId) : null;
+	public TemplateLabels getTemplateDefaultLabels(String templateCode) {
+		CustomizableTemplateLabels labels = useCache ? templateLabelsCache.get(templateCode) : null;
 		if (labels != null) {
 			return labels;
 		}
@@ -115,7 +107,7 @@ public class CustomizableLabelsService {
 		Map<String, Map<String, CustomizableTemplateLabel>> maps = new HashMap<>();
 		Map<String, CustomizableTemplateLabel> fallbackMap = new HashMap<>();
 
-		List<CustomizableTemplateLabel> defaultLabels = repo.findDefaultTemplateLabels(templateId);
+		List<CustomizableTemplateLabel> defaultLabels = repo.findDefaultTemplateLabels(templateCode);
 
 		
 		//keep order
@@ -160,7 +152,7 @@ public class CustomizableLabelsService {
 		}
 		
 		if (useCache) {
-			templateLabelsCache.put(templateId, labels);
+			templateLabelsCache.put(templateCode, labels);
 		}
 		return labels;
 	}
@@ -171,32 +163,32 @@ public class CustomizableLabelsService {
 		repo.saveCustomizedLabels(labels);
 	}
 
-
-	@Transactional
-	public void saveCustomizedLabels(Long unitId, Long templateId, Map<String, String> labels) {
-		Map<String, String> map = new HashMap<>(labels);
-		List<CustomizableTemplateLabel> list = repo.findCustomizedTemplateLabels(templateId, unitId);
-		
-		for (CustomizableTemplateLabel label : list) {
-			String s = map.get(label.getCode());
-			if (s == null) {
-				repo.delete(label);
-			} else {
-				label.setLabel(s);
-				repo.save(label);
-				map.remove(label.getCode());
-			}
-		}
-		
-		for (Entry<String, String> e : map.entrySet()) {
-			CustomizableTemplateLabel label = new CustomizableTemplateLabel();
-			label.setUnitId(unitId);
-			label.setTemplate(new Template(templateId));
-			label.setCode(e.getKey());
-			label.setLabel(e.getValue());
-			repo.save(label);
-		}
-	}
+//
+//	@Transactional
+//	public void saveCustomizedLabels(Long unitId, String templateCode, Map<String, String> labels) {
+//		Map<String, String> map = new HashMap<>(labels);
+//		List<CustomizableTemplateLabel> list = repo.findCustomizedTemplateLabels(templateCode, unitId);
+//		
+//		for (CustomizableTemplateLabel label : list) {
+//			String s = map.get(label.getCode());
+//			if (s == null) {
+//				repo.delete(label);
+//			} else {
+//				label.setLabel(s);
+//				repo.save(label);
+//				map.remove(label.getCode());
+//			}
+//		}
+//		
+//		for (Entry<String, String> e : map.entrySet()) {
+//			CustomizableTemplateLabel label = new CustomizableTemplateLabel();
+//			label.setUnitId(unitId);
+//			label.setTemplate(new Template(templateCode));
+//			label.setCode(e.getKey());
+//			label.setLabel(e.getValue());
+//			repo.save(label);
+//		}
+//	}
 
 
 	@Autowired(required = false)

src/main/java/com/jh/common/template/customizable/CustomizableTemplateLabel.java → src/main/java/com/jh/boot/template/customizable/CustomizableTemplateLabel.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -8,8 +8,8 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jh.common.jpa.AbstractIdEntity;
-import com.jh.common.template.Template;
+import com.jh.boot.jpa.AbstractIdEntity;
+import com.jh.boot.template.Template;
 
 
 @Entity

src/main/java/com/jh/boot/template/customizable/CustomizableTemplateService.java

+package com.jh.boot.template.customizable;
+
+import java.io.Writer;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.jh.boot.template.TemplateEngine;
+import com.jh.boot.template.TemplateService;
+
+public class CustomizableTemplateService implements TemplateService {
+
+	@Autowired
+	private TemplateEngine engine;
+	
+	@Autowired
+	private CustomizableLabelsService labelsService;
+	
+	
+	@Override
+	public void evaluate(Writer writer, String templateCode, Map<String, Object> data, Locale locale) {
+		if (data == null) {
+			data = Collections.emptyMap();
+		}
+		
+		Map<String, String> labels = labelsService.getTranslatedTemplateLabels(templateCode, null, locale.toString());
+
+		data = new HashMap<String, Object>(data);
+		data.put("labels", locale);
+		engine.evaluate(writer, templateCode, data);
+	}
+	
+}

src/main/java/com/jh/common/template/customizable/TemplateLabels.java → src/main/java/com/jh/boot/template/customizable/TemplateLabels.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import java.util.Map;
 import java.util.Set;

src/main/java/com/jh/common/template/customizable/TemplateParam.java → src/main/java/com/jh/boot/template/customizable/TemplateParam.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import javax.persistence.Column;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
-import com.jh.common.jpa.AbstractIdEntity;
-import com.jh.common.template.Template;
+import com.jh.boot.jpa.AbstractIdEntity;
+import com.jh.boot.template.Template;
 
 //@Entity
 //@Table(name = "CUSTOMIZABLE_TEMPLATE_PARAM")

src/main/java/com/jh/common/template/customizable/TemplateParamValue.java → src/main/java/com/jh/boot/template/customizable/TemplateParamValue.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import javax.persistence.Column;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
-import com.jh.common.jpa.AbstractIdEntity;
-import com.jh.common.template.Template;
+import com.jh.boot.jpa.AbstractIdEntity;
+import com.jh.boot.template.Template;
 
 //@Entity
 //@Table(name = "CUSTOMIZABLE_TEMPLATE_PARAM")

src/main/java/com/jh/common/template/customizable/TemplateSettings.java → src/main/java/com/jh/boot/template/customizable/TemplateSettings.java

-package com.jh.common.template.customizable;
+package com.jh.boot.template.customizable;
 
 import javax.persistence.Column;
 
-import com.jh.common.jpa.AbstractIdEntity;
+import com.jh.boot.jpa.AbstractIdEntity;
 
 //@Entity
 //@Table(name = "CUSTOMIZABLE_TEMPLATE_SETTINGS")

src/main/java/com/jh/common/template/handlebars/HandlebarsTemplateService.java → src/main/java/com/jh/boot/template/handlebars/HandlebarsTemplateEngine.java

-package com.jh.common.template.handlebars;
+package com.jh.boot.template.handlebars;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.Writer;
 import java.text.MessageFormat;
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -23,9 +20,10 @@ import com.github.jknack.handlebars.Options;
 import com.github.jknack.handlebars.Template;
 import com.github.jknack.handlebars.context.JavaBeanValueResolver;
 import com.github.jknack.handlebars.context.MapValueResolver;
-import com.jh.common.i18n.I18nContext;
-import com.jh.common.i18n.I18nUtils;
-import com.jh.common.template.TemplateService;
+import com.jh.boot.i18n.I18nContext;
+import com.jh.boot.i18n.I18nUtils;
+import com.jh.boot.template.TemplateEngine;
+import com.jh.boot.template.TemplateLoader;
 
 
 /**
@@ -64,16 +62,16 @@ import com.jh.common.template.TemplateService;
  * 
  * @author Jan Hrabal
  */
-public class HandlebarsTemplateService implements TemplateService {
+public class HandlebarsTemplateEngine implements TemplateEngine {
 
-	/** The use cache. */
 	private boolean useCache = false;
 
-	/** The template cache. */
 	private Map<String, Template> templateCache;
 
 	private Handlebars handlebars;
 	
+	private TemplateLoader templateLoader;
+	
 	
 	/**
 	 * Initializes instance.
@@ -151,30 +149,32 @@ public class HandlebarsTemplateService implements TemplateService {
 	
 	
 	@Override
-	public void evaluate(Writer writer, String templateCode, Map<String, Object> data, Locale locale) {
+	public void evaluate(Writer writer, String templateCode, Map<String, Object> data) {
 	    String name = "template://" + templateCode;
 
 	    Template template = useCache ? templateCache.get(name) : null;
 
-	    //TODO read template
-	    
 		if (template == null) {
+			String s = templateLoader.loadTemplate(templateCode);
+			if (s == null) {
+				throw new RuntimeException(String.format("Template %s not found", templateCode));
+			}
+			try {
 				template = handlebars.compileInline(s);
+			} catch (IOException e) {
+				throw new RuntimeException("Cannot evaluate template", e);
+			}
 			if (useCache) {
 				templateCache.put(name, template);
 			}
 		}
 		
-		evaluateTemplate(template, data, locale, writer);
+		evaluateTemplate(template, data, writer);
 	}
 	
 
 	@Override
-	public void evaluateInline(Writer writer, String template, Map<String, Object> data, Locale locale) {
-		if (locale == null) {
-			locale = Locale.ENGLISH;
-		}
-		
+	public void evaluateInline(Writer writer, String template, Map<String, Object> data) {
 		String name = "inline://" + template;
 		
 		Template t = useCache ? templateCache.get(name) : null;
@@ -189,11 +189,11 @@ public class HandlebarsTemplateService implements TemplateService {
 			}
 		}
 		
-		evaluateTemplate(t, data, locale, writer);
+		evaluateTemplate(t, data, writer);
 	}
 	
 	
-	protected void evaluateTemplate(Template t, Map<String, Object> data, Locale locale,  Writer writer) {
+	protected void evaluateTemplate(Template t, Map<String, Object> data, Writer writer) {
 		  Context context = Context
 				    .newBuilder(data)
 				    .combine(data)

src/main/java/com/jh/common/utils/DataURLUtils.java → src/main/java/com/jh/boot/utils/DataURLUtils.java

@@ -2,7 +2,7 @@
  * Created on 19. 12. 2017 12:29:34
  *
  */
-package com.jh.common.utils;
+package com.jh.boot.utils;
 
 import java.util.Base64;
 import java.util.Base64.Encoder;

src/main/java/com/jh/common/utils/DateUtils.java → src/main/java/com/jh/boot/utils/DateUtils.java

@@ -2,7 +2,7 @@
  * Created on 27. 8. 2017 20:53:14
  *
  */
-package com.jh.common.utils;
+package com.jh.boot.utils;
 
 import java.time.LocalDate;
 import java.time.LocalTime;

src/main/java/com/jh/common/utils/InputStreamUtils.java → src/main/java/com/jh/boot/utils/InputStreamUtils.java

@@ -2,7 +2,7 @@
  * Created on 2. 8. 2017 9:50:42
  *
  */
-package com.jh.common.utils;
+package com.jh.boot.utils;
 
 import java.io.InputStream;
 import java.util.Scanner;

src/main/java/com/jh/common/utils/Utils.java → src/main/java/com/jh/boot/utils/Utils.java

-package com.jh.common.utils;
+package com.jh.boot.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

src/main/java/com/jh/common/web/FallbackLocaleResolver.java → src/main/java/com/jh/boot/web/FallbackLocaleResolver.java

@@ -2,7 +2,7 @@
  * Created on 29. 1. 2018 13:40:45
  *
  */
-package com.jh.common.web;
+package com.jh.boot.web;
 
 import java.util.LinkedHashSet;
 import java.util.Locale;

src/main/java/com/jh/common/web/GlobalControllerExceptionHandler.java → src/main/java/com/jh/boot/web/GlobalControllerExceptionHandler.java

-package com.jh.common.web;
+package com.jh.boot.web;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException;

src/main/java/com/jh/common/web/JhWebConfig.java → src/main/java/com/jh/boot/web/JhWebConfig.java

-package com.jh.common.web;
+package com.jh.boot.web;
 
 import java.util.List;
 
@@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.jh.common.web.list.PagingArgumentResolver;
-import com.jh.common.web.list.SortingArgumentResolver;
+import com.jh.boot.web.list.PagingArgumentResolver;
+import com.jh.boot.web.list.SortingArgumentResolver;
 
 
 public class JhWebConfig implements WebMvcConfigurer {

src/main/java/com/jh/common/web/LocalDateControllerAdvice.java → src/main/java/com/jh/boot/web/LocalDateControllerAdvice.java

-package com.jh.common.web;
+package com.jh.boot.web;
 
 import java.beans.PropertyEditorSupport;
 import java.time.LocalDate;

src/main/java/com/jh/common/web/error/BadRequestException.java → src/main/java/com/jh/boot/web/error/BadRequestException.java

-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import java.util.Collection;
 

src/main/java/com/jh/common/web/error/ErrorMessage.java → src/main/java/com/jh/boot/web/error/ErrorMessage.java

-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/jh/common/web/error/ErrorMessages.java → src/main/java/com/jh/boot/web/error/ErrorMessages.java

@@ -2,7 +2,7 @@
  * Created on 9. 10. 2017 14:36:28
  *
  */
-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 /**
  * The Interface ErrorMessages.

src/main/java/com/jh/common/web/error/ErrorMessagesException.java → src/main/java/com/jh/boot/web/error/ErrorMessagesException.java

@@ -2,7 +2,7 @@
  * Created on 9. 11. 2017 10:26:30
  *
  */
-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import java.util.Collection;
 

src/main/java/com/jh/common/web/error/ErrorStatus.java → src/main/java/com/jh/boot/web/error/ErrorStatus.java

-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import org.springframework.http.HttpStatus;
 

src/main/java/com/jh/common/web/error/NotFoundException.java → src/main/java/com/jh/boot/web/error/NotFoundException.java

-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import java.util.Collection;
 

src/main/java/com/jh/common/web/error/RestApiException.java → src/main/java/com/jh/boot/web/error/RestApiException.java

@@ -2,7 +2,7 @@
  * Created on 24. 1. 2018 8:46:58
  *
  */
-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import java.util.Collection;
 
@@ -48,7 +48,7 @@ public class RestApiException extends ErrorMessagesException implements ErrorSta
      * Gets the error status.
      *
      * @return the error status
-     * @see com.jh.common.web.error.ErrorStatus#getErrorStatus()
+     * @see com.jh.boot.web.error.ErrorStatus#getErrorStatus()
      */
     @Override
     public HttpStatus getErrorStatus() {

src/main/java/com/jh/common/web/error/RestResponseEntityExceptionHandler.java → src/main/java/com/jh/boot/web/error/RestResponseEntityExceptionHandler.java

-package com.jh.common.web.error;
+package com.jh.boot.web.error;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/com/jh/common/web/list/DefaultSorting.java → src/main/java/com/jh/boot/web/list/DefaultSorting.java

@@ -2,7 +2,7 @@
  * Created on 25. 8. 2017 18:29:24
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/jh/common/web/list/DefaultSortingInfo.java → src/main/java/com/jh/boot/web/list/DefaultSortingInfo.java

-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 /**
  * Default implementation of {@link SortingInfo}.
@@ -27,7 +27,7 @@ public class DefaultSortingInfo implements SortingInfo {
 
     /**
      * @return
-     * @see com.jh.common.web.list.SortingInfo#getField()
+     * @see com.jh.boot.web.list.SortingInfo#getField()
      */
     @Override
     public String getField() {
@@ -36,7 +36,7 @@ public class DefaultSortingInfo implements SortingInfo {
 
     /**
      * @return
-     * @see com.jh.common.web.list.SortingInfo#getTrend()
+     * @see com.jh.boot.web.list.SortingInfo#getTrend()
      */
     @Override
     public SortTrend getTrend() {

src/main/java/com/jh/common/web/list/ListHelper.java → src/main/java/com/jh/boot/web/list/ListHelper.java

@@ -2,7 +2,7 @@
  * Created on 3. 11. 2016 9:19:23
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 import java.util.List;
 import java.util.Objects;
@@ -13,7 +13,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 
-import com.jh.common.utils.Utils;
+import com.jh.boot.utils.Utils;
 
 
 /**

src/main/java/com/jh/common/web/list/Page.java → src/main/java/com/jh/boot/web/list/Page.java

@@ -2,7 +2,7 @@
  * Created on 12. 10. 2016 13:01:20
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/com/jh/common/web/list/PagingArgumentResolver.java → src/main/java/com/jh/boot/web/list/PagingArgumentResolver.java

-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;

src/main/java/com/jh/common/web/list/PagingInfo.java → src/main/java/com/jh/boot/web/list/PagingInfo.java

@@ -2,7 +2,7 @@
  * Created on 13. 10. 2016 17:11:34
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 /**
  * TODO.

src/main/java/com/jh/common/web/list/SortTrend.java → src/main/java/com/jh/boot/web/list/SortTrend.java

@@ -2,7 +2,7 @@
  * Created on 30. 10. 2016 7:32:25
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 /**
  * The Enum SortTrend.

src/main/java/com/jh/common/web/list/SortingArgumentResolver.java → src/main/java/com/jh/boot/web/list/SortingArgumentResolver.java

-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -6,7 +6,7 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import com.jh.common.utils.Utils;
+import com.jh.boot.utils.Utils;
 
 /**
  * The Class SortingArgumentResolver.

src/main/java/com/jh/common/web/list/SortingInfo.java → src/main/java/com/jh/boot/web/list/SortingInfo.java

@@ -2,7 +2,7 @@
  * Created on 13. 10. 2016 17:11:34
  *
  */
-package com.jh.common.web.list;
+package com.jh.boot.web.list;
 
 /**
  * TODO.

src/main/java/com/jh/common/template/TemplateEngine.java

-package com.jh.common.template;
-
-import java.io.Writer;
-import java.util.Locale;
-import java.util.Map;
-
-public interface TemplateEngine {
-
-	/**
-	 * TODO.
-	 *
-	 * @param templateName the template name
-	 * @param clazz the clazz
-	 * @param data the data
-	 * @param locale the locale
-	 * @param writer the writer
-	 */
-	void evaluateTemplate(String templateName, Class<?> clazz, Map<String, Object> data, Locale locale, Writer writer);
-
-	/**
-	 * TODO.
-	 *
-	 * @param template the template
-	 * @param data the data
-	 * @param locale the locale
-	 * @param writer the writer
-	 */
-	void evaluateTemplate(String template, Map<String, Object> data, Locale locale, Writer writer);
-
-}
\ No newline at end of file