Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
douglascrp committed Jan 6, 2023
2 parents 53e2795 + f503719 commit 9afe1f6
Show file tree
Hide file tree
Showing 296 changed files with 50,637 additions and 1,020 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Java CI

on:
push:
paths-ignore:
- 'grafana/**'
- 'images/**'
- '*.md'
- '**/*.md'
- '*.sh'
- '**/*.sh'
- '*.bat'
- '**/*.bat'
branches:
- '*'
tags:
- '*'
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven
run: mvn --batch-mode --update-snapshots package
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,36 @@ We hope to have lots of collaborators on this project. As such, we have outlined
It is a key goal of our project to foster active participation and collaboration with the greater Alfresco community. To that end we expect folks to conform to our [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).

# License
This addon is licensed under the GNU Lesser General Public License (LGPL) similarily to the original work by Antonio Soler. See [LICENSE.md](./LICENSE.md) for the full LGPL license.
This addon is licensed under the GNU Lesser General Public License (LGPL) v3 similarily to the original work by Antonio Soler. See [LICENSE.md](./LICENSE.md) for the full LGPL license.

Alfresco (base software) - Copyright © Alfresco Software Ltd.

This addon contains code forked from the [JavaScript Console project](https://github.com/share-extras/js-console) developed by Florian Maul, with major contributions from Jens Goldhammer and Axel Faust. The JavaScript Console project is/was licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). Based on section 4, item d of the Apache License, the modifications made to JavaScript Console source code / derivative work created as part of this fork are (re-)licensed under the GNU Lesser General Public License (LGPL) as the umbrella license for this addon.

This addon contains / packages the following, unaltered open source libraries in at least some of its distribution artifacts (AMP):

- [MenoData Time4J](https://github.com/MenoData/Time4J), GNU Lesser General Public License v2.1
- [cron-utils](https://github.com/jmrozanec/cron-utils), Apache License, Version 2.0
- [moment.js](https://momentjs.com/), MIT License
- [Smoothie Charts](http://smoothiecharts.org/), MIT LIcense
- [Sizzle.js](http://sizzlejs.com/), [custom "as-is" open license](https://github.com/jquery/sizzle/blob/main/LICENSE.txt)
- [CodeMirror](https://codemirror.net/), MIT License
- [js-beautifier](https://beautifier.io/), MIT License
- [Tern](https://ternjs.net/), MIT License
- [jsonlint](https://github.com/zaach/jsonlint), MIT License
- [jquery](https://jquery.com/), MIT License

The Contributor Covenant is released under [Creative Commons Attribution 4.0 International Public License](https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE.md).

Original authors:

- [Axel Faust](https://github.com/AFaust), Acosix / Order of the Bee
- [Markus Joos](https://github.com/mrksjs), AdNovum
- Florian Maul, fme AG (JavaScript Console)

Maintainers:

- [Axel Faust](https://github.com/AFaust), Acosix / Order of the Bee
- [Bindu Wavell](https://github.com/binduwavell), Zia / Order of the Bee
- [Younes Regaieg](https://github.com/yregaieg), Order of the Bee
- [Robrecht Vanhuysse](https://github.com/RVanhuysseXenit), Xenit Solutions nv / Order of the Bee
277 changes: 277 additions & 0 deletions grafana/Grafana-active-sessions-dashboard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": 7,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"description": "",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 0
},
"hiddenSeries": false,
"id": 2,
"interval": "",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "alfresco_active_sessions{instance=\"hostname:port\",type=\"NumActive\"}",
"legendFormat": "NumActive",
"refId": "A"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Alfresco Active Sessions",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"cacheTimeout": null,
"datasource": null,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 0
},
"id": 4,
"links": [],
"options": {
"colorMode": "value",
"fieldOptions": {
"calcs": [
"lastNotNull"
],
"defaults": {
"mappings": [
{
"id": 0,
"op": "=",
"text": "N/A",
"type": 1,
"value": "null"
}
],
"nullValueMode": "connected",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 300
}
]
},
"unit": "none"
},
"overrides": [],
"values": false
},
"graphMode": "area",
"justifyMode": "auto",
"orientation": "horizontal"
},
"pluginVersion": "6.6.2",
"targets": [
{
"expr": "alfresco_active_sessions{instance=\"hostname:port\",type=\"MaxActive\"}",
"legendFormat": "MaxActive",
"refId": "A"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Maximum number of active sessions",
"type": "stat"
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 9
},
"hiddenSeries": false,
"id": 6,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "alfresco_active_sessions{instance=\"hostname:port\",type=\"NumIdle\"}",
"legendFormat": "NumIdle",
"refId": "A"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Idle Sessions",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"schemaVersion": 22,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "OOTB",
"uid": "-5WkhDRMz",
"version": 2
}
Binary file added images/Grafana.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/test-transform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.orderofthebee.support-tools</groupId>
<artifactId>support-tools-parent</artifactId>
<version>1.2.0.0-SNAPSHOT</version>
<version>1.2.0.0</version>
<packaging>pom</packaging>

<name>OOTBee Support Tools - Parent</name>
Expand Down Expand Up @@ -453,6 +453,10 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
<configuration>
<!-- if built on a JDK 11, this suppresses issues due to referencing unnamed Java modules -->
<source>8</source>
</configuration>
<executions>
<execution>
<id>attach-javadoc</id>
Expand All @@ -472,6 +476,7 @@
<includes>
<include>META-INF/resources/*.js</include>
<include>META-INF/resources/**/*.js</include>
<include>alfresco/module/*/**/*.js</include>
<include>alfresco/templates/*.js</include>
<include>alfresco/templates/**/*.js</include>
<include>alfresco/webscripts/*.js</include>
Expand Down
Loading

0 comments on commit 9afe1f6

Please sign in to comment.