\n'},4:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(5,a),inverse:this.program(7,a),data:a}),null!=s&&(i+=s),i},5:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" \n
\n

\n'},7:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" \n
\n

\n'},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(2,a),inverse:this.program(10,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(11,a),inverse:this.program(13,a),data:a}),null!=s&&(i+=s),i},11:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" \n"},13:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" \n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p=""+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"\n\n\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(9,a),data:a}),null!=s&&(p+=s),p+='\n\n',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="\n",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n\n \n\n'},useData:!0});var HeaderView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;HeaderView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"},t.prototype.initialize=function(){},t.prototype.showPetStore=function(){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})},t.prototype.showWordnikDev=function(){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})},t.prototype.showCustomOnKeyup=function(e){return 13===e.keyCode?this.showCustom():void 0},t.prototype.showCustom=function(e){return null!=e&&e.preventDefault(),this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})},t.prototype.update=function(e,t,n){return null==n&&(n=!1),$("#input_baseUrl").val(e),n?this.trigger("update-swagger-ui",{url:e}):void 0},t}(Backbone.View),this.Handlebars.templates.param_list=Handlebars.template({1:function(){return" multiple='multiple'"},3:function(){return""},5:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(3,a),inverse:this.program(6,a),data:a}),null!=s&&(i+=s),i},6:function(e,t,n,a){var s,i=t.helperMissing,r="";return s=(t.isArray||e&&e.isArray||i).call(e,e,{name:"isArray",hash:{},fn:this.program(3,a),inverse:this.program(7,a),data:a}),null!=s&&(r+=s),r},7:function(){return" \n"},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isDefault:e,{name:"if",hash:{},fn:this.program(10,a),inverse:this.program(12,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return' \n"},12:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" \n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p=""+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"\n\n \n\n',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="\n",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n'},useData:!0});var MainView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;MainView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}var n;return __extends(t,e),n={alpha:function(e,t){return e.path.localeCompare(t.path)},method:function(e,t){return e.method.localeCompare(t.method)}},t.prototype.initialize=function(e){var t,n,a,s;null==e&&(e={}),this.model.auths=[],s=this.model.securityDefinitions;for(n in s)a=s[n],t={name:n,type:a.type,value:a},this.model.auths.push(t);return"2.0"===this.model.swaggerVersion?this.model.validatorUrl="validatorUrl"in e.swaggerOptions?e.swaggerOptions.validatorUrl:this.model.url.indexOf("localhost")>0?null:"http://online.swagger.io/validator":void 0},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p;if(this.model.securityDefinitions)for(s in this.model.securityDefinitions)e=this.model.securityDefinitions[s],"apiKey"===e.type&&0===$("#apikey_button").length&&(t=new ApiKeyButton({model:e}).render().el,$(".auth_main_container").append(t)),"basicAuth"===e.type&&0===$("#basic_auth_button").length&&(t=new BasicAuthButton({model:e}).render().el,$(".auth_main_container").append(t));for($(this.el).html(Handlebars.templates.main(this.model)),r={},n=0,p=this.model.apisArray,l=0,o=p.length;o>l;l++){for(i=p[l],a=i.name;"undefined"!=typeof r[a];)a=a+"_"+n,n+=1; i.id=a,r[a]=i,this.addResource(i,this.model.auths)}return $(".propWrap").hover(function(){return $(".optionsWrapper",$(this)).show()},function(){return $(".optionsWrapper",$(this)).hide()}),this},t.prototype.addResource=function(e,t){var n;return e.id=e.id.replace(/\s/g,"_"),n=new ResourceView({model:e,tagName:"li",id:"resource_"+e.id,className:"resource",auths:t,swaggerOptions:this.options.swaggerOptions}),$("#resources").append(n.render().el)},t.prototype.clear=function(){return $(this.el).html("")},t}(Backbone.View),this.Handlebars.templates.param_readonly=Handlebars.template({1:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"

"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"

"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"

