summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorArul.Nambi <arul.nambi@amdocs.com>2017-10-13 13:53:04 -0400
committerArul.Nambi <arul.nambi@amdocs.com>2017-10-13 13:54:55 -0400
commit693ae815dc41650498fefb87bf2d4a1639a3b855 (patch)
tree6ef6f6b9a34c7cf2fa8268219972e392972ca5db /src/test
parente1a380a1311471e972a7196c50c25ed1ef7c25e1 (diff)
Fixing the startup after junit increase
The ajsc container was starting up after the cleanup. So cleaning up the servlet filters to remove the unwanted files. Issue-ID: AAI-429 Change-Id: I254e4421a6e1735191afc48cf58cb3c46e17defc Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/resources/appconfig/elasticsearch.properties2
-rw-r--r--src/test/resources/appconfig/etc/ajsc-override-web.xml10
-rw-r--r--src/test/resources/appconfig/etc/runner-web.xml12
-rw-r--r--src/test/resources/appconfig/search-service.properties3
4 files changed, 0 insertions, 27 deletions
diff --git a/src/test/resources/appconfig/elasticsearch.properties b/src/test/resources/appconfig/elasticsearch.properties
index 55e4350..07f16dc 100644
--- a/src/test/resources/appconfig/elasticsearch.properties
+++ b/src/test/resources/appconfig/elasticsearch.properties
@@ -16,8 +16,6 @@ elasticsearch.javaApiPort=8443
# Index names for various searches.
#
elasticsearch.indexName=entity-search-index
-elasticsearch.topographicalIndexName=topography-search-index
-elasticsearch.entityCountHistoryIndexName=entitycounthistoryindex
elasticsearch.autosuggestIndexname=entity-autosuggest-index
# Default document type
diff --git a/src/test/resources/appconfig/etc/ajsc-override-web.xml b/src/test/resources/appconfig/etc/ajsc-override-web.xml
index c07a539..c66ac89 100644
--- a/src/test/resources/appconfig/etc/ajsc-override-web.xml
+++ b/src/test/resources/appconfig/etc/ajsc-override-web.xml
@@ -26,16 +26,6 @@
<url-pattern>/visualization/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>GeoVisualizationServlet</servlet-name>
- <url-pattern>/visualization/geovisualization/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>EntityCountHistoryServlet</servlet-name>
- <url-pattern>/visualization/entityCountHistory/*</url-pattern>
- </servlet-mapping>
-
<filter-mapping>
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
diff --git a/src/test/resources/appconfig/etc/runner-web.xml b/src/test/resources/appconfig/etc/runner-web.xml
index f70d71b..1c6ccdc 100644
--- a/src/test/resources/appconfig/etc/runner-web.xml
+++ b/src/test/resources/appconfig/etc/runner-web.xml
@@ -30,18 +30,6 @@
<servlet-class>org.onap.aai.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class>
</servlet>
- <servlet>
- <servlet-name>GeoVisualizationServlet</servlet-name>
- <servlet-class>org.onap.aai.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>EntityCountHistoryServlet</servlet-name>
- <servlet-class>org.onap.aai.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class>
- </servlet>
-
-
-
<filter>
<filter-name>ElasticSearchSynchronizerFilter</filter-name>
<filter-class>org.onap.aai.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class>
diff --git a/src/test/resources/appconfig/search-service.properties b/src/test/resources/appconfig/search-service.properties
index 13e25ac..4f7f036 100644
--- a/src/test/resources/appconfig/search-service.properties
+++ b/src/test/resources/appconfig/search-service.properties
@@ -15,9 +15,6 @@ search-service.httpPort=9509
#
# Searchable entities
search-service.indexName=entity-search-index
-# Inventory searches
-search-service.topographicalIndexName=topography-search-index
-search-service.entityCountHistoryIndexName=entitycounthistoryindex
############################## Version ##############################
#