diff options
| -rw-r--r-- | src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml | 1 | ||||
| -rw-r--r-- | src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml | 21 | ||||
| -rw-r--r-- | src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml | 23 | ||||
| -rw-r--r-- | src/main/config/ajsc-jetty.xml | 2 |
4 files changed, 2 insertions, 45 deletions
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml index 22ae528..2aa3908 100644 --- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml +++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= org.onap.dmaap diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml index c27414f..9cb67d4 100644 --- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml +++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml @@ -1,24 +1,3 @@ -<!-- - ============LICENSE_START======================================================= - org.onap.dmaap - ================================================================================ - Copyright © 2017 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - - ECOMP is a trademark and service mark of AT&T Intellectual Property. - - --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml index 1a499f2..ac72847 100644 --- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml +++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml @@ -1,24 +1,3 @@ -<!-- - ============LICENSE_START======================================================= - org.onap.dmaap - ================================================================================ - Copyright © 2017 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - - ECOMP is a trademark and service mark of AT&T Intellectual Property. - - --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" @@ -41,7 +20,7 @@ <property name="supportUnwrapped" value="true" /> </bean> - <bean id="jacksonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" /> + <bean id="jacksonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider" /> <bean id="cambriaExMapper" class="com.att.nsa.dmaap.DMaaPCambriaExceptionMapper" /> diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml index f5a1ef3..dd81d84 100644 --- a/src/main/config/ajsc-jetty.xml +++ b/src/main/config/ajsc-jetty.xml @@ -86,7 +86,7 @@ <!-- SSL Keystore configuration --> <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> - <Set name="KeyStorePath">/appl/dmaapMR1/bundleconfig/etc/keystore.jks</Set> + <Set name="KeyStorePath"><SystemProperty name="AJSC_HOME" />/bundleconfig/etc/keystore.jks</Set> <Set name="KeyStorePassword">changeit</Set> <Set name="KeyManagerPassword">changeit</Set> </New> |