diff options
| author |   Ganesh Chandrasekaran <ganesh.c@samsung.com> | 2018-07-23 14:27:22 +0900 |
|---|---|---|
| committer | Ganesh Chandrasekaran <ganesh.c@samsung.com> | 2018-07-23 14:27:37 +0900 |
| commit | 021cae43d3b22dcbd41e7b34ca4215c167714ab4 (patch) | |
| tree | 7ef08cca0a2a169fc7456c7416e3557969cd8582 /saltstack-adapter/saltstack-adapter-provider/src/main/resources | |
| parent | e70da25135855b88571b19c108089b74181996a6 (diff) | |
Use ByteStream instead of FileStream
Issue-ID: CCSDK-393
Change-Id: Id004f0bce1768e00f3e326efc204532acdb22546
Signed-off-by: Ganesh Chandrasekaran <ganesh.c@samsung.com>
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-provider/src/main/resources')
2 files changed, 8 insertions, 10 deletions
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml index 446ab3e44..e360f8184 100755 --- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml @@ -20,19 +20,22 @@ ============LICENSE_END========================================================= --> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" - xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" +<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" + xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> - <bean id="propProvider" class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterPropertiesProviderImpl" /> + <bean id="propProvider" + class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterPropertiesProviderImpl"/> - <bean id="saltstackAdapterInstance" class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterImpl"> + <bean id="saltstackAdapterInstance" + class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterImpl"> <argument ref="propProvider"/> </bean> <service ref="saltstackAdapterInstance"> <interfaces> - <value>org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdapter</value> + <value>org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdapter + </value> </interfaces> </service> diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties index 0b077524d..1755f7adf 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties @@ -21,7 +21,6 @@ # # ============LICENSE_END========================================================= ### - # # Default properties for the APP-C TestService Adapter # @@ -31,17 +30,13 @@ # to supply configuration options org.onap.appc.bootstrap.file=appc.properties org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties - appc.application.name=APPC - # # Define the message resource bundle name to be loaded org.onap.appc.resources=org.onap/appc/i18n/MessageResources # # The name of the adapter. org.onap.appc.provider.adaptor.name=org.onap.appc.appc_saltstack_adapter - - # Default truststore path and password org.onap.appc.adapter.saltstack.trustStore=/opt/opendaylight/tls-client/mykeystore.js org.onap.appc.adapter.saltstack.trustStore.trustPasswd=changeit |