Implement support for v10 model entities. 61/3861/1
authorFraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
Wed, 3 May 2017 17:47:43 +0000 (13:47 -0400)
committerFraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
Wed, 3 May 2017 17:48:14 +0000 (13:48 -0400)
commit578368fce559ad28eb3bc62064e4c39858fa3339
tree3ab6b05b4e2738e0a2e9c3a4633ff2693652f5a4
parent3c76a64c4d8571c5a319af42fedc61b851106f6d
Implement support for v10 model entities.

Change-Id: Id2b42b70d7fe0ada6695ac9632b314f21ace193f
Signed-off-by: Fraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
93 files changed:
ajsc-shared-config/README.txt [new file with mode: 0644]
ajsc-shared-config/etc/PartnerProfile.xml [new file with mode: 0644]
ajsc-shared-config/etc/aft.properties [new file with mode: 0644]
ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml [new file with mode: 0644]
ajsc-shared-config/etc/logback.xml [moved from src/main/resources/logback.xml with 86% similarity]
ajsc-shared-config/etc/spm2.jks [new file with mode: 0644]
antBuild/build.xml [new file with mode: 0644]
bundleconfig-local/etc/appprops/AAFUserRoles.properties [new file with mode: 0644]
bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties [new file with mode: 0644]
bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties [new file with mode: 0644]
bundleconfig-local/etc/appprops/app-intercepts.properties [new file with mode: 0644]
bundleconfig-local/etc/appprops/methodMapper.properties [new file with mode: 0644]
bundleconfig-local/etc/sysprops/sys-props.properties [new file with mode: 0644]
pom.xml
src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy [new file with mode: 0644]
src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt [new file with mode: 0644]
src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt [new file with mode: 0644]
src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props [moved from src/main/docker/startup.sh with 84% similarity]
src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route [moved from src/test/resources/models/vnf-model.xml with 78% similarity]
src/main/assemble/ajsc_module_assembly.xml [new file with mode: 0644]
src/main/assemble/ajsc_props_assembly.xml [moved from src/main/webapp/WEB-INF/rest-servlet.xml with 56% similarity]
src/main/assemble/ajsc_runtime_assembly.xml [new file with mode: 0644]
src/main/bin/start.sh [moved from src/main/resources/model-loader.properties with 51% similarity]
src/main/config/ajsc-chef.jks [new file with mode: 0644]
src/main/config/ajsc-jetty.xml [new file with mode: 0644]
src/main/config/ajsc-override-web.xml [new file with mode: 0644]
src/main/config/ajscJetty.jks [new file with mode: 0644]
src/main/config/cadi.properties [new file with mode: 0644]
src/main/config/jul-redirect.properties [new file with mode: 0644]
src/main/config/keyfile [new file with mode: 0644]
src/main/config/runner-web.xml [new file with mode: 0644]
src/main/docker/.dockerignore [deleted file]
src/main/docker/Dockerfile
src/main/docker/update_config.sh [deleted file]
src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
src/main/java/org/openecomp/modelloader/entity/Artifact.java
src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java
src/main/java/org/openecomp/modelloader/entity/ArtifactType.java
src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java
src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java
src/main/java/org/openecomp/modelloader/notification/EventCallback.java
src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java
src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java
src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java
src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
src/main/resources/aai-os-cert.p12 [deleted file]
src/main/resources/org/openecomp/modelloader/filemonitor/FileMonitorMsgs.properties [deleted file]
src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
src/main/resources/schema/aai_schema_v8.xsd
src/main/resources/schema/vnfcatalog.xsd
src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context [new file with mode: 0644]
src/main/runtime/context/default#0.context [new file with mode: 0644]
src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json [new file with mode: 0644]
src/main/runtime/shiroRole/ajscadmin.json [new file with mode: 0644]
src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json [new file with mode: 0644]
src/main/runtime/shiroRole/contextadmin#default.json [new file with mode: 0644]
src/main/runtime/shiroUser/ajsc.json [new file with mode: 0644]
src/main/runtime/shiroUserRole/ajsc#ajscadmin.json [new file with mode: 0644]
src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json [new file with mode: 0644]
src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json [new file with mode: 0644]
src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java
src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java
src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java [moved from src/test/java/org/openecomp/modelloader/restclient/AAIRestClientTest.java with 92% similarity]
src/test/java/org/openecomp/modelloader/service/ModelLoaderServiceTest.java [deleted file]
src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java
src/test/resources/logback-test.xml
src/test/resources/model-loader-empty-auth-password.properties
src/test/resources/model-loader-no-auth-password.properties
src/test/resources/model-loader.properties
src/test/resources/models/AAI-Testvsp..vmme_cinder..module-1-resource-1.xml [new file with mode: 0644]
src/test/resources/models/AAI-Testvsp..vmme_small_ecomp..module-0-resource-1.xml [new file with mode: 0644]
src/test/resources/models/AAI-VL-resource-1.xml [new file with mode: 0644]
src/test/resources/models/AAI-stellService-service-1.xml [new file with mode: 0644]
src/test/resources/models/AAI-testvsp-resource-1.xml [new file with mode: 0644]
src/test/resources/models/complete-model.xml
src/test/resources/models/incomplete-model.xml [moved from src/main/webapp/WEB-INF/web.xml with 56% similarity]
src/test/resources/models/incomplete-models.xml [new file with mode: 0644]
src/test/resources/models/invalid-model.xml [new file with mode: 0644]
src/test/resources/models/l3-network-widget.json [new file with mode: 0644]
src/test/resources/models/l3-network-widget.xml [moved from src/main/webapp/WEB-INF/applicationContext.xml with 61% similarity]
src/test/resources/models/named-query-wan-connector.xml
src/test/resources/models/vnf-model.json [deleted file]
src/test/resources/models/wan-connector-model.xml [deleted file]
src/test/resources/vnfcatalogexample.xml
version.properties