This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 55b97bec9c946e782c89667dd216736c97a60b40 Author: Maxim Solodovnik <[email protected]> AuthorDate: Fri Jun 6 09:52:59 2025 +0700 [OPENMEETINGS-2795] javadocs are generated as expected --- openmeetings-core/pom.xml | 24 ----------- openmeetings-db/pom.xml | 20 --------- openmeetings-mediaserver/pom.xml | 24 ----------- openmeetings-server/src/main/assembly/site.xml | 48 +++++++++++++++++----- .../{webservice => ws}/AbstractWebServiceTest.java | 2 +- .../{webservice => ws}/CreateTomcatExtension.java | 2 +- .../{webservice => ws}/TestCalendarService.java | 2 +- .../{webservice => ws}/TestErrorService.java | 2 +- .../{webservice => ws}/TestFileService.java | 2 +- .../{webservice => ws}/TestGroupService.java | 2 +- .../{webservice => ws}/TestInfoService.java | 2 +- .../{webservice => ws}/TestRecordingService.java | 2 +- .../{webservice => ws}/TestRoomService.java | 2 +- .../{webservice => ws}/TestUserService.java | 2 +- .../{webservice => ws}/TestWbService.java | 2 +- .../{webservice => ws}/TestWebConverters.java | 2 +- openmeetings-webservice/pom.xml | 20 --------- .../src/main/java/module-info.java | 2 + pom.xml | 4 ++ 19 files changed, 56 insertions(+), 110 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 860d5ad34..3fdc3fa85 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -32,30 +32,6 @@ <properties> <site.basedir>${project.parent.basedir}</site.basedir> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <configuration> - <groups> - <group> - <title>OM core components</title> - <packages>org.apache.openmeetings.core</packages> - </group> - </groups> - <skip>${site.skip}</skip> - </configuration> - <goals> - <goal>javadoc-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>jakarta.annotation</groupId> diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml index 5f1a51b48..478806e2c 100644 --- a/openmeetings-db/pom.xml +++ b/openmeetings-db/pom.xml @@ -114,26 +114,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <configuration> - <groups> - <group> - <title>DB DAO, DTO and Entity objects</title> - <packages>org.apache.openmeetings.db</packages> - </group> - </groups> - <skip>${site.skip}</skip> - </configuration> - <goals> - <goal>javadoc-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml index 0a79ec625..16855e2eb 100644 --- a/openmeetings-mediaserver/pom.xml +++ b/openmeetings-mediaserver/pom.xml @@ -50,28 +50,4 @@ <artifactId>kurento-client</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <configuration> - <groups> - <group> - <title>OM media components</title> - <packages>org.apache.openmeetings.mediaserver</packages> - </group> - </groups> - <skip>${site.skip}</skip> - </configuration> - <goals> - <goal>javadoc-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/openmeetings-server/src/main/assembly/site.xml b/openmeetings-server/src/main/assembly/site.xml index 036d8bdb7..8b2131e51 100644 --- a/openmeetings-server/src/main/assembly/site.xml +++ b/openmeetings-server/src/main/assembly/site.xml @@ -25,15 +25,21 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> + <!-- util --> <fileSet> - <directory>${project.parent.basedir}/openmeetings-core/target/site</directory> - <outputDirectory>openmeetings-core</outputDirectory> + <directory>${project.parent.basedir}/openmeetings-util/target/site</directory> + <outputDirectory>openmeetings-util</outputDirectory> <excludes> <exclude>javadoc.sh</exclude> <exclude>options</exclude> <exclude>packages</exclude> </excludes> </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-util/target/reports/apidocs</directory> + <outputDirectory>openmeetings-util/apidocs</outputDirectory> + </fileSet> + <!-- db --> <fileSet> <directory>${project.parent.basedir}/openmeetings-db/target/site</directory> <outputDirectory>openmeetings-db</outputDirectory> @@ -44,8 +50,13 @@ </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-install/target/site</directory> - <outputDirectory>openmeetings-install</outputDirectory> + <directory>${project.parent.basedir}/openmeetings-db/target/reports/apidocs</directory> + <outputDirectory>openmeetings-db/apidocs</outputDirectory> + </fileSet> + <!-- core --> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-core/target/site</directory> + <outputDirectory>openmeetings-core</outputDirectory> <excludes> <exclude>javadoc.sh</exclude> <exclude>options</exclude> @@ -53,14 +64,20 @@ </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-screenshare/target/site</directory> - <outputDirectory>openmeetings-screenshare</outputDirectory> + <directory>${project.parent.basedir}/openmeetings-core/target/reports/apidocs</directory> + <outputDirectory>openmeetings-core/apidocs</outputDirectory> + </fileSet> + <!-- install --> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-install/target/site</directory> + <outputDirectory>openmeetings-install</outputDirectory> <excludes> <exclude>javadoc.sh</exclude> <exclude>options</exclude> <exclude>packages</exclude> </excludes> </fileSet> + <!-- service --> <fileSet> <directory>${project.parent.basedir}/openmeetings-service/target/site</directory> <outputDirectory>openmeetings-service</outputDirectory> @@ -71,14 +88,24 @@ </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-util/target/site</directory> - <outputDirectory>openmeetings-util</outputDirectory> + <directory>${project.parent.basedir}/openmeetings-db/target/reports/apidocs</directory> + <outputDirectory>openmeetings-db/apidocs</outputDirectory> + </fileSet> + <!-- webservice --> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-service/target/site</directory> + <outputDirectory>openmeetings-service</outputDirectory> <excludes> <exclude>javadoc.sh</exclude> <exclude>options</exclude> <exclude>packages</exclude> </excludes> </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-webservice/target/reports/apidocs</directory> + <outputDirectory>openmeetings-webservice/apidocs</outputDirectory> + </fileSet> + <!-- web --> <fileSet> <directory>${project.parent.basedir}/openmeetings-web/target/site</directory> <outputDirectory>openmeetings-web</outputDirectory> @@ -88,9 +115,10 @@ <exclude>packages</exclude> </excludes> </fileSet> + <!-- screenshare --> <fileSet> - <directory>${project.parent.basedir}/openmeetings-webservice/target/site</directory> - <outputDirectory>openmeetings-webservice</outputDirectory> + <directory>${project.parent.basedir}/openmeetings-screenshare/target/site</directory> + <outputDirectory>openmeetings-screenshare</outputDirectory> <excludes> <exclude>javadoc.sh</exclude> <exclude>options</exclude> diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java similarity index 99% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java index 802c7a58b..df4f6c595 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.web.AbstractOmServerTest.createPass; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/CreateTomcatExtension.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/CreateTomcatExtension.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/CreateTomcatExtension.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/CreateTomcatExtension.java index b327dd57c..ad76962d3 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/CreateTomcatExtension.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/CreateTomcatExtension.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.util.OmFileHelper.getOmHome; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java similarity index 99% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java index 2fd15d9ee..aee03be5c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.web.AbstractOmServerTest.ONE_HOUR; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java index 956e56e0c..7927a887b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.web.AbstractOmServerTest.rnd; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java index d926eacf5..0b4300ad9 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.UUID.randomUUID; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java similarity index 99% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java index 6df7df769..337557e26 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static org.apache.openmeetings.web.AbstractOmServerTest.adminUsername; import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestInfoService.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestInfoService.java index d471cb959..91d454251 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestInfoService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRecordingService.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRecordingService.java index 421b8d8e8..96d3f171a 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRecordingService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.web.AbstractOmServerTest.getUser; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRoomService.java similarity index 99% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRoomService.java index 2e56b5b7b..b6f7bb85a 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestRoomService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java similarity index 99% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java index 433920b11..0cffd87c1 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWbService.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWbService.java index fc38c0235..76d494095 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWbService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java similarity index 98% rename from openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java rename to openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java index 76173860a..19cbe7964 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.webservice; +package org.apache.openmeetings.ws; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml index 0cd76468d..21d758adf 100644 --- a/openmeetings-webservice/pom.xml +++ b/openmeetings-webservice/pom.xml @@ -34,26 +34,6 @@ </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <configuration> - <groups> - <group> - <title>Available WebServices</title> - <packages>org.apache.openmeetings.webservice</packages> - </group> - </groups> - <skip>${site.skip}</skip> - </configuration> - <goals> - <goal>javadoc-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>io.openapitools.swagger</groupId> <artifactId>swagger-maven-plugin</artifactId> diff --git a/openmeetings-webservice/src/main/java/module-info.java b/openmeetings-webservice/src/main/java/module-info.java index 246465751..b81c03e37 100644 --- a/openmeetings-webservice/src/main/java/module-info.java +++ b/openmeetings-webservice/src/main/java/module-info.java @@ -18,6 +18,8 @@ */ module org.apache.openmeetings.webservice { + exports org.apache.openmeetings.webservice; + exports org.apache.openmeetings.webservice.error; exports org.apache.openmeetings.webservice.util; requires org.apache.openmeetings.core; diff --git a/pom.xml b/pom.xml index faf3bf26d..344cb83e1 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ <wicket.configuration>DEPLOYMENT</wicket.configuration> <om.quick.build>false</om.quick.build> <om.notquick.build>true</om.notquick.build> + <site.skip>false</site.skip> <logback.console></logback.console> <db>h2</db> <jdk.version>17</jdk.version> @@ -1298,6 +1299,9 @@ <notimestamp>true</notimestamp> <links> <link>https://openmeetings.apache.org/openmeetings-db/apidocs/</link> + <link>https://docs.spring.io/spring-framework/docs/current/javadoc-api/</link> + <link>https://jakartaee.github.io/rest/apidocs/3.0.0/</link> + <link>https://cxf.apache.org/javadoc/latest-4.0.x/</link> </links> </configuration> </plugin>
