Update the latest changes to prepare the new release soon

mycollab-app-community/pom.xml

@@ -19,11 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.mycollab</groupId>
-            <artifactId>mycollab-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.mycollab</groupId>
@@ -83,6 +78,12 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-client</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -294,7 +295,7 @@
                                 </copy>
                                 <copy todir="${installer.staging.dir}/config">
                                     <fileset dir="${basedir}/src/main/config">
-                                        <exclude name="mycollab.properties"/>
+                                        <exclude name="application.properties"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${installer.staging.dir}/logs">
@@ -306,6 +307,7 @@
                                 <copy todir="${installer.staging.dir}/lib">
                                     <fileset dir="${basedir}/src/main/lib"/>
                                 </copy>
+                                <chmod dir="${installer.staging.dir}/bin/" includes="*.sh" perm="700"/>
                             </target>
                         </configuration>
                     </execution>

mycollab-app-community/src/main/config/application.properties.ftl

@@ -1,5 +1,5 @@
 #=====================================================
-# You can visit link http://community.mycollab.com/configuration/
+# You can visit link https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/advanced-configuration/
 # to get all configuration fieldBuilder and their meanings
 #=====================================================
 
@@ -10,9 +10,9 @@ app.siteName=${sitename}
 app.notifyEmail=${mailNotify}
 
 server.address=${serveraddress}
-server.apiUrl=http://api.mycollab.com/api/
+server.apiUrl=https://api.mycollab.com/
 server.storageSystem=file
-server.siteUrl=http://%s:%d
+server.siteUrl=http://%s:%d/
 server.resourceDownloadUrl=http://%s:%d/file/
 server.cdnUrl=http://%s:%d/assets/
 

mycollab-app-community/src/main/resources/banner.txt

