Merge pull request #284 from usdot-fhwa-OPS/revert-283-v2xrelease_6.2

Revert "V2xrelease 6.2"
usdot-fhwa-OPS · Dec 6, 2021 · 1958b3c · 1958b3c
2 parents 93ac2e6 + b8d4b68
commit 1958b3c
Show file tree

Hide file tree

Showing 89 changed files with 277 additions and 9,739 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -189,49 +189,6 @@ jobs:
         command: |
           echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
           docker push usdotfhwaops/v2xhubarm:latest
-  port_drayage_webservice_build_develop :
-    docker:
-      - image: cimg/openjdk:11.0.12
-    # Set working directory
-    working_directory: "/home/V2X-Hub"
-    steps:
-     - setup_remote_docker
-     - checkout
-     - run: 
-        name: Maven Build JAR
-        # Build Port Drayage Web Service
-        command: |
-          cd tools/port-drayage-webservice/
-          mvn clean install  
-     - run: 
-        name: Build Docker Image and Push
-        # Build and push Port Drayage Web Service Docker images
-        command: | 
-          cd tools/port-drayage-webservice/
-          docker build -t usdotfhwaops/port-drayage-webservice:latest .
-          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
-          docker push usdotfhwaops/port-drayage-webservice:latest
-  port_drayage_webservice_build :
-    docker:
-      - image: cimg/openjdk:11.0.12
-    # Set working directory
-    steps:
-     - setup_remote_docker
-     - checkout
-     - run: 
-        name: Maven Build JAR
-        # Build Port Drayage Web Service
-        command: |
-          cd tools/port-drayage-webservice/
-          mvn clean install  
-     - run: 
-        name: Build Docker Image and Push
-        # Build and push Port Drayage Web Service Docker images
-        command: | 
-          cd tools/port-drayage-webservice/
-          docker build -t usdotfhwaops/port-drayage-webservice:${CIRCLE_BRANCH,,} .
-          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
-          docker push usdotfhwaops/port-drayage-webservice:${CIRCLE_BRANCH,,}
 workflows:
   version: 2
   build:
@@ -258,13 +215,5 @@ workflows:
       - sonar-scanner_develop:
           requires:
             - docker_build_push_develop
-      - port_drayage_webservice_build_develop:
-          filters:
-              branches:
-                only: develop
-      - port_drayage_webservice_build:
-          filters:
-            branches:
-              ignore: develop
 
 
diff --git a/.gitignore b/.gitignore
@@ -76,10 +76,4 @@ Thumbs.db
 *.app
 
 #docker-compose variables
-.env
-
-#Maven build directory
-tools/port-drayage-webservice/target/
-
-#Java PKS for HTTPS setup
-tools/port-drayage-webservice/src/main/resources/tutorial.jks
+.env
diff --git a/.sonarqube/sonar-scanner.properties b/.sonarqube/sonar-scanner.properties
@@ -47,7 +47,7 @@ sonar.modules=  PedestrianPlugin, \
   TmxTools, \
   MessageLoggerPlugin, \
   CommandPlugin, \
-  PortDrayagePlugin, \
+  MobilityOperationPlugin, \
   ODELoggerPlugin, \
   DsrcImmediateForwardPlugin, \
   MessageReceiverPlugin
@@ -61,7 +61,7 @@ TmxUtils.sonar.projectBaseDir                   =/home/V2X-Hub/src/tmx/TmxUtils
 CARMACloudPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/CARMACloudPlugin
 CommandPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/CommandPlugin
 CswPlugin.sonar.projectBaseDir			=/home/V2X-Hub/src/v2i-hub/CswPlugin
-PortDrayagePlugin.sonar.projectBaseDir	        =/home/V2X-Hub/src/v2i-hub/PortDrayagePlugin
+MobilityOperationPlugin.sonar.projectBaseDir	=/home/V2X-Hub/src/v2i-hub/MobilityOperationPlugin
 ODELoggerPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/ODELoggerPlugin
 MessageLoggerPlugin.sonar.projectBaseDir            =/home/V2X-Hub/src/v2i-hub/MessageLoggerPlugin
 DmsPlugin.sonar.projectBaseDir                  =/home/V2X-Hub/src/v2i-hub/DmsPlugin
