summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/config/spring-beans
diff options
context:
space:
mode:
Diffstat (limited to 'sparkybe-onap-application/config/spring-beans')
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml3
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml1
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-oxm.xml18
3 files changed, 1 insertions, 21 deletions
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml
index b44d626..5eb2184 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml
@@ -3,11 +3,10 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+
<bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader"
init-method="loadModel">
<constructor-arg ref="oxmModelProcessorSet" />
- <constructor-arg ref="nodeIngestor" />
<constructor-arg ref="schemaVersions" />
</bean>
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml
index 3c2d76b..c6db248 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml
@@ -8,7 +8,6 @@
init-method="loadModel">
<constructor-arg name="apiVersionOverride" value="${oxm.apiVersion}" />
<constructor-arg ref="oxmModelProcessorSet" />
- <constructor-arg ref="nodeIngestor" />
</bean>
</beans> \ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
index c392153..a210d12 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
@@ -35,24 +35,6 @@
</property>
</bean>
- <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean">
- <!-- When running with AJSC these properties must be injected directly.
- The reason for this is unknown. -->
- <property name="nodeDirectory" value="${nodeDir}" />
- <property name="edgeDirectory" value="${edgeDir}" />
- </bean>
-
- <bean id="schemaVersions" class="org.onap.aai.setup.SchemaVersions"/>
-
- <bean id="oxmConfigTranslator" class="org.onap.aai.setup.AAIConfigTranslator">
- <constructor-arg ref="schemaLocationsBean" />
- <constructor-arg ref="schemaVersions" />
- </bean>
-
- <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor">
- <constructor-arg ref="oxmConfigTranslator" />
- </bean>
-
<bean id="searchProviderRegistry"
class="org.onap.aai.sparky.search.registry.SearchProviderRegistry" />