You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/12 07:28:23 UTC
svn commit: r1522448 [2/8] - in /openmeetings/trunk/singlewebapp: docs/
src/main/java/org/apache/openmeetings/axis/services/
src/main/java/org/apache/openmeetings/backup/
src/main/java/org/apache/openmeetings/cli/
src/main/java/org/apache/openmeetings/...
Added: openmeetings/trunk/singlewebapp/docs/red5sip-integration_3.0.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/red5sip-integration_3.0.html?rev=1522448&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/red5sip-integration_3.0.html (added)
+++ openmeetings/trunk/singlewebapp/docs/red5sip-integration_3.0.html Thu Sep 12 05:28:14 2013
@@ -0,0 +1,1053 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<!--
+Copyright 1999-2004 The Apache Software Foundation
+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.
+-->
+
+
+<!-- Content Stylesheet for Site -->
+
+
+<!-- start the processing -->
+ <!-- ====================================================================== -->
+ <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
+ <!-- Main Page Section -->
+ <!-- ====================================================================== -->
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+ <meta name="author" content="OpenMeetings Team">
+ <meta name="email" content="solomax@apache.org">
+
+
+
+
+ <title>Apache OpenMeetings - SIP-Transport Integration</title>
+ <link rel="stylesheet" type="text/css" href="css/openmeetings.css">
+ <link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
+ <link rel="stylesheet" type="text/css" href="css/coin-slider-styles.css">
+ <link rel="stylesheet" type="text/css" href="css/colorbox.css" />
+
+ <!-- Add jQuery library -->
+ <script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
+
+ <!-- Add coinslider plugins -->
+ <script type="text/javascript" src="js/coin-slider.min.js"></script>
+
+ <!-- Add colorbox plugin -->
+ <script type="text/javascript" src="js/jquery.colorbox.js"></script>
+
+ <script src="js/jquery.ui.core.js"></script>
+ <script src="js/jquery.ui.widget.js"></script>
+
+ <script src="js/jquery.ui.accordion.js"></script>
+
+ <script>
+ $(function() {
+ $( "#accordion" ).accordion({
+ autoHeight: false,
+ navigation: true,
+ navigationFilter: function () {
+ var sidebarHrefArray = this.href.split("/");
+ var sideBarLastString = sidebarHrefArray[sidebarHrefArray.length - 1].toLowerCase();
+
+ if (sideBarLastString.indexOf("#") == -1) {
+ return false;
+ }
+
+ /* document.location.href */
+ var currentSection = "";
+
+ var currentLocation = "";
+ var currentLink = "";
+ if (false) {
+
+ }
+
+ else if (document.location.href.indexOf("/index.html") > 0) {
+ currentLocation = "General";
+ currentLink = "/index.html".substr(1, "/index.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/license.html") > 0) {
+ currentLocation = "General";
+ currentLink = "/license.html".substr(1, "/license.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("http://www.apache.org/") > 0) {
+ currentLocation = "General";
+ currentLink = "http://www.apache.org/".substr(1, "http://www.apache.org/".length);
+ }
+
+
+ else if (document.location.href.indexOf("/downloads.html") > 0) {
+ currentLocation = "General";
+ currentLink = "/downloads.html".substr(1, "/downloads.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/commercial-support.html") > 0) {
+ currentLocation = "General";
+ currentLink = "/commercial-support.html".substr(1, "/commercial-support.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/installation.html") > 0) {
+ currentLocation = "InstallationandUpgrade";
+ currentLink = "/installation.html".substr(1, "/installation.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/Upgrade.html") > 0) {
+ currentLocation = "InstallationandUpgrade";
+ currentLink = "/Upgrade.html".substr(1, "/Upgrade.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools") > 0) {
+ currentLocation = "InstallationandUpgrade";
+ currentLink = "https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools".substr(1, "https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools".length);
+ }
+
+
+ else if (document.location.href.indexOf("/CommandLineAdmin.html") > 0) {
+ currentLocation = "InstallationandUpgrade";
+ currentLink = "/CommandLineAdmin.html".substr(1, "/CommandLineAdmin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/get-involved.html") > 0) {
+ currentLocation = "Community";
+ currentLink = "/get-involved.html".substr(1, "/get-involved.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/team-list.html") > 0) {
+ currentLocation = "Community";
+ currentLink = "/team-list.html".substr(1, "/team-list.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/mail-lists.html") > 0) {
+ currentLocation = "Community";
+ currentLink = "/mail-lists.html".substr(1, "/mail-lists.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("http://cwiki.apache.org/confluence/display/OPENMEETINGS/") > 0) {
+ currentLocation = "Community";
+ currentLink = "http://cwiki.apache.org/confluence/display/OPENMEETINGS/".substr(1, "http://cwiki.apache.org/confluence/display/OPENMEETINGS/".length);
+ }
+
+
+ else if (document.location.href.indexOf("/svn.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/svn.html".substr(1, "/svn.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("http://issues.apache.org/jira/browse/OPENMEETINGS") > 0) {
+ currentLocation = "Development";
+ currentLink = "http://issues.apache.org/jira/browse/OPENMEETINGS".substr(1, "http://issues.apache.org/jira/browse/OPENMEETINGS".length);
+ }
+
+
+ else if (document.location.href.indexOf("/dependencies.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/dependencies.html".substr(1, "/dependencies.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/BuildInstructions.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/BuildInstructions.html".substr(1, "/BuildInstructions.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/JUnitTesting.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/JUnitTesting.html".substr(1, "/JUnitTesting.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/ManualTesting.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/ManualTesting.html".substr(1, "/ManualTesting.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/ReleaseGuide.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/ReleaseGuide.html".substr(1, "/ReleaseGuide.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/WebsiteGuide.html") > 0) {
+ currentLocation = "Development";
+ currentLink = "/WebsiteGuide.html".substr(1, "/WebsiteGuide.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/SoapRestAPI.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/SoapRestAPI.html".substr(1, "/SoapRestAPI.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/RestAPISample.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/RestAPISample.html".substr(1, "/RestAPISample.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/LdapAndADS.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/LdapAndADS.html".substr(1, "/LdapAndADS.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/oauth2.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/oauth2.html".substr(1, "/oauth2.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/voip-sip-integration.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/voip-sip-integration.html".substr(1, "/voip-sip-integration.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/ErrorsTable.html") > 0) {
+ currentLocation = "Integration";
+ currentLink = "/ErrorsTable.html".substr(1, "/ErrorsTable.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/MoodlePlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/MoodlePlugin.html".substr(1, "/MoodlePlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/SakaiPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/SakaiPlugin.html".substr(1, "/SakaiPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/JiraPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/JiraPlugin.html".substr(1, "/JiraPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/JoomlaPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/JoomlaPlugin.html".substr(1, "/JoomlaPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/DrupalPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/DrupalPlugin.html".substr(1, "/DrupalPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/BitrixPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/BitrixPlugin.html".substr(1, "/BitrixPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/ConfluencePlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/ConfluencePlugin.html".substr(1, "/ConfluencePlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/SugarCRMPlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/SugarCRMPlugin.html".substr(1, "/SugarCRMPlugin.html".length);
+ }
+
+
+ else if (document.location.href.indexOf("/RedminePlugin.html") > 0) {
+ currentLocation = "Plugins";
+ currentLink = "/RedminePlugin.html".substr(1, "/RedminePlugin.html".length);
+ }
+
+ else if (document.location.href.indexOf("/ApacheDerbyConfig.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/ApacheDerbyConfig.html".substr(1, "/ApacheDerbyConfig.html".length);
+ }
+ else if (document.location.href.indexOf("/IBMDB2Config.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/IBMDB2Config.html".substr(1, "/IBMDB2Config.html".length);
+ }
+ else if (document.location.href.indexOf("/OracleConfig.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/OracleConfig.html".substr(1, "/OracleConfig.html".length);
+ }
+ else if (document.location.href.indexOf("/MySQLConfig.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/MySQLConfig.html".substr(1, "/MySQLConfig.html".length);
+ }
+ else if (document.location.href.indexOf("/PostgresConfig.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/PostgresConfig.html".substr(1, "/PostgresConfig.html".length);
+ }
+ else if (document.location.href.indexOf("/Internationalisation.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/Internationalisation.html".substr(1, "/Internationalisation.html".length);
+ }
+ else if (document.location.href.indexOf("/LanguageEditor.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/LanguageEditor.html".substr(1, "/LanguageEditor.html".length);
+ }
+ else if (document.location.href.indexOf("/TimeZoneHandling.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/TimeZoneHandling.html".substr(1, "/TimeZoneHandling.html".length);
+ }
+ else if (document.location.href.indexOf("/EditTemplates.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/EditTemplates.html".substr(1, "/EditTemplates.html".length);
+ }
+ else if (document.location.href.indexOf("/PortSettings.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/PortSettings.html".substr(1, "/PortSettings.html".length);
+ }
+ else if (document.location.href.indexOf("/JVMPerformanceTuning.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/JVMPerformanceTuning.html".substr(1, "/JVMPerformanceTuning.html".length);
+ }
+ else if (document.location.href.indexOf("/themes-and-branding.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/themes-and-branding.html".substr(1, "/themes-and-branding.html".length);
+ }
+ else if (document.location.href.indexOf("/Dashboard.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/Dashboard.html".substr(1, "/Dashboard.html".length);
+ }
+ else if (document.location.href.indexOf("/WebcamResolutions.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/WebcamResolutions.html".substr(1, "/WebcamResolutions.html".length);
+ }
+ else if (document.location.href.indexOf("/ConferenceRoomLayoutOptions.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/ConferenceRoomLayoutOptions.html".substr(1, "/ConferenceRoomLayoutOptions.html".length);
+ }
+ else if (document.location.href.indexOf("/HotKeys.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/HotKeys.html".substr(1, "/HotKeys.html".length);
+ }
+ else if (document.location.href.indexOf("/WebappNamePath.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/WebappNamePath.html".substr(1, "/WebappNamePath.html".length);
+ }
+ else if (document.location.href.indexOf("/Navigation.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/Navigation.html".substr(1, "/Navigation.html".length);
+ }
+ else if (document.location.href.indexOf("/CalendarAndTimezone.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/CalendarAndTimezone.html".substr(1, "/CalendarAndTimezone.html".length);
+ }
+ else if (document.location.href.indexOf("/CustomRoomTypeHowTo.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/CustomRoomTypeHowTo.html".substr(1, "/CustomRoomTypeHowTo.html".length);
+ }
+ else if (document.location.href.indexOf("/CustomCryptMechanism.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/CustomCryptMechanism.html".substr(1, "/CustomCryptMechanism.html".length);
+ }
+ else if (document.location.href.indexOf("/GeneralConfiguration.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/GeneralConfiguration.html".substr(1, "/GeneralConfiguration.html".length);
+ }
+ else if (document.location.href.indexOf("/RestrictedAccess.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/RestrictedAccess.html".substr(1, "/RestrictedAccess.html".length);
+ }
+ else if (document.location.href.indexOf("/RTMPSAndHTTPS.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/RTMPSAndHTTPS.html".substr(1, "/RTMPSAndHTTPS.html".length);
+ }
+ else if (document.location.href.indexOf("/OpenOfficeConverter.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/OpenOfficeConverter.html".substr(1, "/OpenOfficeConverter.html".length);
+ }
+ else if (document.location.href.indexOf("/FFMPEGVersionSwitch.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/FFMPEGVersionSwitch.html".substr(1, "/FFMPEGVersionSwitch.html".length);
+ }
+ else if (document.location.href.indexOf("/Clustering.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/Clustering.html".substr(1, "/Clustering.html".length);
+ }
+ else if (document.location.href.indexOf("/GetVersionInfo.html") > 0) {
+ currentLocation = "Configuration";
+ currentLink = "/GetVersionInfo.html".substr(1, "/GetVersionInfo.html".length);
+ }
+
+ currentLink = currentLink.toLowerCase();
+ currentLocation = currentLocation.toLowerCase();
+
+ return sideBarLastString == currentLink+"#"+currentLocation;
+ }
+ });
+ });
+ </script>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $('.fancybox-buttons').colorbox({rel:'fancybox-buttons',width:"75%", height:"75%"});
+ $('#accordion a').each(function() {
+ var a = $(this);
+ var href = a.attr("href");
+ if (href.indexOf("#") == -1) {
+ var compareIt = href.substr(2, href.length);
+ if (document.location.href.indexOf(compareIt)!= -1) {
+ a.addClass('active');
+ }
+ }
+ });
+ $('#coin-slider').coinslider({ width: 640,height: 400, delay: 4000 });
+ });
+ </script>
+
+ <style type="text/css">
+ .fancybox-custom .fancybox-outer {
+ box-shadow: 0 0 50px #222;
+ }
+ </style>
+ </head>
+
+ <body bgcolor="#ffffff" text="#000000" link="#123465" vlink="#123465" alink="#000000">
+ <div class="mainbody" style="min-width: 960px; width: 94%;">
+ <div class="superbody" style="width: 100%;">
+ <table border="0" width="100%" cellspacing="0">
+ <!-- TOP IMAGE -->
+ <tr>
+ <td align="left">
+<a href="http://openmeetings.apache.org/"><img src="./images/logo-2.jpg" alt="Apache OpenMeetings" border="0"/></a>
+</td>
+ <td width="80%" align="right" valign="top" >
+ <a href="demo.html">Demo</a>
+ <span>|</span>
+ <a href="downloads.html" target="_PARENT">Download</a>
+ <span>|</span>
+ <a href="installation.html" target="_PARENT">Installation</a>
+ <span>|</span>
+ <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS" target="_BLANK">Wiki</a>
+ <span> </span>
+</td>
+ </tr>
+ </table>
+ <table border="0" width="100%" cellspacing="4">
+ <tr><td colspan="2">
+ <hr noshade="noshade" size="1"/>
+ </td></tr>
+
+ <tr>
+ <!-- LEFT SIDE NAVIGATION -->
+ <td width="20%" valign="top" nowrap="nowrap">
+
+ <!-- special ACon Logo - leave here for next time
+ <a href="http://apachecon.com/2005/US/">
+ <img src="http://apache.org/images/ac2005us_blue_125x125.jpg" height="125"
+ width="125" border="0" alt="ApacheCon US 2005" />
+ </a> -->
+
+ <!-- regular menu -->
+
+
+ <!-- ============================================================ -->
+ <div id="accordion" style="width: 100%">
+
+ <h3><a href="#General">General</a></h3>
+ <div>
+ <a href="./index.html">Home</a>
+<br/>
+ <a href="./license.html">License</a>
+<br/>
+ <a href="http://www.apache.org/">ASF</a>
+<br/>
+ <a href="./downloads.html">Downloads</a>
+<br/>
+ <a href="./commercial-support.html">Commercial Support</a>
+<br/>
+ </div>
+ <h3><a href="#InstallationandUpgrade">Installation and Upgrade</a></h3>
+ <div>
+ <a href="./installation.html">Installation</a>
+<br/>
+ <a href="./Upgrade.html">Upgrade</a>
+<br/>
+ <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools">Tutorials</a>
+<br/>
+ <a href="./CommandLineAdmin.html">Command Line Admin</a>
+<br/>
+ </div>
+ <h3><a href="#Community">Community</a></h3>
+ <div>
+ <a href="./get-involved.html">Get Involved</a>
+<br/>
+ <a href="./team-list.html">Committers</a>
+<br/>
+ <a href="./mail-lists.html">Mailing Lists</a>
+<br/>
+ <a href="http://cwiki.apache.org/confluence/display/OPENMEETINGS/">Wiki</a>
+<br/>
+ </div>
+ <h3><a href="#Development">Development</a></h3>
+ <div>
+ <a href="./svn.html">Source Code</a>
+<br/>
+ <a href="http://issues.apache.org/jira/browse/OPENMEETINGS">Bugs / Issues (JIRA)</a>
+<br/>
+ <a href="./dependencies.html">Dependencies</a>
+<br/>
+ <a href="./BuildInstructions.html">Build Instructions</a>
+<br/>
+ <a href="./JUnitTesting.html">JUnit Testing</a>
+<br/>
+ <a href="./ManualTesting.html">Manual Testing</a>
+<br/>
+ <a href="./ReleaseGuide.html">Release Guide</a>
+<br/>
+ <a href="./WebsiteGuide.html">Website Guide</a>
+<br/>
+ </div>
+ <h3><a href="#Integration">Integration</a></h3>
+ <div>
+ <a href="./SoapRestAPI.html">SOAP/REST API</a>
+<br/>
+ <a href="./RestAPISample.html">REST API Sample</a>
+<br/>
+ <a href="./LdapAndADS.html">Ldap and ADS</a>
+<br/>
+ <a href="./oauth2.html">OAuth2</a>
+<br/>
+ <a href="./voip-sip-integration.html">VoIP and SIP</a>
+<br/>
+ <a href="./ErrorsTable.html">Errors table</a>
+<br/>
+ </div>
+ <h3><a href="#Plugins">Plugins</a></h3>
+ <div>
+ <a href="./MoodlePlugin.html">Moodle Plugin</a>
+<br/>
+ <a href="./SakaiPlugin.html">Sakai Plugin</a>
+<br/>
+ <a href="./JiraPlugin.html">Jira Plugin</a>
+<br/>
+ <a href="./JoomlaPlugin.html">Joomla Plugin</a>
+<br/>
+ <a href="./DrupalPlugin.html">Drupal Plugin</a>
+<br/>
+ <a href="./BitrixPlugin.html">Bitrix Plugin</a>
+<br/>
+ <a href="./ConfluencePlugin.html">Confluence Plugin</a>
+<br/>
+ <a href="./SugarCRMPlugin.html">SugarCRM Plugin</a>
+<br/>
+ <a href="./RedminePlugin.html">Redmine Plugin</a>
+<br/>
+ </div>
+ <h3><a href="#Configuration">Configuration</a></h3>
+ <div>
+ <b>DB Sample Configurations</b><br/>
+ <a href="./ApacheDerbyConfig.html">Apache Derby</a>
+<br/>
+ <a href="./IBMDB2Config.html">IBM DB2</a>
+<br/>
+ <a href="./OracleConfig.html">Oracle</a>
+<br/>
+ <a href="./MySQLConfig.html">MySQL</a>
+<br/>
+ <a href="./PostgresConfig.html">Postgres</a>
+<br/>
+ <b>Localization and languages</b><br/>
+ <a href="./Internationalisation.html">Internationalisation</a>
+<br/>
+ <a href="./LanguageEditor.html">LanguageEditor</a>
+<br/>
+ <a href="./TimeZoneHandling.html">TimeZoneHandling</a>
+<br/>
+ <a href="./EditTemplates.html">EditTemplates</a>
+<br/>
+ <b>NAT Port Settings</b><br/>
+ <a href="./PortSettings.html">Port settings</a>
+<br/>
+ <b>Performance</b><br/>
+ <a href="./JVMPerformanceTuning.html">JVM performance tuning</a>
+<br/>
+ <b>User Interface</b><br/>
+ <a href="./themes-and-branding.html">Themes</a>
+<br/>
+ <a href="./Dashboard.html">Dashboard</a>
+<br/>
+ <a href="./WebcamResolutions.html">Webcam resolutions</a>
+<br/>
+ <a href="./ConferenceRoomLayoutOptions.html">Room layout options</a>
+<br/>
+ <a href="./HotKeys.html">Hot Keys</a>
+<br/>
+ <b>Customization</b><br/>
+ <a href="./WebappNamePath.html">Webapp name/path</a>
+<br/>
+ <a href="./Navigation.html">Navigation</a>
+<br/>
+ <a href="./CalendarAndTimezone.html">Calendar and timezone</a>
+<br/>
+ <a href="./CustomRoomTypeHowTo.html">Custom room type</a>
+<br/>
+ <a href="./CustomCryptMechanism.html">Custom ctypt mechanism</a>
+<br/>
+ <a href="./GeneralConfiguration.html">General Configuration</a>
+<br/>
+ <b>Security</b><br/>
+ <a href="./RestrictedAccess.html">Restricted Access</a>
+<br/>
+ <a href="./RTMPSAndHTTPS.html">RTMPS and HTTPS</a>
+<br/>
+ <b>Converters</b><br/>
+ <a href="./OpenOfficeConverter.html">OpenOffice Converter</a>
+<br/>
+ <a href="./FFMPEGVersionSwitch.html">FFMPEG Version Switch</a>
+<br/>
+ <b>Clustering</b><br/>
+ <a href="./Clustering.html">Clustering</a>
+<br/>
+ <b>Misc</b><br/>
+ <a href="./GetVersionInfo.html">Get version info</a>
+<br/>
+ </div>
+
+ </div>
+
+ <br/>
+
+ </td>
+ <td width="80%" align="left" valign="top">
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="SIP-Transport Integration"><strong>SIP-Transport Integration</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>You need Apache OpenMeetings <strong>version 2.1</strong> to apply this guide!</p>
+ <p>You need Asterisk <strong>version 11</strong> to apply this guide!</p>
+ <p>Here is instruction how-to set up red5sip transport integration with OpenMeetings on Ubuntu 12.10.</p>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="Prerequisites"><strong>Prerequisites</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <div>
+ Run the commands
+ <blockquote>
+ <i>
+ sudo apt-get update && sudo apt-get upgrade<br />
+ sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev<br />
+ </i>
+ </blockquote>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="ODBC Setup"><strong>ODBC Setup</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <div>
+ Run the commands
+ <blockquote>
+ <i>
+ sudo apt-get update<br />
+ sudo apt-get install unixODBC unixODBC-dev libmyodbc
+ </i>
+ </blockquote>
+ </div>
+ <div>
+ Set up Asterisk connector:<br /><br />
+ Modify file <tt>/etc/odbc.ini</tt> as follows: (replace USER, PASSWORD and Socket with values relative to your system)
+ <blockquote>
+ <i>
+ [asterisk-connector]<br />
+ Description = MySQL connection to 'openmeetings' database<br />
+ Driver = MySQL<br />
+ Database = openmeetings<br />
+ Server = localhost<br />
+ USER = root<br />
+ PASSWORD =<br />
+ Port = 3306<br />
+ Socket = /var/run/mysqld/mysqld.sock<br />
+ </i>
+ </blockquote><br /><br />
+ Modify file <tt>/etc/odbcinst.ini</tt> as follows: (replace the path to the *.so files below with the real paths on your system)
+ <blockquote>
+ (The path below is for x32 server, x64 version is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br />
+ <i>
+ [MySQL]<br />
+ Description = ODBC for MySQL<br />
+ Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br />
+ Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br />
+ FileUsage = 1<br />
+ </i>
+ </blockquote><br /><br />
+ Run the following command to ensure everything works as expected:
+ <blockquote>
+ <i>echo "select 1" | isql -v asterisk-connector</i>
+ </blockquote>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="Building and setting up Asterisk"><strong>Building and setting up Asterisk</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <div>
+ Run the commands
+ <blockquote>
+ <i>
+ sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk<br />
+ sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br />
+ sudo tar -xvzf asterisk-11.2.1.tar.gz<br />
+ cd ./asterisk-11.2.1<br />
+ sudo make clean<br />
+ sudo ./configure<br />
+ sudo make<br />
+ sudo make install<br />
+ sudo make samples<br />
+ sudo make config<br />
+ sudo service asterisk start<br />
+ </i>
+ </blockquote>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="Configure Asterisk"><strong>Configure Asterisk</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <div>
+ Enable asterisk ODBC module:<br /><br />
+ Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br />
+ <strong>Add/uncomment the following lines</strong>
+ <blockquote>
+ <i>
+ preload => res_odbc.so<br />
+ preload => res_config_odbc.so<br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Create/update "[asterisk]" section in <tt>/etc/asterisk/res_odbc.conf</tt>:
+ <blockquote>
+ <i>
+ [asterisk]<br />
+ enabled => yes<br />
+ dsn => asterisk-connector<br />
+ pre-connect => yes
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Modify <tt>/etc/asterisk/sip.conf</tt><br />
+ <strong>Add/uncomment the following line</strong>:<br />
+ <blockquote>
+ <i>
+ videosupport=yes<br />
+ rtcachefriends=yes<br />
+ </i>
+ </blockquote>
+ <strong>Increase maxexpiry value to 43200</strong>:<br />
+ <blockquote>
+ <i>
+ maxexpiry=43200<br />
+ </i>
+ </blockquote>
+ <strong>Add user for the "SIP Transport"</strong>:<br />
+ <blockquote>
+ <i>
+ [red5sip_user]<br />
+ type=friend<br />
+ secret=12345<br />
+ disallow=all<br />
+ allow=ulaw<br />
+ allow=h264<br />
+ host=dynamic<br />
+ nat=force_rport,comedia<br />
+ context=rooms-red5sip<br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>:
+ <blockquote>
+ <i>
+ [settings]<br />
+ sippeers => odbc,asterisk,sipusers<br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Modify <tt>/etc/asterisk/extensions.conf</tt><br />
+ <strong>Add the following section</strong>:<br />
+ <blockquote>
+ <i>
+ [rooms]<br />
+ exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br />
+ exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br />
+ exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br />
+ exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br />
+ exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br />
+ exten => _400X!,n,Hangup<br />
+ exten => _400X!,n(notavail),Answer()<br />
+ exten => _400X!,n,Playback(invalid)<br />
+ exten => _400X!,n,Hangup<br />
+ <br />
+ [rooms-originate]<br />
+ exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br />
+ exten => _400X!,n,Hangup<br />
+ <br />
+ [rooms-out]<br />
+ ; *****************************************************<br />
+ ; Extensions for outgoing calls from Openmeetings room.<br />
+ ; *****************************************************<br />
+ <br />
+ [rooms-red5sip]<br />
+ exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br />
+ exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br />
+ exten => _400X!,n(notavail),Hangup <br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Modify <tt>/etc/asterisk/confbridge.conf</tt><br />
+ <strong>Add/Modify the following secions</strong>:<br />
+ <blockquote>
+ <i>
+ [general]<br />
+ <br />
+ [red5sip_user]<br />
+ type=user<br />
+ marked=yes<br />
+ dsp_drop_silence=yes<br />
+ denoise=true<br />
+ <br />
+ [sip_user]<br />
+ type=user<br />
+ end_marked=yes<br />
+ wait_marked=yes<br />
+ music_on_hold_when_empty=yes<br />
+ dsp_drop_silence=yes<br />
+ denoise=true<br />
+ <br />
+ [default_bridge]<br />
+ type=bridge<br />
+ video_mode=follow_talker<br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ To enable Asterisk Manager API modify <tt>/etc/asterisk/manager.conf</tt><br />
+ <strong>Add/Modify the following sections</strong>:<br />
+ <blockquote>
+ <i>
+ [general]<br />
+ enabled = yes<br />
+ webenabled = no<br />
+ port = 5038<br />
+ bindaddr = 127.0.0.1<br />
+ <br />
+ [openmeetings]<br />
+ secret = 12345<br />
+ deny=0.0.0.0/0.0.0.0<br />
+ permit=127.0.0.1/255.255.255.0<br />
+ read = all<br />
+ write = all<br />
+ </i>
+ </blockquote>
+ </div>
+ <br />
+ <div>
+ Update Openmeetings with creadentials for Asterisk manager.
+ Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt><br />
+ find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong>
+ uncomment its parameters and set it to your custom values.
+ <p style="font-size: larger; color: blue;">
+ IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
+ otherwise all SIP related room information will be lost
+ </p>
+ </div>
+ <br />
+ <div>
+ Restart asterisk:
+ <blockquote>
+ <i>service asterisk restart</i>
+ </blockquote>
+ </div>
+ <br />
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr><td ><!-- bgcolor="#EEEEEE" -->
+ <font color="#000000" face="verdana,arial,helvetica,sanserif">
+ <a name="Setup red5sip transport"><strong>Setup red5sip transport</strong></a>
+ </font>
+ <hr style="width:100%; color:#999999; background-color:#999999; height:1px; border:0px;"/>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <div>
+ Download red5sip from
+ <blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</blockquote>
+ </div>
+ <div>
+ Build with Apache Ant
+ <blockquote>
+ <i>ant</i>
+ </blockquote>
+ </div>
+ <div>
+ Insert proper values to the <tt>/opt/red5sip/settings.properties</tt>
+
+ <blockquote>
+ <i>
+ red5.host=127.0.0.1 # red5 server address<br />
+ om.context=openmeetings # Openmeetings context<br />
+ red5.codec=asao<br />
+ red5.codec.rate=22 # should correlate with mic settings in public/config.xml<br />
+ sip.obproxy=127.0.0.1 # asterisk adderss<br />
+ sip.phone=red5sip_user # sip phone number<br />
+ sip.authid=red5sip_user # sip auth id<br />
+ sip.secret=12345 # sip password<br />
+ sip.realm=asterisk # sip realm<br />
+ sip.proxy=127.0.0.1 # address of sip proxy <br />
+ rooms.forceStart=no # TBD <br />
+ rooms=1 # TBD (not in use) <br />
+ </i>
+ </blockquote>
+ </div>
+ <div>
+ Add red5sip to autostart:
+ <blockquote>
+ <i>
+ sudo cp /opt/red5sip/red5sip /etc/init.d/<br />
+ sudo chmod a+x /etc/init.d/red5sip<br />
+ sudo update-rc.d red5sip defaults
+ </i>
+ </blockquote>
+ </div>
+ <div>
+ Start openmeetings
+ <blockquote>
+ <i>service red5 start</i>
+ </blockquote>
+ </div>
+ <div>
+ Start red5sip
+ <blockquote>
+ <i>service red5sip start</i>
+ </blockquote>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ </td>
+ </tr>
+
+ <!-- FOOTER -->
+ <tr><td colspan="2">
+ <hr noshade="noshade" size="1"/>
+ </td></tr>
+ <tr><td colspan="2">
+ <div align="center"><font color="#123465" size="-1"><em>
+ Copyright © 2003-2013, The Apache Software Foundation
+ </em></font></div>
+ </td></tr>
+ </table>
+ </div>
+ </div>
+ </body>
+ </html>
+<!-- end the processing -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html (original)
+++ openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html Thu Sep 12 05:28:14 2013
@@ -687,6 +687,9 @@ limitations under the License.
<a href="red5sip-integration_2.1.html">
Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 2.1
</a>.<br />
+ <a href="red5sip-integration_3.0.html">
+ Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0
+ </a>.<br />
</p>
</blockquote>
</td></tr>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java Thu Sep 12 05:28:14 2013
@@ -28,20 +28,20 @@ import java.util.List;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -23,9 +23,9 @@ import java.util.Date;
import java.util.List;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
public class CalendarWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java Thu Sep 12 05:28:14 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.axis.ser
import java.util.Date;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
public class FLVRecordingReturn {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java Thu Sep 12 05:28:14 2013
@@ -28,17 +28,17 @@ import java.util.LinkedHashMap;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.file.FileProcessor;
import org.apache.openmeetings.data.file.FileUtils;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.file.dto.FileExplorerObject;
-import org.apache.openmeetings.data.file.dto.LibraryPresentation;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dto.file.FileExplorerObject;
+import org.apache.openmeetings.db.dto.file.LibraryPresentation;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.StoredFile;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/FileWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -19,9 +19,9 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.file.dto.FileExplorerObject;
-import org.apache.openmeetings.data.file.dto.LibraryPresentation;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.dto.file.FileExplorerObject;
+import org.apache.openmeetings.db.dto.file.LibraryPresentation;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
public class FileWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java Thu Sep 12 05:28:14 2013
@@ -22,18 +22,18 @@ import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation.Valid;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.entity.room.Room;
/**
* This class provides method entry points necessary for OM to Jabber integration.
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java Thu Sep 12 05:28:14 2013
@@ -31,28 +31,28 @@ import java.util.Map;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.InvitationManager.MessageType;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation.Valid;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -23,9 +23,9 @@ import java.util.List;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomType;
public class RoomWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java Thu Sep 12 05:28:14 2013
@@ -21,10 +21,10 @@ package org.apache.openmeetings.axis.ser
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.entity.server.Server;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.entity.server.Server;
public class ServerWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java Thu Sep 12 05:28:14 2013
@@ -24,20 +24,20 @@ import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.ErrorDao;
-import org.apache.openmeetings.data.basic.dao.SOAPLoginDao;
import org.apache.openmeetings.data.beans.basic.ErrorResult;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.basic.ErrorValue;
-import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ErrorDao;
+import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.basic.ErrorValue;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.MainService;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.axis.ser
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.data.beans.basic.ErrorResult;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.entity.user.User;
public class UserWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentCategoryConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentCategoryConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentCategoryConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentCategoryConverter.java Thu Sep 12 05:28:14 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.backup;
import java.util.Map;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+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;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java Thu Sep 12 05:28:14 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.backup;
import java.util.Map;
-import org.apache.openmeetings.data.user.dao.OrganisationDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.db.dao.user.OrganisationDao;
+import org.apache.openmeetings.db.entity.user.Organisation;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java Thu Sep 12 05:28:14 2013
@@ -18,19 +18,19 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.data.conference.PollManager;
-import org.apache.openmeetings.persistence.beans.poll.PollType;
+import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.entity.room.PollType;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
public class PollTypeConverter extends OmConverter<PollType> {
- private PollManager pollManager;
+ private PollDao pollManager;
public PollTypeConverter() {
//default constructor is for export
}
- public PollTypeConverter(PollManager pollManagement) {
+ public PollTypeConverter(PollDao pollManagement) {
this.pollManager = pollManagement;
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomConverter.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.backup;
import java.util.Map;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.persistence.beans.room.Room;
+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;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.backup;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.db.entity.room.RoomType;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/StateConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/StateConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/StateConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/StateConverter.java Thu Sep 12 05:28:14 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.db.dao.user.StateDao;
+import org.apache.openmeetings.db.entity.user.State;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.backup;
import java.util.Map;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java Thu Sep 12 05:28:14 2013
@@ -45,16 +45,16 @@ import org.apache.openjpa.jdbc.conf.JDBC
import org.apache.openjpa.jdbc.schema.SchemaTool;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.log.LogFactoryImpl.LogImpl;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.documents.InstallationDocumentHandler;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.BackupExport;
import org.apache.openmeetings.utils.BackupImport;
import org.apache.openmeetings.utils.ImportHelper;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/SlaveHTTPConnectionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/SlaveHTTPConnectionManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/SlaveHTTPConnectionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/SlaveHTTPConnectionManager.java Thu Sep 12 05:28:14 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.cluster.sync.RestClient;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.entity.server.Server;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java Thu Sep 12 05:28:14 2013
@@ -32,7 +32,7 @@ import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.entity.server.Server;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java Thu Sep 12 05:28:14 2013
@@ -32,10 +32,12 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;