Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref: Split jicoco into -jetty, -mucclient and -health-checker. #213

Merged
merged 1 commit into from
Dec 11, 2024
Merged

ref: Split jicoco into -jetty, -mucclient and -health-checker. #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 jicoco/checkstyle.xml → jicoco-health-checker/checkstyle.xml
View file
Open in desktop
File renamed without changes.
119 changes: 119 additions & 0 deletions jicoco-health-checker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0"?>
<!--
~ Copyright @ 2018 - present 8x8, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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>

<parent>
<groupId>org.jitsi</groupId>
<artifactId>jicoco-parent</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>

<artifactId>jicoco-health-checker</artifactId>
<version>1.1-SNAPSHOT</version>
<name>jicoco-health-checker</name>
<description>Jitsi Common Components - Health Checker</description>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<!-- org.jitsi -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-utils</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<source>src/main/kotlin</source>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<source>src/test/kotlin</source>
<source>src/test/java</source>
</sourceDirs>
</configuration>
</execution>
</executions>
<configuration>
<jvmTarget>11</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<executions>
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<release>11</release>
<compilerArgs>
<arg>-Xlint:all,-serial</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</project>
0 .../kotlin/org/jitsi/health/HealthChecker.kt → .../kotlin/org/jitsi/health/HealthChecker.kt
View file
Open in desktop
File renamed without changes.
37 changes: 37 additions & 0 deletions jicoco-jetty/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="120"/>
<property name="ignorePattern" value="http://|https://"/>
</module>

<module name="TreeWalker">
<module name="LeftCurly">
<property name="option" value="nl"/>
<property name="tokens" value="LITERAL_CATCH"/>
<property name="tokens" value="LITERAL_ELSE"/>
<property name="tokens" value="LITERAL_FINALLY"/>
<property name="tokens" value="LITERAL_IF"/>
<property name="tokens" value="LITERAL_TRY"/>
</module>

<!-- Skips empty blocks {}, to not skip them: value="alone" -->
<module name="RightCurly">
<property name="option" value="alone_or_singleline"/>
</module>

<module name="WhitespaceAfter">
<!-- Drops TYPECAST from default tokens -->
<property name="tokens" value="COMMA , SEMI , LITERAL_IF , LITERAL_ELSE , LITERAL_WHILE , LITERAL_DO , LITERAL_FOR , DO_WHILE"/>
</module>
</module>

<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
</module>
31 changes: 8 additions & 23 deletions jicoco/pom.xml → jicoco-jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
<version>1.1-SNAPSHOT</version>
</parent>

<artifactId>jicoco</artifactId>
<artifactId>jicoco-jetty</artifactId>
<version>1.1-SNAPSHOT</version>
<name>jicoco</name>
<description>Jitsi Common Components</description>
<name>jicoco-jetty</name>
<description>Jitsi Common Components - Jetty Helpers and Wrappers</description>

<dependencies>
<dependency>
Expand Down Expand Up @@ -66,26 +66,6 @@
<artifactId>jcl-core</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-core</artifactId>
<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-extensions</artifactId>
<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-tcp</artifactId>
<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-xmlparser-stax</artifactId>
<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-http</artifactId>
Expand Down Expand Up @@ -132,6 +112,11 @@
<artifactId>jicoco-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jicoco-health-checker</artifactId>
<version>${project.version}</version>
</dependency>

<!-- test -->
<dependency>
Expand Down
0 .../java/org/jitsi/meet/ShutdownService.java → .../java/org/jitsi/meet/ShutdownService.java
View file
Open in desktop
File renamed without changes.
0 .../src/main/java/org/jitsi/rest/Health.java → .../src/main/java/org/jitsi/rest/Health.java
View file
Open in desktop
File renamed without changes.
0 ...src/main/java/org/jitsi/rest/Version.java → ...src/main/java/org/jitsi/rest/Version.java
View file
Open in desktop
File renamed without changes.
0 .../jitsi/rest/JettyBundleActivatorConfig.kt → .../jitsi/rest/JettyBundleActivatorConfig.kt
View file
Open in desktop
File renamed without changes.
0 ...ain/kotlin/org/jitsi/rest/JettyHelpers.kt → ...ain/kotlin/org/jitsi/rest/JettyHelpers.kt
View file
Open in desktop
File renamed without changes.
0 ...org/jitsi/shutdown/ShutdownServiceImpl.kt → ...org/jitsi/shutdown/ShutdownServiceImpl.kt
View file
Open in desktop
File renamed without changes.
0 .../test/java/org/jitsi/rest/HealthTest.java → .../test/java/org/jitsi/rest/HealthTest.java
View file
Open in desktop
File renamed without changes.
0 ...test/java/org/jitsi/rest/VersionTest.java → ...test/java/org/jitsi/rest/VersionTest.java
View file
Open in desktop
File renamed without changes.
0 ...jitsi/shutdown/ShutdownServiceImplTest.kt → ...jitsi/shutdown/ShutdownServiceImplTest.kt
View file
Open in desktop
File renamed without changes.
37 changes: 37 additions & 0 deletions jicoco-mucclient/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="120"/>
<property name="ignorePattern" value="http://|https://"/>
</module>

<module name="TreeWalker">
<module name="LeftCurly">
<property name="option" value="nl"/>
<property name="tokens" value="LITERAL_CATCH"/>
<property name="tokens" value="LITERAL_ELSE"/>
<property name="tokens" value="LITERAL_FINALLY"/>
<property name="tokens" value="LITERAL_IF"/>
<property name="tokens" value="LITERAL_TRY"/>
</module>

<!-- Skips empty blocks {}, to not skip them: value="alone" -->
<module name="RightCurly">
<property name="option" value="alone_or_singleline"/>
</module>

<module name="WhitespaceAfter">
<!-- Drops TYPECAST from default tokens -->
<property name="tokens" value="COMMA , SEMI , LITERAL_IF , LITERAL_ELSE , LITERAL_WHILE , LITERAL_DO , LITERAL_FOR , DO_WHILE"/>
</module>
</module>

<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
</module>
Loading
Loading