aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-20Fix the bug "Repeat upload package has logic error".nancylizi1-0/+9
Change-Id: I548de180491738f3e13a119e9d6cc5e03253ca2d Issue-id:TOSCA-124 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-18TOSCA-121 Modify the problem of session closed when appincation access the ↵sunqi3101-10/+10
same database table at the same time Change-Id: Ic9f8720339858eed7cf9b71e32255ab334e94a94 Issue-id: TOSCA-121 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-10-13The url of http server via msb is started with 'files/catalog-http'.YuanHu1-1/+5
Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9 Issue-id: TOSCA-108 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-13Merge "Fix the problem "when upload package throws an exception "String ↵sun qi1-13/+15
index out of range: -1""
2016-10-13Fix the problem "when upload package throws an exception "String index out ↵nancylizi1-13/+15
of range: -1" Change-Id: I594c2e47b104d237390dc9f45d4447e3129f2594 Issue-id:TOSCA-115 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-13Merge "bump OPEN-O snapshot versions on master"Jian Huang10-11/+10
2016-10-13bump OPEN-O snapshot versions on masterhuangjian10-11/+10
Change-Id: I23da3f8053950b890647614c79ad800cfc7e06c5 Issue-id: TOSCA-112 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-10-13Parser download csar package from http server via msb.YuanHu1-2/+2
Change-Id: Ibc414e5f01a57065de459d4a95ba27d8e5c2fb77 Issue-id: TOSCA-108 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-12Protected of NullPointerException while convert json string to java Object.YuanHu2-13/+29
When call zte parser api. Issue-id: TOSCA-108 Change-Id: I430a018f787b8c413b625dbd4a07b79f87ab0ef7 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-12Fix bug "define csar meta in different way may cause upload package failed".nancylizi1-6/+8
Issue-id:TOSCA-106 Change-Id: I5c4c73229787bdd17280c12d1074dffc21a1f327 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-10Modify the request parameter from extensionList to extension, while call ↵YuanHu2-16/+15
tosca-yaml-parser. Change-Id: Ie00fbca7ab2d3e71c72ff58715ff09c0df874506 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-10Change the default parser type from zte to aria.YuanHu2-3/+2
Change-Id: I5ef4941c63ee34cd35abcdaab1eeac77bdca8384 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-30Parse Plan information from our own alone file. Definitions/plans.yamlYuanHu12-75/+411
Change-Id: Ic300ff92bc8063cad33a372f3f31ecc5941c3b1a Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-29Clean Code. Extracting common methods.YuanHu6-85/+149
Dynamically Obtain the download-uri of service template. Change-Id: I79e60b6105bdad9cf9682776bc9dda7d2034fc54 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-29Modify the bug which "Catalog unit test failure on latest daily build"nancylizi3-1/+6
Issue-id:TOSCA-83 Change-Id: Ife531fe8662cfd7c0735d7e1fd9075238aaa5994 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-27Update license headerhuangjian206-10083/+9926
Change-Id: I9254691ebb7c05ebed80d2348e750db773ff0685 Issue-id: TOSCA-84 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-27Restore the bug which delete package can not delete templatenancylizi1-32/+6
Issue-id:TOSCA-82 Change-Id: Ib749580b30c5bad4dbaf7607e8a3e6d5f38991aa Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Change download uri of package, restore the bug in upload package.nancylizi4-15/+24
Issue-id:TOSCA-81 Change-Id: I96964c84ac237f6e07ab4d63b409faec0de58c85 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Modify the bug about uploadPackage and queryPackageByIdnancylizi3-79/+86
Issue-id:TOSCA-77 Change-Id: I2697f150bca4404bd2c806c9669961c2ddba6de2 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Add junit about model manager.nancylizi2-0/+518
Issue-id:TOSCA-78 Change-Id: I9871f7c109f0bd60183c893d05c31e7996d3685a Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-23Code cleanup. Such as Providing new public method, changing method name.YuanHu5-20/+12
Change-Id: Ida1cd134c94c8c014a4a827acdb06404633d1fc3 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-22Modification for co-debug with aria parser.YuanHu7-141/+222
Change-Id: I4839aab6651149d5b167c4cc452d922a5af878c7 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-21TOSCA-69 Modify the default port of http serversunqi3103-4/+6
Change-Id: Ibbe9f1ee1e6b2ade52c75ee01c9facad0aa4df58 Issue-id: TOSCA-69 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-09-21TOSCA-68 Modify start and stop script.so that we can run or stop catalog ↵sunqi3104-7/+10
service at any path Change-Id: I98fbf875f163a0e2116e0667d2e4c7e03d5d8e5d Issue-id: TOSCA-68 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-09-21Merge "Provide put method for the ModelParserFactory."Jian Huang1-0/+10
2016-09-211. The publish package name add system typehuangjian2-16/+10
2. Parameter tasks is deprecated, use target instead Change-Id: Ic7e23133ed919161e0fd8b9d980fe9064bed8c52 Issue-id: TOSCA-65 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-21Provide put method for the ModelParserFactory.YuanHu1-0/+10
Change-Id: Ic58fdc4d4192e8e3fa2dff6af37c6bf4c8a5e032 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-21Merge "Delete the redundant Configuration Items. Such as ↵Jian Huang11-205/+53
opentoscaServerAddr, yamlParseAddr, ariaParserAddr, wso2HostIp, wso2HostPort, ldapServerIp, ldapServerPort, ldapLogindn, ldapPassword, ldapVersion."
2016-09-20Output Linux distribution packagehuangjian4-80/+207
Change-Id: I359b251d96076718c704b3d68127c9401e345643 Issue-id: TOSCA-63 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-20Delete the redundant Configuration Items. Such as opentoscaServerAddr, ↵YuanHu11-205/+53
yamlParseAddr, ariaParserAddr, wso2HostIp, wso2HostPort, ldapServerIp, ldapServerPort, ldapLogindn, ldapPassword, ldapVersion. Change-Id: Ia1b6693a66cf500f94cb58b51543c35d57520c23 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-20Modify the log file storage pathhuangjian1-100/+100
Change-Id: Ie158d1b2dec04bf0f88acfd94bb655829c8dec17 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-20Remove unused code of package manager, change a way to read yamlParseAddr ↵nancylizi12-254/+33
from config file. Issue-id: TOSCA-58 Change-Id: Ie6183f9eefe4e8204a1d9b7ff614b0276d76d9c7 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-19Remove Chinese charactornancylizi3-7/+6
Change-Id: I7457b30f67498c6dccf30350e667e6288c21b8a3 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-19Change *.sh script files format to UNIXhuangjian2-2/+2
Change-Id: I71dddbee826e87a5e203ac4713d541d9ba24c476 Issue-id: TOSCA-54 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-14Fix build errors in autorelease full clean buildGary Wu10-8/+17
Fix build errors found in autorelease during full clean build of all projects. Change-Id: I8131b7ca968dc48aa87000837003e69931967830 Issue-id: INT-9 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2016-09-14Codes for the interface with aria parser.YuanHu11-145/+753
Change-Id: I7bac354212fa12c08aaa266f057bb10bedb5c4c3 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-13Change the package name of these classes.YuanHu4-6/+5
Change-Id: I5d900f9d02f7abacceba7b499fe7c03cba7b3511 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-13Change the package name of these class. ↵YuanHu8-21/+24
org.openo.commontosca.catalog.model.parser.yaml --> org.openo.commontosca.catalog.model.parser.yaml.zte Change-Id: I02c7f3468205f0341bedf03fbd66a2fed07a2155 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-09Modify the change line tag crlf to lf, modify check style, add the parser ↵nancylizi65-6215/+6235
calling in package manager, remove Chinese comment. Change-Id: I77226cb8d69b8a62c8364e371b83fdb9e462ce1d Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-08Change java.io.File.deleteOnExit() to java.io.File.delete(). For the latter ↵YuanHu1-415/+415
id more stable. Change-Id: I52c6982fd1fbfcd9146f7a80ccf9f4cf16feba3f Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-08Merge changes Icbb40a43,I4c84d3bb,I124e06b6Jian Huang3-5/+49
* changes: Put the csar package to the httpserver and post the path to the parser. Protected for Response Null While Deploy Plan-Package to wso2 NullPointer Protected while plan is empty.
2016-09-06Normalize line endingsGary Wu1-0/+2
Change-Id: Ie1563a1eb7cd181667b4757d46a1711f7ecf1a6c Issue-id: INT-40 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2016-09-06Put the csar package to the httpserver and post the path to the parser.YuanHu1-3/+40
Change-Id: Icbb40a431c7202e41b957031d4500104a67cfc9d Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-06Protected for Response Null While Deploy Plan-Package to wso2YuanHu1-1/+5
Change-Id: I4c84d3bb9f94f01e21e605791019e62a78618e13 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-06NullPointer Protected while plan is empty.YuanHu1-1/+4
Change-Id: I124e06b671fea5305c617483c64547e91c2fe212 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-06The configuration of wso2HostIp and wso2HostPortYuanHu1-0/+4
Change-Id: Ica50061c22e9f3609e2eb251408927bb1c3d8798 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-05add init db scriptssunqi3106-109/+53
Change-Id: I565142502e1740666fa810c82ce927ed8a43ce35 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-09-03Merge "Fix deploy issue in common-tosca-catalog httpserver"Jian Huang1-14/+39
2016-09-02Fix deploy issue in common-tosca-catalog httpserverGary Wu1-14/+39
Change-Id: I4325af634d104888b26111834a3c02fc3e445862 Issue-id: INT-40 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2016-09-01Delete the useless commetdnancylizi7-330/+16
Change-Id: I40c2e11d23df61b38ab69910ac88c387a1260747 Signed-off-by: nancylizi <li.zi30@zte.com.cn>