\n"},3:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(4,a),inverse:this.program(6,a),data:a}),null!=s&&(i+=s),i},4:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return" "+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"\n"},6:function(){return" (empty)\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p=""+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"\n\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(3,a),data:a}),null!=s&&(p+=s),p+='\n',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="\n",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n\n'},useData:!0});var OperationView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;OperationView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.invocationUrl=null,t.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"},t.prototype.initialize=function(e){return null==e&&(e={}),this.auths=e.auths,this.parentId=this.model.parentId,this.nickname=this.model.nickname,this},t.prototype.mouseEnter=function(e){var t,n,a,s,i,r,l,o,p,u;return t=$(this.el).find(".content"),p=e.pageX,u=e.pageY,r=$(window).scrollLeft(),l=$(window).scrollTop(),s=r+$(window).width(),i=l+$(window).height(),o=t.width(),n=t.height(),p+o>s&&(p=s-o),r>p&&(p=r),u+n>i&&(u=i-n),l>u&&(u=l),a={},a.top=u,a.left=p,t.css(a),$(e.currentTarget.parentNode).find("#api_information_panel").show()},t.prototype.mouseExit=function(e){return $(e.currentTarget.parentNode).find("#api_information_panel").hide()},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p,u,h,c,d,m,f,y,g,v,_,w,b,x,k,O,C,S,P,T,D,H,M,E,R,V,N,U,A;if(i=jQuery.inArray(this.model.method,this.model.supportedSubmitMethods())>=0,i||(this.model.isReadOnly=!0),this.model.description=this.model.description||this.model.notes,this.model.description&&(this.model.description=this.model.description.replace(/(?:\r\n|\r|\n)/g,"
")),this.model.oauth=null,o=this.model.authorizations||this.model.security)if(Array.isArray(o))for(k=0,P=o.length;P>k;k++){n=o[k];for(l in n){t=n[l];for(e in this.auths)if(t=this.auths[e],"oauth2"===t.type){this.model.oauth={},this.model.oauth.scopes=[],R=t.value.scopes;for(r in R)b=R[r],y=n[l].indexOf(r),y>=0&&(p={scope:r,description:b},this.model.oauth.scopes.push(p))}}}else for(r in o)if(b=o[r],"oauth2"===r)for(null===this.model.oauth&&(this.model.oauth={}),void 0===this.model.oauth.scopes&&(this.model.oauth.scopes=[]),O=0,T=b.length;T>O;O++)p=b[O],this.model.oauth.scopes.push(p);if("undefined"!=typeof this.model.responses){this.model.responseMessages=[],V=this.model.responses;for(a in V)x=V[a],m=null,f=this.model.responses[a].schema,f&&f.$ref&&(m=f.$ref,0===m.indexOf("#/definitions/")&&(m=m.substring("#/definitions/".length))),this.model.responseMessages.push({code:a,message:x.description,responseModel:m})}if("undefined"==typeof this.model.responseMessages&&(this.model.responseMessages=[]),g=null,this.model.successResponse){_=this.model.successResponse;for(l in _)x=_[l],this.model.successCode=l,"object"==typeof x&&"function"==typeof x.createJSONSample&&(g={sampleJSON:JSON.stringify(x.createJSONSample(),void 0,2),isParam:!1,signature:x.getMockSignature()})}else this.model.responseClassSignature&&"string"!==this.model.responseClassSignature&&(g={sampleJSON:this.model.responseSampleJSON,isParam:!1,signature:this.model.responseClassSignature});for($(this.el).html(Handlebars.templates.operation(this.model)),g?(d=new SignatureView({model:g,tagName:"div"}),$(".model-signature",$(this.el)).append(d.render().el)):(this.model.responseClassSignature="string",$(".model-signature",$(this.el)).html(this.model.type)),s={isParam:!1},s.consumes=this.model.consumes,s.produces=this.model.produces,N=this.model.parameters,C=0,D=N.length;D>C;C++)u=N[C],w=u.type||u.dataType||"","undefined"==typeof w&&(m=u.schema,m&&m.$ref&&(h=m.$ref,w=0===h.indexOf("#/definitions/")?h.substring("#/definitions/".length):h)),w&&"file"===w.toLowerCase()&&(s.consumes||(s.consumes="multipart/form-data")),u.type=w;for(c=new ResponseContentTypeView({model:s}),$(".response-content-type",$(this.el)).append(c.render().el),U=this.model.parameters,S=0,H=U.length;H>S;S++)u=U[S],this.addParameter(u,s.consumes);for(A=this.model.responseMessages,E=0,M=A.length;M>E;E++)v=A[E],this.addStatusCode(v);return this},t.prototype.addParameter=function(e,t){var n;return e.consumes=t,n=new ParameterView({model:e,tagName:"tr",readOnly:this.model.isReadOnly}),$(".operation-params",$(this.el)).append(n.render().el)},t.prototype.addStatusCode=function(e){var t;return t=new StatusCodeView({model:e,tagName:"tr"}),$(".operation-status",$(this.el)).append(t.render().el)},t.prototype.submitOperation=function(e){var t,n,a,s,i,r,l,o,p,u,h,c,d,m,f,y;if(null!=e&&e.preventDefault(),n=$(".sandbox",$(this.el)),t=!0,n.find("input.required").each(function(){return $(this).removeClass("error"),""===jQuery.trim($(this).val())?($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){return $(e).focus()}}(this)}),t=!1):void 0}),n.find("textarea.required").each(function(){return $(this).removeClass("error"),""===jQuery.trim($(this).val())?($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){return $(e).focus()}}(this)}),t=!1):void 0}),t){for(s={},r={parent:this},a=!1,m=n.find("input"),o=0,h=m.length;h>o;o++)i=m[o],null!=i.value&&jQuery.trim(i.value).length>0&&(s[i.name]=i.value),"file"===i.type&&(s[i.name]=i.files[0],a=!0);for(f=n.find("textarea"),p=0,c=f.length;c>p;p++)i=f[p],null!=i.value&&jQuery.trim(i.value).length>0&&(s[i.name]=i.value);for(y=n.find("select"),u=0,d=y.length;d>u;u++)i=y[u],l=this.getSelectedValue(i),null!=l&&jQuery.trim(l).length>0&&(s[i.name]=l);return r.responseContentType=$("div select[name=responseContentType]",$(this.el)).val(),r.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val(),$(".response_throbber",$(this.el)).show(),a?this.handleFileUpload(s,n):this.model["do"](s,r,this.showCompleteStatus,this.showErrorStatus,this)}},t.prototype.success=function(e,t){return t.showCompleteStatus(e)},t.prototype.handleFileUpload=function(e,t){var n,a,s,i,r,l,o,p,u,h,c,d,m,f,y,g,v,_,w;for(g=t.serializeArray(),p=0,d=g.length;d>p;p++)i=g[p],null!=i.value&&jQuery.trim(i.value).length>0&&(e[i.name]=i.value);for(n=new FormData,o=0,v=this.model.parameters,u=0,m=v.length;m>u;u++)l=v[u],("form"===l.paramType||"formData"===l["in"])&&"file"!==l.type.toLowerCase()&&void 0!==e[l.name]&&n.append(l.name,e[l.name]);for(s={},_=this.model.parameters,h=0,f=_.length;f>h;h++)l=_[h],"header"===l.paramType&&(s[l.name]=e[l.name]);for(w=t.find('input[type~="file"]'),c=0,y=w.length;y>c;c++)a=w[c],"undefined"!=typeof a.files[0]&&(n.append($(a).attr("name"),a.files[0]),o+=1);return this.invocationUrl=this.model.supportHeaderParams()?(s=this.model.getHeaderParams(e),delete s["Content-Type"],this.model.urlify(e,!1)):this.model.urlify(e,!0),$(".request_url",$(this.el)).html("

"),$(".request_url pre",$(this.el)).text(this.invocationUrl),r={type:this.model.method,url:this.invocationUrl,headers:s,data:n,dataType:"json",contentType:!1,processData:!1,error:function(e){return function(t){return e.showErrorStatus(e.wrap(t),e)}}(this),success:function(e){return function(t){return e.showResponse(t,e)}}(this),complete:function(e){return function(t){return e.showCompleteStatus(e.wrap(t),e)}}(this)},window.authorizations&&window.authorizations.apply(r),0===o&&r.data.append("fake","true"),jQuery.ajax(r),!1},t.prototype.wrap=function(e){var t,n,a,s,i,r,l;for(a={},n=e.getAllResponseHeaders().split("\r"),r=0,l=n.length;l>r;r++)s=n[r],t=s.match(/^([^:]*?):(.*)$/),t||(t=[]),t.shift(),void 0!==t[0]&&void 0!==t[1]&&(a[t[0].trim()]=t[1].trim());return i={},i.content={},i.content.data=e.responseText,i.headers=a,i.request={},i.request.url=this.invocationUrl,i.status=e.status,i},t.prototype.getSelectedValue=function(e){var t,n,a,s,i;if(e.multiple){for(n=[],i=e.options,a=0,s=i.length;s>a;a++)t=i[a],t.selected&&n.push(t.value);return n.length>0?n:null}return e.value},t.prototype.hideResponse=function(e){return null!=e&&e.preventDefault(),$(".response",$(this.el)).slideUp(),$(".response_hider",$(this.el)).fadeOut()},t.prototype.showResponse=function(e){var t;return t=JSON.stringify(e,null," ").replace(/\n/g,"
"),$(".response_body",$(this.el)).html(escape(t))},t.prototype.showErrorStatus=function(e,t){return t.showStatus(e)},t.prototype.showCompleteStatus=function(e,t){return t.showStatus(e)},t.prototype.formatXml=function(e){var t,n,a,s,i,r,l,o,p,u,h,c,d;for(o=/(>)(<)(\/*)/g,u=/[ ]*(.*)[ ]+\n/g,t=/(<.+>)(.+\n)/g,e=e.replace(o,"$1\n$2$3").replace(u,"$1\n").replace(t,"$1\n$2"),l=0,n="",i=e.split("\n"),a=0,s="other",p={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0},h=function(e){var t,i,r,l,o,u,h;return u={single:Boolean(e.match(/<.+\/>/)),closing:Boolean(e.match(/<\/.+>/)),opening:Boolean(e.match(/<[^!?].*>/))},o=function(){var e;e=[];for(r in u)h=u[r],h&&e.push(r);return e}()[0],o=void 0===o?"other":o,t=s+"->"+o,s=o,l="",a+=p[t],l=function(){var e,t,n;for(n=[],i=e=0,t=a;t>=0?t>e:e>t;i=t>=0?++e:--e)n.push(" ");return n}().join(""),"opening->closing"===t?n=n.substr(0,n.length-1)+e+"\n":n+=l+e+"\n"},c=0,d=i.length;d>c;c++)r=i[c],h(r);return n},t.prototype.showStatus=function(e){var t,n,a,s,i,r,l,o,p,u,h;if(void 0===e.content?(n=e.data,h=e.url):(n=e.content.data,h=e.request.url),i=e.headers,a=null,i&&(a=i["Content-Type"]||i["content-type"],a&&(a=a.split(";")[0].trim())),$(".response_body",$(this.el)).removeClass("json"),$(".response_body",$(this.el)).removeClass("xml"),n)if("application/json"===a||/\+json$/.test(a)){r=null;try{r=JSON.stringify(JSON.parse(n),null," ")}catch(c){s=c,r="can't parse JSON. Raw result:\n\n"+n}t=$("

").text(r),o=$('').append(t)}else"application/xml"===a||/\+xml$/.test(a)?(t=$("").text(this.formatXml(n)),o=$('').append(t)):"text/html"===a?(t=$("").html(_.escape(n)),o=$('').append(t)):/^image\//.test(a)?o=$("").attr("src",h):(t=$("").text(n),o=$('').append(t));else t=$("").text("no content"),o=$('').append(t);return p=o,$(".request_url",$(this.el)).html("
"),$(".request_url pre",$(this.el)).text(h),$(".response_code",$(this.el)).html(""+e.status+"
"),$(".response_body",$(this.el)).html(p),$(".response_headers",$(this.el)).html(""+_.escape(JSON.stringify(e.headers,null,"  ")).replace(/\n/g,"
")+"
"),$(".response",$(this.el)).slideDown(),$(".response_hider",$(this.el)).show(),$(".response_throbber",$(this.el)).hide(),u=$(".response_body",$(this.el))[0],l=this.options.swaggerOptions,l.highlightSizeThreshold&&e.data.length>l.highlightSizeThreshold?u:hljs.highlightBlock(u)},t.prototype.toggleOperationContent=function(){var e;return e=$("#"+Docs.escapeResourceName(this.parentId+"_"+this.nickname+"_content")),e.is(":visible")?Docs.collapseOperation(e):Docs.expandOperation(e)},t}(Backbone.View);var ParameterContentTypeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ParameterContentTypeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:"),this},t.prototype.template=function(){return Handlebars.templates.parameter_content_type},t}(Backbone.View),this.Handlebars.templates.param_required=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(2,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i},2:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return'			\n"},4:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(5,a),inverse:this.program(7,a),data:a}),null!=s&&(i+=s),i},5:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+'\n        
\n        \n'},7:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				\n				
\n				\n'},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(10,a),inverse:this.program(12,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"			\n"},12:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(13,a),inverse:this.program(15,a),data:a}),null!=s&&(i+=s),i},13:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				\n"},15:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p=""+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"\n\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(9,a),data:a}),null!=s&&(p+=s),p+='\n\n	',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="\n\n",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n\n'},useData:!0}),this.Handlebars.templates.parameter_content_type=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t.each.call(e,null!=e?e.consumes:e,{name:"each",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i},2:function(e){var t,n=this.lambda,a='  \n"},4:function(){return'  \n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i='\n\n"},useData:!0});var ParameterView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ParameterView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(e,t){return"array"===e.type.toLowerCase()||e.allowMultiple?t.fn(this):t.inverse(this)})},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p;return p=this.model.type||this.model.dataType,"undefined"==typeof p&&(i=this.model.schema,i&&i.$ref&&(a=i.$ref,p=0===a.indexOf("#/definitions/")?a.substring("#/definitions/".length):a)),this.model.type=p,this.model.paramType=this.model["in"]||this.model.paramType,("body"===this.model.paramType||"body"===this.model["in"])&&(this.model.isBody=!0),p&&"file"===p.toLowerCase()&&(this.model.isFile=!0),this.model["default"]=this.model["default"]||this.model.defaultValue,this.model.allowableValues&&(this.model.isList=!0),o=this.template(),$(this.el).html(o(this.model)),r={sampleJSON:this.model.sampleJSON,isParam:!0,signature:this.model.signature},this.model.sampleJSON?(l=new SignatureView({model:r,tagName:"div"}),$(".model-signature",$(this.el)).append(l.render().el)):$(".model-signature",$(this.el)).html(this.model.signature),t=!1,this.model.isBody&&(t=!0),e={isParam:t},e.consumes=this.model.consumes,t?(n=new ParameterContentTypeView({model:e}),$(".parameter-content-type",$(this.el)).append(n.render().el)):(s=new ResponseContentTypeView({model:e}),$(".response-content-type",$(this.el)).append(s.render().el)),this},t.prototype.template=function(){return this.model.isList?Handlebars.templates.param_list:this.options.readOnly?this.model.required?Handlebars.templates.param_readonly_required:Handlebars.templates.param_readonly:this.model.required?Handlebars.templates.param_required:Handlebars.templates.param},t}(Backbone.View);var ResourceView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ResourceView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(e){return null==e&&(e={}),this.auths=e.auths,""===this.model.description&&(this.model.description=null),null!=this.model.description?this.model.summary=this.model.description:void 0},t.prototype.render=function(){var e,t,n,a,s,i,r;for(n={},$(this.el).html(Handlebars.templates.resource(this.model)),r=this.model.operationsArray,s=0,i=r.length;i>s;s++){for(a=r[s],e=0,t=a.nickname;"undefined"!=typeof n[t];)t=t+"_"+e,e+=1;n[t]=a,a.nickname=t,a.parentId=this.model.id,this.addOperation(a)}return $(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource")),$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource")),$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource")),this},t.prototype.addOperation=function(e){var t;return e.number=this.number,t=new OperationView({model:e,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions,auths:this.auths}),$(".endpoints",$(this.el)).append(t.render().el),this.number++},t.prototype.callDocs=function(e,t){return t.preventDefault(),Docs[e](t.currentTarget.getAttribute("data-id"))},t}(Backbone.View),this.Handlebars.templates.resource=Handlebars.template({1:function(){return" : "},3:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"\n      Raw\n    
"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r,l="function",o=t.helperMissing,p=this.escapeExpression,u=t.blockHelperMissing,h="\n  \n    '+p((i=null!=(i=t.name||(null!=e?e.name:e))?i:o,typeof i===l?i.call(e,{name:"name",hash:{},data:a}):i))+" ";return i=null!=(i=t.summary||(null!=e?e.summary:e))?i:o,r={name:"summary",hash:{},fn:this.program(1,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.summary||(s=u.call(e,s,r)),null!=s&&(h+=s),i=null!=(i=t.summary||(null!=e?e.summary:e))?i:o,s=typeof i===l?i.call(e,{name:"summary",hash:{},data:a}):i,null!=s&&(h+=s),h+="\n  
\n  \n    \n      Show/Hide\n    
\n    \n      \n        List Operations\n      \n    
\n    \n      \n        Expand Operations\n      \n    
\n    ',i=null!=(i=t.url||(null!=e?e.url:e))?i:o,r={name:"url",hash:{},fn:this.program(3,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.url||(s=u.call(e,s,r)),null!=s&&(h+=s),h+"\n  
\n
\n\n\n
\n"},useData:!0});var ResponseContentTypeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ResponseContentTypeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),$("label[for=responseContentType]",$(this.el)).text("Response Content Type"),this},t.prototype.template=function(){return Handlebars.templates.response_content_type},t}(Backbone.View),this.Handlebars.templates.response_content_type=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t.each.call(e,null!=e?e.produces:e,{name:"each",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i},2:function(e){var t,n=this.lambda,a='  \n"},4:function(){return'  \n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i='\n\n"},useData:!0});var SignatureView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;SignatureView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"},t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),this.switchToSnippet(),this.isParam=this.model.isParam,this.isParam&&$(".notice",$(this.el)).text("Click to set as parameter value"),this},t.prototype.template=function(){return Handlebars.templates.signature},t.prototype.switchToDescription=function(e){return null!=e&&e.preventDefault(),$(".snippet",$(this.el)).hide(),$(".description",$(this.el)).show(),$(".description-link",$(this.el)).addClass("selected"),$(".snippet-link",$(this.el)).removeClass("selected")},t.prototype.switchToSnippet=function(e){return null!=e&&e.preventDefault(),$(".description",$(this.el)).hide(),$(".snippet",$(this.el)).show(),$(".snippet-link",$(this.el)).addClass("selected"),$(".description-link",$(this.el)).removeClass("selected")},t.prototype.snippetToTextArea=function(e){var t;return this.isParam&&(null!=e&&e.preventDefault(),t=$("textarea",$(this.el.parentNode.parentNode.parentNode)),""===$.trim(t.val()))?t.val(this.model.sampleJSON):void 0},t}(Backbone.View),this.Handlebars.templates.signature=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p='\n\n  Model
\n  Model Schema
\n
\n\n\n\n  \n    ';return i=null!=(i=t.signature||(null!=e?e.signature:e))?i:l,s=typeof i===r?i.call(e,{name:"signature",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n  
\n\n  \n    '+o((i=null!=(i=t.sampleJSON||(null!=e?e.sampleJSON:e))?i:l,typeof i===r?i.call(e,{name:"sampleJSON",hash:{},data:a}):i))+'
\n    \n  
\n
\n\n'},useData:!0});var StatusCodeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;StatusCodeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e,t,n;return n=this.template(),$(this.el).html(n(this.model)),swaggerUi.api.models.hasOwnProperty(this.model.responseModel)?(e={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:!1,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()},t=new SignatureView({model:e,tagName:"div"}),$(".model-signature",this.$el).append(t.render().el)):$(".model-signature",this.$el).html(""),this},t.prototype.template=function(){return Handlebars.templates.status_code},t}(Backbone.View),this.Handlebars.templates.status_code=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p=""+o((i=null!=(i=t.code||(null!=e?e.code:e))?i:l,typeof i===r?i.call(e,{name:"code",hash:{},data:a}):i))+"\n";return i=null!=(i=t.message||(null!=e?e.message:e))?i:l,s=typeof i===r?i.call(e,{name:"message",hash:{},data:a}):i,null!=s&&(p+=s),p+"\n"},useData:!0});
\ No newline at end of file
diff --git a/catalog/src/main/resources/migrations.xml b/catalog-core/catalog-mgr/src/main/resources/migrations.xml
similarity index 50%
rename from catalog/src/main/resources/migrations.xml
rename to catalog-core/catalog-mgr/src/main/resources/migrations.xml
index f6791098..41231d6e 100644
--- a/catalog/src/main/resources/migrations.xml
+++ b/catalog-core/catalog-mgr/src/main/resources/migrations.xml
@@ -1,12 +1,13 @@
+
 
