* Continue update the codebase according with the new micro service architect

Author: hainguyen

…/src/main/config/mycollab.properties.ftl …c/main/config/application.properties.ftlmycollab-app-community/src/main/config/mycollab.properties.ftl renamed to mycollab-app-community/src/main/config/application.properties.ftl mycollab-app-community/src/main/config/mycollab.properties.ftl renamed to mycollab-app-community/src/main/config/application.properties.ftl

@@ -6,17 +6,23 @@
 #=====================================================
 #    SITE CONFIGURATION
 #=====================================================
-site.name=${sitename}
-server.address=${serveraddress}
+app.siteName=${sitename}
+app.notifyEmail=${mailNotify}
 
+server.address=${serveraddress}
+server.apiUrl=http://api.mycollab.com/api/
+server.storageSystem=file
+server.siteUrl=http://%s:%d
+server.resourceDownloadUrl=http://%s:%d/file/
+server.cdnUrl=http://%s:%d/assets/
 
 #=====================================================
 #    DATABASE CONFIGURATION
 #=====================================================
-db.driverClassName=com.mysql.jdbc.Driver
-db.url=${dbUrl}
-db.username=${dbUser}
-db.password=${dbPassword}
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.url=${dbUrl}
+spring.datasource.username=${dbUser}
+spring.datasource.password=${dbPassword}
 
 #=====================================================
 #    MAIL CONFIGURATION
@@ -27,9 +33,8 @@ mail.smtphost=${smtpAddress}
 mail.port=${smtpPort}
 mail.username=${smtpUserName}
 mail.password=${smtpPassword}
-mail.isTLS=${smtpTLSEnable}
-mail.isSSL=${smtpSSLEnable}
-mail.notify=${mailNotify}
+mail.startTls=${smtpTLSEnable}
+mail.ssl=${smtpSSLEnable}
 
 #=====================================================
 #    ERROR REPORTING

mycollab-app-community/src/main/config/application.yml

@@ -22,15 +22,13 @@ import org.infinispan.commons.api.BasicCache
 import org.infinispan.context.Flag
 import org.infinispan.manager.EmbeddedCacheManager
 import org.slf4j.LoggerFactory
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Service
 
 /**
  * @author MyCollab Ltd
  * @since 5.1.4
  */
 @Service
