diff options
| author |   Brian Freeman <bf1936@att.com> | 2017-11-12 22:34:34 +0000 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2017-11-12 22:42:47 +0000 |
| commit | 024e6d1689ee38b37ac054636557b5dff8f26270 (patch) | |
| tree | dd10eefd3c71323b0ddd1237aa429a0c1faa5f5d /dmaap-listener | |
| parent | 292cce64a1a610283306a5f2280c787d8edb916d (diff) | |
Change dmaapClient dependency
Issue-ID: CCSDK-142
Change-Id: I5a3cd0626c71eadd414ab9939774d159638b99a6
Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'dmaap-listener')
| -rwxr-xr-x | dmaap-listener/pom.xml | 20 | ||||
| -rw-r--r-- | dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java | 10 |
2 files changed, 24 insertions, 6 deletions
diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index d1e173ca0..0ebde6ced 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -18,7 +18,8 @@ <fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version> <skip.SWM>true</skip.SWM> <dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base> - <dmaap.listener.version>0.2.12</dmaap.listener.version> + <dmaap.listener.version>1.0.0-SNAPSHOT</dmaap.listener.version> + <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> @@ -27,7 +28,7 @@ <dependencies> <dependency> - <groupId>com.att.nsa</groupId> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> <version>${dmaap.listener.version}</version> </dependency> @@ -97,8 +98,19 @@ <target>1.7</target> </configuration> </plugin> - - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.6</version> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>org.onap.ccsdk.sli.northbound.dmaapclient.DmaapListener</mainClass> + </manifest> + </archive> + </configuration> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.6</version> diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java index a0c555303..a51ea7c88 100644 --- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java +++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java @@ -71,19 +71,25 @@ public abstract class SdncDmaapConsumer implements Runnable { try (FileInputStream in = new FileInputStream(new File(propertiesPath))) { + LOG.debug("propertiesPath: " + propertiesPath); this.properties = (Properties) properties.clone(); this.properties.load(in); - String timeoutStr = properties.getProperty("timeout"); + + String timeoutStr = this.properties.getProperty("timeout"); + LOG.debug("timeoutStr: " + timeoutStr); if ((timeoutStr != null) && (timeoutStr.length() > 0)) { timeout = parseTimeOutValue(timeoutStr); } - String fetchPauseStr = properties.getProperty("fetchPause"); + String fetchPauseStr = this.properties.getProperty("fetchPause"); + LOG.debug("fetchPause(Str): " + fetchPauseStr); if ((fetchPauseStr != null) && (fetchPauseStr.length() > 0)) { fetchPause = parseFetchPause(fetchPauseStr); } + LOG.debug("fetchPause: " + fetchPause); + this.consumer = MRClientFactory.createConsumer(propertiesPath); ready = true; |