http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/library.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/video/library.lzx 
b/openmeetings-flash/src/main/swf/video/library.lzx
index ef42828..6862298 100644
--- a/openmeetings-flash/src/main/swf/video/library.lzx
+++ b/openmeetings-flash/src/main/swf/video/library.lzx
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-  
--->
-<library>
-       <!-- APL author sebawagner -->
-       <resource name="level_meter_rsc" src="resources/level_meter.png" />
-       <!-- APL author sebawagner -->
-       <resource name="test_setup_record_rsc" 
src="resources/webstart_record.png" />
-       <!-- APL author sebawagner -->
-       <resource name="test_setup_play_rsc" src="resources/run.png" />
-       <!-- APL author sebawagner -->
-       <resource name="test_setup_stop_rsc" src="resources/stop.png" />
-       <!-- FamFam Icon Set -->
-       <resource name="test_setup_info_rsc" src="resources/information.png" />
-       <!--  FamFam Icon Creative Commons -->
-       <resource name="warning_icon_popup_devices_rsc" 
src="resources/error.png" />
-
-       <!--  FamFam Icon Creative Commons -->
-       <resource name="resyncuser_rsc" src="resources/arrow_refresh_small.png" 
/>
-       
-       <!--  APL author sebawagner -->
-       <resource name="mic_rsc" src="resources/micro.png" />
-       
-       <!--  APL author sebawagner -->
-       <resource name="speaking" src="resources/speaking.png" />
-
-       <!--  IconFinder Creative Commons -->
-       <resource name="volume" src="resources/volume.png" />
-       
-       <!--  FamFam Icon Creative Commons -->
-       <resource name="mute_btn_rsc">
-               <frame src="resources/sound.png" />
-               <frame src="resources/sound_mute.png" />
-       </resource>
-       
-       <!--  APL author sebawagner -->
-       <resource name="mute_micro_btn_rsc">
-               <frame src="resources/mute_micro.png" />
-               <frame src="resources/mute_micro_red.png" />
-       </resource>
-
-       <!--  APL author sebawagner -->
-       <resource name="lz_recorder_play" src="resources/webstart_play.png" />
-
-       <include href="videoUserProfilePicSWF10.lzx" />
-       <include href="editRecordStreamSWF10.lzx" />
-       <include href="baseVideoObject.lzx" />
-       <include href="videoObjectPlayBroadcast.lzx" />
-       <include href="videoObjectTestBroadcast.lzx" />
-       <include href="videoObjectPlayTestBroadcast.lzx" />
-       <include href="volumeSlider.lzx" />
-       
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+  
+-->
+<library>
+       <!-- APL author sebawagner -->
+       <resource name="level_meter_rsc" src="resources/level_meter.png" />
+       <!-- APL author sebawagner -->
+       <resource name="test_setup_record_rsc" 
src="resources/webstart_record.png" />
+       <!-- APL author sebawagner -->
+       <resource name="test_setup_play_rsc" src="resources/run.png" />
+       <!-- APL author sebawagner -->
+       <resource name="test_setup_stop_rsc" src="resources/stop.png" />
+       <!-- FamFam Icon Set -->
+       <resource name="test_setup_info_rsc" src="resources/information.png" />
+       <!--  FamFam Icon Creative Commons -->
+       <resource name="warning_icon_popup_devices_rsc" 
src="resources/error.png" />
+
+       <!--  FamFam Icon Creative Commons -->
+       <resource name="resyncuser_rsc" src="resources/arrow_refresh_small.png" 
/>
+       
+       <!--  APL author sebawagner -->
+       <resource name="mic_rsc" src="resources/micro.png" />
+       
+       <!--  APL author sebawagner -->
+       <resource name="speaking" src="resources/speaking.png" />
+
+       <!--  IconFinder Creative Commons -->
+       <resource name="volume" src="resources/volume.png" />
+       
+       <!--  FamFam Icon Creative Commons -->
+       <resource name="mute_btn_rsc">
+               <frame src="resources/sound.png" />
+               <frame src="resources/sound_mute.png" />
+       </resource>
+       
+       <!--  APL author sebawagner -->
+       <resource name="mute_micro_btn_rsc">
+               <frame src="resources/mute_micro.png" />
+               <frame src="resources/mute_micro_red.png" />
+       </resource>
+
+       <!--  APL author sebawagner -->
+       <resource name="lz_recorder_play" src="resources/webstart_play.png" />
+
+       <include href="videoUserProfilePicSWF10.lzx" />
+       <include href="editRecordStreamSWF10.lzx" />
+       <include href="baseVideoObject.lzx" />
+       <include href="videoObjectPlayBroadcast.lzx" />
+       <include href="videoObjectTestBroadcast.lzx" />
+       <include href="videoObjectPlayTestBroadcast.lzx" />
+       <include href="volumeSlider.lzx" />
+       
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx 
b/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
index b21e348..120d57f 100644
--- a/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
+++ b/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-  
--->
-<library>
-
-       <!--- Contains no microphone or camera Object, this view can only 
subscribe 
-               to a video or live-stream -->
-       <class name="videoObjectPlayBroadcast" extends="baseVideoObject" 
isremote="true">
-               <attribute name="interviewPodId" value="-1" />
-               <attribute name="ratioW" value="1" />
-               <attribute name="ratioH" value="1" />
-
-               <attribute name="videoInsetX" value="2" type="number" />
-               <attribute name="videoInsetY" value="21" type="number" />
-               <attribute name="bottomBarHeight" value="0" type="number" />
-
-               <handler name="oninit">
-               <![CDATA[
-                       if ($debug) Debug.write("Init videoObjectPlayBroadcast 
",this.isremote,this.clientVars);
-                       //Display widget defined in mother class
-                       this._loudness.bringToFront();
-                       this._resizeview.bringToFront();
-               ]]>
-               </handler>
-
-               <!--- Change the video resolution by chaning pod size -->
-               <method name="setDefaultVideoSize" args="w,h">
-                       this.initRatio = w / h;
-                       this.setAttribute("width", w + this.videoInsetX);
-
-                       if (canvas.currentRoomObj.showMicrophoneStatus) {
-                               this.setAttribute("bottomBarHeight", 
this._innertop.height + 1);
-                       }
-                       this.setAttribute("height", (minimized ? 0 : h) + 
this.videoInsetY + this.bottomBarHeight);
-               </method>
-
-               <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }" 
y="$once{ parent.videoInsetY-1 }"
-                       
height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
-                       width="${parent.width-parent.videoInsetX}">
-
-                       <attribute name="initH" />
-                       <attribute name="initW" />
-
-                       <handler name="oninit">
-                               this.r.setAttribute('frame',5);
-                               this.initH = this.height;
-                               this.initW = this.width;
-                       </handler>
-
-                       <view name="r"></view>
-
-                       <baseVideoStreamDevice name="_videostream"
-                               bgcolor="black" width="${parent.width}" 
height="${parent.height}">
-                               <handler name="onlevel">
-                                       var fullLength = parent.height-24;
-                                       
parent._activityLevel.setAttribute("height",-this.level*(fullLength/100));
-                               </handler>
-                       </baseVideoStreamDevice>
-
-                       <view name="_activityLevel" width="6" x="2" 
y="${parent.height}"
-                               opacity="0.5" bgcolor="0x00FF00" height="0" />
-               </view>
-       </class>
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+  
+-->
+<library>
+
+       <!--- Contains no microphone or camera Object, this view can only 
subscribe 
+               to a video or live-stream -->
+       <class name="videoObjectPlayBroadcast" extends="baseVideoObject" 
isremote="true">
+               <attribute name="interviewPodId" value="-1" />
+               <attribute name="ratioW" value="1" />
+               <attribute name="ratioH" value="1" />
+
+               <attribute name="videoInsetX" value="2" type="number" />
+               <attribute name="videoInsetY" value="21" type="number" />
+               <attribute name="bottomBarHeight" value="0" type="number" />
+
+               <handler name="oninit">
+               <![CDATA[
+                       if ($debug) Debug.write("Init videoObjectPlayBroadcast 
",this.isremote,this.clientVars);
+                       //Display widget defined in mother class
+                       this._loudness.bringToFront();
+                       this._resizeview.bringToFront();
+               ]]>
+               </handler>
+
+               <!--- Change the video resolution by chaning pod size -->
+               <method name="setDefaultVideoSize" args="w,h">
+                       this.initRatio = w / h;
+                       this.setAttribute("width", w + this.videoInsetX);
+
+                       if (canvas.currentRoomObj.showMicrophoneStatus) {
+                               this.setAttribute("bottomBarHeight", 
this._innertop.height + 1);
+                       }
+                       this.setAttribute("height", (minimized ? 0 : h) + 
this.videoInsetY + this.bottomBarHeight);
+               </method>
+
+               <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }" 
y="$once{ parent.videoInsetY-1 }"
+                       
height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
+                       width="${parent.width-parent.videoInsetX}">
+
+                       <attribute name="initH" />
+                       <attribute name="initW" />
+
+                       <handler name="oninit">
+                               this.r.setAttribute('frame',5);
+                               this.initH = this.height;
+                               this.initW = this.width;
+                       </handler>
+
+                       <view name="r"></view>
+
+                       <baseVideoStreamDevice name="_videostream"
+                               bgcolor="black" width="${parent.width}" 
height="${parent.height}">
+                               <handler name="onlevel">
+                                       var fullLength = parent.height-24;
+                                       
parent._activityLevel.setAttribute("height",-this.level*(fullLength/100));
+                               </handler>
+                       </baseVideoStreamDevice>
+
+                       <view name="_activityLevel" width="6" x="2" 
y="${parent.height}"
+                               opacity="0.5" bgcolor="0x00FF00" height="0" />
+               </view>
+       </class>
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/videoObjectPlayTestBroadcast.lzx
----------------------------------------------------------------------
diff --git 
a/openmeetings-flash/src/main/swf/video/videoObjectPlayTestBroadcast.lzx 
b/openmeetings-flash/src/main/swf/video/videoObjectPlayTestBroadcast.lzx
index e989ae5..e2237da 100644
--- a/openmeetings-flash/src/main/swf/video/videoObjectPlayTestBroadcast.lzx
+++ b/openmeetings-flash/src/main/swf/video/videoObjectPlayTestBroadcast.lzx
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-  
--->
-<library>
-
-
-<!---
-       contains microphone and camera for broadcasting,
-       this class is used only in Meetings-Modus
- -->
-
- 
-<class name="videoObjectPlayTestBroadcast" extends="view" >
-
-       <view name="_chatvideoinner" x="0" y="0" height="${parent.height}" 
width="${parent.width}">
-               
-               <baseVideoStream name="_videostream" mode="broadcast"
-                                                width="${parent.width}" 
height="${parent.height}" bgcolor="0x000000" />
-               
-       </view> 
-</class>
-
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+  
+-->
+<library>
+
+
+<!---
+       contains microphone and camera for broadcasting,
+       this class is used only in Meetings-Modus
+ -->
+
+ 
+<class name="videoObjectPlayTestBroadcast" extends="view" >
+
+       <view name="_chatvideoinner" x="0" y="0" height="${parent.height}" 
width="${parent.width}">
+               
+               <baseVideoStream name="_videostream" mode="broadcast"
+                                                width="${parent.width}" 
height="${parent.height}" bgcolor="0x000000" />
+               
+       </view> 
+</class>
+
+
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/videoObjectTestBroadcast.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/video/videoObjectTestBroadcast.lzx 
b/openmeetings-flash/src/main/swf/video/videoObjectTestBroadcast.lzx
index 2fff0a2..bec171d 100644
--- a/openmeetings-flash/src/main/swf/video/videoObjectTestBroadcast.lzx
+++ b/openmeetings-flash/src/main/swf/video/videoObjectTestBroadcast.lzx
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-  
--->
-<library>
-
-
-<!---
-       contains microphone and camera for broadcasting,
-       this class is used only in Meetings-Modus
- -->
-
- 
-<class name="videoObjectTestBroadcast" extends="view" >
-
-    <event name="sendCameraStatus" />
-    
-    <event name="sendMicroStatus" />
-    
-       <view name="_chatvideoinner" x="0" y="0" height="${parent.height}" 
width="${parent.width}">
-               
-               <baseVideoStreamDevice name="_videostream" mode="broadcast" 
sendNotificationViaLocalConnection="false"
-                                                width="${parent.width}" 
height="${parent.height}" bgcolor="0x000000">
-                       <handler name="sendCameraStatus" args="camStatus">
-                if ($debug) Debug.write("sendCameraStatus",camStatus);
-                parent.parent.sendCameraStatus.sendEvent(camStatus);
-            </handler>
-            
-            <handler name="sendMicroStatus" args="micStatus">
-                if ($debug) Debug.write("sendMicroStatus",micStatus);
-                parent.parent.sendMicroStatus.sendEvent(micStatus);
-            </handler>
-               </baseVideoStreamDevice>
-               
-       </view> 
-</class>
-
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+  
+-->
+<library>
+
+
+<!---
+       contains microphone and camera for broadcasting,
+       this class is used only in Meetings-Modus
+ -->
+
+ 
+<class name="videoObjectTestBroadcast" extends="view" >
+
+    <event name="sendCameraStatus" />
+    
+    <event name="sendMicroStatus" />
+    
+       <view name="_chatvideoinner" x="0" y="0" height="${parent.height}" 
width="${parent.width}">
+               
+               <baseVideoStreamDevice name="_videostream" mode="broadcast" 
sendNotificationViaLocalConnection="false"
+                                                width="${parent.width}" 
height="${parent.height}" bgcolor="0x000000">
+                       <handler name="sendCameraStatus" args="camStatus">
+                if ($debug) Debug.write("sendCameraStatus",camStatus);
+                parent.parent.sendCameraStatus.sendEvent(camStatus);
+            </handler>
+            
+            <handler name="sendMicroStatus" args="micStatus">
+                if ($debug) Debug.write("sendMicroStatus",micStatus);
+                parent.parent.sendMicroStatus.sendEvent(micStatus);
+            </handler>
+               </baseVideoStreamDevice>
+               
+       </view> 
+</class>
+
+
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx 
b/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
index dda7420..9795677 100644
--- a/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
+++ b/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-  
--->
-<library>
-
-<class name="videoUserProfilePicSWF10" extends="view" x="1" y="2" 
width="${parent.width-2}" height="${parent.height-3}" 
-               clip="true" bgcolor="white">
-       <attribute name="value" value="null" />
-               
-       <handler name="oninit">
-       <![CDATA[
-               if ($debug) Debug.write("videoUserProfilePicSWF10::oninit", 
this);
-               this._userpic.setAttribute('src', 
canvas.getPictureUrl(value.userId, value.picture_uri));
-       ]]>
-       </handler>      
-       <omImage name="_userpic" stretches="both" width="${parent.width}" 
height="${parent.height}" />
-</class>
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+  
+-->
+<library>
+
+<class name="videoUserProfilePicSWF10" extends="view" x="1" y="2" 
width="${parent.width-2}" height="${parent.height-3}" 
+               clip="true" bgcolor="white">
+       <attribute name="value" value="null" />
+               
+       <handler name="oninit">
+       <![CDATA[
+               if ($debug) Debug.write("videoUserProfilePicSWF10::oninit", 
this);
+               this._userpic.setAttribute('src', 
canvas.getPictureUrl(value.userId, value.picture_uri));
+       ]]>
+       </handler>      
+       <omImage name="_userpic" stretches="both" width="${parent.width}" 
height="${parent.height}" />
+</class>
+
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/main/swf/video/volumeSlider.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/video/volumeSlider.lzx 
b/openmeetings-flash/src/main/swf/video/volumeSlider.lzx
index 9d636aa..0f4c93c 100644
--- a/openmeetings-flash/src/main/swf/video/volumeSlider.lzx
+++ b/openmeetings-flash/src/main/swf/video/volumeSlider.lzx
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.
-
--->
-<library>
-
-       <class name="VolumeSlider" extends="closableView" clickable="true" 
height="120">
-               <attribute name="videoStream" value="null" />
-               <attribute name="ownStream" type="boolean" value="false" />
-               <attribute name="resizing" type="boolean" value="false" />
-       
-               <attribute name="videoObject" value="null" />
-               <attribute name="initialNumber" value="50" type="number" />
-               <attribute name="maxvalue" value="100" type="number" />
-       
-               <!--- @keywords private -->
-               <method name="passModeEvent" args="eventStr,view">
-               <![CDATA[
-                       if (eventStr == "onmousedown") {
-                               if (null != view) {
-                                       if (!view.childOf(this)) {
-                                               this.close();
-                                       }
-                               } else {
-                                       this.close();
-                               }
-                       }
-                       if (view && view.childOf(this)) {
-                               if (view[eventStr]) {
-                                       view[eventStr].sendEvent(view);
-                               }
-                               return false;
-                       }
-                       return true;
-               ]]>
-               </method>
-       
-               <vslider name="_slider" height="$once{parent.height}" y="10" 
x="0" minvalue="0" maxvalue="100" initvalue="$once{ parent.initialNumber }"
-                       showrange="false" showvalue="false" switchaxis="true">
-                       <handler name="onvalue" args="v">
-                               if ($debug) Debug.write("onvalue", v);
-       
-                               parent.videoObject.setStreamVolume(Number(v));
-                       </handler>
-                       <handler name="onvalueChosenFinal">
-                               parent.close();
-                       </handler>
-               </vslider>
-       
-       </class>
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+
+-->
+<library>
+
+       <class name="VolumeSlider" extends="closableView" clickable="true" 
height="120">
+               <attribute name="videoStream" value="null" />
+               <attribute name="ownStream" type="boolean" value="false" />
+               <attribute name="resizing" type="boolean" value="false" />
+       
+               <attribute name="videoObject" value="null" />
+               <attribute name="initialNumber" value="50" type="number" />
+               <attribute name="maxvalue" value="100" type="number" />
+       
+               <!--- @keywords private -->
+               <method name="passModeEvent" args="eventStr,view">
+               <![CDATA[
+                       if (eventStr == "onmousedown") {
+                               if (null != view) {
+                                       if (!view.childOf(this)) {
+                                               this.close();
+                                       }
+                               } else {
+                                       this.close();
+                               }
+                       }
+                       if (view && view.childOf(this)) {
+                               if (view[eventStr]) {
+                                       view[eventStr].sendEvent(view);
+                               }
+                               return false;
+                       }
+                       return true;
+               ]]>
+               </method>
+       
+               <vslider name="_slider" height="$once{parent.height}" y="10" 
x="0" minvalue="0" maxvalue="100" initvalue="$once{ parent.initialNumber }"
+                       showrange="false" showvalue="false" switchaxis="true">
+                       <handler name="onvalue" args="v">
+                               if ($debug) Debug.write("onvalue", v);
+       
+                               parent.videoObject.setStreamVolume(Number(v));
+                       </handler>
+                       <handler name="onvalueChosenFinal">
+                               parent.close();
+                       </handler>
+               </vslider>
+       
+       </class>
+
+</library>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-flash/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/site/site.xml 
b/openmeetings-flash/src/site/site.xml
index b7a0eae..dd3dc53 100644
--- a/openmeetings-flash/src/site/site.xml
+++ b/openmeetings-flash/src/site/site.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed 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.
- -->
-<project xmlns="http://maven.apache.org/DECORATION/1.7.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 
http://maven.apache.org/xsd/decoration-1.7.0.xsd";
-  name="Apache OpenMeetings Project">
-
-       <body>
-               <menu ref="parent"/>
-               <menu name="Project">
-                       <item name="About" href="/index.html" />
-                       <item name="Info" href="/project-info.html" />
-                       <item name="Summary" href="/project-summary.html" />
-                       <item name="License" href="/license.html" />
-                       <item name="Dependencies" href="/dependencies.html" />
-                       <item name="Dependency Convergence" 
href="/dependency-convergence.html" />
-                       <item name="RAT Report" href="/rat-report.html" />
-               </menu>
-       </body>
-       <custom>
-               <reflowSkin>
-                       <bottomNav maxSpan="12">
-                               <column>Parent Project</column>
-                               <column>Project</column>
-                       </bottomNav>
-               </reflowSkin>
-       </custom>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed 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.
+ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.7.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 
http://maven.apache.org/xsd/decoration-1.7.0.xsd";
+  name="Apache OpenMeetings Project">
+
+       <body>
+               <menu ref="parent"/>
+               <menu name="Project">
+                       <item name="About" href="/index.html" />
+                       <item name="Info" href="/project-info.html" />
+                       <item name="Summary" href="/project-summary.html" />
+                       <item name="License" href="/license.html" />
+                       <item name="Dependencies" href="/dependencies.html" />
+                       <item name="Dependency Convergence" 
href="/dependency-convergence.html" />
+                       <item name="RAT Report" href="/rat-report.html" />
+               </menu>
+       </body>
+       <custom>
+               <reflowSkin>
+                       <bottomNav maxSpan="12">
+                               <column>Parent Project</column>
+                               <column>Project</column>
+                       </bottomNav>
+               </reflowSkin>
+       </custom>
+</project>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
index 71c8ebc..79ee837 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
@@ -1,55 +1,55 @@
-/*
- * 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.backup;
-
-import java.util.Map;
-
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class AppointmentConverter extends OmConverter<Appointment> {
-       private AppointmentDao appointmentDao;
-       private Map<Long, Long> idMap;
-       
-       public AppointmentConverter() {
-               //default constructor is for export
-       }
-       
-       public AppointmentConverter(AppointmentDao appointmentDao, Map<Long, 
Long> idMap) {
-               this.appointmentDao = appointmentDao;
-               this.idMap = idMap;
-       }
-       
-       @Override
-       public Appointment read(InputNode node) throws Exception {
-               long oldId = getLong(node);
-               Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
-               
-               Appointment a = appointmentDao.getAny(newId);
-               return a == null ? new Appointment() : a;
-       }
-
-       @Override
-       public void write(OutputNode node, Appointment value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import java.util.Map;
+
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class AppointmentConverter extends OmConverter<Appointment> {
+       private AppointmentDao appointmentDao;
+       private Map<Long, Long> idMap;
+       
+       public AppointmentConverter() {
+               //default constructor is for export
+       }
+       
+       public AppointmentConverter(AppointmentDao appointmentDao, Map<Long, 
Long> idMap) {
+               this.appointmentDao = appointmentDao;
+               this.idMap = idMap;
+       }
+       
+       @Override
+       public Appointment read(InputNode node) throws Exception {
+               long oldId = getLong(node);
+               Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
+               
+               Appointment a = appointmentDao.getAny(newId);
+               return a == null ? new Appointment() : a;
+       }
+
+       @Override
+       public void write(OutputNode node, Appointment value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
index d0750c5..aec044e 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
@@ -1,39 +1,39 @@
-/*
- * 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.backup;
-
-import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class AppointmentReminderTypeConverter extends OmConverter<Reminder> {
-       public AppointmentReminderTypeConverter() {
-       }
-       
-       @Override
-       public Reminder read(InputNode node) throws Exception {
-               return Reminder.get(getInt(node));
-       }
-
-       @Override
-       public void write(OutputNode node, Reminder value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
-}
+/*
+ * 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.backup;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class AppointmentReminderTypeConverter extends OmConverter<Reminder> {
+       public AppointmentReminderTypeConverter() {
+       }
+       
+       @Override
+       public Reminder read(InputNode node) throws Exception {
+               return Reminder.get(getInt(node));
+       }
+
+       @Override
+       public void write(OutputNode node, Reminder value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
index d44ddbd..7f3967d 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
@@ -1,41 +1,41 @@
-/*
- * 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.backup;
-
-import java.util.Date;
-
-import org.apache.openmeetings.util.CalendarPatterns;
-import org.simpleframework.xml.convert.Converter;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class DateConverter implements Converter<Date> {
-       @Override
-       public Date read(InputNode node) throws Exception {
-               String val = node.getValue();
-               return val == null || "null".equals(val) ? new Date() : 
CalendarPatterns.parseImportDate(val);
-       }
-
-       @Override
-       public void write(OutputNode node, Date value) throws Exception {
-               node.setAttribute("class", "java.util.Date");
-               node.setData(true);
-               node.setValue(value == null ? "0" : 
CalendarPatterns.getExportDate(value));
-       }
+/*
+ * 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.backup;
+
+import java.util.Date;
+
+import org.apache.openmeetings.util.CalendarPatterns;
+import org.simpleframework.xml.convert.Converter;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class DateConverter implements Converter<Date> {
+       @Override
+       public Date read(InputNode node) throws Exception {
+               String val = node.getValue();
+               return val == null || "null".equals(val) ? new Date() : 
CalendarPatterns.parseImportDate(val);
+       }
+
+       @Override
+       public void write(OutputNode node, Date value) throws Exception {
+               node.setAttribute("class", "java.util.Date");
+               node.setData(true);
+               node.setValue(value == null ? "0" : 
CalendarPatterns.getExportDate(value));
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
index 29cee41..67c363b 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
@@ -1,55 +1,55 @@
-/*
- * 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.backup;
-
-import java.util.Map;
-
-import org.apache.openmeetings.db.dao.user.GroupDao;
-import org.apache.openmeetings.db.entity.user.Group;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class GroupConverter extends OmConverter<Group> {
-       private GroupDao groupDao;
-       private Map<Long, Long> idMap;
-       
-       public GroupConverter() {
-               //default constructor is for export
-       }
-       
-       public GroupConverter(GroupDao groupDao, Map<Long, Long> idMap) {
-               this.groupDao = groupDao;
-               this.idMap = idMap;
-       }
-       
-       @Override
-       public Group read(InputNode node) throws Exception {
-               long oldId = getLong(node);
-               long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
-               
-               Group o = groupDao.get(newId);
-               return o == null ? new Group() : o;
-       }
-
-       @Override
-       public void write(OutputNode node, Group value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import java.util.Map;
+
+import org.apache.openmeetings.db.dao.user.GroupDao;
+import org.apache.openmeetings.db.entity.user.Group;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class GroupConverter extends OmConverter<Group> {
+       private GroupDao groupDao;
+       private Map<Long, Long> idMap;
+       
+       public GroupConverter() {
+               //default constructor is for export
+       }
+       
+       public GroupConverter(GroupDao groupDao, Map<Long, Long> idMap) {
+               this.groupDao = groupDao;
+               this.idMap = idMap;
+       }
+       
+       @Override
+       public Group read(InputNode node) throws Exception {
+               long oldId = getLong(node);
+               long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
+               
+               Group o = groupDao.get(newId);
+               return o == null ? new Group() : o;
+       }
+
+       @Override
+       public void write(OutputNode node, Group value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
index 4ab9f24..de31d41 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
@@ -1,29 +1,29 @@
-/*
- * 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.backup;
-
-import org.simpleframework.xml.stream.InputNode;
-
-public abstract class InlineConverter<T> extends OmConverter<T> {
-       
-       String getNextValue(InputNode parent, String name) throws Exception {
-               InputNode node = parent.getNext(name);
-               return node != null ? node.getValue() : null;
-       }
-}
+/*
+ * 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.backup;
+
+import org.simpleframework.xml.stream.InputNode;
+
+public abstract class InlineConverter<T> extends OmConverter<T> {
+       
+       String getNextValue(InputNode parent, String name) throws Exception {
+               InputNode node = parent.getNext(name);
+               return node != null ? node.getValue() : null;
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java
index 6f6aa7f..dc7dc7e 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java
@@ -1,34 +1,34 @@
-/*
- * 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.backup;
-
-import org.simpleframework.xml.transform.Transform;
-
-public class IntegerTransform implements Transform<Integer>{
-       @Override
-       public Integer read(String value) throws Exception {
-               return OmConverter.getInt(value, 0);
-       }
-
-       @Override
-       public String write(Integer value) throws Exception {
-               return "" + value;
-       }
-
-}
+/*
+ * 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.backup;
+
+import org.simpleframework.xml.transform.Transform;
+
+public class IntegerTransform implements Transform<Integer>{
+       @Override
+       public Integer read(String value) throws Exception {
+               return OmConverter.getInt(value, 0);
+       }
+
+       @Override
+       public String write(Integer value) throws Exception {
+               return "" + value;
+       }
+
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java
index d48be83..e171383 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java
@@ -1,33 +1,33 @@
-/*
- * 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.backup;
-
-import org.simpleframework.xml.transform.Transform;
-
-public class LongTransform implements Transform<Long> {
-       @Override
-       public Long read(String value) throws Exception {
-               return OmConverter.getLong(value);
-       }
-
-       @Override
-       public String write(Long value) throws Exception {
-               return "" + value;
-       }
-}
+/*
+ * 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.backup;
+
+import org.simpleframework.xml.transform.Transform;
+
+public class LongTransform implements Transform<Long> {
+       @Override
+       public Long read(String value) throws Exception {
+               return OmConverter.getLong(value);
+       }
+
+       @Override
+       public String write(Long value) throws Exception {
+               return "" + value;
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
index 613e6ff..f4c9349 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
@@ -1,55 +1,55 @@
-/*
- * 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.backup;
-
-import java.util.Map;
-
-import org.apache.openmeetings.db.dao.calendar.OmCalendarDao;
-import org.apache.openmeetings.db.entity.calendar.OmCalendar;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class OmCalendarConverter extends OmConverter<OmCalendar> {
-       private OmCalendarDao calendarDao;
-       private Map<Long, Long> idMap;
-       
-       public OmCalendarConverter() {
-               //default constructor is for export
-       }
-
-       public OmCalendarConverter(OmCalendarDao calendarDao, Map<Long, Long> 
idMap) {
-               this.calendarDao = calendarDao;
-               this.idMap = idMap;
-       }
-
-       @Override
-       public OmCalendar read(InputNode node) throws Exception {
-               long oldId = getLong(node);
-               Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
-               
-               OmCalendar c = calendarDao.get(newId);
-               return c == null ? new OmCalendar() : c;
-       }
-
-       @Override
-       public void write(OutputNode node, OmCalendar value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
-}
+/*
+ * 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.backup;
+
+import java.util.Map;
+
+import org.apache.openmeetings.db.dao.calendar.OmCalendarDao;
+import org.apache.openmeetings.db.entity.calendar.OmCalendar;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class OmCalendarConverter extends OmConverter<OmCalendar> {
+       private OmCalendarDao calendarDao;
+       private Map<Long, Long> idMap;
+       
+       public OmCalendarConverter() {
+               //default constructor is for export
+       }
+
+       public OmCalendarConverter(OmCalendarDao calendarDao, Map<Long, Long> 
idMap) {
+               this.calendarDao = calendarDao;
+               this.idMap = idMap;
+       }
+
+       @Override
+       public OmCalendar read(InputNode node) throws Exception {
+               long oldId = getLong(node);
+               Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
+               
+               OmCalendar c = calendarDao.get(newId);
+               return c == null ? new OmCalendar() : c;
+       }
+
+       @Override
+       public void write(OutputNode node, OmCalendar value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
index 6d3055e..34539e1 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
@@ -1,56 +1,56 @@
-/*
- * 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.backup;
-
-import org.simpleframework.xml.convert.Converter;
-import org.simpleframework.xml.stream.InputNode;
-
-public abstract class OmConverter<T> implements Converter<T> {
-       static long getLong(InputNode node) throws Exception {
-               return getLong(node.getValue());
-       }
-
-       static long getLong(String value) {
-               return getLong(value, 0);
-       }
-       
-       static long getLong(String value, long def) {
-               long result = def;
-               try {
-                       result = Long.valueOf(value).longValue();
-               } catch (Exception e) {
-                       //no op
-               }
-               return result;
-       }
-
-       static int getInt(InputNode node) throws Exception {
-               return getInt(node.getValue(), 0);
-       }
-       
-       static int getInt(String value, int def) {
-               int result = def;
-               try {
-                       result = Integer.valueOf(value).intValue();
-               } catch (Exception e) {
-                       //no op
-               }
-               return result;
-       }
-}
+/*
+ * 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.backup;
+
+import org.simpleframework.xml.convert.Converter;
+import org.simpleframework.xml.stream.InputNode;
+
+public abstract class OmConverter<T> implements Converter<T> {
+       static long getLong(InputNode node) throws Exception {
+               return getLong(node.getValue());
+       }
+
+       static long getLong(String value) {
+               return getLong(value, 0);
+       }
+       
+       static long getLong(String value, long def) {
+               long result = def;
+               try {
+                       result = Long.valueOf(value).longValue();
+               } catch (Exception e) {
+                       //no op
+               }
+               return result;
+       }
+
+       static int getInt(InputNode node) throws Exception {
+               return getInt(node.getValue(), 0);
+       }
+       
+       static int getInt(String value, int def) {
+               int result = def;
+               try {
+                       result = Integer.valueOf(value).intValue();
+               } catch (Exception e) {
+                       //no op
+               }
+               return result;
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
index 3381b3f..365904d 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
@@ -1,38 +1,38 @@
-/*
- * 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.backup;
-
-import org.apache.openmeetings.db.entity.room.RoomPoll;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
-       public PollTypeConverter() {}
-       
-       @Override
-       public RoomPoll.Type read(InputNode node) throws Exception {
-               return RoomPoll.Type.get(getLong(node));
-       }
-
-       @Override
-       public void write(OutputNode node, RoomPoll.Type value) throws 
Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
+       public PollTypeConverter() {}
+       
+       @Override
+       public RoomPoll.Type read(InputNode node) throws Exception {
+               return RoomPoll.Type.get(getLong(node));
+       }
+
+       @Override
+       public void write(OutputNode node, RoomPoll.Type value) throws 
Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java
index e751335..128ee13 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java
@@ -1,47 +1,47 @@
-/*
- * 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.backup;
-
-import org.apache.openmeetings.db.entity.record.Recording;
-import org.apache.openmeetings.db.entity.record.Recording.Status;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class RecordingStatusConverter extends OmConverter<Recording.Status> {
-       private static final String PROCESSING = "PROCESSING";
-       public RecordingStatusConverter() {}
-
-       @Override
-       public Recording.Status read(InputNode node) throws Exception {
-               Recording.Status result = null;
-               String val = node.getValue();
-               try {
-                       result = Recording.Status.valueOf(val);
-               } catch (Exception e) {
-                       result = PROCESSING.equals(val) ? Status.CONVERTING : 
Status.NONE;
-               }
-               return result;
-       }
-
-       @Override
-       public void write(OutputNode node, Recording.Status value) throws 
Exception {
-               node.setData(true);
-               node.setValue(value == null ? Status.NONE.name() : 
value.name());
-       }
-}
+/*
+ * 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.backup;
+
+import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.openmeetings.db.entity.record.Recording.Status;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class RecordingStatusConverter extends OmConverter<Recording.Status> {
+       private static final String PROCESSING = "PROCESSING";
+       public RecordingStatusConverter() {}
+
+       @Override
+       public Recording.Status read(InputNode node) throws Exception {
+               Recording.Status result = null;
+               String val = node.getValue();
+               try {
+                       result = Recording.Status.valueOf(val);
+               } catch (Exception e) {
+                       result = PROCESSING.equals(val) ? Status.CONVERTING : 
Status.NONE;
+               }
+               return result;
+       }
+
+       @Override
+       public void write(OutputNode node, Recording.Status value) throws 
Exception {
+               node.setData(true);
+               node.setValue(value == null ? Status.NONE.name() : 
value.name());
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
index 3a0fa36..20ccba1 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
@@ -1,55 +1,55 @@
-/*
- * 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.backup;
-
-import java.util.Map;
-
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.entity.room.Room;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class RoomConverter extends OmConverter<Room> {
-       private RoomDao roomDao;
-       private Map<Long, Long> idMap;
-       
-       public RoomConverter() {
-               //default constructor is for export
-       }
-       
-       public RoomConverter(RoomDao roomDao, Map<Long, Long> idMap) {
-               this.roomDao = roomDao;
-               this.idMap = idMap;
-       }
-       
-       @Override
-       public Room read(InputNode node) throws Exception {
-               long oldId = getLong(node);
-               long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
-
-               Room r = roomDao.get(newId);
-               return r == null ? new Room() : r;
-       }
-
-       @Override
-       public void write(OutputNode node, Room value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import java.util.Map;
+
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class RoomConverter extends OmConverter<Room> {
+       private RoomDao roomDao;
+       private Map<Long, Long> idMap;
+       
+       public RoomConverter() {
+               //default constructor is for export
+       }
+       
+       public RoomConverter(RoomDao roomDao, Map<Long, Long> idMap) {
+               this.roomDao = roomDao;
+               this.idMap = idMap;
+       }
+       
+       @Override
+       public Room read(InputNode node) throws Exception {
+               long oldId = getLong(node);
+               long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : 
oldId;
+
+               Room r = roomDao.get(newId);
+               return r == null ? new Room() : r;
+       }
+
+       @Override
+       public void write(OutputNode node, Room value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
index 2696c27..a6f8f5b 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
@@ -1,38 +1,38 @@
-/*
- * 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.backup;
-
-import org.apache.openmeetings.db.entity.room.Room.Type;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class RoomTypeConverter extends OmConverter<Type> {
-       public RoomTypeConverter() {}
-       
-       @Override
-       public Type read(InputNode node) throws Exception {
-               return Type.get(getInt(node));
-       }
-
-       @Override
-       public void write(OutputNode node, Type value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import org.apache.openmeetings.db.entity.room.Room.Type;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class RoomTypeConverter extends OmConverter<Type> {
+       public RoomTypeConverter() {}
+       
+       @Override
+       public Type read(InputNode node) throws Exception {
+               return Type.get(getInt(node));
+       }
+
+       @Override
+       public void write(OutputNode node, Type value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
index 70e19af..59e680a 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
@@ -1,36 +1,36 @@
-/*
- * 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.backup;
-
-import org.apache.openmeetings.db.entity.user.User.Salutation;
-import org.simpleframework.xml.stream.InputNode;
-import org.simpleframework.xml.stream.OutputNode;
-
-public class SalutationConverter extends OmConverter<Salutation> {
-       @Override
-       public Salutation read(InputNode node) throws Exception {
-               return Salutation.get(getInt(node));
-       }
-
-       @Override
-       public void write(OutputNode node, Salutation value) throws Exception {
-               node.setData(true);
-               node.setValue(value == null ? "0" : "" + value.getId());
-       }
+/*
+ * 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.backup;
+
+import org.apache.openmeetings.db.entity.user.User.Salutation;
+import org.simpleframework.xml.stream.InputNode;
+import org.simpleframework.xml.stream.OutputNode;
+
+public class SalutationConverter extends OmConverter<Salutation> {
+       @Override
+       public Salutation read(InputNode node) throws Exception {
+               return Salutation.get(getInt(node));
+       }
+
+       @Override
+       public void write(OutputNode node, Salutation value) throws Exception {
+               node.setData(true);
+               node.setValue(value == null ? "0" : "" + value.getId());
+       }
 }
\ No newline at end of file

Reply via email to