Repository: openmeetings Updated Branches: refs/heads/master 337acf951 -> 3ebbb1129
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3ebbb112 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3ebbb112 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3ebbb112 Branch: refs/heads/master Commit: 3ebbb1129563f8272dca171dc07f11b6cf97dbfc Parents: 337acf9 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 4 15:09:20 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 4 15:09:20 2017 +0700 ---------------------------------------------------------------------- .../core/data/file/FileProcessor.java | 2 +- .../listener/async/StreamAudioWriter.java | 2 -- .../core/remote/RecordingService.java | 1 - .../openmeetings/core/service/MainService.java | 11 +----- .../db/entity/calendar/Appointment.java | 2 -- .../openmeetings/db/entity/room/Room.java | 1 - .../openmeetings/db/entity/room/RoomPoll.java | 5 ++- .../openmeetings/db/entity/user/User.java | 1 - .../cli/ConnectionPropertiesPatcher.java | 1 - .../apache/openmeetings/cli/DerbyPatcher.java | 5 --- .../openmeetings/screenshare/CaptureScreen.java | 17 --------- .../service/calendar/AppointmentLogic.java | 1 - .../service/calendar/caldav/iCalUtils.java | 16 --------- .../apache/openmeetings/util/StoredFile.java | 2 +- .../web/admin/configurations/ConfigForm.java | 2 +- .../web/pages/install/InstallWizard.java | 6 ---- .../apache/openmeetings/web/room/RoomPanel.java | 5 --- .../web/room/menu/RoomMenuPanel.java | 14 ++++---- .../web/user/profile/MessagesContactsPanel.java | 1 - .../openmeetings/webservice/FileWebService.java | 3 -- .../webservice/NetTestWebService.java | 1 - .../openmeetings/webservice/RoomWebService.java | 36 -------------------- 22 files changed, 13 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java index b3f82a1..629ee5b 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java @@ -113,7 +113,7 @@ public class FileProcessor { // convert to pdf, thumbs, swf and xml-description result = generatePDF.convertPDF(f, sf); } else if (isChart) { - //TODO should be implemented copyFile(temp, file); + //TODO should be implemented log.debug("uploaded chart file"); } else if (isImage) { // convert it to JPG http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java index 4e51098..8b1a178 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java @@ -174,13 +174,11 @@ public class StreamAudioWriter extends BaseStreamWriter { ITag tag = new Tag(); tag.setDataType(streampacket.getDataType()); - // log.debug("data.limit() :: "+data.limit()); tag.setBodySize(data.limit()); tag.setTimestamp(timeStamp); tag.setBody(data); writer.writeTag(tag); - } } catch (Exception e) { log.error("##REC:: [packetReceived]", e); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java index 35bafe3..41fc468 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java @@ -226,7 +226,6 @@ public class RecordingService implements IPendingServiceCallback { private void addListener(IConnection conn, String broadcastid, String streamName, Long metaId, boolean isScreenSharing, boolean isInterview) { log.debug("Recording show for: {}", conn.getScope().getContextPath()); log.debug("Name of CLient and Stream to be recorded: {}", broadcastid); - // log.debug("Application.getInstance()"+Application.getInstance()); log.debug("Scope " + conn); log.debug("Scope " + conn.getScope()); // Get a reference to the current broadcast stream. http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java index ab787f5..5976c2c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java @@ -62,16 +62,7 @@ public class MainService { } } } - /* - TODO need to be reviewed - Calendar c = WebSession.getCalendar(); - if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) { - allowed = true; - } else { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format - deniedMessage = Application.getString("error.hash.period") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd())); - } - */ + // TODO restrict by time??? } } else { allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(u.getId())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java ---------------------------------------------------------------------- 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 7d52363..a010e6d 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 @@ -129,8 +129,6 @@ public class Appointment implements IDataProviderEntity { private int id; - Reminder() {} // default; - Reminder(int id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java ---------------------------------------------------------------------- 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 2dbf047..4da21d5 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 @@ -125,7 +125,6 @@ public class Room implements IDataProviderEntity { //, custom(5) private int id; - Type() {} //default; Type(int id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java ---------------------------------------------------------------------- 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 7818497..a319411 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 @@ -68,11 +68,10 @@ public class RoomPoll implements IDataProviderEntity { @XmlType(namespace="org.apache.openmeetings.room.poll.type") public enum Type { - yesNo - , numeric; + yesNo(YES_NO_TYPE_ID) + , numeric(NUMERIC_TYPE_ID); private int id; - Type() {} //default; Type(int id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java ---------------------------------------------------------------------- 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 132bcc5..df3d10b 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 @@ -134,7 +134,6 @@ public class User implements IDataProviderEntity { , prof(SALUTATION_PROF_ID); private int id; - Salutation() {} //default; Salutation(int id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java index c6ccca5..b46f607 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java @@ -87,7 +87,6 @@ public abstract class ConnectionPropertiesPatcher { private static Document getDocument(File xml) throws Exception { DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - //dbFactory.setNamespaceAware(true); DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); return dBuilder.parse(xml); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java index 1bc86e4..402b598 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java @@ -23,11 +23,6 @@ public class DerbyPatcher extends ConnectionPropertiesPatcher { protected String getUrl(String _url, String host, String _port, String _db) { String db = (_db == null) ? "openmeetings" : _db; String suffix = _url.substring(_url.indexOf(';')); - - if (host != null && _port != null) { - //return "jdbc:derby" + "://" + host + ":" + _port + "/" + db + suffix; - } - return "jdbc:derby" + ":" + db + suffix; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java index f63339c..a8cd2c7 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java @@ -141,23 +141,6 @@ public class CaptureScreen extends Thread { } } - /* - private void pushAudio(byte[] audio, long ts) { - if (startPublish) { - buffer.put((byte) 6); - buffer.put(audio); - buffer.flip(); - - // I can stream audio - //packets successfully using linear PCM at 11025Hz. For those packets I - //push one byte (0x06) which specifies the format of audio data in a - //ByteBuffer, and then real audio data: - RTMPMessage rtmpMsg = RTMPMessage.build(new AudioData(buffer), (int) ts); - client.publishStreamData(streamId, rtmpMsg); - } - } - */ - public void pushVideo(VideoData data, int ts) { if (startPublish) { if (Red5.getConnectionLocal() == null) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java index fc109ae..d25f575 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java @@ -93,7 +93,6 @@ public class AppointmentLogic { */ // ---------------------------------------------------------------------------------------------- public void doScheduledMeetingReminder() { - // log.debug("doScheduledMeetingReminder"); String baseUrl = cfgDao.getString(CONFIG_APPLICATION_BASE_URL, DEFAULT_BASE_URL); if (baseUrl == null || baseUrl.length() < 1) { log.error("Error retrieving baseUrl for application"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java ---------------------------------------------------------------------- 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 1ed42c9..a667136 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 @@ -429,22 +429,6 @@ public class iCalUtils { meeting.getProperties().add(ui); - /* RRule rRule = null; - if (appointment.getIsDaily() != null) { - rRule = new RRule("FREQ=DAILY"); - } else if (appointment.getIsWeekly() != null) { - rRule = new RRule("FREQ=WEEKLY"); - } else if (appointment.getIsMonthly() != null) { - rRule = new RRule("FREQ=MONTHLY"); - } else if (appointment.getIsYearly() != null) { - rRule = new RRule("FREQ=YEARLY"); - } - - if (rRule != null) { - meeting.getProperties().add(rRule); - } - */ - if (appointment.getMeetingMembers() != null) { for (MeetingMember meetingMember : appointment.getMeetingMembers()) { Attendee attendee = new Attendee(URI.create("mailto:"; + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java index 0b01a0a..7b03ca0 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java @@ -60,7 +60,7 @@ public class StoredFile { Set<MediaType> types = new LinkedHashSet<>(); types.addAll(CONVERT_TYPES); types.addAll(PDF_TYPES); - //TODO have to be tested and re-added ext.addAll(chartExtensions); + //TODO Charts need to added StringBuilder sb = new StringBuilder("audio/*,video/*,image/*,text/*"); sb.append(",application/vnd.oasis.opendocument.*"); sb.append(",application/vnd.sun.xml.*"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java index 6ca57a4..8ae972f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java @@ -78,7 +78,7 @@ public class ConfigForm extends AdminBaseForm<Configuration> { @Override public Object getDisplayValue(Type rt) { - return rt.name();//getString("room.type." + rt.name()); + return rt.name();//TODO localization } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index bf07390..5d582c2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java @@ -669,7 +669,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { } if (th != null) { timer.stop(target); - //TODO change text, localize progressBar.setVisible(false); target.add(container.replace(new ErrorMessagePanel("status", getString("install.wizard.install.failed"), th)) , desc.setVisible(false) @@ -677,7 +676,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { } else { progressBar.setModelObject(Application.get()._getBean(ImportInitvalues.class).getProgress()); progressBar.refresh(target); - //TODO uncomment later target.add(value); //TODO add current step result as info } } @@ -693,9 +691,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { target.add(container, desc.setVisible(false)); } }); - //TODO uncomment later progressBar.add(value = new Label("value", progressBar.getModel())); - //TODO uncomment later value.setOutputMarkupId(true); - //progressBar.setVisible(false); container.add(congrat = new CongratulationsPanel("status")); congrat.setVisible(false); @@ -708,7 +703,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { timer.restart(target); new Thread(new InstallProcess(Application.get()._getBean(ImportInitvalues.class)) , "Openmeetings - Installation").start(); - //progressBar.setVisible(true); desc.setDefaultModelObject(getString("install.wizard.install.started")); target.add(desc, container); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index c78b6cd..d288f82 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -527,11 +527,8 @@ public class RoomPanel extends BasePanel { case roomEnter: sidebar.update(handler); menu.update(handler); - // TODO should this be fixed? - //activities.addActivity(new Activity(m, Activity.Type.roomEnter), handler); break; case roomExit: - //TODO check user/remove tab sidebar.update(handler); activities.add(new Activity(m, Activity.Type.roomExit), handler); break; @@ -576,8 +573,6 @@ public class RoomPanel extends BasePanel { break; case kick: { - //FIXME TODO add line to activities about user kick - //activities.add(new Activity(m, Activity.Type.roomExit), handler); String uid = ((TextRoomMessage)m).getText(); if (getClient().getUid().equals(uid)) { handler.add(room.setVisible(false)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index b8c6e02..a0ac158 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -284,18 +284,18 @@ public class RoomMenuPanel extends Panel { actionsMenu.setTop(true); actionsMenu.getItems().add(inviteMenuItem); - actionsMenu.getItems().add(shareMenuItem); //FIXME enable/disable - actionsMenu.getItems().add(applyModerMenuItem); //FIXME enable/disable - actionsMenu.getItems().add(applyWbMenuItem); //FIXME enable/disable - actionsMenu.getItems().add(applyAvMenuItem); //FIXME enable/disable + actionsMenu.getItems().add(shareMenuItem); + actionsMenu.getItems().add(applyModerMenuItem); + actionsMenu.getItems().add(applyWbMenuItem); + actionsMenu.getItems().add(applyAvMenuItem); actionsMenu.getItems().add(pollCreateMenuItem); - actionsMenu.getItems().add(pollResultMenuItem); //FIXME enable/disable - actionsMenu.getItems().add(pollVoteMenuItem); //FIXME enable/disable + actionsMenu.getItems().add(pollResultMenuItem); + actionsMenu.getItems().add(pollVoteMenuItem); actionsMenu.getItems().add(sipDialerMenuItem); actionsMenu.getItems().add(downloadPngMenuItem); actionsMenu.getItems().add(downloadJpgMenuItem); actionsMenu.getItems().add(downloadPdfMenuItem); - //TODO seems need to be removed actionsMenu.getItems().add(new RoomMenuItem(Application.getString(1126), Application.getString(1490))); + //TODO add local cache editor menu.add(actionsMenu); return menu; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index bea15d1..72a621d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -408,7 +408,6 @@ public class MessagesContactsPanel extends UserBasePanel { selectMessage(-1, null); add(container.add(dv).setOutputMarkupId(true)); - //TODO add valid autoupdate add(new AjaxSelfUpdatingTimerBehavior(seconds(15))); add(selectedMessage.add(roomContainer.setVisible(false)).setOutputMarkupId(true)); IDataProvider<UserContact> dp = new IDataProvider<UserContact>() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java index e65b0fd..4b24f45 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java @@ -174,9 +174,6 @@ public class FileWebService extends BaseWebService { throw new ServiceException("Bad id");//TODO err code -1 ???? } Set<Right> rights = getRights(userId); - /* FIXME TODO permissions - if (AuthLevelUtil.hasWebServiceLevel(rights) - || (AuthLevelUtil.hasUserLevel(rights) && userId.equals(f.getOwnerId())))*/ if (AuthLevelUtil.hasUserLevel(rights)) { f.setInsertedBy(userId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java index c92a01a..9fd244b 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java @@ -96,7 +96,6 @@ public class NetTestWebService { } ResponseBuilder response = Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new ByteArrayInputStream(data)); - //response.header("Content-Disposition", "attachment; filename=test.png"); response.header("Cache-Control", "no-cache"); response.header("Content-Length", String.valueOf(data.length)); return response.build(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3ebbb112/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java ---------------------------------------------------------------------- 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 42146f2..bbedf33 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 @@ -239,42 +239,6 @@ public class RoomWebService extends BaseWebService { } } - /**//* - * Adds a new Room like through the Frontend - * - * @param sid - * The SID from getSession - * @param room - * room object - * - * @return - id of the user added or error code - * @throws ServiceException - *//* - @WebMethod - @PUT - @Path("/{id}") - public RoomDTO update(@WebParam(name="sid") @QueryParam("sid") String sid, @PathParam("id") @WebParam(name="id") Long id, @WebParam(name="room") @QueryParam("room") RoomDTO room) throws ServiceException { - try { - Long userId = sessionDao.checkSession(sid); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - if (roomDao.get(id) == null) { - throw new ServiceException("Room not found"); - } - Room r = room.get(roomTypeDao); - r.setId(id); - r = roomDao.update(r, userId); - return new RoomDTO(r); - } else { - throw NO_PERMISSION; - } - } catch (ServiceException err) { - throw err; - } catch (Exception err) { - log.error("update", err); - throw new ServiceException(err.getMessage()); - } - }*/ - /** * Delete a room by its room id *
