From 7f383f98c874d5918fa6e55597f30432b13a658d Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 30 Jul 2018 14:35:31 -0700 Subject: Karaf 4 for first few features appc-metric appc-dmaap-adapter appc-chef-adapter appc-netconf-adapter appc-rest-adapter Change-Id: I1d5a8e39cac7be74b05a0782f0971f8d08c8162d Signed-off-by: Patrick Brady Issue-ID: APPC-1029 --- ...TopicOne_junit-consumer-one_consumer.properties | 34 ++++ ...TopicOne_junit-consumer-two_consumer.properties | 30 ++++ ...TopicOne_junit-producer-one_producer.properties | 35 ++++ .../JunitTopicOnepreferredRoute.properties | 3 + .../appc-dmaap-adapter-bundle/pom.xml | 19 ++- .../resources/org/onap/appc/default.properties | 2 +- .../features-appc-dmaap-adapter/pom.xml | 48 ++++++ .../onap-appc-dmaap-adapter/pom.xml | 109 ++++++++++++ .../appc-dmaap-adapter-features/pom.xml | 182 +++++---------------- .../src/main/resources/features.xml | 44 ----- .../appc-dmaap-adapter-installer/pom.xml | 18 +- .../appc-message-adapter-api/pom.xml | 7 +- .../appc-message-adapter-factory/pom.xml | 7 +- appc-adapters/appc-dmaap-adapter/pom.xml | 7 +- 14 files changed, 337 insertions(+), 208 deletions(-) create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml create mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml delete mode 100644 appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml (limited to 'appc-adapters/appc-dmaap-adapter') diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties new file mode 100644 index 000000000..6dddbc0e4 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties @@ -0,0 +1,34 @@ +#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178988019 +#Mon Aug 13 09:49:48 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=GET +password=secret +routeOffer=MR1 +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +username=key +Version=1.0 +group=junit-client +timeout=1000 +SubContextPath=/ +authDate=2016-02-18T13\:57\:37-0800 +filter= +authKey=01234567890abcde\:01234567890abcdefghijklmn +Environment=TEST +host=192.168.1.1 +Protocol=http +Partner=BOT_R +contenttype=application/json +id=junit-consumer-one +Latitude=50.000000 +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPNOAUTH +AFT_ENVIRONMENT=AFTUAT +limit=5 +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties new file mode 100644 index 000000000..f80f762aa --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties @@ -0,0 +1,30 @@ +#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178854566 +#Mon Aug 13 09:47:34 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=GET +routeOffer=MR1 +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +Version=1.0 +group=junit-client +timeout=15000 +SubContextPath=/ +filter=none +Environment=TEST +host=192.168.10.10 +Protocol=http +Partner=BOT_R +contenttype=application/json +Latitude=50.000000 +id=junit-consumer-two +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPAAF +AFT_ENVIRONMENT=AFTUAT +limit=1000 +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties new file mode 100644 index 000000000..910e713d5 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties @@ -0,0 +1,35 @@ +#producer.properties file created on the fly for topic:JunitTopicOne on:1534178854558 +#Mon Aug 13 09:47:34 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=POST +password=admin +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +username=admin +partition=2 +Version=1.0 +maxBatchSize=100 +group=junit-client +SubContextPath=/ +authDate=2016-07-20T11\:30\:56-0700 +filter=none +authKey=01234567890abcde\:01234567890abcdefghijklmn +Environment=TEST +host=192.168.10.10 +Protocol=http +Partner=BOT_R +contenttype=application/json +id=junit-producer-one +Latitude=50.000000 +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPNOAUTH +AFT_ENVIRONMENT=AFTUAT +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 +MessageSentThreadOccurance=50 +maxAgeMs=250 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties new file mode 100644 index 000000000..301a75845 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties @@ -0,0 +1,3 @@ +#preferredRoute.properties file created on the fly for topic:JunitTopicOne on:1534173919002 +#Mon Aug 13 08:25:19 PDT 2018 +preferredRouteKey=JunitTopicOne_MR1 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 2542f9e2e..dba4e1c3c 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -22,11 +22,12 @@ 4.0.0 - org.onap.appc - appc-dmaap-adapter + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + - + org.onap.appc appc-dmaap-adapter-bundle bundle DMaaP Adapter - bundle @@ -44,7 +45,7 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -57,6 +58,7 @@ equinoxSDK381 org.eclipse.osgi + ${equinox.osgi.version} @@ -149,8 +151,9 @@ org.onap.dmaap.messagerouter.dmaapclient dmaapClient - ${dmaap.client.version} - + ${dmaap.client.version} + jar-with-dependencies + org.json @@ -175,8 +178,8 @@ org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator org.onap.appc.adapter.messaging.* - !org.slf4j.event,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets,org.w3c.* - *;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-* + com.att.eelf.configuration,*;resolution:=optional + dmaapClient,eelf-core true OSGI-INF/blueprint/blueprint.xml diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties index 0e12fe24a..8dea0a61d 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties @@ -25,7 +25,7 @@ org.onap.appc.bootstrap.file=test.properties org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},. # Properties commented out below are provided in appc.properties -#poolMembers=:3904 +poolMembers=10.0.0.1 #event.pool.members=:3904 topic.read=APPC-CL diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml new file mode 100644 index 000000000..0f29d14e6 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + + org.onap.appc.parent + feature-repo-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + features-appc-dmaap-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-dmaap-adapter + ${project.version} + xml + features + + + + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml new file mode 100644 index 000000000..075be7944 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml @@ -0,0 +1,109 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-dmaap-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.appc + appc-dmaap-adapter-bundle + ${project.version} + + + org.onap.appc + appc-message-adapter-factory + ${project.version} + + + org.onap.appc + appc-message-adapter-api + ${project.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + false + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + + + + + + + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml index a2c898145..1cd6b44cc 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml @@ -1,148 +1,42 @@ +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 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========================================================= +--> - 4.0.0 - - appc-dmaap-adapter - org.onap.appc - 1.4.0-SNAPSHOT - - appc-dmaap-adapter-features - DMaaP Adapter - Features - - jar - - - - org.onap.appc - appc-dmaap-adapter-bundle - ${project.version} - - - - org.onap.appc - appc-message-adapter-factory - ${project.version} - - - - commons-lang - commons-lang - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - - - - - - - - - - - - - - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + 4.0.0 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-dmaap-adapter-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-dmaap-adapter + features-appc-dmaap-adapter + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml deleted file mode 100644 index e23713930..000000000 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - odl-mdsal-broker - - mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version} - mvn:org.onap.appc/appc-message-adapter-factory/${project.version} - mvn:org.onap.appc/appc-message-adapter-api/${project.version} - - - - diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml index 387aaa4e2..f404a6499 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - appc-dmaap-adapter - org.onap.appc + odlparent-lite + org.onap.appc.parent 1.4.0-SNAPSHOT + + org.onap.appc appc-dmaap-adapter-installer dMaaP Adapter - Karaf Installer pom @@ -33,14 +35,14 @@ appc-dmaap-adapter appc-dmaap-adapter - mvn:org.onap.appc/appc-dmaap-adapter-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-dmaap-adapter/${project.version}/xml/features false org.onap.appc - appc-dmaap-adapter-features + onap-appc-dmaap-adapter ${project.version} features xml @@ -127,6 +129,14 @@ false org.opendaylight provided + + + com.fasterxml.jackson.core + jackson-annotations + 2.5.4 + jar + + diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index afe6a2d71..d3f0765a0 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - org.onap.appc - appc-dmaap-adapter + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-message-adapter-api bundle appc-message-adapter-api @@ -52,6 +54,7 @@ equinoxSDK381 org.eclipse.osgi + ${equinox.osgi.version} diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 0b8e4e782..09bfe6b45 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - org.onap.appc - appc-dmaap-adapter + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-message-adapter-factory bundle appc-message-adapter-factory @@ -61,6 +63,7 @@ equinoxSDK381 org.eclipse.osgi + ${equinox.osgi.version} diff --git a/appc-adapters/appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/pom.xml index b3cab9beb..425e65c35 100644 --- a/appc-adapters/appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/pom.xml @@ -22,11 +22,12 @@ 4.0.0 - org.onap.appc - appc-adapters + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - + org.onap.appc appc-dmaap-adapter DMaaP Adapter Adapter to read and write messages on the DMaaP Service -- cgit 1.2.3-korg