Move from annotation/ to annotations/

bigbluebutton-html5/imports/api/2.0/annotation/index.js

@@ -1 +0,0 @@
-export default new Mongo.Collection('annotation');

bigbluebutton-html5/imports/api/2.0/annotations/index.js

@@ -0,0 +1 @@
+export default new Mongo.Collection('annotations');

bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { check } from 'meteor/check';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import addAnnotation from '../modifiers/addAnnotation';
 import removeAnnotation from '../modifiers/removeAnnotation';
 

bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js

@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 
 const ANNOTATION_TYPE_TEXT = 'text';
 const ANNOTATION_TYPE_PENCIL = 'pencil';

bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js

@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 
 export default function clearAnnotations(meetingId) {

bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard.js

@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 import { check } from 'meteor/check';
 

bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/removeAnnotation.js

@@ -1,5 +1,5 @@
 import { check } from 'meteor/check';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 
 export default function removeAnnotation(meetingId, whiteboardId, shapeId) {

bigbluebutton-html5/imports/api/2.0/annotations/server/publishers.js

@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
@@ -21,4 +21,4 @@ function publish(...args) {
   return mapToAcl('subscriptions.annotations', boundAnnotations)(args);
 }
 
-Meteor.publish('annotation', publish);
+Meteor.publish('annotations', publish);

bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js

@@ -4,7 +4,7 @@ import Logger from '/imports/startup/server/logger';
 import clearUsers from '/imports/api/2.0/users/server/modifiers/clearUsers';
 import clearChats from '/imports/api/2.0/chat/server/modifiers/clearChats';
 import clearBreakouts from '/imports/api/2.0/breakouts/server/modifiers/clearBreakouts';
-import clearAnnotations from '/imports/api/2.0/annotation/server/modifiers/clearAnnotations';
+import clearAnnotations from '/imports/api/2.0/annotations/server/modifiers/clearAnnotations';
 import clearSlides from '/imports/api/2.0/slides/server/modifiers/clearSlides';
 import clearPolls from '/imports/api/2.0/polls/server/modifiers/clearPolls';
 import clearCursor from '/imports/api/2.0/cursor/server/modifiers/clearCursor';

bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlidesPresentation.js

@@ -1,7 +1,7 @@
 import Slides from '/imports/api/2.0/slides';
 import Logger from '/imports/startup/server/logger';
 import { check } from 'meteor/check';
-import clearAnnotationsWhiteboard from '/imports/api/2.0/annotation/server/modifiers/clearAnnotationsWhiteboard';
+import clearAnnotationsWhiteboard from '/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard';
 
 export default function clearSlidesPresentation(meetingId, presentationId) {
   check(meetingId, String);

bigbluebutton-html5/imports/startup/client/base.jsx

@@ -87,7 +87,7 @@ Base.propTypes = propTypes;
 Base.defaultProps = defaultProps;
 
 const SUBSCRIPTIONS_NAME = [
-  'users2x', 'chat2x', 'cursor2x', 'meetings2x', 'polls2x', 'presentations2x', 'annotation', 'slides2x', 'captions2x', 'breakouts2x', 'voiceUsers',
+  'users2x', 'chat2x', 'cursor2x', 'meetings2x', 'polls2x', 'presentations2x', 'annotations', 'slides2x', 'captions2x', 'breakouts2x', 'voiceUsers',
 ];
 
 const BaseContainer = createContainer(({ params }) => {

bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js

@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 
 const getCurrentAnnotations = (whiteboardId) => {
   if (!whiteboardId) {

bigbluebutton-html5/server/main.js

@@ -3,7 +3,7 @@ import '/imports/startup/server';
 // 2x
 import '/imports/api/2.0/meetings/server';
 import '/imports/api/2.0/users/server';
-import '/imports/api/2.0/annotation/server';
+import '/imports/api/2.0/annotations/server';
 import '/imports/api/2.0/cursor/server';
 import '/imports/api/2.0/polls/server';
 import '/imports/api/2.0/captions/server';