@@ -85,7 +85,6 @@ TmxTools.sonar.sources                    =src
 TmxUtils.sonar.sources                    =src
 MessageLoggerPlugin.sonar.sources             =src
 CswPlugin.sonar.sources                   =src
-PortDrayagePlugin.sonar.sources           =src
 DmsPlugin.sonar.sources                   =src
 DsrcImmediateForwardPlugin.sonar.sources  =src
 LocationPlugin.sonar.sources              =src
@@ -114,7 +113,6 @@ MobilityOperationPlugin.sonar.sources	  =src
 TmxUtils.sonar.cfamily.gcov.reportsPath                   =coverage
 #MessageLoggerPlugin.sonar.cfamily.gcov.reportsPath            =coverage
 #CswPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
-#PortDrayagePlugin.sonar.cfamily.gcov.reportsPath          =coverage
 #DmsPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 #DsrcImmediateForwardPlugin.sonar.cfamily.gcov.reportsPath =coverage
 #LocationPlugin.sonar.cfamily.gcov.reportsPath             =coverage
@@ -140,7 +138,6 @@ TmxUtils.sonar.tests=test
 #TmxTools.sonar.tests=test
 #MessageLoggerPlugin.sonar.tests=test
 #CswPlugin.sonar.tests=test
-#PortDrayagePlugin.sonar.tests=test
 #DmsPlugin.sonar.tests=test
 #DsrcImmediateForwardPlugin.sonar.tests=test
 #LocationPlugin.sonar.tests=test

diff --git a/Dockerfile b/Dockerfile
@@ -60,11 +60,6 @@ RUN make install
 WORKDIR /home/V2X-Hub/ext/ccserver
 RUN cmake . 
 RUN make
-RUN make install
-
-WORKDIR /home/V2X-Hub/ext/pdclient
-RUN cmake .
-RUN make
 RUN make install 
 
 ### setup and install v2x-hub core and plugins 
@@ -106,8 +101,8 @@ RUN ln -s ../bin TimPlugin/bin
 RUN zip TimPlugin.zip TimPlugin/bin/TimPlugin TimPlugin/manifest.json
 RUN ln -s ../bin CARMACloudPlugin/bin
 RUN zip CARMACloudPlugin.zip CARMACloudPlugin/bin/CARMACloudPlugin CARMACloudPlugin/manifest.json
-RUN ln -s ../bin PortDrayagePlugin/bin
-RUN zip PortDrayagePlugin.zip PortDrayagePlugin/bin/PortDrayagePlugin PortDrayagePlugin/manifest.json
+RUN ln -s ../bin MobilityOperationPlugin/bin
+RUN zip MobilityOperationPlugin.zip MobilityOperationPlugin/bin/MobilityOperationPlugin MobilityOperationPlugin/manifest.json
 RUN ln -s ../bin ODELoggerPlugin/bin
 RUN zip ODELoggerPlugin.zip ODELoggerPlugin/bin/ODELoggerPlugin ODELoggerPlugin/manifest.json
 

diff --git a/configuration/amd64/docker-compose.yml b/configuration/amd64/docker-compose.yml
@@ -16,7 +16,6 @@ services:
       - mysql_root_password
     volumes:
       - ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
-      - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
 
   php:
     image: usdotfhwaops/php:latest
@@ -28,7 +27,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:v2xrelease_6.2
+    image: usdotfhwaops/v2xhubamd:latest
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -41,10 +40,6 @@ services:
     volumes:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
-  port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice:v2xrelease_6.2
-    container_name: port_drayage_webservice
-    network_mode: host
 secrets:
     mysql_password:
         file: ./secrets/mysql_password.txt

diff --git a/configuration/amd64/mysql/localhost.sql b/configuration/amd64/mysql/localhost.sql
diff --git a/configuration/amd64/mysql/port_drayage.sql b/configuration/amd64/mysql/port_drayage.sql
diff --git a/configuration/amd64/mysql/suntrax/port_area_operations.sql b/configuration/amd64/mysql/suntrax/port_area_operations.sql