merge r74915 from trunk to branch 5.0
TMDM-960:Fix collision between our build.xml and RCP's in org.talend.mdm.commmon


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@74917 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r75058 from trunk to branch 5.0
TMDM-3140: add http.server.port as the default port 8180


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@75059 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r76831 from trunk to branch 5.0
bug TMDM-3219 fix: Text delimiter is not handled correctly by Import


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@77008 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r77032 from trunk to branch 5.0
TMDM-3310:Changing admin's default password not supported


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@77046 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r77040 from trunk to branch 5.0
TMDM-3310: change the default password to 'talend'


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@77052 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r77536 from trunk to branch 5.0
TMDM-3309:Custom layout role should be set in the role ACL


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@77538 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r78096 from trunk to branch 5.0
TMDM-3337:Error when migrating from 4.2.3 to 4.2.4 with DBMigrationTool


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78118 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r77870 from trunk to branch 5.0
bug TMDM-3219 fixed: fix pom.xml wrong format


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78145 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r77902 from trunk to branch 5.0
bug TMDM-3219 fixed: fix code according to jira comments
Are all poi* required (such poi-examples)
-pom.xml wrongly formatted
-Methods such CommonUtil#splitContent must have their Junit test
-In UploadData.java are all InputStream closed ?


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78146 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r78588 from trunk to branch 5.0
TMDM-3219 Reviewed apache poi dependencies


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78589 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r78598 from trunk to branch 5.0
TMDM-3191:mdm.conf problems


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78599 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r78647 from trunk to branch 5.0
TMDM-3191:mdm.conf problems


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@78659 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r79037 from trunk to branch 5.0
TMDM-3191:mdm.conf problems


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@79044 f6f1c999-d317-4740-80b0-e6d1abc6f99e
TMDM-3980 : add dependent lib for xslt test

git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@83811 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r83900 from trunk to branch 5.0
Avoid generating outside build directory


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@83912 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r86008 from trunk to branch 5.1
TMDM-4223 : Add support for eclipse 3.7 m2e plugin


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_1@86017 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r86015 from trunk to branch 5.1
TMDM-4223 : Fix m2e conformance for the followings:
-Plugin execution not covered by lifecycle configuration: org.codehaus.mojo:gwt-maven-plugin:1.2:compile (execution: gwt-compile, phase: process-classes)
-maven-dependency-plugin (goals "copy-dependencies", "unpack") is not supported by m2e
-maven-resources-plugin prior to 2.4 is not supported by m2e. Use maven-resources-plugin version 2.4 or later.


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_1@86019 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r86008 from trunk to branch 5.0
TMDM-4223 : Add support for eclipse 3.7 m2e plugin


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@86032 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r86015 from trunk to branch 5.0
TMDM-4223 : Fix m2e conformance for the followings:
-Plugin execution not covered by lifecycle configuration: org.codehaus.mojo:gwt-maven-plugin:1.2:compile (execution: gwt-compile, phase: process-classes)
-maven-dependency-plugin (goals "copy-dependencies", "unpack") is not supported by m2e
-maven-resources-plugin prior to 2.4 is not supported by m2e. Use maven-resources-plugin version 2.4 or later.


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_0@86035 f6f1c999-d317-4740-80b0-e6d1abc6f99e
merge r92405 from trunk to branch 5.1
TMDM-4610: Update server-side code to make the limit of getConceptsInDataCluster configurable


git-svn-id: http://talendforge.org/svn/tom/branches/branch-5_1@92631 f6f1c999-d317-4740-80b0-e6d1abc6f99e