- 
-
-
-
 
 
-    
+    
         
     
-	
-	
+
+    
         
     
-	
-	
+
+    
         
     
 
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/IntegrationManager.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
similarity index 79%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/IntegrationManager.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
index 789aa225..8e212103 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/IntegrationManager.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.resource;
+package org.openo.commontosca.catalog.db.resource;
 
 import java.util.ArrayList;
 
@@ -23,14 +23,14 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.dao.DaoManager;
-import org.openo.orchestrator.nfv.catalog.db.entity.NodeTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.TemplateData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
+import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
+import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
 
 public class IntegrationManager {
     private static PackageManager packageManager;
@@ -47,7 +47,8 @@ public class IntegrationManager {
     @AfterClass
     public static void tearDownAfterClass() throws Exception {
         try {
-            HibernateSession.destory();
+            HibernateSession.destory();  
+            DaoManager.getInstance().setDaoNull();
             H2DbServer.shutDown();
         } catch (Exception e) {
             Assert.fail("Exception" + e.getMessage());
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/PackageManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
similarity index 78%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/PackageManagerTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
index d811dd5f..52ec701f 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/PackageManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.resource;
+package org.openo.commontosca.catalog.db.resource;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,12 +27,12 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.common.Parameters;
-import org.openo.orchestrator.nfv.catalog.db.dao.DaoManager;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.db.common.Parameters;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
 
 public class PackageManagerTest {
     private static PackageManager manager;
@@ -48,6 +48,7 @@ public class PackageManagerTest {
     public static void tearDownAfterClass() throws Exception {
         try {
             HibernateSession.destory();
+            DaoManager.getInstance().setPackageDao(null);
             H2DbServer.shutDown();
         } catch (Exception e) {
             Assert.fail("Exception" + e.getMessage());
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
similarity index 77%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateManagerTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
index 44bc3ea0..66b25048 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.resource;
+package org.openo.commontosca.catalog.db.resource;
 
 import java.util.ArrayList;
 
@@ -23,13 +23,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.dao.DaoManager;
-import org.openo.orchestrator.nfv.catalog.db.entity.NodeTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.TemplateData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
+import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
+import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
 
 public class TemplateManagerTest {
     private static TemplateManager manager;
@@ -45,6 +45,9 @@ public class TemplateManagerTest {
     public static void tearDownAfterClass() throws Exception {
         try {
             HibernateSession.destory();
+            DaoManager.getInstance().setTemplateDao(null);
+            DaoManager.getInstance().setServiceTemplateDao(null);
+            DaoManager.getInstance().setNodeTemplateDao(null);
             H2DbServer.shutDown();
         } catch (Exception e) {
             Assert.fail("Exception" + e.getMessage());
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateMappingManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
similarity index 78%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateMappingManagerTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
index 36045a02..4f952e47 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/TemplateMappingManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.resource;
+package org.openo.commontosca.catalog.db.resource;
 
 import java.util.ArrayList;
 
@@ -23,14 +23,11 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.dao.DaoManager;
-import org.openo.orchestrator.nfv.catalog.db.entity.NodeTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateMappingData;
-import org.openo.orchestrator.nfv.catalog.db.entity.TemplateData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
 
 public class TemplateMappingManagerTest {
     private static TemplateManager manager;
@@ -46,6 +43,7 @@ public class TemplateMappingManagerTest {
     public static void tearDownAfterClass() throws Exception {
         try {
             HibernateSession.destory();
+            DaoManager.getInstance().setTemplateDao(null);
             H2DbServer.shutDown();
         } catch (Exception e) {
             Assert.fail("Exception" + e.getMessage());
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/dao/PackageDaoTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
similarity index 74%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/dao/PackageDaoTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
index 6c2a3d23..b61fde9e 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/resource/dao/PackageDaoTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.resource.dao;
+package org.openo.commontosca.catalog.db.resource.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -28,13 +28,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.common.Parameters;
-import org.openo.orchestrator.nfv.catalog.db.dao.PackageDao;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
-import org.openo.orchestrator.nfv.catalog.db.util.HqlFactory;
+import org.openo.commontosca.catalog.db.common.Parameters;
+import org.openo.commontosca.catalog.db.dao.PackageDao;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.util.HqlFactory;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
 
 public class PackageDaoTest {
 
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtilTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
similarity index 59%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtilTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
index 51d70288..cd923160 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtilTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.util;
+package org.openo.commontosca.catalog.db.util;
 
 import static org.junit.Assert.*;
 
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServer.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
similarity index 56%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServer.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
index 5e55d918..ceb3c7c0 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServer.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.util;
+package org.openo.commontosca.catalog.db.util;
 
 import java.sql.SQLException;
 
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServerUtil.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
similarity index 65%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServerUtil.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
index 81e66bdf..033e49f2 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/H2DbServerUtil.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.util;
+package org.openo.commontosca.catalog.db.util;
 
 import java.io.File;
 import java.net.URISyntaxException;
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HibernateSession.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
similarity index 72%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HibernateSession.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
index e2a6e398..0b031a7a 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HibernateSession.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.util;
+package org.openo.commontosca.catalog.db.util;
 
 import java.io.File;
 import java.net.URISyntaxException;
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HqlFactoryTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
similarity index 80%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HqlFactoryTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
index ee69f762..d1070180 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/db/util/HqlFactoryTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
@@ -1,25 +1,25 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.db.util;
+package org.openo.commontosca.catalog.db.util;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
 
 public class HqlFactoryTest {
 
diff --git a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/wrapper/PackageWrapperTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
similarity index 82%
rename from catalog/src/test/java/org/openo/orchestrator/nfv/catalog/wrapper/PackageWrapperTest.java
rename to catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
index 0f637328..066710c4 100644
--- a/catalog/src/test/java/org/openo/orchestrator/nfv/catalog/wrapper/PackageWrapperTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
@@ -1,19 +1,19 @@
 /**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *             http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.openo.orchestrator.nfv.catalog.wrapper;
+package org.openo.commontosca.catalog.wrapper;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,23 +32,23 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openo.orchestrator.nfv.catalog.CatalogAppConfiguration;
-import org.openo.orchestrator.nfv.catalog.common.Config;
-import org.openo.orchestrator.nfv.catalog.common.HttpServerAddrConfig;
-import org.openo.orchestrator.nfv.catalog.common.HttpServerPathConfig;
-import org.openo.orchestrator.nfv.catalog.common.MsbAddrConfig;
-import org.openo.orchestrator.nfv.catalog.db.dao.DaoManager;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.db.resource.PackageManager;
-import org.openo.orchestrator.nfv.catalog.db.util.H2DbServer;
-import org.openo.orchestrator.nfv.catalog.db.util.HibernateSession;
-import org.openo.orchestrator.nfv.catalog.entity.EnumOperationalState;
-import org.openo.orchestrator.nfv.catalog.entity.EnumProcessState;
-import org.openo.orchestrator.nfv.catalog.entity.EnumUsageState;
-import org.openo.orchestrator.nfv.catalog.entity.response.CsarFileUriResponse;
-import org.openo.orchestrator.nfv.catalog.entity.response.PackageMeta;
-import org.openo.orchestrator.nfv.catalog.filemanage.entity.FileLink;
+import org.openo.commontosca.catalog.CatalogAppConfiguration;
+import org.openo.commontosca.catalog.common.Config;
+import org.openo.commontosca.catalog.common.MsbAddrConfig;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.resource.PackageManager;
+import org.openo.commontosca.catalog.filemanage.entity.FileLink;
+import org.openo.commontosca.catalog.common.HttpServerAddrConfig;
+import org.openo.commontosca.catalog.common.HttpServerPathConfig;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.util.H2DbServer;
+import org.openo.commontosca.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.entity.EnumOperationalState;
+import org.openo.commontosca.catalog.entity.EnumProcessState;
+import org.openo.commontosca.catalog.entity.EnumUsageState;
+import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;
+import org.openo.commontosca.catalog.entity.response.PackageMeta;
 
 import static org.junit.Assert.*;
 
@@ -258,6 +258,7 @@ public class PackageWrapperTest {
     public static void tearDownAfterClass() {
         try {
             HibernateSession.destory();
+            DaoManager.getInstance().setDaoNull();
             H2DbServer.shutDown();
         } catch (Exception e) {
             Assert.fail("Exception" + e.getMessage());
diff --git a/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml b/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml
new file mode 100644
index 00000000..e0b13c51
--- /dev/null
+++ b/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+    true
+    org.hibernate.dialect.H2Dialect
+    org.h2.Driver
+    jdbc:h2:tcp://localhost:8205/./db/catalog
+    catalog
+    catalog
+    update
+    thread
+    
+    
+    
+    
+
+
\ No newline at end of file
diff --git a/catalog/src/test/resources/NanocellGW.csar b/catalog-core/catalog-mgr/src/test/resources/NanocellGW.csar
similarity index 100%
rename from catalog/src/test/resources/NanocellGW.csar
rename to catalog-core/catalog-mgr/src/test/resources/NanocellGW.csar
diff --git a/catalog/src/test/resources/db/catalog.mv.db b/catalog-core/catalog-mgr/src/test/resources/db/catalog.mv.db
similarity index 100%
rename from catalog/src/test/resources/db/catalog.mv.db
rename to catalog-core/catalog-mgr/src/test/resources/db/catalog.mv.db
diff --git a/catalog/src/test/resources/sql/catalog-resource-createObj-mysql.sql b/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
similarity index 79%
rename from catalog/src/test/resources/sql/catalog-resource-createObj-mysql.sql
rename to catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
index 66d8406a..3966c7dc 100644
--- a/catalog/src/test/resources/sql/catalog-resource-createObj-mysql.sql
+++ b/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
@@ -1,17 +1,17 @@
 --
---     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+-- Copyright 2016 [ZTE] and others.
 --
---     Licensed under the Apache License, Version 2.0 (the "License");
---     you may not use this file except in compliance with the License.
---     You may obtain a copy of the License at
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
 --
---             http://www.apache.org/licenses/LICENSE-2.0
+--     http://www.apache.org/licenses/LICENSE-2.0
 --
---     Unless required by applicable law or agreed to in writing, software
---     distributed under the License is distributed on an "AS IS" BASIS,
---     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---     See the License for the specific language governing permissions and
---     limitations under the License.
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 DROP TABLE IF EXISTS catalog_package_table;
diff --git a/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
similarity index 66%
rename from catalog-all/pom.xml
rename to catalog-core/distribution/catalog-all/pom.xml
index 4f397a21..3fa414af 100644
--- a/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -1,40 +1,40 @@
 
 
-    4.0.0
-	
-        catalog-parent
-        org.openo.orchestrator.nfv.catalog
-        0.0.1-SNAPSHOT
+    
+        org.openo.commontosca.catalog
+        distribution
+        1.0.0-SNAPSHOT
     
+
+    4.0.0
     catalog-all
-    openo/catalog/catalog-all
+    openo/commontosca/catalog/distribution/catalog-all
     pom
-          
-		catalog-all
-        UTF-8
+    
+    
+        openo-commontosca-catalog
     
     
         
             
                 org.apache.maven.plugins
                 maven-dependency-plugin
-                2.8
                 
                     
                         unpack-catalog
@@ -43,30 +43,30 @@
                             unpack-dependencies
                         
                         
-                            org.openo.orchestrator.nfv.catalog
+                            org.openo.commontosca.catalog
                             catalog-standalone
                             
                                 target/assembly/catalog
                             
                         
                     
-					 
+                    
                         unpack-httpserver
                         package
                         
                             unpack-dependencies
                         
                         
-                            org.openo.orchestrator.nfv.catalog
-                            httpserver-standalone
+                            org.openo.commontosca.catalog
+                            httpserver
                             
                                 target/assembly/
                             
                         
                     
                 
-            			
-			
+            
+            
                 org.apache.maven.plugins
                 maven-antrun-plugin
                 
@@ -77,8 +77,8 @@
                             run
                         
                         
-                                                          
-							   
+                            
+                                
                                     
                                 
                             
@@ -86,7 +86,7 @@
                     
                 
              
-			
+            
                 org.codehaus.mojo
                 build-helper-maven-plugin
                 
@@ -106,21 +106,21 @@
                         
                     
                 
-            			
+            
         
     
     
         
-            org.openo.orchestrator.nfv.catalog
+            org.openo.commontosca.catalog
             catalog-standalone
             ${project.version}
-			 zip	
+            zip
         
-		 
-            org.openo.orchestrator.nfv.catalog
-            httpserver-standalone   
+        
+            org.openo.commontosca.catalog
+            httpserver
             ${project.version}
-            zip			
+            zip
         
     
 
\ No newline at end of file
diff --git a/catalog-standalone/pom.xml b/catalog-core/distribution/catalog-standalone/pom.xml
similarity index 78%
rename from catalog-standalone/pom.xml
rename to catalog-core/distribution/catalog-standalone/pom.xml
index 32249e72..d6e86117 100644
--- a/catalog-standalone/pom.xml
+++ b/catalog-core/distribution/catalog-standalone/pom.xml
@@ -1,29 +1,30 @@
 
 
-    4.0.0
     
-        catalog-parent
-        org.openo.orchestrator.nfv.catalog
-        0.0.1-SNAPSHOT
+        org.openo.commontosca.catalog
+        distribution
+        1.0.0-SNAPSHOT
     
+    
+    4.0.0
     catalog-standalone
-    openo/catalog/catalog-standalone
+    openo/commontosca/catalog/distribution/catalog-standalone
     pom
 
     
@@ -70,8 +71,8 @@
                         
                             
                                 
-                                    org.openo.orchestrator.nfv.catalog
-                                    catalog
+                                    org.openo.commontosca.catalog
+                                    catalog-mgr
                                     jar
                                     true
                                     target/assembly/
@@ -128,8 +129,8 @@
 
     
         
-            org.openo.orchestrator.nfv.catalog
-            catalog
+            org.openo.commontosca.catalog
+            catalog-mgr
             ${project.version}
         
       
diff --git a/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql
similarity index 53%
rename from catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql
index 482d6cb5..9b7ed341 100644
--- a/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql
@@ -1,17 +1,17 @@
 --
---     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+-- Copyright 2016 [ZTE] and others.
 --
---     Licensed under the Apache License, Version 2.0 (the "License");
---     you may not use this file except in compliance with the License.
---     You may obtain a copy of the License at
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
 --
---             http://www.apache.org/licenses/LICENSE-2.0
+--     http://www.apache.org/licenses/LICENSE-2.0
 --
---     Unless required by applicable law or agreed to in writing, software
---     distributed under the License is distributed on an "AS IS" BASIS,
---     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---     See the License for the specific language governing permissions and
---     limitations under the License.
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 /******************drop old database and user***************************/
diff --git a/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql
similarity index 79%
rename from catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql
index 8039a715..d49e60ba 100644
--- a/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql
@@ -1,17 +1,17 @@
 --
---     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+-- Copyright 2016 [ZTE] and others.
 --
---     Licensed under the Apache License, Version 2.0 (the "License");
---     you may not use this file except in compliance with the License.
---     You may obtain a copy of the License at
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
 --
---             http://www.apache.org/licenses/LICENSE-2.0
+--     http://www.apache.org/licenses/LICENSE-2.0
 --
---     Unless required by applicable law or agreed to in writing, software
---     distributed under the License is distributed on an "AS IS" BASIS,
---     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---     See the License for the specific language governing permissions and
---     limitations under the License.
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 use catalog;
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql
new file mode 100644
index 00000000..50b0c190
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql
@@ -0,0 +1,17 @@
+--
+-- Copyright 2016 [ZTE] and others.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+--
\ No newline at end of file
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql
new file mode 100644
index 00000000..d0bd6180
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql
@@ -0,0 +1,20 @@
+--
+-- Copyright 2016 [ZTE] and others.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SET autocommit = 0;
+
+COMMIT;
+SET autocommit = 1;
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
similarity index 67%
rename from catalog-standalone/src/main/assembly/conf/catalog.yml
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
index 3785c38b..14deab79 100644
--- a/catalog-standalone/src/main/assembly/conf/catalog.yml
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
@@ -1,17 +1,17 @@
 #
-#     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
 #
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#             http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 template: Hello, %s!
@@ -75,7 +75,7 @@ logging:
   loggers:
 
     # Sets the level for 'com.example.app' to DEBUG.
-    org.openo.orchestrator.nfv.catalog.CatalogApp: INFO
+    org.openo.commontosca.catalog.catalog.CatalogApp: INFO
 
   appenders:
     - type: console
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat
new file mode 100644
index 00000000..e3644ddf
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat
@@ -0,0 +1,24 @@
+@REM
+@REM Copyright 2016 [ZTE] and others.
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+echo %1 | findstr %2 >NUL
+echo ERRORLEVEL=%ERRORLEVEL%
+IF ERRORLEVEL 1 goto findend
+for /f "tokens=1" %%a in (%1) do (  
+    echo kill %1
+    taskkill /F /pid %%a
+)
+:findend
\ No newline at end of file
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat
new file mode 100644
index 00000000..61a00e69
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat
@@ -0,0 +1,42 @@
+@REM
+@REM Copyright 2016 [ZTE] and others.
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+@echo off
+title init catalog db
+
+set RUNHOME=%~dp0
+echo ### RUNHOME: %RUNHOME%
+
+echo ### init catalog db
+rem cd /d %RUNHOME%
+
+set JAVA="%JAVA_HOME%\bin\java.exe"
+set port=8777
+set jvm_opts=-Xms50m -Xmx128m
+rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n
+set class_path=%RUNHOME%;%RUNHOME%catalog-service.jar
+echo ### jvm_opts: %jvm_opts%
+echo ### class_path: %class_path%
+
+%JAVA% -classpath %class_path% %jvm_opts% org.openo.commontosca.catalog.CatalogApp  db migrate %RUNHOME%conf\catalog.yml
+
+IF ERRORLEVEL 1 goto showerror
+exit
+:showerror
+echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check!
+echo After checking, press any key to close 
+pause
+exit
\ No newline at end of file
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh
new file mode 100644
index 00000000..b950f88c
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh
@@ -0,0 +1,31 @@
+#
+# Copyright 2016 [ZTE] and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+DIRNAME=`dirname $0`
+RUNHOME=`cd $DIRNAME/; pwd`
+echo @RUNHOME@ $RUNHOME
+
+title catalog  Database setup
+
+echo ### Starting catalog Database setup
+echo @JAVA_HOME@ $JAVA_HOME
+JAVA="$JAVA_HOME/bin/java"
+echo @JAVA@ $JAVA
+
+class_path="$RUNHOME/:$RUNHOME/catalog-service.jar"
+echo @class_path@ $class_path
+
+"$JAVA" -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp db migrate "$RUNHOME/conf/catalog.yml"
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat
new file mode 100644
index 00000000..7dbcab0e
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat
@@ -0,0 +1,40 @@
+@REM
+@REM Copyright 2016 [ZTE] and others.
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+@echo off
+title catalog-service
+
+set RUNHOME=%~dp0
+echo ### RUNHOME: %RUNHOME%
+echo ### Starting catalog-service
+
+set JAVA="%JAVA_HOME%\bin\java.exe"
+set port=8312
+set jvm_opts=-Xms50m -Xmx128m
+rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n
+set class_path=%RUNHOME%;%RUNHOME%catalog-service.jar
+echo ### jvm_opts: %jvm_opts%
+echo ### class_path: %class_path%
+
+%JAVA% -classpath %class_path% %jvm_opts% org.openo.commontosca.catalog.CatalogApp server %RUNHOME%conf/catalog.yml
+
+IF ERRORLEVEL 1 goto showerror
+exit
+:showerror
+echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check!
+echo After checking, press any key to close 
+pause
+exit
\ No newline at end of file
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh
new file mode 100644
index 00000000..4eda12c4
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh
@@ -0,0 +1,34 @@
+#
+# Copyright 2016 [ZTE] and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+DIRNAME=`dirname $0`
+RUNHOME=`cd $DIRNAME/; pwd`
+echo @RUNHOME@ $RUNHOME
+
+echo @JAVA_HOME@ $JAVA_HOME
+JAVA="$JAVA_HOME/bin/java"
+echo @JAVA@ $JAVA
+
+JAVA_OPTS="-Xms50m -Xmx128m"
+port=8312
+#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n"
+echo @JAVA_OPTS@ $JAVA_OPTS
+
+class_path="$RUNHOME/:$RUNHOME/catalog-service.jar"
+echo @class_path@ $class_path
+
+"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp server "$RUNHOME/conf/catalog.yml"
+
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat
new file mode 100644
index 00000000..f3e7c08f
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat
@@ -0,0 +1,34 @@
+@REM
+@REM Copyright 2016 [ZTE] and others.
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+@echo off
+title stopping catalog-service
+
+set HOME=%~dp0
+set Main_Class="org.openo.commontosca.catalog.CatalogApp"
+
+echo ================== catalog-service info =============================================
+echo HOME=$HOME
+echo Main_Class=%Main_Class%
+echo ===============================================================================
+
+echo ### Stopping catalog-service
+cd /d %HOME%
+
+for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do (
+  call find_kill_process "%%i" %Main_Class%
+)
+exit
\ No newline at end of file
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh
new file mode 100644
index 00000000..40ae2dad
--- /dev/null
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Copyright 2016 [ZTE] and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+DIRNAME=`dirname $0`
+HOME=`cd $DIRNAME/; pwd`
+Main_Class="org.openo.commontosca.catalog.CatalogApp"
+
+echo ================== catalog-service info =============================================
+echo HOME=$HOME
+echo Main_Class=$Main_Class
+echo ===============================================================================
+cd $HOME; pwd
+
+echo @WORK_DIR@ $HOME
+
+function save_service_pid(){
+    service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'`
+    echo @service_pid@ $service_pid
+}
+
+function kill_service_process(){
+    ps -p $service_pid
+    if [ $? == 0 ]; then
+        kill -9 $service_pid
+    fi
+}
+
+save_service_pid;
+echo @C_CMD@ kill -9 $service_pid
+kill_service_process;
\ No newline at end of file
diff --git a/catalog-core/distribution/pom.xml b/catalog-core/distribution/pom.xml
new file mode 100644
index 00000000..c7c22908
--- /dev/null
+++ b/catalog-core/distribution/pom.xml
@@ -0,0 +1,34 @@
+
+
+    
+        org.openo.commontosca.catalog
+        catalog-core-parent
+        1.0.0-SNAPSHOT
+    
+
+    4.0.0
+    distribution
+    openo/commontosca/catalog/distribution
+    pom
+
+    
+        catalog-standalone
+        catalog-all
+    
+
diff --git a/httpserver-standalone/pom.xml b/catalog-core/httpserver/pom.xml
similarity index 68%
rename from httpserver-standalone/pom.xml
rename to catalog-core/httpserver/pom.xml
index 251cf9ff..b1ead67a 100644
--- a/httpserver-standalone/pom.xml
+++ b/catalog-core/httpserver/pom.xml
@@ -1,41 +1,42 @@
 
 
-    4.0.0
-	
-        catalog-parent
-        org.openo.orchestrator.nfv.catalog
-        0.0.1-SNAPSHOT
+    
+        org.openo.commontosca.catalog
+        catalog-core-parent
+        1.0.0-SNAPSHOT
     
-    httpserver-standalone
-    openo/catalog/httpserver-standalone
+    
+    4.0.0
+    httpserver
+    openo/commontosca/catalog/httpserver
     pom
+    
     
         7.0.62
-		http-server
-        UTF-8
+        http-server
     
+    
     
         
             
                 org.apache.maven.plugins
                 maven-dependency-plugin
-                2.8
                 
                     
                         unpack-tomcat
@@ -52,8 +53,8 @@
                         
                     
                 
-            			
-			
+            
+            
                 org.apache.maven.plugins
                 maven-antrun-plugin
                 
@@ -64,12 +65,12 @@
                             run
                         
                         
-                            							
-                               
-									
-								
-								
-							   
+                            
+                                
+                                    
+                                
+                                
+                                
                                     
                                 
                             
@@ -77,7 +78,7 @@
                     
                 
               
-			 
+            
                 org.codehaus.mojo
                 build-helper-maven-plugin
                 
diff --git a/httpserver-standalone/src/main/assembly/tomcat/conf/web.xml b/catalog-core/httpserver/src/main/assembly/tomcat/conf/web.xml
similarity index 99%
rename from httpserver-standalone/src/main/assembly/tomcat/conf/web.xml
rename to catalog-core/httpserver/src/main/assembly/tomcat/conf/web.xml
index e1736353..af6dd7c9 100644
--- a/httpserver-standalone/src/main/assembly/tomcat/conf/web.xml
+++ b/catalog-core/httpserver/src/main/assembly/tomcat/conf/web.xml
@@ -1,19 +1,19 @@
 
 
 
+
+    
+        org.openo.commontosca.catalog
+        catalog-root
+        1.0.0-SNAPSHOT
+    
+
+    4.0.0
+    catalog-core-parent
+    openo/commontosca/catalog/catalog-core-parent
+    pom
+
+    
+        catalog-mgr
+        httpserver
+        distribution
+    
+
diff --git a/catalog-parent/catalogparent-lite/pom.xml b/catalog-parent/catalogparent-lite/pom.xml
new file mode 100644
index 00000000..01c023d4
--- /dev/null
+++ b/catalog-parent/catalogparent-lite/pom.xml
@@ -0,0 +1,115 @@
+
+
+    
+
+    4.0.0
+    org.openo.commontosca.catalog
+    catalogparent-lite
+    1.0.0-SNAPSHOT
+    openo/commontosca/catalog/catalogparent-lite
+    pom
+
+    
+        
+            
+                
+                    org.eclipse.m2e
+                    lifecycle-mapping
+                    1.0.0
+                
+                
+                    org.apache.maven.plugins
+                    maven-compiler-plugin
+                    3.3
+                    
+                        true
+                        true
+                        1.7
+                        1.7
+                        1.7
+                        UTF-8
+                        true
+                    
+                
+                
+                    org.apache.maven.plugins
+                    maven-jar-plugin
+                    2.6
+                    
+                        
+                            false
+                        
+                        true
+                    
+                
+                
+                    org.apache.maven.plugins
+                    maven-shade-plugin
+                    2.4
+                
+                
+                    org.apache.maven.plugins
+                    maven-dependency-plugin
+                    2.10          
+                
+                
+                    org.apache.maven.plugins
+                    maven-resources-plugin
+                    2.7
+                    
+                        UTF-8
+                        
+                            pdf
+                            swf
+                            exe
+                            png
+                            gif
+                            jpg
+                            jpeg
+                            bmp
+                            eot
+                            ttf
+                            svg
+                            woff
+                            woff2
+                            mso
+                            wmz
+                            emz
+                            otf
+                        
+                    
+                
+                
+                    org.codehaus.mojo
+                    build-helper-maven-plugin
+                    1.10
+                
+                
+                    com.mycila
+                    license-maven-plugin
+                    3.0.rc1
+                
+            
+        
+    
+
diff --git a/catalog-parent/catalogparent/pom.xml b/catalog-parent/catalogparent/pom.xml
new file mode 100644
index 00000000..8ae32bcf
--- /dev/null
+++ b/catalog-parent/catalogparent/pom.xml
@@ -0,0 +1,231 @@
+
+
+    
+        org.openo.commontosca.catalog
+        catalogparent-lite
+        1.0.0-SNAPSHOT
+        ../catalogparent-lite
+    
+
+    4.0.0
+    catalogparent
+    openo/commontosca/catalog/catalogparent
+    pom
+
+    
+        0.8.0
+        1.5.3
+        1.16.4
+        2.16
+        5.0
+        2.5.1
+        2.2.4
+        1.6
+        3.0.7
+        3.3
+        5.1.18
+        1.2.1
+        1.4
+        4.10
+        1.4.10
+        1.9.5
+        1.4.182
+        1.8.2
+        7.0.62
+    
+
+    
+        
+            
+            
+                io.dropwizard
+                dropwizard-core
+                ${dropwizard.version}
+            
+            
+                io.dropwizard
+                dropwizard-assets
+                ${dropwizard.version}
+            
+            
+                io.dropwizard
+                dropwizard-hibernate
+                ${dropwizard.version}
+            
+            
+                io.dropwizard
+                dropwizard-migrations
+                ${dropwizard.version}
+            
+            
+            
+                io.swagger
+                swagger-jersey2-jaxrs
+                ${swagger.version}
+            
+            
+            
+                org.projectlombok
+                lombok
+                ${lombok.version}
+            
+            
+            
+                org.glassfish.jersey.core
+                jersey-server
+                ${jersey.version}
+            
+            
+                org.glassfish.jersey.media
+                jersey-media-multipart
+                ${jersey.version}
+            
+            
+                org.glassfish.jersey.containers
+                jersey-container-servlet-core
+                ${jersey.version}
+            
+            
+            
+                com.eclipsesource.jaxrs
+                consumer
+                ${jaxrs.consumer.version}
+            
+            
+            
+                com.fasterxml.jackson.dataformat
+                jackson-dataformat-xml
+                ${jackson-version}
+            
+            
+                com.fasterxml.jackson.core
+                jackson-annotations
+                ${jackson-version}
+            
+            
+            
+                com.google.code.gson
+                gson
+                ${gson.version}
+            
+            
+            
+                dom4j
+                dom4j
+                ${dom4j.version}
+            
+            
+            
+                org.cometd.java
+                bayeux-api
+                ${cometd.version}
+            
+            
+                org.cometd.java
+                cometd-java-annotations
+                ${cometd.version}
+            
+            
+                org.cometd.java
+                cometd-java-client
+                ${cometd.version}
+            
+            
+                org.cometd.java
+                cometd-java-common
+                ${cometd.version}
+            
+            
+                org.cometd.java
+                cometd-java-oort
+                ${cometd.version}
+            
+            
+                org.cometd.java
+                cometd-java-server
+                ${cometd.version}
+            
+            
+            
+                commons-net
+                commons-net
+                ${commons-net.version}
+            
+            
+            
+                mysql
+                mysql-connector-java
+                ${mysql-connector-java.version}
+            
+            
+            
+                commons-fileupload
+                commons-fileupload
+                ${commons-fileupload.version}
+            
+            
+                commons-io
+                commons-io
+                ${commons-io.version}
+            
+            
+            
+                io.dropwizard
+                dropwizard-testing
+                ${dropwizard.version}
+            
+              
+                junit  
+                junit  
+                ${junit.version}
+             
+             
+                org.powermock 
+                powermock-module-junit4 
+                ${org.powermock.version}
+             
+             
+                org.powermock 
+                powermock-api-mockito 
+                ${org.powermock.version}
+             
+            
+                org.mockito
+                mockito-all
+                ${org.mockito.version}
+            
+            
+                com.h2database
+                h2
+                ${h2database.version}
+            
+            
+                org.apache.ant
+                ant
+                ${org.apache.ant.version}
+            
+            
+            
+                org.apache.tomcat
+                tomcat
+                ${tomcat.version}
+            
+        
+    
+
diff --git a/catalog-parent/pom.xml b/catalog-parent/pom.xml
new file mode 100644
index 00000000..36a7adb5
--- /dev/null
+++ b/catalog-parent/pom.xml
@@ -0,0 +1,36 @@
+
+
+    
+        org.openo.commontosca.catalog
+        catalogparent-lite
+        1.0.0-SNAPSHOT
+        catalogparent-lite
+    
+
+    4.0.0
+    org.openo.commontosca.catalog
+    catalogparent-aggregator
+    openo/commontosca/catalog/catalogparent-aggregator
+    pom
+
+    
+        catalogparent
+        catalogparent-lite
+    
+
diff --git a/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql b/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql
deleted file mode 100644
index e3d0522e..00000000
--- a/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
---     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
---
---     Licensed under the Apache License, Version 2.0 (the "License");
---     you may not use this file except in compliance with the License.
---     You may obtain a copy of the License at
---
---             http://www.apache.org/licenses/LICENSE-2.0
---
---     Unless required by applicable law or agreed to in writing, software
---     distributed under the License is distributed on an "AS IS" BASIS,
---     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---     See the License for the specific language governing permissions and
---     limitations under the License.
---
-
---
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql b/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql
deleted file mode 100644
index 41fd7a18..00000000
--- a/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql
+++ /dev/null
@@ -1,20 +0,0 @@
---
---     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
---
---     Licensed under the Apache License, Version 2.0 (the "License");
---     you may not use this file except in compliance with the License.
---     You may obtain a copy of the License at
---
---             http://www.apache.org/licenses/LICENSE-2.0
---
---     Unless required by applicable law or agreed to in writing, software
---     distributed under the License is distributed on an "AS IS" BASIS,
---     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---     See the License for the specific language governing permissions and
---     limitations under the License.
---
-
-SET autocommit = 0;
-
-COMMIT;
-SET autocommit = 1;
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/find_kill_process.bat b/catalog-standalone/src/main/assembly/find_kill_process.bat
deleted file mode 100644
index 728eec53..00000000
--- a/catalog-standalone/src/main/assembly/find_kill_process.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-@REM
-@REM     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-@REM
-@REM     Licensed under the Apache License, Version 2.0 (the "License");
-@REM     you may not use this file except in compliance with the License.
-@REM     You may obtain a copy of the License at
-@REM
-@REM             http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM     Unless required by applicable law or agreed to in writing, software
-@REM     distributed under the License is distributed on an "AS IS" BASIS,
-@REM     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM     See the License for the specific language governing permissions and
-@REM     limitations under the License.
-@REM
-
-echo %1 | findstr %2 >NUL
-echo ERRORLEVEL=%ERRORLEVEL%
-IF ERRORLEVEL 1 goto findend
-for /f "tokens=1" %%a in (%1) do (  
-    echo kill %1
-    taskkill /F /pid %%a
-)
-:findend
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/initDB.bat b/catalog-standalone/src/main/assembly/initDB.bat
deleted file mode 100644
index bafc036f..00000000
--- a/catalog-standalone/src/main/assembly/initDB.bat
+++ /dev/null
@@ -1,42 +0,0 @@
-@REM
-@REM     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-@REM
-@REM     Licensed under the Apache License, Version 2.0 (the "License");
-@REM     you may not use this file except in compliance with the License.
-@REM     You may obtain a copy of the License at
-@REM
-@REM             http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM     Unless required by applicable law or agreed to in writing, software
-@REM     distributed under the License is distributed on an "AS IS" BASIS,
-@REM     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM     See the License for the specific language governing permissions and
-@REM     limitations under the License.
-@REM
-
-@echo off
-title init catalog db
-
-set RUNHOME=%~dp0
-echo ### RUNHOME: %RUNHOME%
-
-echo ### init catalog db
-rem cd /d %RUNHOME%
-
-set JAVA="%JAVA_HOME%\bin\java.exe"
-set port=8777
-set jvm_opts=-Xms50m -Xmx128m
-rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n
-set class_path=%RUNHOME%;%RUNHOME%catalog-service.jar
-echo ### jvm_opts: %jvm_opts%
-echo ### class_path: %class_path%
-
-%JAVA% -classpath %class_path% %jvm_opts% org.openo.orchestrator.nfv.catalog.CatalogApp  db migrate %RUNHOME%conf\catalog.yml
-
-IF ERRORLEVEL 1 goto showerror
-exit
-:showerror
-echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check!
-echo After checking, press any key to close 
-pause
-exit
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/initDB.sh b/catalog-standalone/src/main/assembly/initDB.sh
deleted file mode 100644
index 109d119f..00000000
--- a/catalog-standalone/src/main/assembly/initDB.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-
-DIRNAME=`dirname $0`
-RUNHOME=`cd $DIRNAME/; pwd`
-echo @RUNHOME@ $RUNHOME
-
-title catalog  Database setup
-
-echo ### Starting catalog Database setup
-echo @JAVA_HOME@ $JAVA_HOME
-JAVA="$JAVA_HOME/bin/java"
-echo @JAVA@ $JAVA
-
-class_path="$RUNHOME/:$RUNHOME/catalog-service.jar"
-echo @class_path@ $class_path
-
-"$JAVA" -classpath "$class_path" org.openo.orchestrator.nfv.catalog.CatalogApp db migrate "$RUNHOME/conf/catalog.yml"
diff --git a/catalog-standalone/src/main/assembly/run.bat b/catalog-standalone/src/main/assembly/run.bat
deleted file mode 100644
index 4d389704..00000000
--- a/catalog-standalone/src/main/assembly/run.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@REM
-@REM     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-@REM
-@REM     Licensed under the Apache License, Version 2.0 (the "License");
-@REM     you may not use this file except in compliance with the License.
-@REM     You may obtain a copy of the License at
-@REM
-@REM             http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM     Unless required by applicable law or agreed to in writing, software
-@REM     distributed under the License is distributed on an "AS IS" BASIS,
-@REM     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM     See the License for the specific language governing permissions and
-@REM     limitations under the License.
-@REM
-
-@echo off
-title catalog-service
-
-set RUNHOME=%~dp0
-echo ### RUNHOME: %RUNHOME%
-echo ### Starting catalog-service
-
-set JAVA="%JAVA_HOME%\bin\java.exe"
-set port=8312
-set jvm_opts=-Xms50m -Xmx128m
-rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n
-set class_path=%RUNHOME%;%RUNHOME%catalog-service.jar
-echo ### jvm_opts: %jvm_opts%
-echo ### class_path: %class_path%
-
-%JAVA% -classpath %class_path% %jvm_opts% org.openo.orchestrator.nfv.catalog.CatalogApp server %RUNHOME%conf/catalog.yml
-
-IF ERRORLEVEL 1 goto showerror
-exit
-:showerror
-echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check!
-echo After checking, press any key to close 
-pause
-exit
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/run.sh b/catalog-standalone/src/main/assembly/run.sh
deleted file mode 100644
index c3849fa0..00000000
--- a/catalog-standalone/src/main/assembly/run.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-
-DIRNAME=`dirname $0`
-RUNHOME=`cd $DIRNAME/; pwd`
-echo @RUNHOME@ $RUNHOME
-
-echo @JAVA_HOME@ $JAVA_HOME
-JAVA="$JAVA_HOME/bin/java"
-echo @JAVA@ $JAVA
-
-JAVA_OPTS="-Xms50m -Xmx128m"
-port=8312
-#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n"
-echo @JAVA_OPTS@ $JAVA_OPTS
-
-class_path="$RUNHOME/:$RUNHOME/catalog-service.jar"
-echo @class_path@ $class_path
-
-"$JAVA" $JAVA_OPTS -classpath "$class_path"  org.openo.orchestrator.nfv.catalog.CatalogApp server "$RUNHOME/conf/catalog.yml"
-
diff --git a/catalog-standalone/src/main/assembly/stop.bat b/catalog-standalone/src/main/assembly/stop.bat
deleted file mode 100644
index 82f65a52..00000000
--- a/catalog-standalone/src/main/assembly/stop.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-@REM
-@REM     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-@REM
-@REM     Licensed under the Apache License, Version 2.0 (the "License");
-@REM     you may not use this file except in compliance with the License.
-@REM     You may obtain a copy of the License at
-@REM
-@REM             http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM     Unless required by applicable law or agreed to in writing, software
-@REM     distributed under the License is distributed on an "AS IS" BASIS,
-@REM     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM     See the License for the specific language governing permissions and
-@REM     limitations under the License.
-@REM
-
-@echo off
-title stopping catalog-service
-
-set HOME=%~dp0
-set Main_Class="org.openo.orchestrator.nfv.catalog.CatalogApp"
-
-echo ================== catalog-service info =============================================
-echo HOME=$HOME
-echo Main_Class=%Main_Class%
-echo ===============================================================================
-
-echo ### Stopping catalog-service
-cd /d %HOME%
-
-for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do (
-  call find_kill_process "%%i" %Main_Class%
-)
-exit
\ No newline at end of file
diff --git a/catalog-standalone/src/main/assembly/stop.sh b/catalog-standalone/src/main/assembly/stop.sh
deleted file mode 100644
index f66e77b7..00000000
--- a/catalog-standalone/src/main/assembly/stop.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-#     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-
-DIRNAME=`dirname $0`
-HOME=`cd $DIRNAME/; pwd`
-Main_Class="org.openo.orchestrator.nfv.catalog.CatalogApp"
-
-echo ================== catalog-service info =============================================
-echo HOME=$HOME
-echo Main_Class=$Main_Class
-echo ===============================================================================
-cd $HOME; pwd
-
-echo @WORK_DIR@ $HOME
-
-function save_service_pid(){
-    service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'`
-    echo @service_pid@ $service_pid
-}
-
-function kill_service_process(){
-    ps -p $service_pid
-    if [ $? == 0 ]; then
-        kill -9 $service_pid
-    fi
-}
-
-save_service_pid;
-echo @C_CMD@ kill -9 $service_pid
-kill_service_process;
\ No newline at end of file
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/CommonErrorResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/CommonErrorResponse.java
deleted file mode 100644
index 96e6cdc3..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/CommonErrorResponse.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author 00164331
- * 
- */
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CommonErrorResponse {
-
-    private String code;
-
-    private String message;
-
-    /**
-     * @param message2
-     * @return
-     */
-    public static Object failure(String message) {
-        return message;
-    }
-
-    public CommonErrorResponse(String message) {
-        super();
-        this.message = message;
-    }
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/Config.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/Config.java
deleted file mode 100644
index a2cd9d3d..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/Config.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-import org.openo.orchestrator.nfv.catalog.CatalogAppConfiguration;
-
-
-public class Config {
-    private static CatalogAppConfiguration configration;
-
-    public static CatalogAppConfiguration getConfigration() {
-        return configration;
-    }
-
-    public static void setConfigration(CatalogAppConfiguration config) {
-        configration = config;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/DateTimeUtil.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/DateTimeUtil.java
deleted file mode 100644
index 6838e3d3..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/DateTimeUtil.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class DateTimeUtil {
-    public static String getCurrentTime() {
-        return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
-    }
-
-    public static String getFormatTime(Date date) {
-        return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(date);
-    }
-
-    public static String getFormatTime(Date date, String format) {
-        return new SimpleDateFormat(format).format(date);
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/EnumUploadStatus.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/EnumUploadStatus.java
deleted file mode 100644
index c0944d0f..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/EnumUploadStatus.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-public enum EnumUploadStatus {
-    Create_Directory_Success, Create_Directory_Fail, File_Exist, Upload_From_Break_Success, Upload_From_Break_Failed, Upload_New_File_Success, Upload_New_File_Failed
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerAddrConfig.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerAddrConfig.java
deleted file mode 100644
index ed5fcb71..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerAddrConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-/**
- * @author 00164331
- * 
- */
-public class HttpServerAddrConfig {
-
-    protected static String httpServerAddress;
-
-    public static String getHttpServerAddress() {
-        return httpServerAddress;
-    }
-
-    public static void setHttpServerAddress(String httpServerAddress) {
-        HttpServerAddrConfig.httpServerAddress = httpServerAddress;
-    }
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerPathConfig.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerPathConfig.java
deleted file mode 100644
index 2e791cf5..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/HttpServerPathConfig.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-/**
- * @author 00164331
- * 
- */
-public class HttpServerPathConfig {
-    protected static String httpServerPath;
-
-    public static String getHttpServerPath() {
-        return httpServerPath;
-    }
-
-    public static void setHttpServerPath(String httpServerPath) {
-        HttpServerPathConfig.httpServerPath = httpServerPath;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/MsbAddrConfig.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/MsbAddrConfig.java
deleted file mode 100644
index 33428efa..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/MsbAddrConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-/**
- * @author 00164331
- * 
- */
-public class MsbAddrConfig {
-
-    protected static String msbAddress;
-
-    public static String getMsbAddress() {
-        return msbAddress;
-    }
-
-    public static void setMsbAddress(String msbAddress) {
-        MsbAddrConfig.msbAddress = msbAddress;
-    }
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/RestUtil.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/RestUtil.java
deleted file mode 100644
index f515d73e..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/common/RestUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.common;
-
-import javax.ws.rs.core.Response;
-
-/**
- * @author 00164331
- * 
- */
-public class RestUtil {
-    /**
-     * @param e
-     * @return
-     */
-    public static Response getRestException(String errorMsg) {
-        String code = "001";
-        return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
-                .entity(new CommonErrorResponse(code, errorMsg)).build();
-    }
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/CatalogResuorceType.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/CatalogResuorceType.java
deleted file mode 100644
index 2a351731..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/CatalogResuorceType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.common;
-
-/**
- ** @author 10159474
- */
-public enum CatalogResuorceType {
-    SERVICETEMPLATE, PACKAGE, NODETEMPLATE, TEMPLATE, SERVICETEMPLATEMAPPING;
-
-    public static CatalogResuorceType getType(String type) {
-        return valueOf(type);
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/Parameters.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/Parameters.java
deleted file mode 100644
index e75b46b4..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/common/Parameters.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.common;
-
-/**
- * *@author 10159474
- * 
- */
-public enum Parameters {
-    oid, name, provider, version, deletionPending, type, status, csarId, vendor, serviceTemplateId, nodeTemplateId, mappingId, nodeType;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/NodeTemplateDao.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/NodeTemplateDao.java
deleted file mode 100644
index 514dff0f..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/NodeTemplateDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.dao;
-
-import org.hibernate.SessionFactory;
-import org.openo.orchestrator.nfv.catalog.db.entity.NodeTemplateData;
-
-
-/**
- * host DAO class
- * 
- * *@author 10159474
- * 
- */
-public class NodeTemplateDao extends BaseDao {
-
-    public NodeTemplateDao(SessionFactory sessionFactory) {
-        super(sessionFactory);
-    }
-
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/PackageDao.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/PackageDao.java
deleted file mode 100644
index 90c4f5e1..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/PackageDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.dao;
-
-import org.hibernate.SessionFactory;
-import org.openo.orchestrator.nfv.catalog.db.entity.PackageData;
-
-
-/**
- * host DAO class
- * 
- * *@author 10159474
- * 
- */
-public class PackageDao extends BaseDao {
-
-    public PackageDao(SessionFactory sessionFactory) {
-        super(sessionFactory);
-    }
-
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateDao.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateDao.java
deleted file mode 100644
index 794ac9f0..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateDao.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.dao;
-
-import org.hibernate.SessionFactory;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * DAO class
- * 
- * *@author 10159474
- * 
- */
-public class ServiceTemplateDao extends BaseDao {
-    private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateDao.class);
-
-    public ServiceTemplateDao(SessionFactory sessionFactory) {
-        super(sessionFactory);
-    }
-
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateMappingDao.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateMappingDao.java
deleted file mode 100644
index d2c28a42..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/dao/ServiceTemplateMappingDao.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.dao;
-
-import org.hibernate.SessionFactory;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateData;
-import org.openo.orchestrator.nfv.catalog.db.entity.ServiceTemplateMappingData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * DAO class
- * 
- * *@author 10159474
- * 
- */
-public class ServiceTemplateMappingDao extends BaseDao {
-    private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateMappingDao.class);
-
-    public ServiceTemplateMappingDao(SessionFactory sessionFactory) {
-        super(sessionFactory);
-    }
-
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/BaseData.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/BaseData.java
deleted file mode 100644
index 07a64ea4..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/BaseData.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.entity;
-
-public class BaseData {
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/TemplateData.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/TemplateData.java
deleted file mode 100644
index e1f72ab5..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/entity/TemplateData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.entity;
-
-import java.util.ArrayList;
-
-public class TemplateData extends BaseData {
-    private ServiceTemplateData serviceTemplate;
-    private ArrayList nodeTemplates = new ArrayList();
-
-    public ServiceTemplateData getServiceTemplate() {
-        return serviceTemplate;
-    }
-
-    public void setServiceTemplate(ServiceTemplateData serviceTemplate) {
-        this.serviceTemplate = serviceTemplate;
-    }
-
-    public ArrayList getNodeTemplates() {
-        return nodeTemplates;
-    }
-
-    public void setNodeTemplates(ArrayList nodeTemplates) {
-        this.nodeTemplates = nodeTemplates;
-    }
-
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtil.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtil.java
deleted file mode 100644
index a792e925..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/db/util/CatalogDbUtil.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.db.util;
-
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.Gson;
-
-public class CatalogDbUtil {
-    private final static Logger logger = LoggerFactory.getLogger(CatalogDbUtil.class);
-
-    public static String generateId() {
-        return UUID.randomUUID().toString();
-    }
-
-    public static boolean isNotEmpty(String s) {
-        return s != null && !"".equals(s) && s.length() > 0;
-    }
-
-    public static String objectToString(Object obj) {
-        Gson gson = new Gson();
-        if (obj != null)
-            return gson.toJson(obj);
-        else
-            return null;
-    }
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/CSARQueryCondition.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/CSARQueryCondition.java
deleted file mode 100644
index 36972def..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/CSARQueryCondition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CSARQueryCondition {
-
-    private String csarId;
-
-    private String name;
-
-    private String provider;
-
-    private String version;
-
-    private Boolean deletionPending;
-
-    private EnumType type;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumOperationalState.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumOperationalState.java
deleted file mode 100644
index dafe7f8b..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumOperationalState.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity;
-
-public enum EnumOperationalState {
-    Enabled, Disabled
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumProcessState.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumProcessState.java
deleted file mode 100644
index 9f2ab76b..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumProcessState.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity;
-
-/**
- * @author 00164331
- * 
- */
-public enum EnumProcessState {
-    normal, onBoarding, onBoardFailed, deleting, deleteFailed
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumType.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumType.java
deleted file mode 100644
index 23165f51..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity;
-
-public enum EnumType {
-    GSAR, SSAR, NSAR, NFAR
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumUsageState.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumUsageState.java
deleted file mode 100644
index 966a264c..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/EnumUsageState.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity;
-
-public enum EnumUsageState {
-    InUse, NotInUse
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/PackageBasicInfo.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/PackageBasicInfo.java
deleted file mode 100644
index ec16434d..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/PackageBasicInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.request;
-
-import org.openo.orchestrator.nfv.catalog.entity.EnumType;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PackageBasicInfo {
-
-    private String provider;
-
-    private EnumType type;
-
-    private String version;
-
-    private String format;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/UploadPackageFromFtpRequest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/UploadPackageFromFtpRequest.java
deleted file mode 100644
index 8bc45994..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/request/UploadPackageFromFtpRequest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.request;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.openo.orchestrator.nfv.catalog.entity.EnumType;
-
-/**
- * @author 00164331
- * 
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UploadPackageFromFtpRequest {
-
-    private String provider;
-
-    private EnumType type;
-
-    private String version;
-
-    private String ftpUrl;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/CsarFileUriResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/CsarFileUriResponse.java
deleted file mode 100644
index 6ce9b3fe..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/CsarFileUriResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * @author 00164331
- * 
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CsarFileUriResponse {
-
-    private String downloadUri;
-
-    private String localPath;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/PackageMeta.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/PackageMeta.java
deleted file mode 100644
index d9077684..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/PackageMeta.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.response;
-
-import org.openo.orchestrator.nfv.catalog.entity.EnumOperationalState;
-import org.openo.orchestrator.nfv.catalog.entity.EnumProcessState;
-import org.openo.orchestrator.nfv.catalog.entity.EnumUsageState;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PackageMeta {
-
-    private String csarId;
-
-    private String name;
-
-    private String downloadUri;
-
-    private String size;
-
-    private String version;
-
-    private String provider;
-
-    private String type;
-
-    private String format;
-
-    private boolean deletionPending;
-
-    private String createTime;
-
-    private String modifyTime;
-
-    private EnumOperationalState operationalState;
-
-    private EnumUsageState usageState;
-
-    private String onBoardState;
-
-    private EnumProcessState processState;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UpdatePackageResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UpdatePackageResponse.java
deleted file mode 100644
index dba488bd..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UpdatePackageResponse.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UpdatePackageResponse {
-
-    private String usageState;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UploadPackageResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UploadPackageResponse.java
deleted file mode 100644
index 57add55f..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/entity/response/UploadPackageResponse.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.entity.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UploadPackageResponse {
-
-    private String csarId;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManager.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManager.java
deleted file mode 100644
index d9fdd2c9..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.filemanage;
-
-import java.util.ArrayList;
-
-import org.openo.orchestrator.nfv.catalog.filemanage.entity.FileLink;
-
-public interface FileManager {
-    /**
-     * @param srcPath
-     * @param dstPath/packageType/provider/packageName/version
-     * @return
-     */
-    boolean upload(String srcPath, String dstPath);
-
-    boolean download(String srcPath, String dstPath);
-
-    boolean delete(String srcPath);
-
-    ArrayList queryWorkFlow(String path);
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManagerType.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManagerType.java
deleted file mode 100644
index ec65c189..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/FileManagerType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.filemanage;
-
-public enum FileManagerType {
-    ftp, http;
-    public static FileManagerType getType(String type) {
-        return valueOf(type);
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/entity/FileLink.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/entity/FileLink.java
deleted file mode 100644
index 9f70a623..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/filemanage/entity/FileLink.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.filemanage.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class FileLink {
-    private String fileName;
-    private String downloadUri;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/ftp/Ftp.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/ftp/Ftp.java
deleted file mode 100644
index f4212408..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/ftp/Ftp.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.ftp;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * @author 00164331
- * 
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Ftp {
-
-    private String ipAddr;
-
-    private Integer port;
-
-    private String userName;
-
-    private String pwd;
-
-    private String path;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/health/ConsoleHealthCheck.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/health/ConsoleHealthCheck.java
deleted file mode 100644
index bc1569c0..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/health/ConsoleHealthCheck.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.health;
-
-import com.codahale.metrics.health.HealthCheck;
-
-public class ConsoleHealthCheck extends HealthCheck {
-    private final String template;
-
-    public ConsoleHealthCheck(String template) {
-        this.template = template;
-    }
-
-    @Override
-    protected Result check() throws Exception {
-        final String saying = String.format(template, "TEST");
-        if (!saying.contains("TEST")) {
-            return Result.unhealthy("template doesn't include a name");
-        }
-        return Result.healthy();
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/common/EnumToscaRelationShipDefinition.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/common/EnumToscaRelationShipDefinition.java
deleted file mode 100644
index de19ba35..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/common/EnumToscaRelationShipDefinition.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.common;
-
-public enum EnumToscaRelationShipDefinition {
-    VirtualBindsTo{
-        @Override
-        public String getName(){
-            return "tosca.relationships.nfv.VirtualBindsTo";
-        }
-    },
-    VirtualLinksTo{
-        @Override
-        public String getName(){
-            return "tosca.relationships.nfv.VirtualLinksTo";
-        }
-    },
-    DeployedOn{
-        @Override
-        public String getName(){
-            return "tosca.relationships.nfv.DeployedOn";
-        }
-    },
-    BelongTo{
-        @Override
-        public String getName(){
-            return "tosca.relationships.nfv.BelongTo";
-        }
-    };
-    
-    public abstract String getName();
-    
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/EnumDataType.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/EnumDataType.java
deleted file mode 100644
index fb8f2b39..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/EnumDataType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author 10090474
- *
- */
-@AllArgsConstructor
-public enum EnumDataType {
-    STRING("String"), INTEGER("Integer"), FLOAT("Float"), BOOLEAN("Boolean");
-    
-    private String value;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/InputParameter.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/InputParameter.java
deleted file mode 100644
index 783fa1bb..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/InputParameter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author 10090474
- *
- */
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class InputParameter {
-    private String name;
-    private EnumDataType type = EnumDataType.STRING;
-    private String description;
-    private String defaultValue;
-    private boolean required;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/KeyValuePair.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/KeyValuePair.java
deleted file mode 100644
index 60548d33..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/KeyValuePair.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class KeyValuePair {
-    private String key;
-    private String value;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NfvTemplate.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NfvTemplate.java
deleted file mode 100644
index ab038a90..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NfvTemplate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class NfvTemplate {
-	private List vduNodes;
-	private List networkNodes;
-	private List vnfcNodes;
-	private List vnfNodes;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NodeTemplate.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NodeTemplate.java
deleted file mode 100644
index 3ffd68f1..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/NodeTemplate.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class NodeTemplate {
-    private String id;
-    private String name;
-    private String type;
-    private Map properties;
-    private List relationShips;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/QueryRawDataCondition.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/QueryRawDataCondition.java
deleted file mode 100644
index 090c17e0..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/QueryRawDataCondition.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author 10090474
- *
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class QueryRawDataCondition {
-    private String csarId;
-    private KeyValuePair[] inputParameters;
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/RelationShip.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/RelationShip.java
deleted file mode 100644
index d8cbe8df..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/RelationShip.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RelationShip {	
-	private String sourceNodeName;
-	private String targetNodeName;
-	private String sourceNodeId;
-    private String targetNodeId;
-	private String type;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplate.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplate.java
deleted file mode 100644
index 86efe196..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplate.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ServiceTemplate {
-    private String serviceTemplateId;
-    private String templateName;
-    private String vendor;
-    private String version;
-    private String csarid;
-    private String type;
-    private String downloadUri;
-    private InputParameter[] inputs;
-    private ServiceTemplateOperation[] operations;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateOperation.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateOperation.java
deleted file mode 100644
index ba66b6ed..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateOperation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ServiceTemplateOperation {
-    private String name;
-    private String description;
-    private String processId;
-    private InputParameter[] inputs;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateRawData.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateRawData.java
deleted file mode 100644
index 37cfab4e..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/entity/ServiceTemplateRawData.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ServiceTemplateRawData {
-    private String rawData;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerExtPackageRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerExtPackageRest.java
deleted file mode 100644
index 692c13b0..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerExtPackageRest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.container;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity.ContainerServicePackageList;
-
-/**
- * The opentosca container interface for csar.
- * @author 10189609
- *
- */
-@Path("/csars")
-public interface IContainerExtPackageRest {
-	@GET
-	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-	public ContainerServicePackageList getToscaServicePackage(@QueryParam("csarName") String csarName);
-	
-	@POST
-	@Consumes(MediaType.TEXT_PLAIN)
-	public String uploadPackageByToscaService(@QueryParam("fileLocation") String fileLocation);
-	
-	@Path("/{csarId}")
-	@DELETE
-    public String deletePackageById(@PathParam("csarId") String csarId);
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerPortabilityRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerPortabilityRest.java
deleted file mode 100644
index 5086684f..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerPortabilityRest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.container;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-/**
- * The opentosca container interface for policy.
- * @author 10189609
- *
- */
-@Path("/servicetemplates")
-public interface IContainerPortabilityRest {	
-    
-    @Path("/{templateid}/policys")
-	@GET
-    String getToscaPolicys(@PathParam("templateid") String serviceTemplateID);
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerTemplateRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerTemplateRest.java
deleted file mode 100644
index f2957101..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/container/IContainerTemplateRest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.container;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity.ContainerServiceNodeTemplateList;
-import org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity.ContainerServiceTemplateList;
-
-/**
- * The opentosca container interface for service template.
- * @author 10189609
- *
- */
-@Path("/servicetemplates")
-public interface IContainerTemplateRest {
-	@GET
-	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-	ContainerServiceTemplateList getToscaServiceTemplate(@QueryParam("templateid") String templateId);	
-	
-	@Path("/{templateid}/nodetemplates")
-	@GET
-	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-	ContainerServiceNodeTemplateList getToscaServiceNodeTemplates(@PathParam("templateid") String templateId);
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceCommonParam.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceCommonParam.java
deleted file mode 100644
index 6ae91afc..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceCommonParam.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ContainerServiceCommonParam {
-    @XmlElement
-    private String key;
-
-    @XmlElement
-    private String value;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceNodeTemplateList.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceNodeTemplateList.java
deleted file mode 100644
index fdc8fd43..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceNodeTemplateList.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="nodetemplates")
-public class ContainerServiceNodeTemplateList {
-	@XmlElement(name="nodetemplate")
-	private List nodeTemplate;
-
-	public List getNodeTemplate() {
-		return nodeTemplate;
-	}
-
-	public void setNodeTemplate(List nodeTemplate) {
-		this.nodeTemplate = nodeTemplate;
-	}
-	
-	
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceOperationParameter.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceOperationParameter.java
deleted file mode 100644
index 380d3fab..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServiceOperationParameter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity;
-
-/**
- * @author 10189609
- *
- */
-public class ContainerServiceOperationParameter {
-
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServicePackageList.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServicePackageList.java
deleted file mode 100644
index fd53d3dc..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/containerEntity/ContainerServicePackageList.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.containerEntity;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="packages")
-public class ContainerServicePackageList {
-	public static final String NAMESPACE_OF_SELFSERVICE="http://www.eclipse.org/winery/model/selfservice";
-	
-	@XmlElement(name="package")
-	private List packageList;
-
-	public List getPackageList() {
-		return packageList;
-	}
-
-	public void setPackageList(List packageList) {
-		this.packageList = packageList;
-	}
-	
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/lifecycleEnity/InstanceEntity.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/lifecycleEnity/InstanceEntity.java
deleted file mode 100644
index ad46d7df..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/lifecycleEnity/InstanceEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.lifecycleEnity;
-
-public class InstanceEntity {
-	private String serviceTemplateId;
-
-	public String getServiceTemplateId() {
-		return serviceTemplateId;
-	}
-
-	public void setServiceTemplateId(String serviceTemplateId) {
-		this.serviceTemplateId = serviceTemplateId;
-	}
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/roEntity/ResourceResponseEntity.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/roEntity/ResourceResponseEntity.java
deleted file mode 100644
index 834f8262..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/entity/roEntity/ResourceResponseEntity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.entity.roEntity;
-
-import java.util.ArrayList;
-
-public class ResourceResponseEntity
-{
-    ArrayList  data=new ArrayList();   
-    String operationResult;
-
-    public String getOperationResult()
-    {
-        return operationResult;
-    }
-
-    public void setOperationResult(String operationResult)
-    {
-        this.operationResult = operationResult;
-    }
-    public ArrayList  getData()
-    {
-        return data;
-    }
-    public void setData(ArrayList  data)
-    {
-        this.data = data;
-    }   
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/lifecycle/ILifeCycleServiceRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/lifecycle/ILifeCycleServiceRest.java
deleted file mode 100644
index 0a3eb830..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/lifecycle/ILifeCycleServiceRest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.lifecycle;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-/**
- * The lifecycle interface.
- * @author 10189609
- *
- */
-@Path("/appinstances")
-public interface ILifeCycleServiceRest {
-	@GET
-	@Produces(MediaType.APPLICATION_JSON)
-	public String getVNFInstances();
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/ro/IResourceServiceRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/ro/IResourceServiceRest.java
deleted file mode 100644
index 44ec792f..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/externalservice/ro/IResourceServiceRest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.externalservice.ro;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-/**
- * The roc resource interface.
- * @author 10189609
- *
- */
-@Path("/resource")
-public interface IResourceServiceRest {
-	@Path("/vims/{vim_id}")
-	@GET
-	@Produces(MediaType.APPLICATION_JSON)
-	public String getResourceVim(@PathParam("vim_id") String vimId) throws Exception;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/AbstractModelParser.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/AbstractModelParser.java
deleted file mode 100644
index f1788c8b..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/AbstractModelParser.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser;
-
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-
-public abstract class AbstractModelParser {
-    /**
-     * @param packageId
-     * @param fileLocation
-     * @return service template id
-     * @throws CatalogResourceException
-     */
-    public abstract String parse(String packageId, String fileLocation)
-            throws CatalogResourceException;
-    
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumPackageFormat.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumPackageFormat.java
deleted file mode 100644
index 3010c602..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumPackageFormat.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser;
-
-/**
- * enum data.
- * @author 10189609
- *
- */
-public enum EnumPackageFormat {
-    TOSCA_XML, TOSCA_YAML
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumTemplateType.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumTemplateType.java
deleted file mode 100644
index 9254faf3..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/EnumTemplateType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser;
-
-public enum EnumTemplateType {
-    NS, VNF
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/IYamlParseRest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/IYamlParseRest.java
deleted file mode 100644
index 20decb49..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/IYamlParseRest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser.yaml;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.openo.orchestrator.nfv.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;
-
-/**
- * 
- * @author 10090474
- * 
- */
-@Path("/parse")
-public interface IYamlParseRest {
-    /**
-     * @param request
-     * @return
-     * @throws Exception
-     */
-	@POST
-	@Consumes(MediaType.APPLICATION_JSON)
-	@Produces(MediaType.APPLICATION_JSON)
-    String parse(ParseYamlRequestParemeter request)
-            throws Exception;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/YamlParseServiceConsumer.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/YamlParseServiceConsumer.java
deleted file mode 100644
index c1f758ef..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/YamlParseServiceConsumer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser.yaml;
-
-import org.glassfish.jersey.client.ClientConfig;
-import org.openo.orchestrator.nfv.catalog.common.MSBUtil;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-import org.openo.orchestrator.nfv.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;
-import org.openo.orchestrator.nfv.catalog.model.parser.yaml.entity.ParseYamlResult;
-
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
-import com.google.gson.Gson;
-
-/**
- * 
- * @author 10090474
- * 
- */
-public class YamlParseServiceConsumer {
-    /**
-     * get service template by template id from container service.
-     * 
-     * @param request
-     * @return
-     * @throws CatalogResourceException
-     */
-    public static ParseYamlResult getServiceTemplates(
-            final ParseYamlRequestParemeter request)
-            throws CatalogResourceException {
-        try {
-            ClientConfig config = new ClientConfig();
-            IYamlParseRest yamlParseProxy = ConsumerFactory
-                    .createConsumer(MSBUtil.getYamlParseBaseUrl(), config,
-                            IYamlParseRest.class);
-            String jsonStr = yamlParseProxy.parse(request);
-            return new Gson().fromJson(jsonStr, ParseYamlResult.class);
-        } catch (Exception e) {
-            throw new CatalogResourceException("Call parser api failed.", e);
-        }
-
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java
deleted file mode 100644
index 50149774..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.parser.yaml.entity;
-
-
-
-public enum EnumYamlServiceTemplateInfo {
-    ID{
-        @Override
-        public String getName() {
-            return "id";
-        }
-    },
-    VERSION{
-        @Override
-        public String getName() {
-            return "version";
-        }
-    },
-    PROVIDER{
-        @Override
-        public String getName() {
-            return "vendor";
-        }
-    };
-    
-    public abstract String getName();
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/IWSO2RestService.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/IWSO2RestService.java
deleted file mode 100644
index 83902cac..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/IWSO2RestService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.plan.wso2;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity.DeletePackageResponse;
-import org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity.DeployPackageResponse;
-import org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity.StartProcessRequest;
-import org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity.StartProcessResponse;
-
-/**
- * 
- * @author 10090474
- * 
- */
-@Path("/openoapi/wso2bpel/v1")
-public interface IWSO2RestService {
-    /**
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @Path("/package")
-	@POST
-    @Consumes(MediaType.APPLICATION_JSON)
-	@Produces(MediaType.APPLICATION_JSON)
-    DeployPackageResponse deployPackage(FormDataMultiPart request) throws Exception;
-
-    @Path("/package/{packageName}")
-    @DELETE
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    DeletePackageResponse deletePackage(
-            @PathParam("packageName") String packageName) throws Exception;
-
-    @Path("process/instance")
-    @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    StartProcessResponse startProcess(StartProcessRequest request)
-            throws Exception;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeletePackageResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeletePackageResponse.java
deleted file mode 100644
index 87ca8ea5..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeletePackageResponse.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-/**
- * @author 10090474
- *
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class DeletePackageResponse {
-    private static final int STATUS_SUCCESS = 1;
-
-    private int status;
-    private String message;
-    private String exception;
-
-    public boolean isSuccess() {
-        return this.status == STATUS_SUCCESS;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeployPackageResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeployPackageResponse.java
deleted file mode 100644
index d28b896a..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/DeployPackageResponse.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-/**
- * @author 10090474
- *
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class DeployPackageResponse {
-    private static final int STATUS_SUCCESS = 1;
-
-    private int status;
-    private String message;
-    private String packageName;
-    private String processId;
-    private String exception;
-
-    public boolean isSuccess() {
-        return this.status == STATUS_SUCCESS;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessRequest.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessRequest.java
deleted file mode 100644
index 7c914862..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessRequest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity;
-
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-/**
- * @author 10090474
- *
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class StartProcessRequest {
-    private String processId;
-    private Map params;
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessResponse.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessResponse.java
deleted file mode 100644
index df6d057d..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/model/plan/wso2/entity/StartProcessResponse.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.model.plan.wso2.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-/**
- * @author 10090474
- *
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class StartProcessResponse {
-    private static final int STATUS_SUCCESS = 1;
-
-    private int status;
-    private String message;
-    private String response;
-    private String exception;
-
-    public boolean isSuccess() {
-        return this.status == STATUS_SUCCESS;
-    }
-}
diff --git a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/resources/RestUtils.java b/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/resources/RestUtils.java
deleted file mode 100644
index b361cce1..00000000
--- a/catalog/src/main/java/org/openo/orchestrator/nfv/catalog/resources/RestUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-package org.openo.orchestrator.nfv.catalog.resources;
-
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.core.Response;
-
-import org.openo.orchestrator.nfv.catalog.common.CommonErrorResponse;
-import org.openo.orchestrator.nfv.catalog.db.exception.CatalogResourceException;
-
-
-public class RestUtils {
-    /**
-     * @param e
-     * @return
-     */
-    public static InternalServerErrorException newInternalServerErrorException(
-            CatalogResourceException e) {
-        return new InternalServerErrorException(Response
-                .status(Response.Status.INTERNAL_SERVER_ERROR)
-                .entity(new CommonErrorResponse(e.getErrcode() + "", e.getMessage())).build(), e);
-    }
-
-    /**
-     * @param e
-     * @return
-     */
-    public static BadRequestException newBadRequestException(CatalogBadRequestException e) {
-        return new BadRequestException(Response.status(Response.Status.BAD_REQUEST)
-                .entity(new CommonErrorResponse(e.getErrcode() + "", e.getMessage())).build(), e);
-    }
-}
diff --git a/catalog/src/main/resources/api-doc/lib/jquery.slideto.min.js b/catalog/src/main/resources/api-doc/lib/jquery.slideto.min.js
deleted file mode 100644
index 188f4f06..00000000
--- a/catalog/src/main/resources/api-doc/lib/jquery.slideto.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
diff --git a/catalog/src/main/resources/api-doc/o2c.html b/catalog/src/main/resources/api-doc/o2c.html
deleted file mode 100644
index 4f23dfb4..00000000
--- a/catalog/src/main/resources/api-doc/o2c.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
\ No newline at end of file
diff --git a/catalog/src/test/resources/Hibernate.cfg.xml b/catalog/src/test/resources/Hibernate.cfg.xml
deleted file mode 100644
index 170d6b87..00000000
--- a/catalog/src/test/resources/Hibernate.cfg.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-    true
-    org.hibernate.dialect.H2Dialect
-    org.h2.Driver
-    jdbc:h2:tcp://localhost:8205/./db/catalog
-    catalog
-    catalog
-    update
-    thread
-    
-    
-    
-    
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bc86b287..58d8d495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,38 +1,44 @@
 
 
     
-        org.openo.orchestrator
-        openoparentpom
-        0.0.1-SNAPSHOT
+        org.openo.commontosca.catalog
+        catalogparent
+        1.0.0-SNAPSHOT
+        catalog-parent/catalogparent
       
 
     4.0.0
-    org.openo.orchestrator.nfv.catalog
-    catalog-parent
-    openo/catalog
+    catalog-root
+    openo/commontosca/catalog/catalog-root
     pom
-    
-	
+
     
-        catalog
-        catalog-standalone
-		httpserver-standalone
-		catalog-all
+        catalog-parent
+        catalog-core
     
+
+    
+        
+            
+                com.mycila
+                license-maven-plugin
+            
+        
+

Warning: Deprecated

Implementation Notes

Response Class (Status "+l((s=null!=(s=t.successCode||(null!=e?e.successCode:e))?s:r,typeof s===i?s.call(e,{name:"successCode",hash:{},data:a}):s))+')

Parameters

Response Messages

\n \n '+p((i=null!=(i=t.method||(null!=e?e.method:e))?i:o,typeof i===l?i.call(e,{name:"method",hash:{},data:a}):i))+"\n \n \n '+p((i=null!=(i=t.path||(null!=e?e.path:e))?i:o,typeof i===l?i.call(e,{name:"path",hash:{},data:a}):i))+"\n \n

Request URL

Response Body

Response Code

Response Headers