-@Profile("program")
 class InfinispanCacheService(private val instance: EmbeddedCacheManager) : CacheService {
 
     override fun putValue(group: String, key: String, value: Any) {

mycollab-caching/src/main/java/com/mycollab/cache/service/impl/InfinispanCacheService.kt

@@ -21,10 +21,8 @@ import org.infinispan.configuration.cache.ConfigurationBuilder
 import org.infinispan.spring.starter.embedded.InfinispanCacheConfigurer
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Profile
 
 @Configuration
-@Profile("program")
 class CacheConfiguration {
 
     @Bean

mycollab-caching/src/main/java/com/mycollab/cache/spring/CacheConfiguration.kt

@@ -29,11 +29,5 @@
             <artifactId>jasypt</artifactId>
             <version>1.9.2</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker-gae</artifactId>
-            <version>2.3.28</version>
-        </dependency>
     </dependencies>
 </project>

mycollab-config/pom.xml

@@ -17,21 +17,19 @@
 package com.mycollab.configuration
 
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
 
 /**
  * @author MyCollab Ltd
  * @since 5.5.0
  */
 @Component
-@Profile("program", "test")
 @ConfigurationProperties(prefix = "app")
 class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
                                var twitterUrl: String? = "", var googleUrl: String? = "",
                                var linkedinUrl: String? = "", var notifyEmail: String) {
 
-    constructor(): this("", "", "", "", "", "", "")
+    constructor() : this("", "", "", "", "", "", "")
 
     fun defaultUrls() =
             mutableMapOf("facebook_url" to (facebookUrl ?: ""),

mycollab-config/src/main/java/com/mycollab/configuration/ApplicationConfiguration.kt

@@ -17,14 +17,12 @@
 package com.mycollab.configuration
 
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
 
 /**
  * @author MyCollab Ltd
  * @since 6.0.0
  */
-@Profile("program")
 @Component
 @ConfigurationProperties(prefix = "spring.datasource")
 class DatabaseConfiguration(var driverClassName: String = "", var url: String = "",

mycollab-config/src/main/java/com/mycollab/configuration/DatabaseConfiguration.kt

@@ -18,7 +18,6 @@ package com.mycollab.configuration
 
 import com.mycollab.core.arguments.ValuedBean
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
 
 /**
@@ -28,13 +27,12 @@ import org.springframework.stereotype.Component
  * @since 1.0
  */
 @Component
-@Profile("program")
 @ConfigurationProperties(prefix = "mail")
 class EmailConfiguration(var smtphost: String?, var username: String?,
-                              var password: String?, var port: Int,
-                              var startTls: Boolean = false, var ssl: Boolean = false,
-                              var notifyEmail: String) : ValuedBean() {
-    constructor(): this("", "", "", -1, false, false, "")
+                         var password: String?, var port: Int,
+                         var startTls: Boolean = false, var ssl: Boolean = false,
+                         var notifyEmail: String) : ValuedBean() {
+    constructor() : this("", "", "", -1, false, false, "")
 }
 
 

mycollab-config/src/main/java/com/mycollab/configuration/EmailConfiguration.kt

@@ -17,20 +17,18 @@
 package com.mycollab.configuration
 
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
 
 /**
  * @author MyCollab Ltd
  * @since 5.5.0
  */
 @Component
-@Profile("program")
 @ConfigurationProperties(prefix = "server")
-class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int? = 8080,
-                               var address: String?,
-                               var apiUrl: String, var pullMethod: String?, var siteUrl: String,
-                               var resourceDownloadUrl: String, var cdnUrl: String) {
+class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int,
+                          var address: String?,
+                          var apiUrl: String, var pullMethod: String?, var siteUrl: String,
+                          var resourceDownloadUrl: String, var cdnUrl: String) {
 
     constructor() : this("", 8080, "", "", "", "", "", "")
 

mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt

@@ -1,18 +1,8 @@
 package com.mycollab.configuration;
 
-import com.mycollab.core.utils.FileUtils;
 import com.mycollab.spring.AppContextUtil;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.FileTemplateLoader;
-import freemarker.cache.MultiTemplateLoader;
-import freemarker.cache.TemplateLoader;
-import freemarker.template.Configuration;
 import org.joda.time.DateTimeZone;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -32,8 +22,6 @@ public class SiteConfiguration {
     private String endecryptPassword;
     private String dropboxCallbackUrl;
 
-    private Configuration freemarkerConfiguration;
-
     public static void loadConfiguration() {
         TimeZone.setDefault(DateTimeZone.UTC.toTimeZone());
         DateTimeZone.setDefault(DateTimeZone.UTC);
@@ -50,30 +38,6 @@ public static void loadConfiguration() {
         instance.endecryptPassword = ApplicationProperties.getString(BI_ENDECRYPT_PASSWORD, "mycollab123");
 
         instance.dropboxCallbackUrl = ApplicationProperties.getString(DROPBOX_AUTH_LINK);
-
-        Configuration configuration = new Configuration(Configuration.VERSION_2_3_26);
-        configuration.setDefaultEncoding("UTF-8");
-        try {
-            List<TemplateLoader> loaders = new ArrayList<>();
-            File i18nFolder = new File(FileUtils.getUserFolder(), "i18n");
-            File confFolder1 = new File(FileUtils.getUserFolder(), "config");
-            File confFolder2 = new File(FileUtils.getUserFolder(), "src/main/config");
-            if (i18nFolder.exists()) {
-                loaders.add(new FileTemplateLoader(i18nFolder));
-            }
-            if (confFolder1.exists()) {
-                loaders.add(new FileTemplateLoader(confFolder1));
-            }
-            if (confFolder2.exists()) {
-                loaders.add(new FileTemplateLoader(confFolder2));
-            }
-            loaders.add(new ClassTemplateLoader(SiteConfiguration.class.getClassLoader(), ""));
-            configuration.setTemplateLoader(new MultiTemplateLoader(loaders.toArray(new TemplateLoader[loaders.size()])));
-            instance.freemarkerConfiguration = configuration;
-        } catch (IOException e) {
-            e.printStackTrace();
-            System.exit(-1);
-        }
     }
 
     private static SiteConfiguration getInstance() {
@@ -99,7 +63,7 @@ public static boolean isCommunityEdition() {
     }
 
     public static Locale getDefaultLocale() {
-        return instance.defaultLocale;
+        return Locale.US;
     }
 
     public static String getDropboxCallbackUrl() {
@@ -109,8 +73,4 @@ public static String getDropboxCallbackUrl() {
     public static String getEnDecryptPassword() {
         return getInstance().endecryptPassword;
     }
-
-    public static Configuration freemarkerConfiguration() {
-        return getInstance().freemarkerConfiguration;
-    }
 }