Revert "Updating to JPO ODE Dev branch"

This reverts commit 3d379fa.

.dockerignore

@@ -1,7 +1,7 @@
-# add git-ignore syntax here of things you don't want copied into docker image
-.git
-*Dockerfile*
-*docker-compose*
-node_modules
-*target*
+# add git-ignore syntax here of things you don't want copied into docker image
+.git
+*Dockerfile*
+*docker-compose*
+node_modules
+*target*
 *.class

Dockerfile

@@ -1,37 +1,37 @@
-FROM maven:3.5.4-jdk-8-alpine as builder
-MAINTAINER [email protected]
-
-WORKDIR /home
-
-# Copy only the files needed to avoid putting all sorts of junk from your local env on to the image
-COPY ./pom.xml ./
-COPY ./jpo-ode-common/pom.xml ./jpo-ode-common/
-COPY ./jpo-ode-common/src ./jpo-ode-common/src
-COPY ./jpo-ode-plugins/pom.xml ./jpo-ode-plugins/
-COPY ./jpo-ode-plugins/src ./jpo-ode-plugins/src
-COPY ./jpo-ode-core/pom.xml ./jpo-ode-core/
-COPY ./jpo-ode-core/src ./jpo-ode-core/src/
-COPY ./jpo-ode-svcs/pom.xml ./jpo-ode-svcs/
-COPY ./jpo-ode-svcs/src ./jpo-ode-svcs/src
-
-RUN mvn clean package -DskipTests
-
-FROM openjdk:8u171-jre-alpine
-
-WORKDIR /home
-
-COPY --from=builder /home/jpo-ode-svcs/src/main/resources/application.properties /home
-COPY --from=builder /home/jpo-ode-svcs/src/main/resources/logback.xml /home
-COPY --from=builder /home/jpo-ode-svcs/target/jpo-ode-svcs.jar /home
-
-ENTRYPOINT ["java", \
- "-Djava.rmi.server.hostname=$DOCKER_HOST_IP", \
- "-Dcom.sun.management.jmxremote.port=9090", \
- "-Dcom.sun.management.jmxremote.rmi.port=9090", \
- "-Dcom.sun.management.jmxremote", \
- "-Dcom.sun.management.jmxremote.local.only=true", \
- "-Dcom.sun.management.jmxremote.authenticate=false", \
- "-Dcom.sun.management.jmxremote.ssl=false", \
- "-Dlogback.configurationFile=/home/logback.xml", \
- "-jar", \
- "/home/jpo-ode-svcs.jar"]
+FROM maven:3.5.4-jdk-8-alpine as builder
+MAINTAINER [email protected]
+
+WORKDIR /home
+
+# Copy only the files needed to avoid putting all sorts of junk from your local env on to the image
+COPY ./pom.xml ./
+COPY ./jpo-ode-common/pom.xml ./jpo-ode-common/
+COPY ./jpo-ode-common/src ./jpo-ode-common/src
+COPY ./jpo-ode-plugins/pom.xml ./jpo-ode-plugins/
+COPY ./jpo-ode-plugins/src ./jpo-ode-plugins/src
+COPY ./jpo-ode-core/pom.xml ./jpo-ode-core/
+COPY ./jpo-ode-core/src ./jpo-ode-core/src/
+COPY ./jpo-ode-svcs/pom.xml ./jpo-ode-svcs/
+COPY ./jpo-ode-svcs/src ./jpo-ode-svcs/src
+
+RUN mvn clean package -DskipTests
+
+FROM openjdk:8u171-jre-alpine
+
+WORKDIR /home
+
+COPY --from=builder /home/jpo-ode-svcs/src/main/resources/application.properties /home
+COPY --from=builder /home/jpo-ode-svcs/src/main/resources/logback.xml /home
+COPY --from=builder /home/jpo-ode-svcs/target/jpo-ode-svcs.jar /home
+
+ENTRYPOINT ["java", \
+ "-Djava.rmi.server.hostname=$DOCKER_HOST_IP", \
+ "-Dcom.sun.management.jmxremote.port=9090", \
+ "-Dcom.sun.management.jmxremote.rmi.port=9090", \
+ "-Dcom.sun.management.jmxremote", \
+ "-Dcom.sun.management.jmxremote.local.only=true", \
+ "-Dcom.sun.management.jmxremote.authenticate=false", \
+ "-Dcom.sun.management.jmxremote.ssl=false", \
+ "-Dlogback.configurationFile=/home/logback.xml", \
+ "-jar", \
+ "/home/jpo-ode-svcs.jar"]

