Skip to content

Commit 57913c0

Browse files
bgrozevbgrozev
authored
ref: Split jicoco into -jetty, -mucclient and -health-checker. (#213)
1 parent 9a9091d commit 57913c0

File tree

32 files changed

+430
-324
lines changed

32 files changed

+430
-324
lines changed

‎jicoco/checkstyle.xml renamed to ‎jicoco-health-checker/checkstyle.xml

File renamed without changes.

‎jicoco-health-checker/pom.xml

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
~ Copyright @ 2018 - present 8x8, Inc.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>org.jitsi</groupId>
25+
<artifactId>jicoco-parent</artifactId>
26+
<version>1.1-SNAPSHOT</version>
27+
</parent>
28+
29+
<artifactId>jicoco-health-checker</artifactId>
30+
<version>1.1-SNAPSHOT</version>
31+
<name>jicoco-health-checker</name>
32+
<description>Jitsi Common Components - Health Checker</description>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.jetbrains.kotlin</groupId>
37+
<artifactId>kotlin-stdlib-jdk8</artifactId>
38+
</dependency>
39+
<!-- org.jitsi -->
40+
<dependency>
41+
<groupId>${project.groupId}</groupId>
42+
<artifactId>jitsi-utils</artifactId>
43+
</dependency>
44+
</dependencies>
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.jetbrains.kotlin</groupId>
49+
<artifactId>kotlin-maven-plugin</artifactId>
50+
<version>${kotlin.version}</version>
51+
<executions>
52+
<execution>
53+
<id>compile</id>
54+
<phase>compile</phase>
55+
<goals>
56+
<goal>compile</goal>
57+
</goals>
58+
<configuration>
59+
<sourceDirs>
60+
<source>src/main/kotlin</source>
61+
</sourceDirs>
62+
</configuration>
63+
</execution>
64+
<execution>
65+
<id>test-compile</id>
66+
<phase>test-compile</phase>
67+
<goals>
68+
<goal>test-compile</goal>
69+
</goals>
70+
<configuration>
71+
<sourceDirs>
72+
<source>src/test/kotlin</source>
73+
<source>src/test/java</source>
74+
</sourceDirs>
75+
</configuration>
76+
</execution>
77+
</executions>
78+
<configuration>
79+
<jvmTarget>11</jvmTarget>
80+
</configuration>
81+
</plugin>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-compiler-plugin</artifactId>
85+
<version>3.10.1</version>
86+
<executions>
87+
<execution>
88+
<id>default-compile</id>
89+
<phase>none</phase>
90+
</execution>
91+
<execution>
92+
<id>default-testCompile</id>
93+
<phase>none</phase>
94+
</execution>
95+
<execution>
96+
<id>java-compile</id>
97+
<phase>compile</phase>
98+
<goals>
99+
<goal>compile</goal>
100+
</goals>
101+
</execution>
102+
<execution>
103+
<id>java-test-compile</id>
104+
<phase>test-compile</phase>
105+
<goals>
106+
<goal>testCompile</goal>
107+
</goals>
108+
</execution>
109+
</executions>
110+
<configuration>
111+
<release>11</release>
112+
<compilerArgs>
113+
<arg>-Xlint:all,-serial</arg>
114+
</compilerArgs>
115+
</configuration>
116+
</plugin>
117+
</plugins>
118+
</build>
119+
</project>

‎jicoco/src/main/kotlin/org/jitsi/health/HealthChecker.kt renamed to ‎jicoco-health-checker/src/main/kotlin/org/jitsi/health/HealthChecker.kt

File renamed without changes.

‎jicoco-jetty/checkstyle.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
5+
6+
<module name="Checker">
7+
<module name="LineLength">
8+
<property name="fileExtensions" value="java"/>
9+
<property name="max" value="120"/>
10+
<property name="ignorePattern" value="http://|https://"/>
11+
</module>
12+
13+
<module name="TreeWalker">
14+
<module name="LeftCurly">
15+
<property name="option" value="nl"/>
16+
<property name="tokens" value="LITERAL_CATCH"/>
17+
<property name="tokens" value="LITERAL_ELSE"/>
18+
<property name="tokens" value="LITERAL_FINALLY"/>
19+
<property name="tokens" value="LITERAL_IF"/>
20+
<property name="tokens" value="LITERAL_TRY"/>
21+
</module>
22+
23+
<!-- Skips empty blocks {}, to not skip them: value="alone" -->
24+
<module name="RightCurly">
25+
<property name="option" value="alone_or_singleline"/>
26+
</module>
27+
28+
<module name="WhitespaceAfter">
29+
<!-- Drops TYPECAST from default tokens -->
30+
<property name="tokens" value="COMMA , SEMI , LITERAL_IF , LITERAL_ELSE , LITERAL_WHILE , LITERAL_DO , LITERAL_FOR , DO_WHILE"/>
31+
</module>
32+
</module>
33+
34+
<module name="FileTabCharacter">
35+
<property name="eachLine" value="true"/>
36+
</module>
37+
</module>

‎jicoco/pom.xml renamed to ‎jicoco-jetty/pom.xml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<version>1.1-SNAPSHOT</version>
2727
</parent>
2828

29-
<artifactId>jicoco</artifactId>
29+
<artifactId>jicoco-jetty</artifactId>
3030
<version>1.1-SNAPSHOT</version>
31-
<name>jicoco</name>
32-
<description>Jitsi Common Components</description>
31+
<name>jicoco-jetty</name>
32+
<description>Jitsi Common Components - Jetty Helpers and Wrappers</description>
3333

3434
<dependencies>
3535
<dependency>
@@ -66,26 +66,6 @@
6666
<artifactId>jcl-core</artifactId>
6767
<version>2.8</version>
6868
</dependency>
69-
<dependency>
70-
<groupId>org.igniterealtime.smack</groupId>
71-
<artifactId>smack-core</artifactId>
72-
<version>${smack.version}</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.igniterealtime.smack</groupId>
76-
<artifactId>smack-extensions</artifactId>
77-
<version>${smack.version}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.igniterealtime.smack</groupId>
81-
<artifactId>smack-tcp</artifactId>
82-
<version>${smack.version}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.igniterealtime.smack</groupId>
86-
<artifactId>smack-xmlparser-stax</artifactId>
87-
<version>${smack.version}</version>
88-
</dependency>
8969
<dependency>
9070
<groupId>org.glassfish.jersey.containers</groupId>
9171
<artifactId>jersey-container-jetty-http</artifactId>
@@ -132,6 +112,11 @@
132112
<artifactId>jicoco-config</artifactId>
133113
<version>${project.version}</version>
134114
</dependency>
115+
<dependency>
116+
<groupId>${project.groupId}</groupId>
117+
<artifactId>jicoco-health-checker</artifactId>
118+
<version>${project.version}</version>
119+
</dependency>
135120

136121
<!-- test -->
137122
<dependency>

‎jicoco/src/main/java/org/jitsi/meet/ShutdownService.java renamed to ‎jicoco-jetty/src/main/java/org/jitsi/meet/ShutdownService.java

File renamed without changes.

‎jicoco/src/main/java/org/jitsi/rest/Health.java renamed to ‎jicoco-jetty/src/main/java/org/jitsi/rest/Health.java

File renamed without changes.

‎jicoco/src/main/java/org/jitsi/rest/Version.java renamed to ‎jicoco-jetty/src/main/java/org/jitsi/rest/Version.java

File renamed without changes.

‎jicoco/src/main/kotlin/org/jitsi/rest/JettyBundleActivatorConfig.kt renamed to ‎jicoco-jetty/src/main/kotlin/org/jitsi/rest/JettyBundleActivatorConfig.kt

File renamed without changes.

‎jicoco/src/main/kotlin/org/jitsi/rest/JettyHelpers.kt renamed to ‎jicoco-jetty/src/main/kotlin/org/jitsi/rest/JettyHelpers.kt

File renamed without changes.

0 commit comments

Comments
 (0)