Prepare for the next release 5.2.3

README.md

@@ -1,6 +1,6 @@
 # Free, open source CRM, Document and Project Management software
 [![License](http://img.shields.io/badge/License-GPL-orange.svg)](http://www.gnu.org/copyleft/gpl.html) [![Project Stats](https://www.openhub.net/p/mycollab/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mycollab) [![Build](https://travis-ci.org/MyCollab/mycollab.svg)](https://travis-ci.org/MyCollab/mycollab)
-[![Version](https://img.shields.io/badge/Version-5.2.2-brightgreen.svg)](https://community.mycollab.com/)
+[![Version](https://img.shields.io/badge/Version-5.2.3-brightgreen.svg)](https://community.mycollab.com/)
 [![SourceForge](https://img.shields.io/sourceforge/dm/mycollab.svg)](https://community.mycollab.com/download)
 
 ## Introduction
@@ -91,7 +91,7 @@ Please take a look at MyCollab requirements:
 
 ## Installation
 
-The current MyCollab version is 5.2.2 released on 16th November, 2015. This branch focuses in mobile devices, reporting and customize options for on-demand edition.
+The current MyCollab version is 5.2.3 released on 25th November, 2015. This branch focuses in mobile devices, reporting and customize options for on-demand edition.
 
 1. Download MyCollab binary - https://community.mycollab.com/download/
 2. Follow installation guideline at https://community.mycollab.com/installation-guideline/

mycollab-app-community/src/main/assembly/src.xml

@@ -4,8 +4,6 @@
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>mycollab-dist</id>
     <formats>
-        <format>tar.gz</format>
-        <format>tar.bz2</format>
         <format>zip</format>
         <format>dir</format>
     </formats>

mycollab-app-community/src/main/izpack/install.xml

@@ -67,14 +67,14 @@
     <packs>
         <pack name="Base" required="yes">
             <description>The MyCollab core files</description>
-            <file src="../runner.jar" targetdir="$INSTALL_PATH"/>
+            <file src="runner.jar" targetdir="$INSTALL_PATH"/>
             <file src="executor.jar" targetdir="$INSTALL_PATH"/>
             <fileset dir="conf" targetdir="$INSTALL_PATH/conf"/>
             <fileset dir="lib" includes="*" targetdir="$INSTALL_PATH/lib"/>
             <fileset dir="logs" targetdir="$INSTALL_PATH/logs"/>
-            <file src="scripts/mycollab.ini" targetdir="$INSTALL_PATH/bin"/>
-            <fileset dir="scripts" includes="*.sh" targetdir="$INSTALL_PATH/bin" condition="NotWindowsPlatform"/>
-            <fileset dir="scripts" includes="*.bat" targetdir="$INSTALL_PATH/bin" condition="izpack.windowsinstall"/>
+            <file src="bin/mycollab.ini" targetdir="$INSTALL_PATH/bin"/>
+            <fileset dir="bin" includes="*.sh" targetdir="$INSTALL_PATH/bin" condition="NotWindowsPlatform"/>
+            <fileset dir="bin" includes="*.bat" targetdir="$INSTALL_PATH/bin" condition="izpack.windowsinstall"/>
             <fileset dir="txt" includes="*" targetdir="$INSTALL_PATH"/>
             <fileset dir="webapp" includes="**" targetdir="$INSTALL_PATH/webapp"/>
             <executable targetfile="$INSTALL_PATH/bin/mycollab.sh" stage="never" keep="true" condition="NotWindowsPlatform"/>

mycollab-app-community/src/main/java/com/esofthead/mycollab/jetty/CommunityServerRunner.java → mycollab-app-community/src/main/java/com/esofthead/mycollab/jetty/DefaultServerRunner.java

@@ -22,7 +22,7 @@
  * @author MyCollab Ltd.
  * @since 1.0
  */
-public class CommunityServerRunner extends GenericServerRunner {
+public class DefaultServerRunner extends GenericServerRunner {
 
     @Override
     public WebAppContext buildContext(String baseDir) {
@@ -37,6 +37,6 @@ public WebAppContext buildContext(String baseDir) {
     }
 
     public static void main(String[] args) throws Exception {
-        new CommunityServerRunner().run(args);
+        new DefaultServerRunner().run(args);
     }
 }

mycollab-app-community/src/main/txt/README.html

@@ -36,6 +36,22 @@ <h1 id="installation">Installation</h1>
 .mycollab.com/configuration/</a>. You will finish reading and
 understanding in a matter of minutes.</p>
 <h1 id="last-changelog">Last changelog</h1>
+<h2 id="version-5-2-3">Version 5.2.3</h2>
+<p><strong>Library Upgrades</strong></p>
+<ul>
+<li>Joda 2.9.1, Hiraki CP 2.4.2, SLF4J 1.7.13</li>
+<li>Spring framework 4.2.3.RELEASE</li>
+<li>Dynamic Reports 4.0.2</li>
+</ul>
+<p><strong>Improvements &amp; New Features</strong></p>
+<ul>
+<li>Allow inline edit task, milestone and bug summary field in dashboard view</li>
+<li>Minor UI updates</li>
+</ul>
+<p><strong>Bug Fixes</strong></p>
+<ul>
+<li>Upgrade process still keeps the old version value of class path items</li>
+</ul>
 <h2 id="version-5-2-2">Version 5.2.2</h2>
 <p><strong>Library Upgrades</strong></p>
 <ul>

mycollab-app-community/src/main/txt/README.md

@@ -43,6 +43,23 @@ understanding in a matter of minutes.
 Last changelog
 ==============
 
+Version 5.2.3
+-----------------------------
+**Library Upgrades**
+
+* Joda 2.9.1, Hiraki CP 2.4.2, SLF4J 1.7.13
+* Spring framework 4.2.3.RELEASE
+* Dynamic Reports 4.0.2
+
+**Improvements & New Features**
+
+* Allow inline edit task, milestone and bug summary field in dashboard view
+* Minor UI updates
+
+**Bug Fixes**
+
+* Upgrade process still keeps the old version value of class path items
+
 Version 5.2.2
 -----------------------------
 

mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.esofthead.mycollab.widgetset.MyCollabMobileWidgetSet/aosp.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Build timeWed Nov 11 13:36:58 ICT 2015
+# Build timeWed Nov 25 13:50:38 ICT 2015
 
 CACHE:
 ../../../VAADIN/themes/base/fonts/fontawesome-webfont.ttf

mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.esofthead.mycollab.widgetset.MyCollabMobileWidgetSet/gecko1_8.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Build timeWed Nov 11 13:36:58 ICT 2015
+# Build timeWed Nov 25 13:50:38 ICT 2015
 
 CACHE:
 ../../../VAADIN/themes/base/fonts/fontawesome-webfont.woff

mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.esofthead.mycollab.widgetset.MyCollabMobileWidgetSet/ie10.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Build timeWed Nov 11 13:36:58 ICT 2015
+# Build timeWed Nov 25 13:50:38 ICT 2015
 
 CACHE:
 ../../../VAADIN/themes/base/fonts/fontawesome-webfont.woff

mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.esofthead.mycollab.widgetset.MyCollabMobileWidgetSet/safari.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Build timeWed Nov 11 13:36:58 ICT 2015
+# Build timeWed Nov 25 13:50:38 ICT 2015
 
 CACHE:
 ../../../VAADIN/themes/base/fonts/fontawesome-webfont.woff

mycollab-caching-community/pom.xml

@@ -7,15 +7,15 @@
     <parent>
         <groupId>com.esofthead.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.2.2</version>
+        <version>5.2.3</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-caching</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
     </dependencies>
 </project>

mycollab-caching/pom.xml

@@ -7,33 +7,33 @@
     <parent>
         <groupId>com.esofthead.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.2.2</version>
+        <version>5.2.3</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-core</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-dao</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-config</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-test</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

mycollab-config/pom.xml

@@ -7,15 +7,15 @@
     <parent>
         <groupId>com.esofthead.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.2.2</version>
+        <version>5.2.3</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-core</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>

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

@@ -17,6 +17,7 @@
 package com.esofthead.mycollab.configuration;
 
 import com.esofthead.mycollab.core.MyCollabException;
+import com.esofthead.mycollab.core.arguments.ValuedBean;
 
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotNull;
@@ -27,7 +28,7 @@
  * @author MyCollab Ltd.
  * @since 1.0
  */
-public class EmailConfiguration implements Cloneable {
+public class EmailConfiguration extends ValuedBean implements Cloneable {
     @NotNull
     private String host;
     @NotNull

mycollab-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.esofthead.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.2.2</version>
+        <version>5.2.3</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

mycollab-core/src/main/java/com/esofthead/mycollab/core/MyCollabVersion.java

@@ -29,7 +29,7 @@ public class MyCollabVersion {
     public static final String THEME_VERSION = "mycollab_20151109";
 
 	public static String getVersion() {
-		return "5.2.2";
+		return "5.2.3";
 	}
 
     static int[] getVersionNumbers(String ver) {

mycollab-dao/src/main/java/com/esofthead/mycollab/core/arguments/NotBindable.java → mycollab-core/src/main/java/com/esofthead/mycollab/core/arguments/NotBindable.java

@@ -1,18 +1,18 @@
 /**
- * This file is part of mycollab-dao.
+ * This file is part of mycollab-core.
  *
- * mycollab-dao is free software: you can redistribute it and/or modify
+ * mycollab-core is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * mycollab-dao is distributed in the hope that it will be useful,
+ * mycollab-core is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with mycollab-dao.  If not, see <http://www.gnu.org/licenses/>.
+ * along with mycollab-core.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.esofthead.mycollab.core.arguments;
 

mycollab-dao/src/main/java/com/esofthead/mycollab/core/arguments/ValuedBean.java → mycollab-core/src/main/java/com/esofthead/mycollab/core/arguments/ValuedBean.java

@@ -1,18 +1,18 @@
 /**
- * This file is part of mycollab-dao.
+ * This file is part of mycollab-core.
  *
- * mycollab-dao is free software: you can redistribute it and/or modify
+ * mycollab-core is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * mycollab-dao is distributed in the hope that it will be useful,
+ * mycollab-core is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with mycollab-dao.  If not, see <http://www.gnu.org/licenses/>.
+ * along with mycollab-core.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.esofthead.mycollab.core.arguments;
 

mycollab-core/src/main/java/com/esofthead/mycollab/core/utils/StringUtils.java

@@ -86,7 +86,7 @@ public static String formatRichText(String value) {
             return "";
         }
 
-        value = Jsoup.clean(value, Whitelist.relaxed().addTags("img")
+        value = Jsoup.clean(value,relaxed().addTags("img")
                 .addAttributes("img", "align", "alt", "height", "src", "title", "width", "style")
                 .addProtocols("img", "src", "http", "https"));
         Document doc = Jsoup.parse(value);
@@ -96,6 +96,10 @@ public static String formatRichText(String value) {
         return html.replace("\n", "");
     }
 
+    private static Whitelist relaxed() {
+        return (new Whitelist()).addTags(new String[]{"a", "b", "blockquote", "br", "caption", "cite", "code", "col", "colgroup", "dd", "div", "dl", "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "i", "img", "li", "ol", "pre", "q", "small", "span", "strike", "strong", "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "u", "ul"}).addAttributes("a", new String[]{"href", "title"}).addAttributes("blockquote", new String[]{"cite"}).addAttributes("col", new String[]{"span", "width"}).addAttributes("colgroup", new String[]{"span", "width"}).addAttributes("img", new String[]{"align", "alt", "height", "src", "title", "width"}).addAttributes("ol", new String[]{"start", "type"}).addAttributes("q", new String[]{"cite"}).addAttributes("table", new String[]{"summary", "width"}).addAttributes("td", new String[]{"abbr", "axis", "colspan", "rowspan", "width"}).addAttributes("th", new String[]{"abbr", "axis", "colspan", "rowspan", "scope", "width"}).addAttributes("ul", new String[]{"type"}).addProtocols("a", "href", new String[]{"ftp", "http", "https", "mailto"}).addProtocols("blockquote", "cite", new String[]{"http", "https"}).addProtocols("cite", "cite", new String[]{"http", "https"}).addProtocols("img", "src", new String[]{"http", "https"}).addProtocols("q", "cite", new String[]{"http", "https"});
+    }
+
     private static void replaceHtml(Node element) {
         List<Node> elements = element.childNodes();
         Pattern compile = Pattern.compile("(?:https?|ftps?)://[\\w/%.-][/\\??\\w=?\\w?/%.-]?[/\\?&\\w=?\\w?/%.-]*");

mycollab-core/src/main/java/com/esofthead/mycollab/template/velocity/service/TemplateEngine.java

@@ -23,18 +23,16 @@
 
 /**
  * Wrap velocity engine
- * 
+ *
  * @author MyCollab Ltd.
  * @since 4.0.0
- * 
  */
 public interface TemplateEngine {
-	/**
-	 *
-	 * @param context
-	 * @param writer
-	 * @param message
-	 * @param reader
-	 */
-	void evaluate(TemplateContext context, Writer writer, String message, Reader reader);
+    /**
+     * @param context
+     * @param writer
+     * @param message
+     * @param reader
+     */
+    void evaluate(TemplateContext context, Writer writer, String message, Reader reader);
 }

mycollab-dao/pom.xml

@@ -7,21 +7,21 @@
     <parent>
         <groupId>com.esofthead.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.2.2</version>
+        <version>5.2.3</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-core</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.esofthead.mycollab</groupId>
             <artifactId>mycollab-localization</artifactId>
-            <version>5.2.2</version>
+            <version>5.2.3</version>
         </dependency>
 
         <dependency>