Merge pull request #26 from mozzy11/develop

update build configurations and permisions
I-TECH-UW · Mar 27, 2024 · 9e607e1 · 9e607e1
2 parents d1e8b82 + a073e2d
commit 9e607e1
Show file tree

Hide file tree

Showing 36 changed files with 135 additions and 103 deletions.
diff --git a/.github/workflows/ci.yml 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
@@ -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
@@ -17,14 +17,13 @@
 	</properties>
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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 );
     }
 }
diff --git a/analyzers/CobasTaqMan48DBS/pom.xml b/analyzers/CobasTaqMan48DBS/pom.xml
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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 );
     }
 }
diff --git a/analyzers/FacsCantoII/pom.xml b/analyzers/FacsCantoII/pom.xml
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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 );
     }
 }
diff --git a/analyzers/FacsPresto/pom.xml b/analyzers/FacsPresto/pom.xml
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -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
@@ -17,14 +17,13 @@
 	</properties>
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -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
@@ -17,14 +17,13 @@
 	</properties>
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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
@@ -28,14 +28,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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 );
     }
 }
diff --git a/analyzers/Sysmex2000i/pom.xml b/analyzers/Sysmex2000i/pom.xml
@@ -18,14 +18,13 @@
 
 
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/filtered-resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>

diff --git 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 );
     }
 }