* Update README, and minor tweaks of installer

MyCollab · Mar 5, 2015 · 1debb68 · 1debb68
1 parent 0cbe410
commit 1debb68
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,8 @@
 [![License](http://img.shields.io/badge/License-GPL-orange.svg)](http://www.gnu.org/copyleft/gpl.html) [![Build Status](https://travis-ci.org/esofthead/mycollab.svg?branch=master)](https://travis-ci.org/esofthead/mycollab) [![Project Stats](https://www.openhub.net/p/mycollab/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mycollab)
 
 ## Introduction
-The MyCollab Platform offers developers the exact business application platform they’ve been looking for, by combining the tools they need. Built in Java and bundles of open source frameworks and libraries, it seamlessly integrates into CRM, Project Management or Document Management. MyCollab is definitely suitable for the small and mid sized companies to manage their customers, projects etc because of its features, stableness, high performance, and intuitive UI.
 
-MyCollab has bundle three existing modules: Project Management, CRM and Document Management. In future, we can add more modules on MyCollab platform or we develop the marketplace allows developers can extend MyCollab and sell them to MyCollab users.
+MyCollab has bundle three existing modules: Project Management, CRM and Document Management. Intuitive UI, rich features, high performance and stable are the advantages compare with various popular tools in the market such as Redmine, Bugzilla, Mantis etc. This open source is included into a trusted commercial product that is deployed on hundreds of companies' servers.
 
 <table>
   <tr>
@@ -61,11 +60,6 @@ Pull requests and bug reports are always welcome!
 
 Visit our website at http://www.mycollab.com/
 
-## History
-We started development MyCollab since November 2011. MyCollab is developed mainly by Java language with various excellent open sources frameworks/libraries, we can name some of them are Spring, Vaadin, MyBatis, JUnit, RestEasy, Infinispan, Jetty, Solr etc. We would love to build our own solution by Java while we can not find complete solution of Office Cloud Tools (CRM, Project and Document Management etc) or they are very expensive to buy. First, we build MyCollab for internal use. Then we believe that there are many companies would love to find a solution like us, so we publish our on demand service and open source part of our products and hope they are useful for interested companies and people.
-
-You can try MyCollab on-demand edition on site http://www.mycollab.com
-
 ## Features
 MyCollab provides the rich set features of Project Management, Customer Management module and online collaboration methods.
   * CRM
@@ -91,6 +85,7 @@ Please take a look at MyCollab requirements:
     [http://community.mycollab.com/installation-guideline/](http://community.mycollab.com/installation-guideline/)
 
 ## Installation
+
 1. Download MyCollab binary - http://community.mycollab.com/download/
 2. Follow installation guideline at http://community.mycollab.com/installation-guideline/
 
@@ -110,3 +105,10 @@ Contact the MyCollab team at:
 * MyCollab community is licensed with Affero GPL v3. For license terms, see http://community.mycollab.com/licenses/
 
 * MyCollab is powered by eSoftHead http://esofthead.com, which is a software outsourcing and offshoring service company based in Vietnam.
+
+
+
+## History
+We started development MyCollab since November 2011. MyCollab is developed mainly by Java language with various excellent open sources frameworks/libraries, we can name some of them are Spring, Vaadin, MyBatis, JUnit, RestEasy, Infinispan, Jetty, Solr etc. We would love to build our own solution by Java while we can not find complete solution of Office Cloud Tools (CRM, Project and Document Management etc) or they are very expensive to buy. First, we build MyCollab for internal use. Then we believe that there are many companies would love to find a solution like us, so we publish our on demand service and open source part of our products and hope they are useful for interested companies and people.
+
+You can try MyCollab on-demand edition on site http://www.mycollab.com
diff --git a/mycollab-app-community/pom.xml b/mycollab-app-community/pom.xml
@@ -335,8 +335,8 @@
                                 </goals>
                                 <configuration>
                                     <izpackBasedir>${staging.dir}</izpackBasedir>
-                                    <installFile>${basedir}/src/izpack/install.xml</installFile>
-                                    <customPanelDirectory>${staging.dir}</customPanelDirectory>
+                                    <descriptor>${basedir}/src/izpack/install.xml</descriptor>
+                                    <installerFile>target/MyCollab-Generic-${project.version}.jar</installerFile>
                                 </configuration>
                             </execution>
                         </executions>
@@ -352,7 +352,7 @@
                     <plugin>
                         <groupId>com.akathist.maven.plugins.launch4j</groupId>
                         <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>1.7.4</version>
                         <executions>
                             <execution>
                                 <id>l4j-clui</id>
@@ -362,7 +362,7 @@
                                 </goals>
                                 <configuration>
                                     <headerType>gui</headerType>
-                                    <jar>target/mycollab-app-community-${project.version}-standard.jar</jar>
+                                    <jar>target/MyCollab-Generic-${project.version}.jar</jar>
                                     <outfile>target/MyCollab-Installer-${project.version}.exe</outfile>
                                     <downloadUrl>http://java.com/download</downloadUrl>
                                     <classPath>
@@ -394,7 +394,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
+                        <version>1.8</version>
                         <executions>
                             <execution>
                                 <id>create-staging-area</id>
@@ -457,13 +457,13 @@
                                             classname="net.sourceforge.jarbundler.JarBundler"
                                             classpathref="maven.plugin.classpath" />
                                         <jarbundler dir="target"
-                                            name="MyCollab-${project.version}"
+                                            name="MyCollab-MacOS-${project.version}"
                                             mainclass="com.izforge.izpack.installer.Installer"
-                                            jar="target/mycollab-app-community-${project.version}-standard.jar"
+                                            jar="target/MyCollab-Generic-${project.version}.jar"
                                             copyright="©2014, MyCollab"
                                             icon="src/main/macos-resources/mycollab.icns"
                                             version="${project.version}" build="GA"
-                                            infostring="MyCollab - the stable, rich features, and high performance platform of Project Management and CRM" />
+                                            infostring="MyCollab - the stable, rich features, and high performance platform of Project Management and CRM tools" />
                                     </tasks>
                                 </configuration>
                             </execution>

diff --git a/mycollab-app-community/src/izpack/install.xml b/mycollab-app-community/src/izpack/install.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
 <installation version="1.0">
 
+    <!-- The resources section. The ids must be these ones if you want to
+        use the LicencePanel and/or the InfoPanel. -->
+    <resources>
+        <res id="LicencePanel.licence" src="txt/LICENSE.txt" />
+        <res id="InfoPanel.info" src="txt/README.md" />
+        <res id="TargetPanel.dir.windows" src="installpath.windows.txt"/>
+        <res id="TargetPanel.dir.unix" src="installpath.unix.txt"/>
+        <res id="TargetPanel.dir.mac" src="installpath.unix.txt"/>
+        <res id="TargetPanel.dir.mac_osx" src="installpath.mac_osx.txt"/>
+    </resources>
+
     <!-- The info section. The meaning of the tags should be natural ... -->
     <info>
-        <appname>MyCollab, the Project and CRM tools</appname>
-        <appversion>5.0.0</appversion>
+        <appname>MyCollab, the professional open source of Project Management tool</appname>
+        <appversion>5.0.1</appversion>
         <appsubpath>mycollab</appsubpath>
         <authors>
             <author name="MyCollab Ltd" email="[email protected]" />
@@ -28,13 +39,6 @@
         <langpack iso3="eng" />
     </locale>
 
-    <!-- The resources section. The ids must be these ones if you want to 
-        use the LicencePanel and/or the InfoPanel. -->
-    <resources>
-        <res id="LicencePanel.licence" src="txt/LICENSE.txt" />
-        <res id="InfoPanel.info" src="txt/README.md" />
-    </resources>
-
     <!-- The panels section. We indicate here which panels we want to use. 
         The order will be respected. -->
     <panels>
@@ -63,7 +67,6 @@
             </fileset>
             <fileset dir="txt" includes="*" targetdir="$INSTALL_PATH" />
             <file src="webapp" targetdir="$INSTALL_PATH" />
-
             <executable targetfile="$INSTALL_PATH/bin/installDaemon.sh"
                 stage="never" keep="true" os="unix|mac">
             </executable>

diff --git a/mycollab-app-community/src/izpack/installpath.mac_osx.txt b/mycollab-app-community/src/izpack/installpath.mac_osx.txt
@@ -0,0 +1 @@
+/usr/local/mycollab
diff --git a/mycollab-app-community/src/izpack/installpath.unix.txt b/mycollab-app-community/src/izpack/installpath.unix.txt
@@ -0,0 +1 @@
+/usr/local/mycollab
diff --git a/mycollab-app-community/src/izpack/installpath.windows.txt b/mycollab-app-community/src/izpack/installpath.windows.txt
@@ -0,0 +1 @@
+C:/mycollab