diff options
Diffstat (limited to 'src/main/config')
| -rw-r--r-- | src/main/config/aaiEntityNodeDescriptors.json | 30 | ||||
| -rw-r--r-- | src/main/config/ajsc-override-web.xml | 34 | ||||
| -rw-r--r-- | src/main/config/cadi.properties | 36 | ||||
| -rw-r--r-- | src/main/config/csp-cookie-filter.properties | 18 | ||||
| -rw-r--r-- | src/main/config/es_sv_mappings.json | 36 | ||||
| -rw-r--r-- | src/main/config/es_sv_settings.json | 36 | ||||
| -rw-r--r-- | src/main/config/runner-web.xml | 45 |
7 files changed, 178 insertions, 57 deletions
diff --git a/src/main/config/aaiEntityNodeDescriptors.json b/src/main/config/aaiEntityNodeDescriptors.json index bf95f28..e72bab0 100644 --- a/src/main/config/aaiEntityNodeDescriptors.json +++ b/src/main/config/aaiEntityNodeDescriptors.json @@ -129,6 +129,21 @@ "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": { @@ -183,6 +198,21 @@ "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/src/main/config/ajsc-override-web.xml b/src/main/config/ajsc-override-web.xml index c66ac89..e267829 100644 --- a/src/main/config/ajsc-override-web.xml +++ b/src/main/config/ajsc-override-web.xml @@ -3,34 +3,22 @@ <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" metadata-complete="false" version="3.0"> - - - - <filter-mapping> - <filter-name>ElasticSearchSynchronizerFilter</filter-name> - <url-pattern>/nothingShouldBeSentHere/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>OxmModelLoaderFilter</filter-name> - <url-pattern>/nothingShouldBeSentHereEither/*</url-pattern> + + <filter-mapping> + <filter-name>LoginFilter</filter-name> + <url-pattern>/*</url-pattern> </filter-mapping> <servlet-mapping> <servlet-name>PortalRestAPIProxy</servlet-name> <url-pattern>/api/v2/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>VisualizationServlet</servlet-name> - <url-pattern>/visualization/*</url-pattern> - </servlet-mapping> - + </servlet-mapping> + <filter-mapping> <filter-name>springSecurityFilterChain</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> + <servlet-mapping> <servlet-name>ManagementServlet</servlet-name> <url-pattern>/mgmt</url-pattern> @@ -47,12 +35,6 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>SearchServlet</servlet-name> - <url-pattern>/elasticSearchQuery/*</url-pattern> - <url-pattern>/search/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jsp</url-pattern> <url-pattern>*.jspf</url-pattern> diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties new file mode 100644 index 0000000..83a5ce0 --- /dev/null +++ b/src/main/config/cadi.properties @@ -0,0 +1,36 @@ +#This properties file is used for defining AAF properties related to the CADI framework. This file is used for running AAF framework + +#In order to test functionality of cadi-ajsc-plugin locally cross domain cookie. Cadi "should" find your hostname for you. +#However, we have seen some situations where this fails. A Local testing +#modification can include modifying your hosts file so that you can use "mywebserver.att.com" for your localhost in order +#to test/verify GLO functionality locally. If you are on a Windows machine, you will already have a machine name associated with +#it that will utilize an AT&T domain such as "sbc.com". You may need to add your domain to this as a comma separated list depending +#upon your particular machine domain. This property is commented out as cadi SHOULD find your machine name. With version 1.2.1 of cadi, +#it appears to resolve Mac machine names as well, now. But, this can be somewhat inconsistent depending on your specific working envrironment. +hostname=mywebserver.att.com + +#Setting csp_domain to PROD will allow for testing using your attuid and password through GLO. +csp_domain=PROD +csp_devl_localhost=true + +basic_realm=csp.att.com +#basic_realm=aaf.att.com +basic_warn=TRUE + +cadi_loglevel=WARN +cadi_keyfile=target/swm/package/nix/dist_files/appl/inventory-ui-service/etc/keyfile + +# Configure AAF +#These are dummy values add appropriate values required +aaf_url=url + +#AJSC - MECHID +#These are dummy values add appropriate values required +aaf_id=dummyid@ajsc.att.com +aaf_password=enc:277edqJCjT0RlUI3BtbDQa-3Ha-CQGd +aaf_timeout=5000 +aaf_clean_interval=30000 +aaf_user_expires=5000 +aaf_high_count=1000 + + diff --git a/src/main/config/csp-cookie-filter.properties b/src/main/config/csp-cookie-filter.properties new file mode 100644 index 0000000..e12109a --- /dev/null +++ b/src/main/config/csp-cookie-filter.properties @@ -0,0 +1,18 @@ +# AT&T Global login page. This is the redirect URL +# Production login page: +# https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/ +# +# Test login page: +# https://webtest.csp.att.com/empsvcs/hrpinmgt/pagLogin/ +global.login.url=https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/ + +# valid domains for open redirect +redirect-domain=att.com,sbc.com,bls.com,cingular.net + +# MOTS ID of the application +application.id=24153 + +# Required by esGateKeeper. Valid values are: +# DEVL - used during development +# PROD - used in production +gatekeeper.environment=PROD
\ No newline at end of file diff --git a/src/main/config/es_sv_mappings.json b/src/main/config/es_sv_mappings.json new file mode 100644 index 0000000..c964ca3 --- /dev/null +++ b/src/main/config/es_sv_mappings.json @@ -0,0 +1,36 @@ +{ + "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" + }, + "perspectives" : { + "type": "string", + "index": "not_analyzed" + }, + "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/src/main/config/es_sv_settings.json b/src/main/config/es_sv_settings.json new file mode 100644 index 0000000..21a357c --- /dev/null +++ b/src/main/config/es_sv_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/src/main/config/runner-web.xml b/src/main/config/runner-web.xml index 1c6ccdc..2e39e24 100644 --- a/src/main/config/runner-web.xml +++ b/src/main/config/runner-web.xml @@ -19,27 +19,22 @@ <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> - + + <servlet> + <servlet-name>PortalRestAPIProxy</servlet-name> + <servlet-class>org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class> + </servlet> + + <filter> + <filter-name>LoginFilter</filter-name> + <filter-class>org.onap.aai.sparky.security.filter.LoginFilter</filter-class> + </filter> + <servlet> <servlet-name>ManagementServlet</servlet-name> <servlet-class>ajsc.ManagementServlet</servlet-class> </servlet> - - <servlet> - <servlet-name>VisualizationServlet</servlet-name> - <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class> - </servlet> - - <filter> - <filter-name>ElasticSearchSynchronizerFilter</filter-name> - <filter-class>org.onap.aai.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class> - </filter> - - <filter> - <filter-name>OxmModelLoaderFilter</filter-name> - <filter-class>org.onap.aai.sparky.config.oxm.OxmModelLoaderFilter</filter-class> - </filter> - + <filter> <filter-name>WriteableRequestFilter</filter-name> <filter-class>com.att.ajsc.csi.writeablerequestfilter.WriteableRequestFilter</filter-class> @@ -59,11 +54,6 @@ <servlet-class>ajsc.servlet.AjscCamelServlet</servlet-class> </servlet> - <servlet> - <servlet-name>SearchServlet</servlet-name> - <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.SearchServlet</servlet-class> - </servlet> - <filter> <filter-name>springSecurityFilterChain</filter-name> <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> @@ -74,16 +64,9 @@ <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> + - <servlet> - <servlet-name>PortalRestAPIProxy</servlet-name> - <servlet-class>org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class> - </servlet> - - <!-- <servlet-mapping> <servlet-name>spring</servlet-name> <url-pattern>/</url-pattern> - </servlet-mapping> --> - - + <!-- BEGIN jsp --> <servlet id="jsp"> |