diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..150b3b2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: openelisglobal-plugins CI Build +on: + push: + branches: [develop] + pull_request: + branches: [develop] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Checkout openelisglobal-plugins + uses: actions/checkout@v2 + with: + repository: ${{github.repository}} + + - name: Build openelisglobal-plugins + run: mvn clean install + + diff --git a/README.md b/README.md index be95e80..92dc20b 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,15 @@ openelisglobal-plugins ====================== Repository for plugins for openelisglobal + +[![Build Status](https://github.com/openelisglobal/openelisglobal-plugins/actions/workflows/ci.yml/badge.svg)](https://github.com/openelisglobal/openelisglobal-plugins/actions/workflows/ci.yml) + +For Building The Plugins + +1. Got to the [Parent pom file](./pom.xml) +1. set the right absolute `SystemPath path` to the `openelisglobal` dependence located under the [lib](./lib/) folder +1. Run the Maven Build + + ```mvn clen install``` +1. Find the built plugin jars under the `plugins` directory + diff --git a/analyzers/CobasC111/pom.xml b/analyzers/CobasC111/pom.xml index 37e1305..f45aa75 100644 --- a/analyzers/CobasC111/pom.xml +++ b/analyzers/CobasC111/pom.xml @@ -17,14 +17,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/CobasC111/src/oe/plugin/analyzer/CobasC111Permission.java b/analyzers/CobasC111/src/oe/plugin/analyzer/CobasC111Permission.java index a13db88..bf5a08c 100644 --- a/analyzers/CobasC111/src/oe/plugin/analyzer/CobasC111Permission.java +++ b/analyzers/CobasC111/src/oe/plugin/analyzer/CobasC111Permission.java @@ -28,7 +28,7 @@ public class CobasC111Permission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "CobasC111Analyzer", "Results->Analyzer->CobasC111Analyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/CobasIntegra400/pom.xml b/analyzers/CobasIntegra400/pom.xml index c8d2c59..5af224e 100644 --- a/analyzers/CobasIntegra400/pom.xml +++ b/analyzers/CobasIntegra400/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/CobasIntegra400/src/oe/plugin/analyzer/CobasIntegra400Permission.java b/analyzers/CobasIntegra400/src/oe/plugin/analyzer/CobasIntegra400Permission.java index a7df8f6..358a7ae 100644 --- a/analyzers/CobasIntegra400/src/oe/plugin/analyzer/CobasIntegra400Permission.java +++ b/analyzers/CobasIntegra400/src/oe/plugin/analyzer/CobasIntegra400Permission.java @@ -28,8 +28,8 @@ public class CobasIntegra400Permission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "CobasIntegra400", "Results->Analyzer->CobasIntegra400" ); - Role role = service.getSystemRole( "Results Admin" ); - //Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); + //Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } \ No newline at end of file diff --git a/analyzers/CobasTaqMan48DBS/pom.xml b/analyzers/CobasTaqMan48DBS/pom.xml index 159804a..6a7642c 100644 --- a/analyzers/CobasTaqMan48DBS/pom.xml +++ b/analyzers/CobasTaqMan48DBS/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/CobasTaqMan48DBS/src/oe/plugin/analyzer/TaqMan48DBSPermission.java b/analyzers/CobasTaqMan48DBS/src/oe/plugin/analyzer/TaqMan48DBSPermission.java index aa280e7..d03177d 100644 --- a/analyzers/CobasTaqMan48DBS/src/oe/plugin/analyzer/TaqMan48DBSPermission.java +++ b/analyzers/CobasTaqMan48DBS/src/oe/plugin/analyzer/TaqMan48DBSPermission.java @@ -28,7 +28,7 @@ public class TaqMan48DBSPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "TaqMan48DBSAnalyzer", "Results->Analyzer->TaqMan48DBSAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/FacsCalibur/pom.xml b/analyzers/FacsCalibur/pom.xml index bf51e83..7cf5bd8 100644 --- a/analyzers/FacsCalibur/pom.xml +++ b/analyzers/FacsCalibur/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/FacsCalibur/src/oe/plugin/analyzer/FacsCaliburPermission.java b/analyzers/FacsCalibur/src/oe/plugin/analyzer/FacsCaliburPermission.java index 8e87467..4242c36 100644 --- a/analyzers/FacsCalibur/src/oe/plugin/analyzer/FacsCaliburPermission.java +++ b/analyzers/FacsCalibur/src/oe/plugin/analyzer/FacsCaliburPermission.java @@ -28,7 +28,7 @@ public class FacsCaliburPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "FacsCalibur", "Results->Analyzer->FacsCalibur" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } \ No newline at end of file diff --git a/analyzers/FacsCantoII/pom.xml b/analyzers/FacsCantoII/pom.xml index 96e95ea..2ca03fd 100644 --- a/analyzers/FacsCantoII/pom.xml +++ b/analyzers/FacsCantoII/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/FacsCantoII/src/oe/plugin/analyzer/FacsCantoIIPermission.java b/analyzers/FacsCantoII/src/oe/plugin/analyzer/FacsCantoIIPermission.java index 20cf39e..489dea1 100644 --- a/analyzers/FacsCantoII/src/oe/plugin/analyzer/FacsCantoIIPermission.java +++ b/analyzers/FacsCantoII/src/oe/plugin/analyzer/FacsCantoIIPermission.java @@ -28,8 +28,8 @@ public class FacsCantoIIPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "FacsCantoII", "Results->Analyzer->FacsCantoII" ); - Role role = service.getSystemRole( "Results Admin" ); - //Role role = service.getSystemRole( "Results Entry" ); + Role role = service.getSystemRole( "Results" ); + //Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } \ No newline at end of file diff --git a/analyzers/FacsPresto/pom.xml b/analyzers/FacsPresto/pom.xml index f6667b9..5f0e738 100644 --- a/analyzers/FacsPresto/pom.xml +++ b/analyzers/FacsPresto/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/FacsPresto/src/oe/plugin/analyzer/FacsPrestoPermission.java b/analyzers/FacsPresto/src/oe/plugin/analyzer/FacsPrestoPermission.java index 7630387..df06ad7 100644 --- a/analyzers/FacsPresto/src/oe/plugin/analyzer/FacsPrestoPermission.java +++ b/analyzers/FacsPresto/src/oe/plugin/analyzer/FacsPrestoPermission.java @@ -28,7 +28,7 @@ public class FacsPrestoPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "FacsPrestoAnalyzer", "Results->Analyzer->FacsPrestoAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/Fully/pom.xml b/analyzers/Fully/pom.xml index 1dc8ae3..a8e0922 100644 --- a/analyzers/Fully/pom.xml +++ b/analyzers/Fully/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/Fully/src/oe/plugin/analyzer/FullyPermission.java b/analyzers/Fully/src/oe/plugin/analyzer/FullyPermission.java index b13ab03..6cdf982 100644 --- a/analyzers/Fully/src/oe/plugin/analyzer/FullyPermission.java +++ b/analyzers/Fully/src/oe/plugin/analyzer/FullyPermission.java @@ -28,7 +28,7 @@ public class FullyPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "FullyAnalyzer", "Results->Analyzer->FullyAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/GeneXpert/src/main/java/oe/plugin/analyzer/GeneXpertPermission.java b/analyzers/GeneXpert/src/main/java/oe/plugin/analyzer/GeneXpertPermission.java index 748e67d..14e979a 100644 --- a/analyzers/GeneXpert/src/main/java/oe/plugin/analyzer/GeneXpertPermission.java +++ b/analyzers/GeneXpert/src/main/java/oe/plugin/analyzer/GeneXpertPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "GeneXpertAnalyzer", "Results->Analyzer->GeneXpertAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/GeneXpertFile/pom.xml b/analyzers/GeneXpertFile/pom.xml index 153fd6c..b6704db 100644 --- a/analyzers/GeneXpertFile/pom.xml +++ b/analyzers/GeneXpertFile/pom.xml @@ -17,14 +17,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/GeneXpertFile/src/oe/plugin/analyzer/GeneXpertAnalyzerPermission.java b/analyzers/GeneXpertFile/src/oe/plugin/analyzer/GeneXpertAnalyzerPermission.java index 7e04927..f0c298a 100644 --- a/analyzers/GeneXpertFile/src/oe/plugin/analyzer/GeneXpertAnalyzerPermission.java +++ b/analyzers/GeneXpertFile/src/oe/plugin/analyzer/GeneXpertAnalyzerPermission.java @@ -29,7 +29,7 @@ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "GeneXpertAnalyzer", "Results->Analyzer->GeneXpertAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/Mindray/src/main/java/oe/plugin/analyzer/MindrayPermission.java b/analyzers/Mindray/src/main/java/oe/plugin/analyzer/MindrayPermission.java index a7adcfa..e24d4b1 100644 --- a/analyzers/Mindray/src/main/java/oe/plugin/analyzer/MindrayPermission.java +++ b/analyzers/Mindray/src/main/java/oe/plugin/analyzer/MindrayPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "MindrayAnalyzer", "Results->Analyzer->MindrayAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/QuantStudio3/pom.xml b/analyzers/QuantStudio3/pom.xml index 793be54..4f70e70 100644 --- a/analyzers/QuantStudio3/pom.xml +++ b/analyzers/QuantStudio3/pom.xml @@ -17,14 +17,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/QuantStudio3/src/oe/plugin/analyzer/QuantStudio3Permission.java b/analyzers/QuantStudio3/src/oe/plugin/analyzer/QuantStudio3Permission.java index 49e27bc..1840eda 100644 --- a/analyzers/QuantStudio3/src/oe/plugin/analyzer/QuantStudio3Permission.java +++ b/analyzers/QuantStudio3/src/oe/plugin/analyzer/QuantStudio3Permission.java @@ -31,7 +31,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "QuantStudio3Analyzer", "Results->Analyzer->QuantStudio3Analyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); SystemModuleUrl moduleUrl = service.getOrCreateSystemModuleUrl(module, "/importAnalyzer"); return service.bindRoleToModule( role, module, moduleUrl ); } diff --git a/analyzers/SysmeXT/pom.xml b/analyzers/SysmeXT/pom.xml index 3fc18f4..9d507b6 100644 --- a/analyzers/SysmeXT/pom.xml +++ b/analyzers/SysmeXT/pom.xml @@ -28,14 +28,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/SysmeXT/src/oe/plugin/analyzer/SysmeXTPermission.java b/analyzers/SysmeXT/src/oe/plugin/analyzer/SysmeXTPermission.java index 93cd4b0..1654dd7 100644 --- a/analyzers/SysmeXT/src/oe/plugin/analyzer/SysmeXTPermission.java +++ b/analyzers/SysmeXT/src/oe/plugin/analyzer/SysmeXTPermission.java @@ -28,7 +28,7 @@ public class SysmeXTPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "SysmeXT", "Results->Analyzer->SysmeXT" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } \ No newline at end of file diff --git a/analyzers/Sysmex2000i/pom.xml b/analyzers/Sysmex2000i/pom.xml index 6b1739b..8a974f8 100644 --- a/analyzers/Sysmex2000i/pom.xml +++ b/analyzers/Sysmex2000i/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/Sysmex2000i/src/oe/plugin/analyzer/SysmexPermission.java b/analyzers/Sysmex2000i/src/oe/plugin/analyzer/SysmexPermission.java index e811968..322d62c 100644 --- a/analyzers/Sysmex2000i/src/oe/plugin/analyzer/SysmexPermission.java +++ b/analyzers/Sysmex2000i/src/oe/plugin/analyzer/SysmexPermission.java @@ -28,7 +28,7 @@ public class SysmexPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "SysmexAnalyzer", "Results->Analyzer->SysmexAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/SysmexXN-L/src/main/java/oe/plugin/analyzer/SysmexXNLAnalyzerPermission.java b/analyzers/SysmexXN-L/src/main/java/oe/plugin/analyzer/SysmexXNLAnalyzerPermission.java index 6b24719..d2b2c46 100644 --- a/analyzers/SysmexXN-L/src/main/java/oe/plugin/analyzer/SysmexXNLAnalyzerPermission.java +++ b/analyzers/SysmexXN-L/src/main/java/oe/plugin/analyzer/SysmexXNLAnalyzerPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "SysmexXNLAnalyzer", "Results->Analyzer->SysmexXNLAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/SysmexXP/src/main/java/oe/plugin/analyzer/SysmexXPAnalyzerPermission.java b/analyzers/SysmexXP/src/main/java/oe/plugin/analyzer/SysmexXPAnalyzerPermission.java index a2e25fc..9ff60c0 100644 --- a/analyzers/SysmexXP/src/main/java/oe/plugin/analyzer/SysmexXPAnalyzerPermission.java +++ b/analyzers/SysmexXP/src/main/java/oe/plugin/analyzer/SysmexXPAnalyzerPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "SysmexXPAnalyzer", "Results->Analyzer->SysmexXPAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/SysmexXT4000i/pom.xml b/analyzers/SysmexXT4000i/pom.xml index fe73b78..4bf72b1 100644 --- a/analyzers/SysmexXT4000i/pom.xml +++ b/analyzers/SysmexXT4000i/pom.xml @@ -18,14 +18,13 @@ - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/SysmexXT4000i/src/oe/plugin/analyzer/SysmexXTPermission.java b/analyzers/SysmexXT4000i/src/oe/plugin/analyzer/SysmexXTPermission.java index 5458840..e87d11d 100644 --- a/analyzers/SysmexXT4000i/src/oe/plugin/analyzer/SysmexXTPermission.java +++ b/analyzers/SysmexXT4000i/src/oe/plugin/analyzer/SysmexXTPermission.java @@ -28,7 +28,7 @@ public class SysmexXTPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "SysmexXTAnalyzer", "Results->Analyzer->SysmexXTAnalyzer" ); - Role role = service.getSystemRole( "Results Admin" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/template/HttpHl7TemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpHl7TemplateAnalyzerPermission.java b/analyzers/template/HttpHl7TemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpHl7TemplateAnalyzerPermission.java index ae05d8b..b365262 100644 --- a/analyzers/template/HttpHl7TemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpHl7TemplateAnalyzerPermission.java +++ b/analyzers/template/HttpHl7TemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpHl7TemplateAnalyzerPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "HttpHl7TemplateAnalyzer", "Results->Analyzer->HttpHl7TemplateAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/template/HttpTemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpTemplateAnalyzerPermission.java b/analyzers/template/HttpTemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpTemplateAnalyzerPermission.java index 99f0fca..c6ead77 100644 --- a/analyzers/template/HttpTemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpTemplateAnalyzerPermission.java +++ b/analyzers/template/HttpTemplateAnalyzer/src/main/java/oe/plugin/analyzer/HttpTemplateAnalyzerPermission.java @@ -30,7 +30,7 @@ protected boolean insertPermission(){ IPluginPermissionService service = SpringContext.getBean(IPluginPermissionService.class); SystemModule module = service.getOrCreateSystemModule("AnalyzerResults", "HttpTemplateAnalyzer", "Results->Analyzer->HttpTemplateAnalyzer"); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/template/OldFileTemplateAnalyzer/src/oe/plugin/analyzer/OldFileTemplateAnalyzerPermission.java b/analyzers/template/OldFileTemplateAnalyzer/src/oe/plugin/analyzer/OldFileTemplateAnalyzerPermission.java index b4be4d1..bc67471 100644 --- a/analyzers/template/OldFileTemplateAnalyzer/src/oe/plugin/analyzer/OldFileTemplateAnalyzerPermission.java +++ b/analyzers/template/OldFileTemplateAnalyzer/src/oe/plugin/analyzer/OldFileTemplateAnalyzerPermission.java @@ -28,7 +28,7 @@ public class OldFileTemplateAnalyzerPermission extends PermissionPlugin { protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "OldFileTemplateAnalyzer", "Results->Analyzer->OldFileTemplateAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } diff --git a/analyzers/weberAnalyzer/pom.xml b/analyzers/weberAnalyzer/pom.xml index f50b171..9ec259d 100644 --- a/analyzers/weberAnalyzer/pom.xml +++ b/analyzers/weberAnalyzer/pom.xml @@ -10,21 +10,20 @@ 1.0 ../../pom.xml - - 1.0 + + 1.0 UTF-8 - src/main/java + src - src/main/filtered-resources - true - - - src/main/resources + src + + **/*.java + diff --git a/analyzers/weberAnalyzer/src/oe/plugin/analyzer/WeberPermission.java b/analyzers/weberAnalyzer/src/oe/plugin/analyzer/WeberPermission.java index c66d723..49c61e7 100644 --- a/analyzers/weberAnalyzer/src/oe/plugin/analyzer/WeberPermission.java +++ b/analyzers/weberAnalyzer/src/oe/plugin/analyzer/WeberPermission.java @@ -28,7 +28,7 @@ public class WeberPermission extends PermissionPlugin{ protected boolean insertPermission(){ PluginPermissionService service = new PluginPermissionService(); SystemModule module = service.getOrCreateSystemModule( "AnalyzerResults", "WeberAnalyzer", "Results->Analyzer->WeberAnalyzer" ); - Role role = service.getSystemRole( "Results entry" ); + Role role = service.getSystemRole( "Results" ); return service.bindRoleToModule( role, module ); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 30bc178..d942918 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ openelisglobal 2.5.0.0 system - /home/caleb/eclipse-ee-workspace/OpenELIS-Projects/openelisglobal-plugins/lib/openelisglobal-2.5.0.0.jar + /home/runner/work/openelisglobal-plugins/openelisglobal-plugins/lib/openelisglobal-2.5.0.0.jar commons-validator