Skip to content

Commit

Permalink
Merge pull request #13 from TAK-Product-Center/upstream/4.6-RELEASE-32
Browse files Browse the repository at this point in the history
TAK Server 4.6-RELEASE-32
  • Loading branch information
takdeveloper authored Sep 29, 2022
2 parents 55e861a + 29e4295 commit 89d644f
Show file tree
Hide file tree
Showing 335 changed files with 15,517 additions and 2,126 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Links:
* [CI Test Execution](src/takserver-takcl-core/docs/ci_testing.md)
* [Publishing](docs/publishing.md)
* [Publishing](src/docs/publishing.md)

---
Clean and Build TAK Server
Expand Down Expand Up @@ -141,7 +141,7 @@ https://localhost:8443/swagger-ui.html
### Integration Tests

Integration tests are executed against master nightly. In addition to this, they can be executed on any branch as follows:
1. Navigate to the [TAKServer Dashboard](https://git.tak.gov/core/takserver).
1. Navigate to the [TAKServer Dashboard](https://git.takmaps.com/core/takserver).
2. On the sidebar, hover over 'CI/CD' and select 'Pipelines'.
3. Find your commit from the list and tap the Play button to the right, and select the test suite you would like to execute. The Main suites are what is executed nightly and execute all the tests.

Expand Down
Binary file modified src/docs/TAK_Server_Configuration_Guide.odt
Binary file not shown.
Binary file modified src/docs/TAK_Server_Configuration_Guide.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* For this implementation, the parameterized type of this class is the same as the type of getBytes() -- this would not usually be the case, the content type
* is expected to be a POJO. https://en.wikipedia.org/wiki/Plain_Old_Java_Object
*
*
*/
public class ByteArrayPayload implements Payload<byte[]> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* We may want to extend it do offer more functionality.
*
* TODO Discuss putting in the PluginContext for use by all plugins
*
*
*/
public final class MetadataUtils {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* the payload must have a zero-argument constructor and be able to set its payload through setBytes.
* @see PayloadSerializationPlugin
*
*
*/
public interface Payload<X> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* globals joint */
/* globals $ */
'use strict';
Expand Down Expand Up @@ -210,6 +209,7 @@ angular.module('roger_federation.Workflows')

//Custom Icons
joint.shapes.bpmn.icons.dataStore = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiBoZWlnaHQ9IjI0cHgiIGlkPSJMYXllcl8xIiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0cHgiIHhtbDpzcGFjZT0icHJlc2VydmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxwYXRoICBkPSJtIDAuOTA3NzQ0NTUsNC4wMTI4NTI1IDAsMTYuMjM1MDExNSBjIDAuNzQwODE4OTUsMy42MDc3ODEgMjEuNDgzNzUxNDUsMy42MDc3ODEgMjIuMjI0NTcwNDUsMCBsIDAsLTE2LjIzNTAxMTUgYyAtMC43NDA4MTksLTMuNjA3NzgwMTIgLTIxLjQ4Mzc1MTUsLTMuNjA3NzgwMTIgLTIyLjIyNDU3MDQ1LDAgMC43NDA4MTg5NSwzLjYwNzc4MDEgMjEuNDgzNzUxNDUsMy42MDc3ODAxIDIyLjIyNDU3MDQ1LDAgTSAwLjkwNzc0NDU1LDYuNTM4Mjk4OCBjIDAuNzQwODE4OTUsMy42MDc3ODAyIDIxLjQ4Mzc1MTQ1LDMuNjA3NzgwMiAyMi4yMjQ1NzA0NSwwIE0gMC45MDc3NDQ1NSw5LjA2Mzc0NDkgYyAwLjc0MDgxODk1LDMuNjA3NzgwMSAyMS40ODM3NTE0NSwzLjYwNzc4MDEgMjIuMjI0NTcwNDUsMCINCiAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MC44OTE5NzE0MSIgLz48L3N2Zz4=";
joint.shapes.bpmn.icons.outgoing = 'data:image/png;base64,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'
joint.shapes.bpmn.icons.federation = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWAgMAAACnE7QbAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuOWwzfk4AAAAJUExURQAAAP///wAAAHPGg3EAAAACdFJOUwAAdpPNOAAAACdJREFUCNdjYGBatYqBgYkBDIinQCwHOI9xFapcA4iNkLvWtIJ0GwDTEwWTtBTeUwAAAABJRU5ErkJggg==";
joint.shapes.bpmn.icons.eventGateway = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuOWwzfk4AAAB1UExURf///wAAAAEBAQsLCw0NDRERERcXFxgYGBwcHCMjIyQkJCkpKSoqKisrKy8vLzAwMDExMTMzMzU1NTk5OTs7O0JCQkNDQ0pKSktLS1FRUVJSUlRUVFlZWVpaWl5eXmFhYWNjY2lpaXNzc3x8fIeHh7q6utvb22ODD/wAAAABdFJOUwBA5thmAAAD10lEQVRYw5VXW3viOgzUbC4kbeiyZcPCNtTF9pn//xPPg3xLSKDrB39tsGXNjCVLIhuD3vuvr+vpdP368t5T/mnQXzvMRnf9vg26vw1WRvPX8VuH79OW6vVtHN9eq/Rh/9QN+l/RZ5OA0/spIvr12ARHXTbY5Tp6O+hv4wMLPOh2Tz03q6Af1MRh0wJ3ANA7itBddyWBu6t+7QFgxw3yawD4pAjNigyNoQg/AaBek4NnAGg9hbZeV6G2FPoWAM53FtT0QKELvve3rMKtD0gchUN0dDYcABwZHEG7kIHetghH8wgAboW/Y/yxsWsYbYVi0ZxJ9ioP94+U1luyp8rdc0FgR7VTEsRpOC3Xoaewm6/zAKpguMoSKZ+lZnRVcLUC4NPnAYBVaBUX5yns/LFSjFY1ywoMVCEyucrHDwDoCknCKvZ5MXsAXtiUuOgaADj8N2LOS+TLZx69wjJlnISw/GC0tOcMsFHCfApBL6yBJl29rvBcr16TuGQD1IznqgODOmDDio954Ac20/9WXeiDC05JyQ5oVqhm6nUA8MKsRM2wUWQC4MUBmLL4WaKw5xjDUcIWJ163sAN6yiX4E9y9C9ccCQH1RdgnOYywVVHU/XY1YfRQAfXPVmnz4pM7t8DPVtJTaScRkVuC7cPftmB0M+3yMxwjHoANpxqgYphV42Ez65p0dyrAhHkCXkUM8Coikshc9aALHIi8AibMIzCK/AHeU6zYDQM+UiDyDvwR+Q2MwYDOAcNlw8Ate1fsWhiQSw6JFQQt7wxcgHcJc7zo7hkCeQOmMJs5ieGWPUFQkjiXUYN3FUOJoJTRFZfqIYYSgU+XuJxvjzGUCG6LrTmYtjGEACrRaCII12t6hmGJYEoXMycU+whDadYWvsfIYpM85JCdlTIXp5zbAg0TKSEAi6RqAdx4j+AyT6rpHA3AkCnjYtTDbNTFQ1QDFQuT4WWzKZeww2qlypyYrL4WLj81TtimZGpXDZj8SLSMxyaX+/JxpTP3I6T08nH1ZX35SZ6RaNiuRWsAZ/Jjlnw9lMfjVg04ryWP6m1ZSoxaNekzet4uZc+xFtwlTgoQQ7TwuMiKy+avB9uyzKvXy7y6LPOWd5XVrNDc3Reau1mhWd0d4WIN6LQkxUtZ6oar1bpYS7oNgnae8SEGUA8/T6efQ6q9bSql14jWGvBZuf+xLD7umMSLthZTW+5uJ08Ruhes8HfX8uxjy2PMNI6TMbHl2T9peXLTtV9runR7ZR63bf6QW9Wi7UuN7OFp7xl7sxUVYj/3vPW9rLe+F/f99jm3qrmR/ecGvlRhe/f/2BV4PKllnhkAAAAASUVORK5CYII=";
joint.shapes.bpmn.icons.messageThrow = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAVBAMAAADV4/HZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAABJQTFRF////AAAAEBAQICAgMDAwQEBA9ql18wAAAAF0Uk5TAEDm2GYAAABVSURBVBjT1Y25EYAwEAOXL2fNkEMHpgQ6gP6bIfAc9tABirQanQ4mG2XIDJU3wIs+eAZR6AqvsIsmuFUXOJXiDk2lSe2WS2Ittnn/jbaBOQx+9J/gAcYZFZNx+7SlAAAAAElFTkSuQmCC";
Expand Down Expand Up @@ -647,6 +647,23 @@ angular.module('roger_federation.Workflows')
},
graphType: "GroupCell",
icon: "circle"
}),
new joint.shapes.bpmn.Activity({
position: { x: 10, y: 100 }, size: { width: 80, height: 80 },
roger_federation: {
name: "",
type: "FederationOutgoing",
stringId: "",
description: "",
interconnected: false,
groupFilters: [],
attributes: []
},
graphType: "FederationOutgoingCell",
attrs: {
'.body': { fill: 'gray', stroke: 'black', opacity: '0.40' },
},
icon: "outgoing"
})
], 'participants');
addStencilToolip(stencil.graphs.participants);
Expand All @@ -664,3 +681,4 @@ angular.module('roger_federation.Workflows')
};
}
]);

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict';