Makefile

@@ -1,33 +1,33 @@
-default:
- $(info Make target options:)
- $(info `make start` to build and run the ODE)
- $(info `make stop` to stop the ODE)
- $(info `make delete` to destroy the current Docker containers)
- $(info `make rebuild` to stop, delete, and then rebuild the containers)
-
-start:
-ifeq ("$(wildcard ./jpo-ode-private)", "")
- $(error "ERROR: Directory `jpo-ode-private` not found in ${PWD}")
-endif
-ifeq ("$(wildcard ./asn1_codec/asn1c_combined/J2735_201603DA.ASN)", "")
- cp ./jpo-ode-private/j2735/J2735_201603DA.ASN ./asn1_codec/asn1c_combined/J2735_201603DA.ASN
-endif
-ifndef DOCKER_HOST_IP
- $(error ERROR: Environment variable DOCKER_HOST_IP is not set)
-endif
-ifndef DOCKER_SHARED_VOLUME
- $(error ERROR: Environment variable DOCKER_SHARED_VOLUME is not set)
-endif
-ifeq ("$(wildcard .env)", "")
- $(warning "WARNING: Environment file `.env` not found in ${PWD}")
-endif
- docker-compose up --build -d
-
-stop:
- docker-compose down
-
-delete:
- docker-compose rm -fvs
-
-rebuild:
- $(MAKE) stop delete start
+default:
+ $(info Make target options:)
+ $(info `make start` to build and run the ODE)
+ $(info `make stop` to stop the ODE)
+ $(info `make delete` to destroy the current Docker containers)
+ $(info `make rebuild` to stop, delete, and then rebuild the containers)
+
+start:
+ifeq ("$(wildcard ./jpo-ode-private)", "")
+ $(error "ERROR: Directory `jpo-ode-private` not found in ${PWD}")
+endif
+ifeq ("$(wildcard ./asn1_codec/asn1c_combined/J2735_201603DA.ASN)", "")
+ cp ./jpo-ode-private/j2735/J2735_201603DA.ASN ./asn1_codec/asn1c_combined/J2735_201603DA.ASN
+endif
+ifndef DOCKER_HOST_IP
+ $(error ERROR: Environment variable DOCKER_HOST_IP is not set)
+endif
+ifndef DOCKER_SHARED_VOLUME
+ $(error ERROR: Environment variable DOCKER_SHARED_VOLUME is not set)
+endif
+ifeq ("$(wildcard .env)", "")
+ $(warning "WARNING: Environment file `.env` not found in ${PWD}")
+endif
+ docker-compose up --build -d
+
+stop:
+ docker-compose down
+
+delete:
+ docker-compose rm -fvs
+
+rebuild:
+ $(MAKE) stop delete start

ReleaseNotes.md

@@ -1,9 +1,10 @@
 ## ODE Release Notes ##
 -----------------------
