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
The following commit(s) were added to refs/heads/master by this push:
new 3857e6a3f site: javadoc generation is fixed
3857e6a3f is described below
commit 3857e6a3f35b18dff8096d57718929f9f8133d15
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Feb 14 10:50:28 2023 +0700
site: javadoc generation is fixed
---
openmeetings-db/pom.xml | 21 +++++++++++++++++++++
.../db/entity/server/RemoteSessionObject.java | 15 +--------------
.../service/calendar/caldav/IcalUtils.java | 1 -
.../service/room/InvitationManager.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 3 ---
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 4c6b73c66..c720b9980 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -106,6 +106,27 @@
</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>
+
<phase>generate-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
index 4c9df1181..9b8c00f32 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
@@ -43,20 +43,7 @@ public class RemoteSessionObject {
}
/**
- * @param username
- * - username
- * @param firstname
- * - first name
- * @param lastname
- * - last name
- * @param pictureUrl
- * - picture url
- * @param email
- * - email
- * @param externalId
- * - external user id
- * @param externalType
- * - external user type
+ * @param user - {@link ExternalUserDTO} object
*
* 06.09.2009 17:05:48 sebastianwagner
*/
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
index 0b8bfb807..950a9664f 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
@@ -316,7 +316,6 @@ public class IcalUtils {
* Note: Replace FastDateFormat to java.time, when shifting to Java 8
or higher.
*
* @param str Date representation in String.
- * @param patterns Patterns to parse the date against
* @param inTimeZone Timezone of the Date.
* @return <code>java.util.Date</code> representation of string or
* <code>null</code> if the Date could not be parsed.
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 3ff8edfdd..dfbc437c5 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -139,7 +139,7 @@ public class InvitationManager implements
IInvitationManager {
}
/**
- * @author vasya
+ * Setting invitation for the appointment, sending emails if needed
*
* @param a - appointment this link is related to
* @param member - attendee being processed
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 88047c6f2..bfec25a41 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -51,7 +51,6 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomFile;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.manager.IClientManager;
-import org.apache.openmeetings.db.manager.IWhiteboardManager;
import org.apache.openmeetings.db.mapper.RoomMapper;
import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.service.room.InvitationManager;
@@ -94,8 +93,6 @@ public class RoomWebService extends BaseWebService {
@Autowired
private IClientManager clientManager;
@Autowired
- private IWhiteboardManager wbManager;
- @Autowired
private InvitationDao inviteDao;
@Autowired
private InvitationManager inviteManager;