angular.module('roger_federation.Workflows')
Expand Down Expand Up @@ -623,6 +622,17 @@ angular.module('roger_federation.Workflows')
});
};

workflowService.getActiveConnections = function() {
return $http.get(
ConfigService.getServerBaseUrlStrV2() + 'getActiveConnections/').then(
function(res) {
return res.data;
},
function(reason) {
throw reason;
});
};



workflowService.getKnownFilters = function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,65 @@

/* globals joint */
/* globals $ */
'use strict';

angular.module('roger_federation.Workflows')
.controller('WorkflowsController', ['$scope', '$rootScope', '$window', '$state', '$stateParams', '$interval', '$uibModal',
.controller('WorkflowsController', ['$scope', '$rootScope', '$window', '$state', '$stateParams', '$timeout', '$uibModal',
'$log', '$http', 'uuid4', 'growl', 'WorkflowService', 'OntologyService', 'JointPaper', 'SemanticsService', workflowsController
]);

function workflowsController($scope, $rootScope, $window, $state, $stateParams, $interval, $uibModal, $log, $http, uuid4, growl, WorkflowService, OntologyService, JointPaper, SemanticsService) {
function workflowsController($scope, $rootScope, $window, $state, $stateParams, $timeout, $uibModal, $log, $http, uuid4, growl, WorkflowService, OntologyService, JointPaper, SemanticsService) {
$scope.JointPaper = JointPaper;
$scope.criticResults = [];

$scope.data = "{users: 'Joe'}";

pollActiveConnections()

function pollActiveConnections() {
WorkflowService.getActiveConnections().then(function(activeConnections) {
setOutgoingNodesStatus(activeConnections)
}).catch(e => setOutgoingNodesStatus([]))
$timeout(pollActiveConnections, 2000);
}

function setOutgoingNodesStatus(activeConnections) {
if (JointPaper.paper && JointPaper.paper._views) {
var outgoingCellKeys = Object.keys(JointPaper.paper._views);
for (var i = 0; i < outgoingCellKeys.length; i++) {
let cellView = JointPaper.paper._views[outgoingCellKeys[i]]

let text = cellView.model.attributes.roger_federation.stringId +'\n\n'
+ cellView.model.attributes.roger_federation.host + ':' + cellView.model.attributes.roger_federation.port

if (cellView.model.attributes.graphType === "FederationOutgoingCell") {
let foundConnection = undefined
activeConnections.forEach(activeConnection => {
if (activeConnection.connectionId === cellView.model.attributes.roger_federation.name)
foundConnection = activeConnection
})
if (foundConnection) {
cellView.model.attributes.attrs['.body']['fill'] = 'green'
text += '\n' + foundConnection.connectionType.toLowerCase()
} else {
if (cellView.model.attributes.roger_federation.outgoingEnabled)
cellView.model.attributes.attrs['.body']['fill'] = 'red'
else
cellView.model.attributes.attrs['.body']['fill'] = 'gray'
}

var shapeLabel = joint.util.breakText(text, {
width: 200
});

cellView.model.set('content', shapeLabel);

cellView.update()
cellView.resize()
}
}
}
}

$scope.addSemanticSubscription = function() {
$state.go('workflows.editor.addSparqlQuery', {
mode: 'new_request',
Expand Down Expand Up @@ -345,6 +391,8 @@ function workflowsController($scope, $rootScope, $window, $state, $stateParams,
$state.go('workflows.editor.addBPMNFederate');
} else if (['Group'].indexOf(propertiesType) !== -1) {
$state.go('workflows.editor.addFederateGroup');
} else if (['FederationOutgoing'].indexOf(propertiesType) !== -1) {
$state.go('workflows.editor.addFederationOutgoing');
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spring_boot_version = 2.4.2
spring_boot_spring_version = 5.3.3
spring_cloud_starter_version = 2.2.3.RELEASE
micrometer_cloudwatch_version = 1.5.5

jts_version = 1.18.0
guava_version = 30.1-jre
intellij_annotations_version = 12.0
jackson_version = 2.11.4
Expand Down Expand Up @@ -59,7 +59,7 @@ spring_data_version = 2.4.3
tinder_version = 1.3.0
whack_version = 2.0.1
worldwind_version = 2.0.0
xerces_version = 2.12.0
xerces_version = 2.12.2
xpp3_version = 1.1.4c
hamcrest_version = 1.3
junit_version = 4.12
Expand All @@ -86,3 +86,4 @@ mockito_version = 2.28.2
jsonwebtoken_version = 0.9.1
caffeine_version = 3.0.2
gradle_shadow_version = 6.1.0
whack_version = 2.0.1
Binary file removed src/lib/whack_2_0_1.jar
Binary file not shown.
Binary file removed src/lib/xml-apis-2.11.0.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions src/takserver-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ dependencies {

compile group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: caffeine_version

compile group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: caffeine_version

compile project(':takserver-fig-core')

testCompile group: 'junit', name: 'junit', version: junit_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ public class ClientEndpoint implements Serializable {

public ClientEndpoint() {}

public ClientEndpoint(String callsign, String uid, Date lastEventTime, String lastEventName, String groups) {
public ClientEndpoint(String callsign, String uid, String username, Date lastEventTime, String lastEventName, String groups) {
this.callsign = callsign;
this.uid = uid;
this.username = username;
this.lastEventTime = lastEventTime;
this.lastStatus = lastEventName;
this.groups = groups;
Expand All @@ -36,6 +37,14 @@ public void setUid(String uid) {
this.uid = uid;
}

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.S'Z'")
public Date getLastEventTime() {
return lastEventTime;
Expand Down Expand Up @@ -65,6 +74,7 @@ public void setGroups(String groups) {

private String callsign;
private String uid;
private String username;
private Date lastEventTime;
private String lastStatus;
private String groups;
Expand Down
Loading

0 comments on commit 89d644f

Please sign in to comment.