-### Release 1.0.8 (May 24, 2019)
-- Integrated odevalidator v0.0.6
+### Release 1.0.9 (TBD)
+- Integrated odevalidator v0.0.5
 - Updated test-harness (see [release notes](./qa/test-harness/README.md#release-history))
-- Changed SNMP deposit timestamp format from MM/DD/YYYY to YYYY/MM/DD
+### Release 1.0.8 (May 17, 2019)
+- Integrated odevalidator v0.0.4
 ### Release 1.0.7 (Apr 15, 2019)
 - Integrated odevalidator v0.0.3
 ### Release 1.0.6 (Apr 8, 2019)

adm.properties

@@ -1,27 +1,27 @@
-# Kafka group.
-group.id=0
-
-# ACM operation type specification; default is decode if left out.
-acm.type=decode
-
-# Path (relative or absolute) to the ACM error reporting XML template.
-acm.error.template=/asn1_codec/config/Output.error.xml
-
-# Kafka topics for ASN.1 Parsing
-asn1.j2735.topic.consumer=topic.Asn1DecoderInput
-asn1.j2735.topic.producer=topic.Asn1DecoderOutput
-
-# Amount of time to wait when no message is available (milliseconds)
-# This is a Kafka configuration parameter that we are using for the
-# intended purpose.
-asn1.j2735.consumer.timeout.ms=5000
-
-# For testing purposes, use one partition.
-asn1.j2735.kafka.partition=0
-
-# The host ip address for the Broker.
-# metadata.broker.list=localhost:9092
-
-# specify the compression codec for all data generated: none, gzip, snappy, lz4
-compression.type=none
-
+# Kafka group.
+group.id=0
+
+# ACM operation type specification; default is decode if left out.
+acm.type=decode
+
+# Path (relative or absolute) to the ACM error reporting XML template.
+acm.error.template=/asn1_codec/config/Output.error.xml
+
+# Kafka topics for ASN.1 Parsing
+asn1.j2735.topic.consumer=topic.Asn1DecoderInput
+asn1.j2735.topic.producer=topic.Asn1DecoderOutput
+
+# Amount of time to wait when no message is available (milliseconds)
+# This is a Kafka configuration parameter that we are using for the
+# intended purpose.
+asn1.j2735.consumer.timeout.ms=5000
+
+# For testing purposes, use one partition.
+asn1.j2735.kafka.partition=0
+
+# The host ip address for the Broker.
+# metadata.broker.list=localhost:9092
+
+# specify the compression codec for all data generated: none, gzip, snappy, lz4
+compression.type=none
+

aem.properties

@@ -1,27 +1,27 @@
-# Kafka group.
-group.id=0
-
-# ACM operation type specification; default is decode if left out.
-acm.type=encode
-
-# Path (relative or absolute) to the ACM error reporting XML template.
-acm.error.template=/asn1_codec/config/Output.error.xml
-
-# Kafka topics for ASN.1 Parsing
-asn1.j2735.topic.consumer=topic.Asn1EncoderInput
-asn1.j2735.topic.producer=topic.Asn1EncoderOutput
-
-# Amount of time to wait when no message is available (milliseconds)
-# This is a Kafka configuration parameter that we are using for the
-# intended purpose.
-asn1.j2735.consumer.timeout.ms=5000
-
-# For testing purposes, use one partition.
-asn1.j2735.kafka.partition=0
-
-# The host ip address for the Broker.
-# metadata.broker.list=localhost:9092
-
-# specify the compression codec for all data generated: none, gzip, snappy, lz4
-compression.type=none
-
+# Kafka group.
+group.id=0
+
+# ACM operation type specification; default is decode if left out.
+acm.type=encode
+
+# Path (relative or absolute) to the ACM error reporting XML template.
+acm.error.template=/asn1_codec/config/Output.error.xml
+
+# Kafka topics for ASN.1 Parsing
+asn1.j2735.topic.consumer=topic.Asn1EncoderInput
+asn1.j2735.topic.producer=topic.Asn1EncoderOutput
+
+# Amount of time to wait when no message is available (milliseconds)
+# This is a Kafka configuration parameter that we are using for the
+# intended purpose.
+asn1.j2735.consumer.timeout.ms=5000
+
+# For testing purposes, use one partition.
+asn1.j2735.kafka.partition=0
+
+# The host ip address for the Broker.
+# metadata.broker.list=localhost:9092
+
+# specify the compression codec for all data generated: none, gzip, snappy, lz4
+compression.type=none
+