@@ -0,0 +1,9 @@
+
+ ===================================================================================================================
+ ___  ___ _  _   ___   ___   __    __     ___  ____       ___   ___   ___  ___ ___  ___ __ __ __  __ __ ______ _  _
+ ||\\//|| \\//  //    // \\  ||    ||    // \\ || ))     //    // \\  ||\\//|| ||\\//|| || || ||\ || || | || | \\//
+ || \/ ||  )/  ((    ((   )) ||    ||    ||=|| ||=)     ((    ((   )) || \/ || || \/ || || || ||\\|| ||   ||    )/
+ ||    || //    \\__  \\_//  ||__| ||__| || || ||_))     \\__  \\_//  ||    || ||    || \\_// || \|| ||   ||   //
+
+ Version 6.0.0
+ ===================================================================================================================

mycollab-app-community/src/main/scripts/mycollab.bat

@@ -18,6 +18,7 @@ rem                   Required to run the with the "debug" argument.
 rem ---------------------------------------------------------------------------
 
 set _RUNJAVA=java
+set MYCOLLAB_PORT=9090
 set MYCOLLAB_OPTS=-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
 
 rem Suppress Terminate batch job on CTRL+C
@@ -85,7 +86,7 @@ goto execCmd
 
 rem Execute Java with the applicable properties
 cd ..
-%_EXECJAVA% -jar executor.jar %* %MYCOLLAB_OPTS%
+%_EXECJAVA% -jar executor.jar %* %MYCOLLAB_OPTS% -Dserver.port=%MYCOLLAB_PORT%
 goto end
 
 :end

mycollab-app-community/src/main/scripts/mycollab.sh

@@ -20,6 +20,7 @@
 # -----------------------------------------------------------------------------
 # OS specific support.  $var _must_ be set to either true or false.
 
+export MYCOLLAB_PORT=9090
 export MYCOLLAB_OPTS=-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
 
 cygwin=false
@@ -153,7 +154,7 @@ if [ "$1" = "--start" ] ; then
   shift
   touch "$MYCOLLAB_OUT"
   cd ..
-  eval \"$_RUNJAVA\" -jar $MYCOLLAB_HOME/executor.jar $MYCOLLAB_OPTS &
+  eval \"$_RUNJAVA\" -jar $MYCOLLAB_HOME/executor.jar $MYCOLLAB_OPTS -Dserver.port=$MYCOLLAB_PORT &
 
   if [ ! -z "$MYCOLLAB_PID" ]; then
     echo $! > "$MYCOLLAB_PID"

mycollab-config/pom.xml

@@ -18,12 +18,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>org.jasypt</groupId>
             <artifactId>jasypt</artifactId>

mycollab-config/src/main/java/com/mycollab/configuration/ApplicationProperties.java

@@ -29,25 +29,17 @@
 
 /**
  * This file contains all constants define in system properties file
- * mycollab.properties read at system started.
+ * application.properties read at system started.
  *
  * @author MyCollab Ltd.
  * @since 1.0
  */
 public class ApplicationProperties {
-    private static final String RESOURCE_PROPERTIES = "mycollab.properties";
+    private static final String RESOURCE_PROPERTIES = "application.properties";
     private static final String DECRYPT_PASS = "esofthead321";
 
     private static Properties properties;
 
-    public static final String MAIL_SMTPHOST = "mail.smtphost";
-    public static final String MAIL_PORT = "mail.port";
-    public static final String MAIL_USERNAME = "mail.username";
-    public static final String MAIL_PASSWORD = "mail.password";
-    public static final String MAIL_IS_TLS = "mail.isTLS";
-    public static final String MAIL_IS_SSL = "mail.isSSL";
-    public static final String MAIL_NOTIFY = "mail.notify";
-
     public static final String DROPBOX_AUTH_LINK = "dropbox.callbackUrl";
 
     public static final String BI_ENDECRYPT_PASSWORD = "endecryptPassword";

mycollab-core/src/main/java/com/mycollab/core/AbstractNotification.kt

@@ -20,23 +20,12 @@ package com.mycollab.core
  * @author MyCollab Ltd
  * @since 5.1.3
  */
-abstract class AbstractNotification(val scope: String, val kind: String) {
-
-    val isGlobalScope: Boolean
-        get() = SCOPE_GLOBAL == scope
+abstract class AbstractNotification(val kind: String) {
 
     companion object {
 
-        @JvmField
-        val WARNING = "warning"
-
-        @JvmField
-        val NEWS = "news"
-
-        @JvmField
-        val SCOPE_GLOBAL = "global"
+        const val WARNING = "warning"
 
-        @JvmField
-        val SCOPE_USER = "user"
+        const val NEWS = "news"
     }
 }

mycollab-core/src/main/java/com/mycollab/core/BroadcastMessage.kt

@@ -20,7 +20,13 @@ package com.mycollab.core
  * @author MyCollab Ltd
  * @since 5.3.5
  */
-class BroadcastMessage(val sAccountId: Int?, val targetUser: String?, val wrapObj: Any) {
+class BroadcastMessage(val scope:String, val sAccountId: Int?, val targetUser: String?, val wrapObj: Any) {
 
-    constructor(wrapObj: Any) : this(null, null, wrapObj)
+    constructor(scope:String, wrapObj: Any) : this(scope, null, null, wrapObj)
+
+    companion object {
+        const val SCOPE_GLOBAL = "global"
+
+        const val SCOPE_USER = "user"
+    }
 }

mycollab-core/src/main/java/com/mycollab/core/NewUpdateAvailableNotification.kt

@@ -20,7 +20,7 @@ package com.mycollab.core
  * @author MyCollab Ltd
  * @since 5.1.3
  */
-class NewUpdateAvailableNotification(val version: String, val autoDownloadLink: String?, val manualDownloadLink: String, val installerFile: String?) : AbstractNotification(AbstractNotification.SCOPE_GLOBAL, AbstractNotification.NEWS) {
+class NewUpdateAvailableNotification(val version: String, val autoDownloadLink: String?, val manualDownloadLink: String, val installerFile: String?) : AbstractNotification(AbstractNotification.NEWS) {
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true

mycollab-core/src/main/java/com/mycollab/core/utils/TimezoneVal.kt

@@ -96,7 +96,7 @@ class TimezoneVal(val id: String?) : Comparable<TimezoneVal> {
         val areas: Array<String>
             get() {
                 val keys = ArrayList(cacheTimezones.keys)
-                Collections.sort(keys)
+                keys.sort()
                 return keys.toTypedArray()
             }
 

mycollab-dao/src/main/java/com/mycollab/db/query/NumberParam.kt

@@ -66,20 +66,19 @@ class NumberParam(id: String, table: String, column: String) : ColumnParam(id, t
             OneValueSearchField(oper, String.format(LESS_THAN_EXPR, this.table, this.column), value)
 
     private fun buildParamIsLessThanEqual(oper: String, value: Any): OneValueSearchField =
-            OneValueSearchField(oper, String.format(
-                    LESS_THAN_EQUAL_EXPR, this.table, this.column), value)
+            OneValueSearchField(oper, String.format(LESS_THAN_EQUAL_EXPR, this.table, this.column), value)
 
     companion object {
 
         @JvmField val OPTIONS = arrayOf(EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUAL, GREATER_THAN, GREATER_THAN_EQUAL, IS_EMPTY, IS_NOT_EMPTY)
 
-        private val EQUAL_EXPR = "%s.%s = "
-        private val NOT_EQUAL_EXPR = "%s.%s <> "
-        private val NULL_EXPR = "%s.%s is null"
-        private val NOT_NULL_EXPR = "%s.%s is not null"
-        private val GREATER_THAN_EXPR = "%s.%s > "
-        private val GREATER_THAN_EQUAL_EXPR = "%s.%s >= "
-        private val LESS_THAN_EXPR = "%s.%s < "
-        private val LESS_THAN_EQUAL_EXPR = "%s.%s <= "
+        private const val EQUAL_EXPR = "%s.%s = "
+        private const val NOT_EQUAL_EXPR = "%s.%s <> "
+        private const val NULL_EXPR = "%s.%s is null"
+        private const val NOT_NULL_EXPR = "%s.%s is not null"
+        private const val GREATER_THAN_EXPR = "%s.%s > "
+        private const val GREATER_THAN_EQUAL_EXPR = "%s.%s >= "
+        private const val LESS_THAN_EXPR = "%s.%s < "
+        private const val LESS_THAN_EQUAL_EXPR = "%s.%s <= "
     }
 }

mycollab-deployer-community/pom.xml

@@ -28,7 +28,6 @@
         <module>../mycollab-scheduler</module>
         <module>../mycollab-scheduler-community</module>
         <module>../mycollab-servlet</module>
-        <module>../mycollab-client-api</module>
         <module>../mycollab-ui</module>
         <module>../mycollab-web</module>
         <module>../mycollab-mobile</module>

mycollab-esb/src/main/java/com/mycollab/module/billing/esb/AccountCreatedCommand.kt

@@ -79,7 +79,7 @@ class AccountCreatedCommand(private val optionValService: OptionValService,
         val project = Project()
         project.saccountid = accountId
         project.description = "Sample project"
-        project.homepage = "http://www.mycollab.com"
+        project.homepage = "https://www.mycollab.com"
         project.name = "Sample project"
         project.projectstatus = StatusI18nEnum.Open.name
         project.shortname = "SP1"
@@ -204,7 +204,7 @@ class AccountCreatedCommand(private val optionValService: OptionValService,
         val folder = Folder()
         folder.name = "Requirements"
         folder.description = "Sample folder"
-        folder.path = PathUtils.getProjectDocumentPath(accountId, projectId) + "/" + StringUtils.generateSoftUniqueId()
+        folder.path = "${PathUtils.getProjectDocumentPath(accountId, projectId)}/${StringUtils.generateSoftUniqueId()}"
         pageService.createFolder(folder, initialUser)
 
         val timer = Timer("Set member notification")

mycollab-esb/src/main/java/com/mycollab/module/common/esb/BatchInsertProjectNotificationItemsCommand.kt

@@ -5,6 +5,7 @@ import com.google.common.eventbus.Subscribe
 import com.mycollab.common.EntryUpdateNotification
 import com.mycollab.common.service.NotificationItemService
 import com.mycollab.core.BroadcastMessage
+import com.mycollab.core.BroadcastMessage.Companion.SCOPE_USER
 import com.mycollab.core.Broadcaster
 import com.mycollab.module.esb.GenericCommand
 import com.mycollab.module.project.event.BatchInsertNotificationItemsEvent
@@ -23,7 +24,7 @@ class BatchInsertProjectNotificationItemsCommand(private val notificationItemsSe
         if (event.notifyUsers.isNotEmpty()) {
             notificationItemsService.batchInsertItems(event.notifyUsers, event.module, event.type, event.typeId, event.messages, event.sAccountId)
             event.notifyUsers.forEachIndexed { index, notifyUser ->
-                Broadcaster.broadcast(BroadcastMessage(event.sAccountId, notifyUser,
+                Broadcaster.broadcast(BroadcastMessage(SCOPE_USER, event.sAccountId, notifyUser,
                         EntryUpdateNotification(notifyUser, event.module, event.type, event.typeId, event.messages[index])))
             }
         }