Merge pull request #1209 from US-CBP/GTAS1.2.1

Gtas 1.2.1
US-CBP · Jun 19, 2019 · 7c9183e · 7c9183e
2 parents b396817 + 10d5bac
commit 7c9183e
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 69 deletions.
diff --git a/gtas-parent/gtas-commons/src/main/resources/commonservices.properties b/gtas-parent/gtas-commons/src/main/resources/commonservices.properties
@@ -2,4 +2,54 @@
 entitymanager.packages.to.scan=gov.gtas
 neo4jusername=username
 neo4jpassword=password
-neo4jEnabled=false
+neo4jEnabled=false
+##################### MessageLoader #####################
+
+inputType=two_dirs
+
+message.dir.origin=C:\\MESSAGE
+message.dir.processed=C:\\MESSAGEOLD
+
+loader.fixedDelay.in.milliseconds=5000
+loader.initialDelay.in.milliseconds=2000
+
+sqs.loader.fixedDelay.in.milliseconds=1000
+sqs.loader.initialDelay.in.milliseconds=1000
+sqs.loader.enabled=false
+sqs.loader.region=
+##### uncomment the line below and provide the queue URL .... DO NOT PUSH THE URL TO GITHUB ####
+# sqs.loader.queue=<AWS SQS Queue URL>
+
+loader.isRunning=false
+
+maxNumofFiles=5
+
+###JMS###
+inbound.loader.jms.queue=GTAS_INBOUND_Q_REDIS
+outbound.loader.jms.queue=GTAS_LOADER_Q
+#########
+### REDIS ###
+redis.connection.string=redis://0.0.0.0:6379
+#############
+
+
+##### Passenger ID Tag and BookingDetail Scheduler settings ####
+
+cleanup.fixedDelay.in.milliseconds=5000
+cleanup.initialDelay.in.milliseconds=2000
+
+#########
+
+##### Data Management Scheduler settings ####
+
+datamanagement.fixedDelay.in.milliseconds=180
+datamanagement.initialDelay.in.milliseconds=20
+
+#########
+
+##################### RuleRunner #####################
+
+ruleRunner.fixedDelay.in.milliseconds=5000
+ruleRunner.initialDelay.in.milliseconds=2000
+
+ruleRunner.isRunning=false
diff --git a/gtas-parent/gtas-job-scheduler-war/src/main/java/gov/gtas/job/config/JobSchedulerConfig.java b/gtas-parent/gtas-job-scheduler-war/src/main/java/gov/gtas/job/config/JobSchedulerConfig.java
@@ -22,9 +22,8 @@
 @Configuration
 @EnableScheduling
 @ComponentScan("gov.gtas.job.scheduler")
-@PropertySource("classpath:jobScheduler.properties")
+@PropertySource("classpath:commonservices.properties")
 @PropertySource("classpath:dashboardJobScheduler.properties")
-@PropertySource("classpath:singleNodeConfig.json")
 @PropertySource(value = "file:${catalina.home}/conf/application.properties", ignoreResourceNotFound = true)
 public class JobSchedulerConfig implements SchedulingConfigurer {
 

diff --git a/gtas-parent/gtas-job-scheduler-war/src/main/resources/jobScheduler.properties b/gtas-parent/gtas-job-scheduler-war/src/main/resources/jobScheduler.properties
diff --git a/...parent/gtas-parsers/src/main/java/gov/gtas/parsers/redisson/config/RedisLoaderConfig.java b/...parent/gtas-parsers/src/main/java/gov/gtas/parsers/redisson/config/RedisLoaderConfig.java
@@ -14,7 +14,7 @@
 @Configuration
 @EnableScheduling
 @ComponentScan("gov.gtas.parsers.redisson")
-@PropertySource("classpath:redisloader.properties")
+@PropertySource("classpath:commonservices.properties")
 @PropertySource(value = "file:${catalina.home}/conf/application.properties", ignoreResourceNotFound = true)
 public class RedisLoaderConfig implements SchedulingConfigurer {
     @Override

diff --git a/gtas-parent/gtas-parsers/src/main/resources/redisloader.properties b/gtas-parent/gtas-parsers/src/main/resources/redisloader.properties
diff --git a/gtas-parent/gtas-webapp/src/main/webapp/app.js b/gtas-parent/gtas-webapp/src/main/webapp/app.js
@@ -311,6 +311,7 @@ var app;
                 })
                 .state('flights', {
                     url: '/flights',
+                    roles: [USER_ROLES.ADMIN, USER_ROLES.VIEW_FLIGHT_PASSENGERS, USER_ROLES.MANAGE_QUERIES, USER_ROLES.MANAGE_RULES, USER_ROLES.MANAGE_WATCHLIST, USER_ROLES.ONE_DAY_LOOKOUT],
                     authenticate: true,
                     views: {
                         '@': {

diff --git a/gtas-parent/gtas-webapp/src/main/webapp/dashboard/dashboard.html b/gtas-parent/gtas-webapp/src/main/webapp/dashboard/dashboard.html
@@ -9,8 +9,8 @@
           <div class="panel-body" style="height: 100%;">
             <!-- <my-elem ></my-elem> -->
 
-<iframe src="http://localhost:5601/app/kibana#/dashboard/7cfbbdc0-2e13-11e9-81a3-0f5bd8b0a7ac?embed=true&_g=(refreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-3d%2Fd%2Cmode%3Arelative%2Cto%3Anow%2B3d%2Fd))" height="100%" width="100%" frameBorder="0"></iframe>                    
-</div>
+            <iframe src="http://localhost:5601/app/kibana#/dashboard/7cfbbdc0-2e13-11e9-81a3-0f5bd8b0a7ac?embed=true&_g=(refreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-3d%2Fd%2Cmode%3Arelative%2Cto%3Anow%2B3d%2Fd))" style="height: calc(80vh - 130px);" width="100%" frameBorder="0"></iframe>
+          </div>
         </div>
       </div>
     </div>