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 80fe7c4 [OPENMEETINGS-2177] build should be fixed
80fe7c4 is described below
commit 80fe7c4dff886ba2a7d5f83628dc9eae22c689b8
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Mar 5 21:29:11 2020 +0700
[OPENMEETINGS-2177] build should be fixed
---
.../bind/adapter/AppointmentReminderAdapter.java | 4 +-
.../db/bind/adapter/BooleanAdapter.java | 5 +-
.../openmeetings/db/bind/adapter/CDATAAdapter.java | 36 --------------
.../db/bind/adapter/ConfigTypeAdapter.java | 5 +-
.../openmeetings/db/bind/adapter/DateAdapter.java | 5 +-
.../db/bind/adapter/EntityAdapter.java | 4 +-
.../db/bind/adapter/FileTypeAdapter.java | 5 +-
.../openmeetings/db/bind/adapter/IntAdapter.java | 4 +-
.../db/bind/adapter/LocalDateAdapter.java | 5 +-
.../openmeetings/db/bind/adapter/LongAdapter.java | 4 +-
.../db/bind/adapter/PollTypeAdapter.java | 4 +-
.../db/bind/adapter/RecordingStatusAdapter.java | 8 +---
.../db/bind/adapter/RoomElementAdapter.java | 5 +-
.../db/bind/adapter/RoomTypeAdapter.java | 4 +-
.../db/bind/adapter/SalutationAdapter.java | 4 +-
.../db/bind/adapter/UserRightAdapter.java | 5 +-
.../db/bind/adapter/UserTypeAdapter.java | 5 +-
.../openmeetings/db/entity/basic/ChatMessage.java | 3 --
.../db/entity/basic/Configuration.java | 5 --
.../db/entity/calendar/Appointment.java | 8 ----
.../db/entity/calendar/MeetingMember.java | 2 -
.../db/entity/calendar/OmCalendar.java | 4 --
.../openmeetings/db/entity/file/BaseFileItem.java | 4 --
.../openmeetings/db/entity/file/FileItem.java | 2 -
.../openmeetings/db/entity/record/Recording.java | 3 --
.../db/entity/record/RecordingChunk.java | 3 --
.../apache/openmeetings/db/entity/room/Room.java | 8 ----
.../openmeetings/db/entity/room/RoomPoll.java | 3 --
.../openmeetings/db/entity/server/LdapConfig.java | 5 --
.../openmeetings/db/entity/server/OAuthServer.java | 9 ----
.../db/entity/server/RemoteSessionObject.java | 4 +-
.../openmeetings/db/entity/user/Address.java | 11 -----
.../db/entity/user/AsteriskSipUser.java | 14 ------
.../apache/openmeetings/db/entity/user/Group.java | 3 --
.../db/entity/user/PrivateMessage.java | 3 --
.../db/entity/user/PrivateMessageFolder.java | 2 -
.../apache/openmeetings/db/entity/user/User.java | 14 ------
.../apache/openmeetings/backup/BackupExport.java | 56 ++++++++++------------
38 files changed, 44 insertions(+), 234 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/AppointmentReminderAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/AppointmentReminderAdapter.java
index e573cf4..c6af037 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/AppointmentReminderAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/AppointmentReminderAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -31,7 +29,7 @@ public class AppointmentReminderAdapter extends
XmlAdapter<String, Appointment.R
@Override
public String marshal(Appointment.Reminder v) throws Exception {
- return CDATA_BEGIN + v.getId() + CDATA_END;
+ return "" + v.getId();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/BooleanAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/BooleanAdapter.java
index 29f0748..8b12587 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/BooleanAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/BooleanAdapter.java
@@ -18,16 +18,13 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import javax.xml.bind.annotation.adapters.XmlAdapter;
public class BooleanAdapter extends XmlAdapter<String, Boolean> {
@Override
public String marshal(Boolean v) throws Exception {
- return CDATA_BEGIN + Boolean.TRUE.equals(v) + CDATA_END;
+ return "" + Boolean.TRUE.equals(v);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/CDATAAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/CDATAAdapter.java
deleted file mode 100644
index 63f6437..0000000
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/CDATAAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-package org.apache.openmeetings.db.bind.adapter;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class CDATAAdapter extends XmlAdapter<String, String> {
- static final String CDATA_BEGIN = "<![CDATA[";
- static final String CDATA_END = "]]>";
-
- @Override
- public String marshal(String v) throws Exception {
- return CDATA_BEGIN + v + CDATA_END;
- }
-
- @Override
- public String unmarshal(String v) throws Exception {
- return v;
- }
-}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/ConfigTypeAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/ConfigTypeAdapter.java
index cb1273f..f85379a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/ConfigTypeAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/ConfigTypeAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -32,7 +29,7 @@ public class ConfigTypeAdapter extends XmlAdapter<String,
Configuration.Type> {
@Override
public String marshal(Configuration.Type v) throws Exception {
- return CDATA_BEGIN + v.name().toUpperCase(Locale.ROOT) +
CDATA_END;
+ return v.name().toUpperCase(Locale.ROOT);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/DateAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/DateAdapter.java
index 3b4145f..c681c92 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/DateAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/DateAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Date;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -29,7 +26,7 @@ public class DateAdapter extends XmlAdapter<String, Date> {
@Override
public String marshal(Date v) throws Exception {
- return CDATA_BEGIN + v.getTime() + CDATA_END;
+ return "" + v.getTime();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java
index 7c3bc1c..916d257 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toLong;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import java.util.Map;
@@ -44,7 +42,7 @@ public abstract class EntityAdapter<E extends
IDataProviderEntity> extends XmlAd
@Override
public String marshal(E v) throws Exception {
- return CDATA_BEGIN + v.getId() + CDATA_END;
+ return "" + v.getId();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/FileTypeAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/FileTypeAdapter.java
index 315e543..7f3c59a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/FileTypeAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/FileTypeAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -32,7 +29,7 @@ public class FileTypeAdapter extends XmlAdapter<String,
BaseFileItem.Type> {
@Override
public String marshal(BaseFileItem.Type v) throws Exception {
- return CDATA_BEGIN + v.name().toUpperCase(Locale.ROOT) +
CDATA_END;
+ return v.name().toUpperCase(Locale.ROOT);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/IntAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/IntAdapter.java
index 9c714f4..ae3b505 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/IntAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/IntAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -28,7 +26,7 @@ public class IntAdapter extends XmlAdapter<String, Integer> {
@Override
public String marshal(Integer v) throws Exception {
- return CDATA_BEGIN + (v == null ? "0" : v.toString()) +
CDATA_END;
+ return (v == null ? "0" : v.toString());
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LocalDateAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LocalDateAdapter.java
index 0ecb087..0d3a3a8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LocalDateAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LocalDateAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneOffset;
@@ -34,7 +31,7 @@ public class LocalDateAdapter extends XmlAdapter<String,
LocalDate> {
@Override
public String marshal(LocalDate v) throws Exception {
- return CDATA_BEGIN +
v.format(DateTimeFormatter.ofPattern(CalendarPatterns.ISO8601_DATE_FORMAT_STRING))
+ CDATA_END;
+ return
v.format(DateTimeFormatter.ofPattern(CalendarPatterns.ISO8601_DATE_FORMAT_STRING));
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LongAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LongAdapter.java
index 2f035ff..77c3a4f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LongAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/LongAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toLong;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -28,7 +26,7 @@ public class LongAdapter extends XmlAdapter<String, Long> {
@Override
public String marshal(Long v) throws Exception {
- return CDATA_BEGIN + (v == null ? "0" : v.toString()) +
CDATA_END;
+ return (v == null ? "0" : v.toString());
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/PollTypeAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/PollTypeAdapter.java
index bb15c13..91bffab 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/PollTypeAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/PollTypeAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -30,7 +28,7 @@ public class PollTypeAdapter extends XmlAdapter<String,
RoomPoll.Type> {
@Override
public String marshal(RoomPoll.Type v) throws Exception {
- return CDATA_BEGIN + v.getId() + CDATA_END;
+ return "" + v.getId();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RecordingStatusAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RecordingStatusAdapter.java
index 48ebd92..0934dea 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RecordingStatusAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RecordingStatusAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -31,10 +28,9 @@ public class RecordingStatusAdapter extends
XmlAdapter<String, Recording.Status>
@Override
public String marshal(Recording.Status v) throws Exception {
- return CDATA_BEGIN + (v == null
+ return "" + (v == null
? Recording.Status.NONE.name()
- : v.name())
- + CDATA_END;
+ : v.name());
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomElementAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomElementAdapter.java
index aec4f01..21cb13f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomElementAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomElementAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -32,7 +29,7 @@ public class RoomElementAdapter extends XmlAdapter<String,
Room.RoomElement> {
@Override
public String marshal(Room.RoomElement v) throws Exception {
- return CDATA_BEGIN + v.name().toUpperCase(Locale.ROOT) +
CDATA_END;
+ return v.name().toUpperCase(Locale.ROOT);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomTypeAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomTypeAdapter.java
index f37cbd4..8bb266f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomTypeAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/RoomTypeAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -31,7 +29,7 @@ public class RoomTypeAdapter extends XmlAdapter<String,
Room.Type> {
@Override
public String marshal(Room.Type v) throws Exception {
- return CDATA_BEGIN + v.getId() + CDATA_END;
+ return "" + v.getId();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/SalutationAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/SalutationAdapter.java
index a90cfc0..1d5ab51 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/SalutationAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/SalutationAdapter.java
@@ -19,8 +19,6 @@
package org.apache.openmeetings.db.bind.adapter;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -30,7 +28,7 @@ public class SalutationAdapter extends XmlAdapter<String,
Salutation> {
@Override
public String marshal(Salutation v) throws Exception {
- return CDATA_BEGIN + v.getId() + CDATA_END;
+ return "" + v.getId();
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserRightAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserRightAdapter.java
index 0091578..fdaf3dd 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserRightAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserRightAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -32,7 +29,7 @@ public class UserRightAdapter extends XmlAdapter<String,
User.Right> {
@Override
public String marshal(User.Right v) throws Exception {
- return CDATA_BEGIN + v.name().toUpperCase(Locale.ROOT) +
CDATA_END;
+ return v.name().toUpperCase(Locale.ROOT);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserTypeAdapter.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserTypeAdapter.java
index 838204e..bbb0256 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserTypeAdapter.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/UserTypeAdapter.java
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.db.bind.adapter;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_BEGIN;
-import static org.apache.openmeetings.db.bind.adapter.CDATAAdapter.CDATA_END;
-
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -32,7 +29,7 @@ public class UserTypeAdapter extends XmlAdapter<String,
User.Type> {
@Override
public String marshal(User.Type v) throws Exception {
- return CDATA_BEGIN + v.name().toUpperCase(Locale.ROOT) +
CDATA_END;
+ return v.name().toUpperCase(Locale.ROOT);
}
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
index 7a20d0b..13512f9 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
@@ -42,7 +42,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.RoomAdapter;
@@ -112,7 +111,6 @@ public class ChatMessage implements IDataProviderEntity {
@Column(name = "message")
@Lob
@XmlElement(name = "message", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String message;
@Column(name = "sent")
@@ -127,7 +125,6 @@ public class ChatMessage implements IDataProviderEntity {
@Column(name = "from_name")
@XmlElement(name = "from_name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String fromName; // this is required for users with no
first/last name specified
@Column(name = "status")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index 360c5e8..c272283 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -40,7 +40,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.ConfigTypeAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.UserAdapter;
@@ -84,23 +83,19 @@ public class Configuration extends HistoricalEntity {
@Column(name = "om_key", unique = true)
@XmlElement(name = "key", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String key;
@Column(name = "value")
@XmlElement(name = "value", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String value;
@Lob
@Column(name = "comment", length = 2048)
@XmlElement(name = "comment", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String comment;
@Column(name = "fromVersion")
@XmlElement(name = "fromVersion", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String fromVersion;
@ManyToOne(fetch = FetchType.LAZY)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
index 7a0fe50..37d8dd0 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
@@ -49,7 +49,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.AppointmentReminderAdapter;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.OmCalendarAdapter;
@@ -184,12 +183,10 @@ public class Appointment extends HistoricalEntity {
@Column(name = "title")
@XmlElement(name = "appointmentName", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String title;
@Column(name = "location")
@XmlElement(name = "appointmentLocation", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String location;
@Column(name = "app_start") // Oracle fails in case 'start' is used as
column name
@@ -205,7 +202,6 @@ public class Appointment extends HistoricalEntity {
@Lob
@Column(name = "description", length = 2048)
@XmlElement(name = "appointmentDescription", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String description;
@ManyToOne(fetch = FetchType.EAGER)
@@ -250,7 +246,6 @@ public class Appointment extends HistoricalEntity {
@Column(name = "icalId")
@XmlElement(name = "icalId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String icalId;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL,
orphanRemoval = true)
@@ -270,7 +265,6 @@ public class Appointment extends HistoricalEntity {
@Column(name = "password")
@XmlElement(name = "icalId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String password;
@Column(name = "is_connected_event", nullable = false)
@@ -292,12 +286,10 @@ public class Appointment extends HistoricalEntity {
@Column(name = "href")
@XmlElement(name = "href", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String href;
@Column(name = "etag")
@XmlElement(name = "etag", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String etag;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
index b01c919..3185fa3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
@@ -39,7 +39,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.AppointmentAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.UserAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@@ -79,7 +78,6 @@ public class MeetingMember extends HistoricalEntity {
@Column(name = "appointment_status")
@XmlElement(name = "appointmentStatus", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String appointmentStatus; // status of the appointment denial,
acceptance, wait.
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
index 95fbe59..f4ef19b 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
@@ -37,7 +37,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.UserAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@@ -79,19 +78,16 @@ public class OmCalendar extends HistoricalEntity {
@Column(name = "title")
@XmlElement(name = "title", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String title;
// Can Also act as the Google Calendar ID for Google Calendars
@Column(name = "href")
@XmlElement(name = "href", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String href;
// Can also act as the Google API Key for Google Calendars. Note, not
always needed.
@Column(name = "sync_token")
@XmlElement(name = "token", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String token;
@Column(name = "sync_type")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
index 68b458b..b07bd38 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
@@ -54,7 +54,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.FileTypeAdapter;
import org.apache.openmeetings.db.bind.adapter.IntAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
@@ -100,12 +99,10 @@ public abstract class BaseFileItem extends
HistoricalEntity {
@Column(name = "name")
@XmlElement(name = "fileName", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Column(name = "hash")
@XmlElement(name = "fileHash", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String hash;
@Column(name = "parent_item_id")
@@ -158,7 +155,6 @@ public abstract class BaseFileItem extends HistoricalEntity
{
@Column(name = "external_type")
@XmlElement(name = "externalType", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String externalType;
// Not Mapped
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 50b1125..46fd0fd 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
@Entity
@@ -59,7 +58,6 @@ public class FileItem extends BaseFileItem {
@Column(name = "external_id")
@XmlElement(name = "externalId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String externalId;
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
index 3e56a15..f5cc2fc 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
@@ -45,7 +45,6 @@ import org.apache.openjpa.persistence.FetchAttribute;
import org.apache.openjpa.persistence.FetchGroup;
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.RecordingStatusAdapter;
@@ -113,7 +112,6 @@ public class Recording extends BaseFileItem {
@Column(name = "comment")
@XmlElement(name = "comment", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String comment;
@Column(name = "record_start")
@@ -128,7 +126,6 @@ public class Recording extends BaseFileItem {
@Column(name = "duration")
@XmlElement(name = "duration", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String duration;
@Column(name = "is_interview")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
index b22f150..566ebfd 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
@@ -39,7 +39,6 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@@ -103,12 +102,10 @@ public class RecordingChunk extends HistoricalEntity {
@Column(name = "stream_name")
@XmlElement(name = "streamName")
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String streamName;
@Column(name = "sid")
@XmlElement(name = "sid", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String sid;
@Column(name = "type")
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 13bb53b..694facb 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
@@ -57,7 +57,6 @@ import org.apache.openjpa.persistence.FetchGroup;
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.IntAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.RoomElementAdapter;
@@ -175,13 +174,11 @@ public class Room extends HistoricalEntity {
@Column(name = "name")
@XmlElement(name = "name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Lob
@Column(name = "comment")
@XmlElement(name = "comment", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String comment;
@Column(name = "type")
@@ -208,11 +205,9 @@ public class Room extends HistoricalEntity {
// Vars to simulate external Room
@Column(name = "external_id")
@XmlElement(name = "externalId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String externalId;
@XmlElement(name = "externalType", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
@Deprecated(since = "5.0")
@Transient
/**
@@ -260,7 +255,6 @@ public class Room extends HistoricalEntity {
@Column(name = "redirect_url")
@XmlElement(name = "redirectURL", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String redirectURL;
@Column(name = "owner_id")
@@ -319,12 +313,10 @@ public class Room extends HistoricalEntity {
@Column(name = "confno")
@XmlElement(name = "confno", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String confno;
@Column(name = "pin")
@XmlElement(name = "pin", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String pin;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
index faeadfc..f347769 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
@@ -49,7 +49,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.PollTypeAdapter;
import org.apache.openmeetings.db.bind.adapter.RoomAdapter;
@@ -112,12 +111,10 @@ public class RoomPoll implements IDataProviderEntity {
@Column(name = "name")
@XmlElement(name = "pollname", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Column(name = "question")
@XmlElement(name = "pollquestion", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String question;
@Column(name = "created")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
index d72e8c7..d13407a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
@@ -38,7 +38,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
import org.apache.openmeetings.db.entity.user.User;
@@ -59,12 +58,10 @@ public class LdapConfig extends HistoricalEntity {
@Column(name = "name")
@XmlElement(name = "name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Column(name = "config_file_name")
@XmlElement(name = "configFileName", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String configFileName;
@Column(name = "add_domain_to_user_name", nullable = false)
@@ -74,7 +71,6 @@ public class LdapConfig extends HistoricalEntity {
@Column(name = "domain")
@XmlElement(name = "domain", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String domain;
@Column(name = "is_active", nullable = false)
@@ -97,7 +93,6 @@ public class LdapConfig extends HistoricalEntity {
@Lob
@Column(name = "comment", length = 2048)
@XmlElement(name = "comment", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String comment;
@Override
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
index c33bfc0..24285f8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
@@ -44,7 +44,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.OauthMapAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@@ -68,12 +67,10 @@ public class OAuthServer extends HistoricalEntity {
@Column(name = "name")
@XmlElement(name = "name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Column(name = "icon_url")
@XmlElement(name = "iconUrl", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String iconUrl;
@Column(name = "enabled", nullable = false)
@@ -83,27 +80,22 @@ public class OAuthServer extends HistoricalEntity {
@Column(name = "client_id")
@XmlElement(name = "clientId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String clientId;
@Column(name = "client_secret")
@XmlElement(name = "clientSecret", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String clientSecret;
@Column(name = "key_url")
@XmlElement(name = "requestKeyUrl", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String requestKeyUrl;
@Column(name = "token_url")
@XmlElement(name = "requestTokenUrl", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String requestTokenUrl;
@Column(name = "token_attributes")
@XmlElement(name = "requestTokenAttributes", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String requestTokenAttributes;
@Column(name = "token_method")
@@ -113,7 +105,6 @@ public class OAuthServer extends HistoricalEntity {
@Column(name = "info_url")
@XmlElement(name = "requestInfoUrl", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String requestInfoUrl;
@Column(name = "info_method")
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 a2508cc..284048b 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
@@ -117,8 +117,8 @@ public class RemoteSessionObject {
return externalId;
}
- public void setExternalId(String externalUserId) {
- this.externalId = externalUserId;
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
}
public String getExternalType() {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
index 6772b0b..88a5ce2 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
@@ -27,9 +27,7 @@ import javax.persistence.Lob;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@Entity
@@ -44,48 +42,39 @@ public class Address extends HistoricalEntity {
@Column(name = "additionalname")
@XmlElement(name = "additionalname", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String additionalname;
@Lob
@Column(name = "comment", length = 2048)
@XmlElement(name = "comment", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String comment;
@Column(name = "fax")
@XmlElement(name = "fax", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String fax;
@Column(name = "country")
@XmlElement(name = "country", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String country;
@Column(name = "street")
@XmlElement(name = "street", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String street;
@Column(name = "town")
@XmlElement(name = "town", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String town;
@Column(name = "zip")
@XmlElement(name = "zip", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String zip;
@Column(name = "email")
@XmlElement(name = "mail", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String email;
@Column(name = "phone")
@XmlElement(name = "phone", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String phone;
public String getAdditionalname() {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
index eeeecd9..7e9e467 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
@@ -35,7 +35,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.IntAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
@@ -65,27 +64,22 @@ public class AsteriskSipUser implements Serializable {
@Column(name = "name", nullable = false, length = 128)
@XmlElement(name = "name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name = ""; // Varchar 128
@Column(name = "secret", length = 128)
@XmlElement(name = "secret", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String secret; // Varchar 128
@Column(name = "context", length = 128)
@XmlElement(name = "context", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String context; // Varchar 128
@Column(name = "host", nullable = false, length = 128)
@XmlElement(name = "host", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String host = "dynamic"; // Varchar 128
@Column(name = "ipaddr", nullable = false, length = 128)
@XmlElement(name = "ipaddr", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String ipaddr = ""; // Varchar 128
@Column(name = "port", nullable = false, length = 8)
@@ -100,22 +94,18 @@ public class AsteriskSipUser implements Serializable {
@Column(name = "defaultuser", nullable = true, length = 128)
@XmlElement(name = "defaultuser", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String defaultuser; // Varchar 128
@Column(name = "fullcontact", length = 512)
@XmlElement(name = "fullcontact", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String fullcontact;
@Column(name = "regserver", nullable = true, length = 128)
@XmlElement(name = "regserver", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String regserver; // Varchar 128
@Column(name = "useragent", nullable = true, length = 128)
@XmlElement(name = "useragent", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String useragent; // Varchar 128
@Column(name = "lastms")
@@ -125,22 +115,18 @@ public class AsteriskSipUser implements Serializable {
@Column(name = "md5secret")
@XmlElement(name = "md5secret", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String md5secret;
@Column(name = "nat", nullable = false)
@XmlElement(name = "nat", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String nat = "force_rport,comedia";
@Column(name = "callbackextension", nullable = true, length = 250)
@XmlElement(name = "callbackextension", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String callbackextension;
@Column(name = "allow", nullable = false, length = 100)
@XmlElement(name = "allow", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String allow = "ulaw;alaw;h264";
public long getId() {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
index cf65aeb..9d50290 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
@@ -34,7 +34,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.IntAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@@ -64,7 +63,6 @@ public class Group extends HistoricalEntity {
@Column(name = "name")
@XmlElement(name = "name", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String name;
@Column(name = "insertedby")
@@ -77,7 +75,6 @@ public class Group extends HistoricalEntity {
@Column(name = "tag")
@XmlElement(name = "tag", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String tag;
@Column(name = "limited", nullable = false)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
index 8d4505f..3ca489c 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
@@ -42,7 +42,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.bind.adapter.RoomAdapter;
@@ -75,13 +74,11 @@ public class PrivateMessage implements IDataProviderEntity {
@Column(name = "subject")
@XmlElement(name = "subject", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String subject;
@Lob
@Column(name = "message")
@XmlElement(name = "message", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String message;
@Column(name = "inserted")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
index 02fd7fa..b4ef4d3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
@@ -35,7 +35,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
@@ -55,7 +54,6 @@ public class PrivateMessageFolder implements
IDataProviderEntity {
@Column(name = "folder_name")
@XmlElement(name = "folderName")
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String folderName;
@Column(name = "user_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 fe53bd5..8d838cc 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
@@ -68,7 +68,6 @@ import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.LoadFetchGroup;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.bind.adapter.BooleanAdapter;
-import org.apache.openmeetings.db.bind.adapter.CDATAAdapter;
import org.apache.openmeetings.db.bind.adapter.DateAdapter;
import org.apache.openmeetings.db.bind.adapter.LocalDateAdapter;
import org.apache.openmeetings.db.bind.adapter.LongAdapter;
@@ -211,7 +210,6 @@ public class User extends HistoricalEntity {
@Column(name = "firstname")
@XmlElement(name = "firstname", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String firstname;
@Column(name = "lastlogin")
@@ -220,24 +218,20 @@ public class User extends HistoricalEntity {
@Column(name = "lastname")
@XmlElement(name = "lastname", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String lastname;
@Column(name = "displayName")
@XmlElement(name = "displayName", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String displayName;
@Column(name = "login")
@XmlElement(name = "login", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String login;
@Basic(fetch = FetchType.LAZY)
@Column(name = "password", length = 1024)
@LoadFetchGroup(FETCH_GROUP_BACKUP)
@XmlElement(name = "pass", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String password;
@Column(name = "regdate")
@@ -253,7 +247,6 @@ public class User extends HistoricalEntity {
@Column(name = "pictureuri")
@XmlElement(name = "pictureUri", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String pictureUri;
@Column(name = "language_id")
@@ -263,7 +256,6 @@ public class User extends HistoricalEntity {
@Column(name = "resethash")
@XmlElement(name = "resethash", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String resethash;
@Column(name = "resetdate")
@@ -273,7 +265,6 @@ public class User extends HistoricalEntity {
@Column(name = "activatehash")
@XmlElement(name = "activatehash", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String activatehash;
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL,
orphanRemoval = true)
@@ -297,11 +288,9 @@ public class User extends HistoricalEntity {
// Vars to simulate external Users
@Column(name = "external_id")
@XmlElement(name = "externalUserId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String externalId;
@XmlElement(name = "externalUserType", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
@Deprecated(since = "5.0")
@Transient
/**
@@ -314,7 +303,6 @@ public class User extends HistoricalEntity {
*/
@Column(name = "time_zone_id")
@XmlElement(name = "timeZoneId", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String timeZoneId;
@Transient
@@ -328,12 +316,10 @@ public class User extends HistoricalEntity {
@Column(name = "user_offers")
@XmlElement(name = "userOffers", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String userOffers;
@Column(name = "user_searchs")
@XmlElement(name = "userSearchs", required = false)
- @XmlJavaTypeAdapter(CDATAAdapter.class)
private String userSearchs;
@Column(name = "show_contact_data", nullable = false)
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 0b9483c..3162d76 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -51,7 +51,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.Writer;
+import java.io.OutputStreamWriter;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -62,7 +62,6 @@ import java.util.zip.ZipOutputStream;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import javax.xml.stream.XMLStreamWriter;
import org.apache.commons.io.FileUtils;
import org.apache.openmeetings.db.dao.basic.ChatDao;
@@ -94,7 +93,6 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.db.util.XmlHelper;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
import org.slf4j.Logger;
@@ -102,8 +100,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
-
/**
*
* @author sebastianwagner
@@ -388,35 +384,33 @@ public class BackupExport {
}
private static <T> void writeList(OutputStream os, String listElement,
List<T> list) throws Exception {
- XMLStreamWriter writer =
XmlHelper.createOutputFactory().createXMLStreamWriter(os);
- writer.writeStartDocument();
- writer.writeComment(BACKUP_COMMENT);
- writer.writeStartElement("root");
- writer.writeStartElement(listElement);
-
- if (list != null && !list.isEmpty()) {
- @SuppressWarnings("unchecked")
- Class<T> eClazz = (Class<T>)list.get(0).getClass();
- JAXBContext jc = JAXBContext.newInstance(eClazz);
- Marshaller marshaller = jc.createMarshaller();
-
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
-
marshaller.setProperty(CharacterEscapeHandler.class.getName(), new
CharacterEscapeHandler() {
- @Override
- public void escape(char[] ac, int i, int j,
boolean flag, Writer writer) throws IOException {
- writer.write(ac, i, j);
- }
- });
- for (T t : list) {
- try {
- marshaller.marshal(t, writer);
- } catch (Exception e) {
- log.debug("Exception While writing node
of type: " + t.getClass(), e);
+ try (OutputStreamWriter sw = new OutputStreamWriter(os)) {
+ sw.write("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n");
+ sw.write("<!--");
+ sw.write(BACKUP_COMMENT);
+ sw.write("-->\n");
+ sw.write("<root>\n");
+ sw.write("<" + listElement + ">\n");
+
+ if (list != null && !list.isEmpty()) {
+ @SuppressWarnings("unchecked")
+ Class<T> eClazz =
(Class<T>)list.get(0).getClass();
+ JAXBContext jc =
JAXBContext.newInstance(eClazz);
+ Marshaller marshaller = jc.createMarshaller();
+
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+ for (T t : list) {
+ try {
+ marshaller.marshal(t, sw);
+ sw.write("\n");
+ } catch (Exception e) {
+ log.debug("Exception While
writing node of type: " + t.getClass(), e);
+ }
}
}
+ sw.write("</" + listElement + ">\n");
+ sw.write("</root>\n");
}
- writer.writeEndElement();
- writer.writeEndElement();
}
private static void writeZip(String prefix, URI base, File file,
ZipOutputStream zos) throws IOException {
