[openmeetings] branch master updated: [OPENMEETINGS-1866] some enums are annotated

[solomax]

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 8cb0412  [OPENMEETINGS-1866] some enums are annotated
8cb0412 is described below

commit 8cb041261979cbbbd377b3be6e70b8170fc54b1c
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Apr 6 21:54:44 2018 +0700

    [OPENMEETINGS-1866] some enums are annotated
---
 .../src/main/java/org/apache/openmeetings/db/entity/room/Room.java   | 2 ++
 .../src/main/java/org/apache/openmeetings/db/entity/user/User.java   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 9953c83..84c4bac 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -92,6 +92,7 @@ public class Room extends HistoricalEntity {
        public static final int PRESENTATION_TYPE_ID = 3;
        public static final int INTERVIEW_TYPE_ID = 4;
 
+       @XmlType(namespace="org.apache.openmeetings.room.right")
        public enum Right {
                superModerator
                , moderator
@@ -118,6 +119,7 @@ public class Room extends HistoricalEntity {
                , MicrophoneStatus
        }
 
+       @XmlType(namespace="org.apache.openmeetings.room.type")
        public enum Type {
                conference(CONFERENCE_TYPE_ID)
                , presentation(PRESENTATION_TYPE_ID)
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index fdb1895..f8a3073 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -109,7 +109,7 @@ public class User extends HistoricalEntity {
        public static final int SALUTATION_DR_ID = 4;
        public static final int SALUTATION_PROF_ID = 5;
 
-       @XmlType(namespace="org.apache.openmeetings.user.user.right")
+       @XmlType(namespace="org.apache.openmeetings.user.right")
        public enum Right {
                Admin                   // access to Admin module
                , GroupAdmin    // partial access to Admin module (should not 
be directly assigned)
@@ -119,7 +119,7 @@ public class User extends HistoricalEntity {
                , Soap                  // use rest/soap calls
        }
 
-       @XmlType(namespace="org.apache.openmeetings.user.user.type")
+       @XmlType(namespace="org.apache.openmeetings.user.type")
        public enum Type {
                user
                , ldap
@@ -127,6 +127,7 @@ public class User extends HistoricalEntity {
                , external
                , contact
        }
+       @XmlType(namespace="org.apache.openmeetings.user.salutation")
        public enum Salutation {
                mr(SALUTATION_MR_ID)
                , ms(SALUTATION_MS_ID)

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.