Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .github/workflows/maven-multi-os.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Compile, Validate and Package BKP-LHC-Client on Multiple OS

on:
push:
branches: [ main ]
pull_request:

jobs:
compile:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
steps:
- name: Checkout code
uses: actions/checkout@v5
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
- name: Compile with Maven
run: |
if [[ "${{ runner.os }}" == "Linux" ]]; then
mvn clean compile -Dos.version=linux-x86_64
elif [[ "${{ runner.os }}" == "macOS" ]]; then
mvn clean compile -Dos.version=osx-x86_64
fi
- name: Validate Maven Project
run: |
if [[ "${{ runner.os }}" == "Linux" ]]; then
mvn validate -Dos.version=linux-x86_64
elif [[ "${{ runner.os }}" == "macOS" ]]; then
mvn validate -Dos.version=osx-x86_64
fi
- name: Package with Maven (Fat JAR)
run: |
if [[ "${{ runner.os }}" == "Linux" ]]; then
mvn clean package -Dos.version=linux-x86_64
elif [[ "${{ runner.os }}" == "macOS" ]]; then
mvn clean package -Dos.version=osx-x86_64
fi
24 changes: 17 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
bin
AliDip2BK.jar
.idea
STATE
AliDip2BK.iml
RunsHistory
out/
## Maven build output
target/

## IDE files
.idea/
.vscode/
*.iml
.classpath
.project
.settings/

## OS files
.DS_Store
Thumbs.db

## Protobuf generated sources (if not needed in VCS)
bin
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
# AliDip2BK
# BKP-LHC-Client

Initial Repository based on work from @iclegrand in repository: https://github.com/iclegrand/AliDip2BK
Repository based on work from @iclegrand in repository: https://github.com/iclegrand/AliDip2BK

Collect selected Info from the CERN DIP system (LHC & ALICE -DCS) and publish them into the Bookkeeping/InfoLogger systems

A detailed description for this project is provided by Roberto in this document:
Projects consumes selected messages from the CERN DIP system (LHC & ALICE -DCS) and publishes them into the O2 systems. A detailed description for this project is provided by Roberto in this document:
https://codimd.web.cern.ch/G0TSXqA1R8iPqWw2w2wuew

### Requirements
- This program requires java 11 on a 64 bit system (this is a constrain from the DIP library)
- maven

This program requires java 11 on a 64 bit system
(this is a constrain from the DIP library)

To test the java version run
java -version

The run configuration is defined in the AliDip2BK.properties file.

To run the program :

sh runAliDip2BK.sh

When the the program is stopped, it enters into the shutdown mode and it will
unsubscribe to the DIP data providers will wait to process the DipData queue
and saves the state of the fills and runs.
### Maven Commands for dev,tst,deployments
```bash
mvn <clean> compile -Dos.version={os_version}
mvn <clean> package -Dos.version={os_version}
```

E.g. os_version `macosx-x86_64`
27 changes: 0 additions & 27 deletions build.xml

This file was deleted.

Binary file removed lib/kafka-clients-3.1.0.jar
Binary file not shown.
Binary file removed lib/protobuf-java-3.20.0.jar
Binary file not shown.
Binary file removed lib/slf4j-api-1.7.30.jar
Binary file not shown.
Binary file removed lib/slf4j-simple-1.7.30.jar
Binary file not shown.
Binary file removed lib64/PlatformDependent.a
Binary file not shown.
Binary file removed lib64/PlatformDependent.lib
Binary file not shown.
Binary file removed lib64/dip-jni.nar
Binary file not shown.
Binary file removed lib64/dip.dll
Binary file not shown.
Binary file removed lib64/dip.lib
Binary file not shown.
Binary file removed lib64/jDIP.dll
Binary file not shown.
Binary file removed lib64/jDIP.lib
Binary file not shown.
Binary file removed lib64/jdim.dll
Binary file not shown.
Binary file removed lib64/jdim.lib
Binary file not shown.
Binary file removed lib64/libdip.so
Binary file not shown.
Binary file removed lib64/libjDIP.so
Binary file not shown.
Binary file removed lib64/libjdim.so
Binary file not shown.
Binary file removed lib64/liblog4cplus.so
Binary file not shown.
Binary file removed lib64/libplatform-dependent-6.1.a
Binary file not shown.
Binary file removed lib64/libplatform-dependent.a
Binary file not shown.
Binary file removed lib64/log4cplus.dll
Binary file not shown.
Binary file removed lib64/log4cplus.lib
Binary file not shown.
Binary file removed lib64/platform-dependent-6.1.lib
Binary file not shown.
Binary file removed lib64/platform-dependent.lib
Binary file not shown.
120 changes: 120 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<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>ch.cern.alice.o2</groupId>
<artifactId>bkp-lhc-client</artifactId>
<version>3.0.0</version>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os.version>linux-x86_64</os.version>
<cern.dip.version>5.7.0</cern.dip.version>
<protobuf.version>4.29.3</protobuf.version>
<kafka.version>3.1.0</kafka.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<slf4j-simple.version>1.7.30</slf4j-simple.version>
</properties>

<dependencies>
<dependency>
<groupId>cern.dip</groupId>
<artifactId>dip</artifactId>
<version>${cern.dip.version}</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cern_dip.jar</systemPath>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j-simple.version}</version>
</dependency>
</dependencies>

<build>
<finalName>o2-bkp-lhc-client-v${project.version}</finalName>
<plugins>
<!-- Protobuf Maven\ Plugin for code generation -->
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.version}</protocArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Compiler plugin -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<!-- Maven JAR Plugin to generate JAR file -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<!-- Maven JAR Plugin to generate UBER JAR file -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>alice.dip.AliDip2BK</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
4 changes: 0 additions & 4 deletions runAliDip2BK.sh

This file was deleted.

Loading
Loading