Skip to content

Commit

Permalink
Merge pull request #25 from CalebSLane/develop
Browse files Browse the repository at this point in the history
work on 2 sysmex analyzer plugins
  • Loading branch information
CalebSLane authored Mar 25, 2024
2 parents b5c1772 + d26ffde commit d1e8b82
Show file tree
Hide file tree
Showing 31 changed files with 1,555 additions and 91 deletions.
11 changes: 6 additions & 5 deletions analyzers/CobasC111/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/CobasIntegra400/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/CobasTaqMan48DBS/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/FacsCalibur/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/FacsCantoII/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/FacsPresto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/Fully/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/GeneXpert/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/GeneXpertFile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/Mindray/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/QuantStudio3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/SysmeXT/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
11 changes: 6 additions & 5 deletions analyzers/Sysmex2000i/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@


<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
Expand Down
89 changes: 89 additions & 0 deletions analyzers/SysmexXN-L/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openelisglobal.plugins</groupId>
<artifactId>SysmexXNLAnalyzer</artifactId>
<parent>
<groupId>org.openelisglobal</groupId>
<artifactId>openelisglobal-plugins</artifactId>
<version>1.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<version>0.3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hapi.version>2.3</hapi.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframework.version}</version>
</dependency>
</dependencies>

<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<id>copy-resources</id>
<!-- here the phase you need -->
<phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/../../plugins</outputDirectory>
<resources>
<resource>
<!-- Get main artifact -->
<directory>target/</directory>
<includes>
<include>${project.build.finalName}.jar</include>
</includes>
<!-- Don't filter binary files -->
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit d1e8b82

Please sign in to comment.