From e3ecab31ee6b93c8d07c52faa9e586eee07ef415 Mon Sep 17 00:00:00 2001 From: da490c Date: Wed, 4 Apr 2018 21:19:50 -0400 Subject: [PATCH] Add new appconfig for spring-boot sparky Issue-ID: AAI-990 Change-Id: I55c1118d55e64340d99db7feb6f574462e11547a Signed-off-by: da490c --- sparky/appconfig/auth/csp-cookie-filter.properties | 12 + sparky/appconfig/auth/inventory-ui-keystore | Bin 7201 -> 4254 bytes .../camel-rests/sparky-core-filter-aggregation.xml | 7 + .../camel-rests/sparky-core-prepareSchema.xml | 11 + .../sparky-core-subscriptionService.xml | 7 + .../camel-rests/sparky-core-unified-search.xml | 7 + .../sparky-core-unifiedFilterRequest.xml | 7 + .../descriptors/aaiEntityNodeDescriptors.json | 218 +++++++++++++++++++ sparky/appconfig/filters/aaiui_views.json | 2 +- .../subscription_object_inspector_mapping.json | 2 +- sparky/appconfig/logging/logback.xml | 172 +++++++++++++++ .../portal/portal-authentication.properties | 8 +- sparky/appconfig/portal/portal.properties | 8 +- sparky/appconfig/portal/roles.config | 6 + sparky/appconfig/schemas/autoSuggestMappings.json | 10 + sparky/appconfig/schemas/autoSuggestSettings.json | 21 ++ sparky/appconfig/schemas/dynamicMappings.json | 14 ++ .../schemas/entityCountHistoryMappings.json | 16 ++ sparky/appconfig/schemas/es_mappings.json | 32 +++ sparky/appconfig/schemas/es_settings.json | 36 +++ sparky/appconfig/sparky-application.properties | 11 + sparky/appconfig/sparky-http-config.properties | 1 + sparky/appconfig/sparky-ssl-config.properties | 3 + .../sparky-core-aggregateVnfSearchProvider.xml | 33 +++ .../spring-beans}/sparky-core-apigw.xml | 6 +- .../appconfig/spring-beans/sparky-core-gizmo.xml | 29 +++ .../spring-beans}/sparky-core-sync.xml | 38 ++-- .../spring-beans}/sparky-core-viewInspect.xml | 10 +- .../sparky-core-viewInspectSearchProvider.xml | 34 +++ sparky/appconfig/spring-beans/sparky-core.xml | 241 +++++++++++++++++++++ .../sparky-core-aggregateVnfSearchProvider.xml | 34 --- sparky/dynamic/conf/sparky-core-gizmo.xml | 28 --- .../conf/sparky-core-viewInspectSearchProvider.xml | 34 --- sparky/dynamic/conf/sparky-core.xml | 227 ------------------- sparky/dynamic/routes/sparky-core-apigw.route | 4 - .../routes/sparky-core-attributeEditRequest.route | 4 - .../routes/sparky-core-entityCountHistory.route | 4 - .../routes/sparky-core-filter-aggregation.route | 4 - .../sparky-core-prepareGeoVisualization.route | 4 - .../dynamic/routes/sparky-core-prepareSchema.route | 4 - .../routes/sparky-core-subscriptionService.route | 4 - .../routes/sparky-core-summaryByEntityType.route | 4 - .../sparky-core-summaryByEntityTypeCount.route | 4 - sparky/dynamic/routes/sparky-core-ui.route | 4 - .../routes/sparky-core-unified-search.route | 5 - .../routes/sparky-core-unifiedFilterRequest.route | 4 - 46 files changed, 972 insertions(+), 402 deletions(-) create mode 100644 sparky/appconfig/auth/csp-cookie-filter.properties create mode 100644 sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml create mode 100644 sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml create mode 100644 sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml create mode 100644 sparky/appconfig/camel-rests/sparky-core-unified-search.xml create mode 100644 sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml create mode 100644 sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json create mode 100644 sparky/appconfig/logging/logback.xml create mode 100644 sparky/appconfig/portal/roles.config create mode 100644 sparky/appconfig/schemas/autoSuggestMappings.json create mode 100644 sparky/appconfig/schemas/autoSuggestSettings.json create mode 100644 sparky/appconfig/schemas/dynamicMappings.json create mode 100644 sparky/appconfig/schemas/entityCountHistoryMappings.json create mode 100644 sparky/appconfig/schemas/es_mappings.json create mode 100644 sparky/appconfig/schemas/es_settings.json create mode 100644 sparky/appconfig/sparky-application.properties create mode 100644 sparky/appconfig/sparky-http-config.properties create mode 100644 sparky/appconfig/sparky-ssl-config.properties create mode 100644 sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml rename sparky/{dynamic/conf => appconfig/spring-beans}/sparky-core-apigw.xml (84%) create mode 100644 sparky/appconfig/spring-beans/sparky-core-gizmo.xml rename sparky/{dynamic/conf => appconfig/spring-beans}/sparky-core-sync.xml (91%) rename sparky/{dynamic/conf => appconfig/spring-beans}/sparky-core-viewInspect.xml (87%) create mode 100644 sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml create mode 100644 sparky/appconfig/spring-beans/sparky-core.xml delete mode 100644 sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml delete mode 100644 sparky/dynamic/conf/sparky-core-gizmo.xml delete mode 100644 sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml delete mode 100644 sparky/dynamic/conf/sparky-core.xml delete mode 100644 sparky/dynamic/routes/sparky-core-apigw.route delete mode 100644 sparky/dynamic/routes/sparky-core-attributeEditRequest.route delete mode 100644 sparky/dynamic/routes/sparky-core-entityCountHistory.route delete mode 100644 sparky/dynamic/routes/sparky-core-filter-aggregation.route delete mode 100644 sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route delete mode 100644 sparky/dynamic/routes/sparky-core-prepareSchema.route delete mode 100644 sparky/dynamic/routes/sparky-core-subscriptionService.route delete mode 100644 sparky/dynamic/routes/sparky-core-summaryByEntityType.route delete mode 100644 sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route delete mode 100644 sparky/dynamic/routes/sparky-core-ui.route delete mode 100644 sparky/dynamic/routes/sparky-core-unified-search.route delete mode 100644 sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route diff --git a/sparky/appconfig/auth/csp-cookie-filter.properties b/sparky/appconfig/auth/csp-cookie-filter.properties new file mode 100644 index 0000000..2315b9f --- /dev/null +++ b/sparky/appconfig/auth/csp-cookie-filter.properties @@ -0,0 +1,12 @@ +global.login.url=aaiportal.onap.org + +# MOTS ID of the application +application.id=12345 + +# valid domains for open redirect +redirect-domain=domain.com + +# Required by esGateKeeper. Valid values are: +# DEVL - used during development +# PROD - used in production +gatekeeper.environment=TEST \ No newline at end of file diff --git a/sparky/appconfig/auth/inventory-ui-keystore b/sparky/appconfig/auth/inventory-ui-keystore index efa01f8d79fcee29a1cbeb19395ab776dcb6b46b..3319e639de12af2ae4d6b019474a8182b604a699 100644 GIT binary patch delta 2259 zcmV;^2rT!ZIG!PY{_Xzl00002000010000100A)o00CRdS#EFu00jUrf&~094h9M< z1_1;CDgqG!0R;dAf&}O*F0X6f>l9*J(#X-QfR5>__}xd|7J*1Ep};5LMY^WM^2Jq9 zmsi$<vlI&=)YcqZ$cfqKBX4N!pm z$-M#2vXNZ&FKtbF0E#96Aw*jY7`X@xoB!pab%YV;$$aCwnUMTH3IOg)x6VhC+6b6l z^sW^yk1_d==jgequp+e$+T@Sn506?AgwxDc=odUWTp>eNe@#60#o}`qPC=_8qabJSQf=jxhC@LO> z1MPn6suPDi8D!JjMkzVEGv%Y?w_+|ENS^J#$hY@#HZ-5)S(w=gLEi*0U7zt260~mx z+E|{MVAgGrVI|Fsu0?~!nUrJZadS^2vym^E^AX>Fn`%BNJ6L@#p;qS-3~G=V z2!d&IRLX;c(y%#lUxt^Wt~5E#eeKNl11+4-76uiv_J65@+ojpJw^Tp2{5UP`kleRA zQtS>0?V3mGE-@*vRRrkv8$!Ai`=>-V!`4M}jdy7Hymvk|v{<*RTWRiSsK#Ite7e32 z;-Dyh|4v;*0w*d(h}aA+U*=8#t*s#Y4uQ^)q@w#hr}D3J^<&V62S23UAy~&XpsDz9 z-1C#UxOH>hoboX^Kgp=8$eK0EL%7=!te->}UKSXr+TA{?YjS>T|BR^U`61#^`fOoW zH`M6Gm;1lK#!(MtV)>5uXu(p#JtZrc^1XF`%IoaR9zVDOW!GqxI3HN4t!^01r?E9( z$>SLnYHd4O+J$Zp!qL6&XYUr+k+=~#3-Zh-XJV%Ibk=i%b!-DGY=s|71{u|ZANjyn z^XeNDecAPwEYM%myk4q>aR zXe*lxJ>bqTXg$VZ6Ts~z&OHr!vW>>2P2#8<=it|h;8`7eP-}q^FSAe4_L{4rp|2*C z6WVc$<=+k=VsL)&zc=LCmmMZ;bd%>q1I1$ZLF{S*Vb}a2hBVz|1qYLv{jk|5rc}X3yEtKcbZ~gJ)8UC zXaak(4!zVelq>$nf23L_ZA^+N-U&cHS2VZ-aoF}$1dOLnFb;x39W7@lp^b6>D^NT{~N<-Z`4hHyVHBH(eyb~9l3IeNW5WxE?U8;QT1^T7ec2@+JSbwKT#2Uqhs`Y>WdP$I_NSmg;}$+bsQ)M~Ss1C$WQBo^I=MbMh;gc!va?nUGo&zf zN`8}VX*oE7#afgy(&0f3(MCA_EL5hRpx+06cs8fZsiiMg6Yot%VSnUp$=$@WH#X!l z-u49pE8w4_tzWkSRz^1{yi)HY?NV;sX5LCc1o%=Q{yp7~fUCdxzE%`nG&4%0%xf7_q?$yW#&jP@xYvR{X;(_}CW1_>&LNQU%;8`qve|_BWHP8B^cj69^?k&7qHh8Rv z>#Yp>%9%@~1N88UpUv_nTpROddI`~&@$P2uUhN2~sg``j2Hj8rN|RB7xvAgBqg=LHXb5ldT~iOkCd=n| z1FQJ)XQtdJRM^kO)Wz-e%`{(4q!q2!qjDMojE|8zt&xqxJgXSy90J?8%=-N|EfJM} zJ}w3^GP?elf%N~RTSl?N2}G;Hb52x1n&q{ft@UZNwKc~&zT3783hAgCHJ~ZV&Fmh#T-70C$j(m delta 4458 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 + + + + + + \ No newline at end of file diff --git a/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml b/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml new file mode 100644 index 0000000..20dba6f --- /dev/null +++ b/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml b/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml new file mode 100644 index 0000000..f6a2953 --- /dev/null +++ b/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/sparky/appconfig/camel-rests/sparky-core-unified-search.xml b/sparky/appconfig/camel-rests/sparky-core-unified-search.xml new file mode 100644 index 0000000..61fd9ad --- /dev/null +++ b/sparky/appconfig/camel-rests/sparky-core-unified-search.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml b/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml new file mode 100644 index 0000000..1b975e9 --- /dev/null +++ b/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json b/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json new file mode 100644 index 0000000..e72bab0 --- /dev/null +++ b/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json @@ -0,0 +1,218 @@ +{ + "generalNodeClass": { + "class": "aai-entity-node general-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "16" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "10" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "33" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }] + }, + "searchedNodeClass": { + "class": "aai-entity-node search-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "16" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "10" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "33" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }] + }, + "selectedSearchedNodeClass": { + "class": "aai-entity-node selected-search-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "31" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "20" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "63" + } + } + }, + { + "type": "button", + "name": "icon_ellipses", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "33", + "y": "-35" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }, + { + "type": "button", + "name": "icon_triangle_warning", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "46", + "y": "-12" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }] + }, + "selectedNodeClass": { + "class": "aai-entity-node selected-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "31" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "20" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "63" + } + } + }, + { + "type": "button", + "name": "icon_ellipses", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "33", + "y": "-35" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }, + { + "type": "button", + "name": "icon_triangle_warning", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "46", + "y": "-12" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }] + } +} \ No newline at end of file diff --git a/sparky/appconfig/filters/aaiui_views.json b/sparky/appconfig/filters/aaiui_views.json index 987637b..9ca0119 100644 --- a/sparky/appconfig/filters/aaiui_views.json +++ b/sparky/appconfig/filters/aaiui_views.json @@ -18,4 +18,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/sparky/appconfig/filters/subscription_object_inspector_mapping.json b/sparky/appconfig/filters/subscription_object_inspector_mapping.json index 858bc3f..ad2ab7a 100644 --- a/sparky/appconfig/filters/subscription_object_inspector_mapping.json +++ b/sparky/appconfig/filters/subscription_object_inspector_mapping.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/sparky/appconfig/logging/logback.xml b/sparky/appconfig/logging/logback.xml new file mode 100644 index 0000000..68b9451 --- /dev/null +++ b/sparky/appconfig/logging/logback.xml @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ${errorLogPattern} + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + + INFO + + 256 + + + + + + + + ${logDirectory}/${auditLogName}.log + + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${auditMetricPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + + ${auditMetricPattern} + + + + + + 256 + + + + + ${logDirectory}/${debugLogName}.log + + ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + 256 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sparky/appconfig/portal/portal-authentication.properties b/sparky/appconfig/portal/portal-authentication.properties index d87e34a..358ff89 100644 --- a/sparky/appconfig/portal/portal-authentication.properties +++ b/sparky/appconfig/portal/portal-authentication.properties @@ -1,6 +1,6 @@ -########################################################################################## -############################## eCOMP Portal Auth Properties ############################## -########################################################################################## +##################################################################################### +############################## Portal Auth Properties ############################## +##################################################################################### ############################## Auth ############################## username=aaiui @@ -11,4 +11,4 @@ password=1t2v1vfv1unz1vgz1t3b # ONAP Cookie Processing - During initial development, this flag, if true, will # prevent the portal interface's login processing from searching for a user # specific cookie, and will instead allow passage if a valid session cookie is discovered. -onap_enabled=true \ No newline at end of file +onap_enabled=true diff --git a/sparky/appconfig/portal/portal.properties b/sparky/appconfig/portal/portal.properties index 4efa0aa..3b947c4 100644 --- a/sparky/appconfig/portal/portal.properties +++ b/sparky/appconfig/portal/portal.properties @@ -1,6 +1,6 @@ -###################################################################################### -############################## eCOMP Portal properties ############################### -###################################################################################### +################################################################################ +############################## Portal properties ############################### +################################################################################ # Java class that implements the ECOMP role and user mgt API portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl @@ -20,4 +20,4 @@ csp_gate_keeper_prod_key = PROD # Toggles use of UEB ueb_listeners_enable = false # IDs application withing UEB flow -ueb_app_key = qFKles9N8gDTV0Zc +ueb_app_key = qFKles9N8gDTV0Zc \ No newline at end of file diff --git a/sparky/appconfig/portal/roles.config b/sparky/appconfig/portal/roles.config new file mode 100644 index 0000000..b8313bd --- /dev/null +++ b/sparky/appconfig/portal/roles.config @@ -0,0 +1,6 @@ +[ + { + "id":1, + "name":"View" + } +] \ No newline at end of file diff --git a/sparky/appconfig/schemas/autoSuggestMappings.json b/sparky/appconfig/schemas/autoSuggestMappings.json new file mode 100644 index 0000000..7857617 --- /dev/null +++ b/sparky/appconfig/schemas/autoSuggestMappings.json @@ -0,0 +1,10 @@ +{ + "properties" : { + "entity_suggest" : { + "type" : "completion", + "payloads" : true, + "analyzer" : "custom_analyzer", + "preserve_position_increments": false + } + } +} \ No newline at end of file diff --git a/sparky/appconfig/schemas/autoSuggestSettings.json b/sparky/appconfig/schemas/autoSuggestSettings.json new file mode 100644 index 0000000..4525be1 --- /dev/null +++ b/sparky/appconfig/schemas/autoSuggestSettings.json @@ -0,0 +1,21 @@ +{ + "analysis": { + "filter": { + "eng_stop": { + "type": "stop", + "stopwords": "_english_" + } + }, + "analyzer": { + "custom_analyzer": { + "type": "custom", + "tokenizer": "standard", + "filter": [ + "lowercase", + "asciifolding", + "eng_stop" + ] + } + } + } + } \ No newline at end of file diff --git a/sparky/appconfig/schemas/dynamicMappings.json b/sparky/appconfig/schemas/dynamicMappings.json new file mode 100644 index 0000000..09a00ac --- /dev/null +++ b/sparky/appconfig/schemas/dynamicMappings.json @@ -0,0 +1,14 @@ +{ + "dynamic_templates": [ + { + "strings": { + "match_mapping_type": "string", + "match": "*", + "mapping": { + "type": "string", + "index": "not_analyzed" + } + } + } + ] +} \ No newline at end of file diff --git a/sparky/appconfig/schemas/entityCountHistoryMappings.json b/sparky/appconfig/schemas/entityCountHistoryMappings.json new file mode 100644 index 0000000..84e3aec --- /dev/null +++ b/sparky/appconfig/schemas/entityCountHistoryMappings.json @@ -0,0 +1,16 @@ +{ + "properties": { + "count": { + "type": "long" + }, + "entityType": { + "type": "string", + "index": "not_analyzed" + }, + "timestamp": { + "type": "date", + "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" + } + } +} + diff --git a/sparky/appconfig/schemas/es_mappings.json b/sparky/appconfig/schemas/es_mappings.json new file mode 100644 index 0000000..216e3d9 --- /dev/null +++ b/sparky/appconfig/schemas/es_mappings.json @@ -0,0 +1,32 @@ +{ + "properties": { + "entityType": { + "type": "string", + "analyzer": "ngram_analyzer", + "search_analyzer": "ngram_analyzer" + }, + "entityPrimaryKeyValue": { + "type": "string", + "index": "not_analyzed" + }, + "searchTagIDs": { + "type": "string" + }, + "searchTags": { + "type": "string", + "analyzer": "ngram_analyzer" + }, + "crossEntityReferenceValues": { + "type": "string", + "analyzer": "ngram_analyzer" + }, + "link": { + "type": "string", + "index": "not_analyzed" + }, + "lastmodTimestamp": { + "type": "date", + "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||yyyy-MM-dd HH:mm:ss||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" + } + } +} \ No newline at end of file diff --git a/sparky/appconfig/schemas/es_settings.json b/sparky/appconfig/schemas/es_settings.json new file mode 100644 index 0000000..21a357c --- /dev/null +++ b/sparky/appconfig/schemas/es_settings.json @@ -0,0 +1,36 @@ +{ + "analysis": { + "filter": { + "ngram_filter": { + "type": "nGram", + "min_gram": 1, + "max_gram": 50, + "token_chars": [ + "letter", + "digit", + "punctuation", + "symbol" + ] + } + }, + "analyzer": { + "ngram_analyzer": { + "type": "custom", + "tokenizer": "whitespace", + "filter": [ + "lowercase", + "asciifolding", + "ngram_filter" + ] + }, + "whitespace_analyzer": { + "type": "custom", + "tokenizer": "whitespace", + "filter": [ + "lowercase", + "asciifolding" + ] + } + } + } +} \ No newline at end of file diff --git a/sparky/appconfig/sparky-application.properties b/sparky/appconfig/sparky-application.properties new file mode 100644 index 0000000..b246676 --- /dev/null +++ b/sparky/appconfig/sparky-application.properties @@ -0,0 +1,11 @@ +camel.springboot.name = SparkyCamelContext +#camel.springboot.xmlRoutes = file:${CONFIG_HOME}/camel-routes/*.route +camel.springboot.xmlRests = file:${CONFIG_HOME}/camel-rests/*.xml + +camel.component.servlet.mapping.context-path=/rest/* +server.servlet.context-path=/services/aai/webapp/ + +# +# attempt to externalize ui JS classes + resources +# +spring.resources.static-locations=file:${APP_HOME}/static/ diff --git a/sparky/appconfig/sparky-http-config.properties b/sparky/appconfig/sparky-http-config.properties new file mode 100644 index 0000000..f81a597 --- /dev/null +++ b/sparky/appconfig/sparky-http-config.properties @@ -0,0 +1 @@ +server.port = 9517 \ No newline at end of file diff --git a/sparky/appconfig/sparky-ssl-config.properties b/sparky/appconfig/sparky-ssl-config.properties new file mode 100644 index 0000000..2c28336 --- /dev/null +++ b/sparky/appconfig/sparky-ssl-config.properties @@ -0,0 +1,3 @@ +server.port = 8000 +server.ssl.key-store=file:${CONFIG_HOME}/auth/inventory-ui-keystore +server.ssl.key-alias=1 \ No newline at end of file diff --git a/sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml b/sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml new file mode 100644 index 0000000..92c4c7b --- /dev/null +++ b/sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + addSearchProviders + + + + + + + + diff --git a/sparky/dynamic/conf/sparky-core-apigw.xml b/sparky/appconfig/spring-beans/sparky-core-apigw.xml similarity index 84% rename from sparky/dynamic/conf/sparky-core-apigw.xml rename to sparky/appconfig/spring-beans/sparky-core-apigw.xml index b8cbfdb..8b5f277 100644 --- a/sparky/dynamic/conf/sparky-core-apigw.xml +++ b/sparky/appconfig/spring-beans/sparky-core-apigw.xml @@ -11,11 +11,13 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sparky/dynamic/conf/sparky-core-sync.xml b/sparky/appconfig/spring-beans/sparky-core-sync.xml similarity index 91% rename from sparky/dynamic/conf/sparky-core-sync.xml rename to sparky/appconfig/spring-beans/sparky-core-sync.xml index 4c172b7..09b13fd 100644 --- a/sparky/dynamic/conf/sparky-core-sync.xml +++ b/sparky/appconfig/spring-beans/sparky-core-sync.xml @@ -4,6 +4,11 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + + + + @@ -74,9 +79,10 @@ - + + @@ -118,6 +124,7 @@ + @@ -127,17 +134,17 @@ - + - + - + @@ -164,8 +171,8 @@ - - + + + @@ -206,8 +214,8 @@ - - + + + @@ -249,8 +258,8 @@ - - + + + @@ -288,7 +298,7 @@ - + + @@ -327,8 +338,8 @@ - - + + @@ -346,6 +357,7 @@ + diff --git a/sparky/dynamic/conf/sparky-core-viewInspect.xml b/sparky/appconfig/spring-beans/sparky-core-viewInspect.xml similarity index 87% rename from sparky/dynamic/conf/sparky-core-viewInspect.xml rename to sparky/appconfig/spring-beans/sparky-core-viewInspect.xml index 569b418..c146e6e 100644 --- a/sparky/dynamic/conf/sparky-core-viewInspect.xml +++ b/sparky/appconfig/spring-beans/sparky-core-viewInspect.xml @@ -8,14 +8,14 @@ class="org.onap.aai.sparky.viewandinspect.config.VisualizationConfigs"> - + - + @@ -36,13 +36,13 @@ - + - + @@ -52,4 +52,4 @@ - + diff --git a/sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml b/sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml new file mode 100644 index 0000000..072c935 --- /dev/null +++ b/sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + Schema + + + + + + + + addSearchProviders + + + + + + + + + diff --git a/sparky/appconfig/spring-beans/sparky-core.xml b/sparky/appconfig/spring-beans/sparky-core.xml new file mode 100644 index 0000000..7e9bb27 --- /dev/null +++ b/sparky/appconfig/spring-beans/sparky-core.xml @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + java.util.HashMap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + an + and + are + as + at + be + but + by + called + for + if + in + into + is + it + no + not + of + on + or + such + that + the + their + then + there + these + they + this + to + was + will + with + + + + + + + + + + + + + + + + + pserver + pnf + + + + + + + + + + + + + diff --git a/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml b/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml deleted file mode 100644 index c176dcd..0000000 --- a/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - addSearchProviders - - - - - - - - - diff --git a/sparky/dynamic/conf/sparky-core-gizmo.xml b/sparky/dynamic/conf/sparky-core-gizmo.xml deleted file mode 100644 index 52fd436..0000000 --- a/sparky/dynamic/conf/sparky-core-gizmo.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml b/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml deleted file mode 100644 index 44a7a8f..0000000 --- a/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - Schema - - - - - - - - addSearchProviders - - - - - - - - - diff --git a/sparky/dynamic/conf/sparky-core.xml b/sparky/dynamic/conf/sparky-core.xml deleted file mode 100644 index 473d967..0000000 --- a/sparky/dynamic/conf/sparky-core.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - java.util.HashMap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - a - an - and - are - as - at - be - but - by - called - for - if - in - into - is - it - no - not - of - on - or - such - that - the - their - then - there - these - they - this - to - was - will - with - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sparky/dynamic/routes/sparky-core-apigw.route b/sparky/dynamic/routes/sparky-core-apigw.route deleted file mode 100644 index 2552920..0000000 --- a/sparky/dynamic/routes/sparky-core-apigw.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-attributeEditRequest.route b/sparky/dynamic/routes/sparky-core-attributeEditRequest.route deleted file mode 100644 index b395f80..0000000 --- a/sparky/dynamic/routes/sparky-core-attributeEditRequest.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-entityCountHistory.route b/sparky/dynamic/routes/sparky-core-entityCountHistory.route deleted file mode 100644 index 2505d78..0000000 --- a/sparky/dynamic/routes/sparky-core-entityCountHistory.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-filter-aggregation.route b/sparky/dynamic/routes/sparky-core-filter-aggregation.route deleted file mode 100644 index 38e2735..0000000 --- a/sparky/dynamic/routes/sparky-core-filter-aggregation.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route b/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route deleted file mode 100644 index 072bd34..0000000 --- a/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-prepareSchema.route b/sparky/dynamic/routes/sparky-core-prepareSchema.route deleted file mode 100644 index 0d31bfb..0000000 --- a/sparky/dynamic/routes/sparky-core-prepareSchema.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sparky/dynamic/routes/sparky-core-subscriptionService.route b/sparky/dynamic/routes/sparky-core-subscriptionService.route deleted file mode 100644 index d0c78e6..0000000 --- a/sparky/dynamic/routes/sparky-core-subscriptionService.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-summaryByEntityType.route b/sparky/dynamic/routes/sparky-core-summaryByEntityType.route deleted file mode 100644 index 627469f..0000000 --- a/sparky/dynamic/routes/sparky-core-summaryByEntityType.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route b/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route deleted file mode 100644 index bf43bcc..0000000 --- a/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-ui.route b/sparky/dynamic/routes/sparky-core-ui.route deleted file mode 100644 index bf221c6..0000000 --- a/sparky/dynamic/routes/sparky-core-ui.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-unified-search.route b/sparky/dynamic/routes/sparky-core-unified-search.route deleted file mode 100644 index 1e20d00..0000000 --- a/sparky/dynamic/routes/sparky-core-unified-search.route +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route b/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route deleted file mode 100644 index 36cf518..0000000 --- a/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file -- 2.16.6