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 2012/09/10 05:56:07 UTC

svn commit: r1382635 [2/9] - in /incubator/openmeetings/trunk/singlewebapp: ./ WebContent/WEB-INF/ WebContent/red5/ docs/ src/ src/META-INF/ src/org/apache/ src/org/apache/openmeetings/ src/org/apache/openmeetings/axis/ src/org/apache/openmeetings/axis...

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon Sep 10 03:55:51 2012
@@ -50,46 +50,46 @@
 
 	<!-- New Class for the Streaming Handlers -->
 	<bean id="web.handler"
-		class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter" />
-	<bean id="openmeetings.ClientListManager" class="org.openmeetings.app.remote.red5.ClientListManager" />
-	<bean id="openmeetings.EmoticonsManager" class="org.openmeetings.app.remote.red5.EmoticonsManager" />
+		class="org.apache.openmeetings.remote.red5.ScopeApplicationAdapter" />
+	<bean id="openmeetings.ClientListManager" class="org.apache.openmeetings.remote.red5.ClientListManager" />
+	<bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.remote.red5.EmoticonsManager" />
 	<bean id="openmeetings.WhiteBoardObjectListManager"
-		class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManager" />
+		class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager" />
 	<bean id="openmeetings.WhiteBoardObjectListManagerById"
-		class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManagerById" />
+		class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById" />
 
 	<!-- Start of Services -->
-	<bean id="xmlcrm.service" class="org.openmeetings.app.remote.MainService" />
-	<bean id="printservice.service" class="org.openmeetings.app.remote.PrintService" />
-	<bean id="pollservice.service" class="org.openmeetings.app.remote.PollService" />
-	<bean id="organisationservice.service" class="org.openmeetings.app.remote.OrganisationService" />
-	<bean id="meetingmemberservice.service" class="org.openmeetings.app.remote.MeetingMemberService" />
-	<bean id="languageservice.service" class="org.openmeetings.app.remote.LanguageService" />
-	<bean id="invitationservice.service" class="org.openmeetings.app.remote.InvitationService" />
-	<bean id="ldapconfigservice.service" class="org.openmeetings.app.remote.LdapConfigService" />
-	<bean id="whiteboardservice.service" class="org.openmeetings.app.remote.WhiteBoardService" />
-	<bean id="userservice.service" class="org.openmeetings.app.remote.UserService" />
-	<bean id="fileservice.service" class="org.openmeetings.app.remote.ConferenceLibrary" />
-	<bean id="openmeetings.FileProcessor" class="org.openmeetings.app.data.file.FileProcessor" />
+	<bean id="xmlcrm.service" class="org.apache.openmeetings.remote.MainService" />
+	<bean id="printservice.service" class="org.apache.openmeetings.remote.PrintService" />
+	<bean id="pollservice.service" class="org.apache.openmeetings.remote.PollService" />
+	<bean id="organisationservice.service" class="org.apache.openmeetings.remote.OrganisationService" />
+	<bean id="meetingmemberservice.service" class="org.apache.openmeetings.remote.MeetingMemberService" />
+	<bean id="languageservice.service" class="org.apache.openmeetings.remote.LanguageService" />
+	<bean id="invitationservice.service" class="org.apache.openmeetings.remote.InvitationService" />
+	<bean id="ldapconfigservice.service" class="org.apache.openmeetings.remote.LdapConfigService" />
+	<bean id="whiteboardservice.service" class="org.apache.openmeetings.remote.WhiteBoardService" />
+	<bean id="userservice.service" class="org.apache.openmeetings.remote.UserService" />
+	<bean id="fileservice.service" class="org.apache.openmeetings.remote.ConferenceLibrary" />
+	<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.data.file.FileProcessor" />
 	<bean id="openmeetings.FlvExplorerConverter"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvExplorerConverter" />
-	<bean id="errorservice.service" class="org.openmeetings.app.remote.ErrorService" />
-	<bean id="conferenceservice.service" class="org.openmeetings.app.remote.ConferenceService" />
-	<bean id="configservice.service" class="org.openmeetings.app.remote.ConfigurationService" />
-	<bean id="chatservice.service" class="org.openmeetings.app.remote.ChatService" />
-	<bean id="calendarservice.service" class="org.openmeetings.app.remote.CalendarService" />
-	<bean id="flvrecorderservice.service" class="org.openmeetings.app.remote.FLVRecorderService" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter" />
+	<bean id="errorservice.service" class="org.apache.openmeetings.remote.ErrorService" />
+	<bean id="conferenceservice.service" class="org.apache.openmeetings.remote.ConferenceService" />
+	<bean id="configservice.service" class="org.apache.openmeetings.remote.ConfigurationService" />
+	<bean id="chatservice.service" class="org.apache.openmeetings.remote.ChatService" />
+	<bean id="calendarservice.service" class="org.apache.openmeetings.remote.CalendarService" />
+	<bean id="flvrecorderservice.service" class="org.apache.openmeetings.remote.FLVRecorderService" />
 	<bean id="openmeetings.FlvRecorderConverterTask"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverterTask" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask" />
 	<bean id="openmeetings.FlvInterviewConverterTask"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverterTask" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask" />
 	<bean id="openmeetings.FlvInterviewReConverterTask"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewReConverterTask" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask" />
 	<bean id="openmeetings.FlvInterviewConverter"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverter" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverter" />
 	<bean id="openmeetings.FlvRecorderConverter"
-		class="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverter" />
-	<bean id="openmeetings.SessionClearJob" class="org.openmeetings.app.quartz.scheduler.SessionClearJob" />
+		class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverter" />
+	<bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.quartz.scheduler.SessionClearJob" />
 	<bean id="sessionClearJob"
 		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
@@ -115,7 +115,7 @@
 		</property>
 	</bean>
 	<bean id="openmeetings.MeetingReminderJob"
-		class="org.openmeetings.app.quartz.scheduler.MeetingReminderJob" />
+		class="org.apache.openmeetings.quartz.scheduler.MeetingReminderJob" />
 	<bean id="meetingReminderClear"
 		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
@@ -140,7 +140,7 @@
 			<value>100000</value>
 		</property>
 	</bean>
-	<bean id="testSetupCleanupJob" class="org.openmeetings.app.quartz.scheduler.TestSetupCleanupJob"/>
+	<bean id="testSetupCleanupJob" class="org.apache.openmeetings.quartz.scheduler.TestSetupCleanupJob"/>
 	<bean id="testSetupCleanup" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="testSetupCleanupJob" />
@@ -174,90 +174,90 @@
 
 	<!-- Interface Transactional -->
 	<bean id="appointmentReminderTypDaoImpl"
-		class="org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl" />
+		class="org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl" />
 	<bean id="appointmentCategoryDaoImpl"
-		class="org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl" />
-	<bean id="roommanagement" class="org.openmeetings.app.data.conference.Roommanagement" />
-	<bean id="organisationmanagement" class="org.openmeetings.app.data.user.Organisationmanagement" />
-	<bean id="salutationmanagement" class="org.openmeetings.app.data.user.Salutationmanagement" />
-	<bean id="errorManagement" class="org.openmeetings.app.data.basic.ErrorManagement" />
-	<bean id="navimanagement" class="org.openmeetings.app.data.basic.Navimanagement" />
-	<bean id="pollManagement" class="org.openmeetings.app.data.conference.PollManagement" />
-	<bean id="omTimeZoneDaoImpl" class="org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl" />
-	<bean id="statemanagement" class="org.openmeetings.app.data.user.Statemanagement" />
-	<bean id="fieldLanguageDaoImpl" class="org.openmeetings.app.data.basic.FieldLanguageDaoImpl" />
-	<bean id="fieldmanagment" class="org.openmeetings.app.data.basic.Fieldmanagment" />
-	<bean id="cfgManagement" class="org.openmeetings.app.data.basic.Configurationmanagement" />
+		class="org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDaoImpl" />
+	<bean id="roommanagement" class="org.apache.openmeetings.data.conference.Roommanagement" />
+	<bean id="organisationmanagement" class="org.apache.openmeetings.data.user.Organisationmanagement" />
+	<bean id="salutationmanagement" class="org.apache.openmeetings.data.user.Salutationmanagement" />
+	<bean id="errorManagement" class="org.apache.openmeetings.data.basic.ErrorManagement" />
+	<bean id="navimanagement" class="org.apache.openmeetings.data.basic.Navimanagement" />
+	<bean id="pollManagement" class="org.apache.openmeetings.data.conference.PollManagement" />
+	<bean id="omTimeZoneDaoImpl" class="org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl" />
+	<bean id="statemanagement" class="org.apache.openmeetings.data.user.Statemanagement" />
+	<bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.data.basic.FieldLanguageDaoImpl" />
+	<bean id="fieldmanagment" class="org.apache.openmeetings.data.basic.Fieldmanagment" />
+	<bean id="cfgManagement" class="org.apache.openmeetings.data.basic.Configurationmanagement" />
 	<bean id="appointmentDao"
-		class="org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl" />
+		class="org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl" />
 	<bean id="appointmentLogic"
-		class="org.openmeetings.app.data.calendar.management.AppointmentLogic" />
+		class="org.apache.openmeetings.data.calendar.management.AppointmentLogic" />
 	<bean id="meetingMemberLogic"
-		class="org.openmeetings.app.data.calendar.management.MeetingMemberLogic" />
-	<bean id="sessionManagement" class="org.openmeetings.app.data.basic.Sessionmanagement" />
-	<bean id="userManagement" class="org.openmeetings.app.data.user.Usermanagement" />
+		class="org.apache.openmeetings.data.calendar.management.MeetingMemberLogic" />
+	<bean id="sessionManagement" class="org.apache.openmeetings.data.basic.Sessionmanagement" />
+	<bean id="userManagement" class="org.apache.openmeetings.data.user.Usermanagement" />
 	<bean id="roomModeratorsDao"
-		class="org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl" />
-	<bean id="conferenceLogDao" class="org.openmeetings.app.data.logs.ConferenceLogDaoImpl" />
-	<bean id="conferenceLogTypeDao" class="org.openmeetings.app.data.logs.ConferenceLogTypeDaoImpl" />
-	<bean id="emailManagement" class="org.openmeetings.app.data.user.Emailmanagement" />
+		class="org.apache.openmeetings.data.conference.dao.RoomModeratorsDaoImpl" />
+	<bean id="conferenceLogDao" class="org.apache.openmeetings.data.logs.ConferenceLogDaoImpl" />
+	<bean id="conferenceLogTypeDao" class="org.apache.openmeetings.data.logs.ConferenceLogTypeDaoImpl" />
+	<bean id="emailManagement" class="org.apache.openmeetings.data.user.Emailmanagement" />
 	<bean id="fileExplorerItemDao"
-		class="org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl" />
-	<bean id="flvRecordingDao" class="org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl" />
+		class="org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl" />
+	<bean id="flvRecordingDao" class="org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl" />
 	<bean id="flvRecordingLogDao"
-		class="org.openmeetings.app.data.flvrecord.FlvRecordingLogDaoImpl" />
+		class="org.apache.openmeetings.data.flvrecord.FlvRecordingLogDaoImpl" />
 	<bean id="flvRecordingMetaDataDao"
-		class="org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl" />
+		class="org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl" />
 	<bean id="flvRecordingMetaDeltaDao"
-		class="org.openmeetings.app.data.flvrecord.FlvRecordingMetaDeltaDaoImpl" />
-	<bean id="ldapConfigDao" class="org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl" />
+		class="org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDaoImpl" />
+	<bean id="ldapConfigDao" class="org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl" />
 	<bean id="invitationManagement"
-		class="org.openmeetings.app.data.conference.Invitationmanagement" />
+		class="org.apache.openmeetings.data.conference.Invitationmanagement" />
 	<bean id="meetingMemberDao"
-		class="org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl" />
+		class="org.apache.openmeetings.data.calendar.daos.MeetingMemberDaoImpl" />
 	<bean id="openXGReturnObjectDao"
-		class="org.openmeetings.app.sip.xmlrpc.custom.dao.OpenXGReturnObjectDaoImpl" />
+		class="org.apache.openmeetings.sip.xmlrpc.custom.dao.OpenXGReturnObjectDaoImpl" />
 	<bean id="privateMessageFolderDao"
-		class="org.openmeetings.app.data.user.dao.PrivateMessageFolderDaoImpl" />
+		class="org.apache.openmeetings.data.user.dao.PrivateMessageFolderDaoImpl" />
 	<bean id="privateMessagesDao"
-		class="org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl" />
-	<bean id="soapLoginDao" class="org.openmeetings.app.data.basic.dao.SOAPLoginDaoImpl" />
-	<bean id="userContactsDao" class="org.openmeetings.app.data.user.dao.UserContactsDaoImpl" />
-	<bean id="userSipDataDao" class="org.openmeetings.app.data.user.dao.UserSipDataDaoImpl" />
-	<bean id="usersDao" class="org.openmeetings.app.data.user.dao.UsersDaoImpl" />
-	<bean id="serverDao" class="org.openmeetings.app.data.basic.dao.ServerDaoImpl" />
+		class="org.apache.openmeetings.data.user.dao.PrivateMessagesDaoImpl" />
+	<bean id="soapLoginDao" class="org.apache.openmeetings.data.basic.dao.SOAPLoginDaoImpl" />
+	<bean id="userContactsDao" class="org.apache.openmeetings.data.user.dao.UserContactsDaoImpl" />
+	<bean id="userSipDataDao" class="org.apache.openmeetings.data.user.dao.UserSipDataDaoImpl" />
+	<bean id="usersDao" class="org.apache.openmeetings.data.user.dao.UsersDaoImpl" />
+	<bean id="serverDao" class="org.apache.openmeetings.data.basic.dao.ServerDaoImpl" />
 
 	<!-- No Interface -->
-	<bean id="manageCryptStyle" class="org.openmeetings.utils.crypt.ManageCryptStyle" />
-	<bean id="openXGHttpClient" class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
-    <bean id="asteriskDbSipClient" class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
-    <bean id="asteriskDAO" class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
-    <bean id="generateImage" class="org.openmeetings.app.documents.GenerateImage" />
-	<bean id="generateThumbs" class="org.openmeetings.app.documents.GenerateThumbs" />
-	<bean id="generatePDF" class="org.openmeetings.app.documents.GeneratePDF" />
-	<bean id="mailHandler" class="org.openmeetings.utils.mail.MailHandler" />
-	<bean id="smsHandler" class="org.openmeetings.utils.sms.SMSHandler" />
-	<bean id="feedbackManagement" class="org.openmeetings.app.data.conference.Feedbackmanagement" />
-	<bean id="importInitvalues" class="org.openmeetings.app.installation.ImportInitvalues" />
-	<bean id="languageImport" class="org.openmeetings.app.xmlimport.LanguageImport" />
-	<bean id="userImport" class="org.openmeetings.app.xmlimport.UserImport" />
-	<bean id="libraryWmlLoader" class="org.openmeetings.app.documents.LibraryWmlLoader" />
-	<bean id="loadAtomRssFeed" class="org.openmeetings.app.rss.LoadAtomRssFeed" />
-	<bean id="authLevelManagement" class="org.openmeetings.app.data.basic.AuthLevelmanagement" />
-	<bean id="generateSWF" class="org.openmeetings.app.documents.GenerateSWF" />
-	<bean id="fileUtils" class="org.openmeetings.app.data.file.FileUtils" />
-	<bean id="ldapLoginManagement" class="org.openmeetings.app.ldap.LdapLoginManagement" />
-	<bean id="timezoneUtil" class="org.openmeetings.utils.math.TimezoneUtil" />
+	<bean id="manageCryptStyle" class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />
+	<bean id="openXGHttpClient" class="org.apache.openmeetings.sip.xmlrpc.OpenXGHttpClient" />
+    <bean id="asteriskDbSipClient" class="org.apache.openmeetings.sip.api.impl.asterisk.AsteriskDbSipClient" />
+    <bean id="asteriskDAO" class="org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
+    <bean id="generateImage" class="org.apache.openmeetings.documents.GenerateImage" />
+	<bean id="generateThumbs" class="org.apache.openmeetings.documents.GenerateThumbs" />
+	<bean id="generatePDF" class="org.apache.openmeetings.documents.GeneratePDF" />
+	<bean id="mailHandler" class="org.apache.openmeetings.utils.mail.MailHandler" />
+	<bean id="smsHandler" class="org.apache.openmeetings.utils.sms.SMSHandler" />
+	<bean id="feedbackManagement" class="org.apache.openmeetings.data.conference.Feedbackmanagement" />
+	<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
+	<bean id="languageImport" class="org.apache.openmeetings.xmlimport.LanguageImport" />
+	<bean id="userImport" class="org.apache.openmeetings.xmlimport.UserImport" />
+	<bean id="libraryWmlLoader" class="org.apache.openmeetings.documents.LibraryWmlLoader" />
+	<bean id="loadAtomRssFeed" class="org.apache.openmeetings.rss.LoadAtomRssFeed" />
+	<bean id="authLevelManagement" class="org.apache.openmeetings.data.basic.AuthLevelmanagement" />
+	<bean id="generateSWF" class="org.apache.openmeetings.documents.GenerateSWF" />
+	<bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
+	<bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement" />
+	<bean id="timezoneUtil" class="org.apache.openmeetings.utils.math.TimezoneUtil" />
 
 
 	<!-- Templates -->
-	<bean id="registerUserTemplate" class="org.openmeetings.app.templates.RegisterUserTemplate" />
-	<bean id="feedbackTemplate" class="org.openmeetings.app.templates.FeedbackTemplate" />
-	<bean id="invitationTemplate" class="org.openmeetings.app.templates.InvitationTemplate" />
-	<bean id="requestContactTemplate" class="org.openmeetings.app.templates.RequestContactTemplate" />
+	<bean id="registerUserTemplate" class="org.apache.openmeetings.templates.RegisterUserTemplate" />
+	<bean id="feedbackTemplate" class="org.apache.openmeetings.templates.FeedbackTemplate" />
+	<bean id="invitationTemplate" class="org.apache.openmeetings.templates.InvitationTemplate" />
+	<bean id="requestContactTemplate" class="org.apache.openmeetings.templates.RequestContactTemplate" />
 	<bean id="requestContactConfirmTemplate"
-		class="org.openmeetings.app.templates.RequestContactConfirmTemplate" />
-	<bean id="resetPasswordTemplate" class="org.openmeetings.app.templates.ResetPasswordTemplate" />
+		class="org.apache.openmeetings.templates.RequestContactConfirmTemplate" />
+	<bean id="resetPasswordTemplate" class="org.apache.openmeetings.templates.ResetPasswordTemplate" />
 
 	<!-- Thread Executor -->
 	<bean id="taskExecutor"
@@ -267,17 +267,17 @@
 		<property name="queueCapacity" value="25" />
 	</bean>
 
-	<bean id="mailThread" class="org.openmeetings.utils.mail.MailThread"/>
-	<bean id="mailiCalThread" class="org.openmeetings.utils.mail.MailiCalThread"/>
+	<bean id="mailThread" class="org.apache.openmeetings.utils.mail.MailThread"/>
+	<bean id="mailiCalThread" class="org.apache.openmeetings.utils.mail.MailiCalThread"/>
 
 	<!-- Axis2 Service Proxy's -->
-	<bean id="userWebService" class="org.openmeetings.axis.services.UserWebService" />
-	<bean id="roomWebService" class="org.openmeetings.axis.services.RoomWebService" />
-	<bean id="fileWebService" class="org.openmeetings.axis.services.FileWebService" />
-	<bean id="calendarWebService" class="org.openmeetings.axis.services.CalendarWebService" />
-  	<bean id="jabberWebService" class="org.openmeetings.axis.services.JabberWebService" />
-	<bean id="serverWebService" class="org.openmeetings.axis.services.ServerWebService" />
+	<bean id="userWebService" class="org.apache.openmeetings.axis.services.UserWebService" />
+	<bean id="roomWebService" class="org.apache.openmeetings.axis.services.RoomWebService" />
+	<bean id="fileWebService" class="org.apache.openmeetings.axis.services.FileWebService" />
+	<bean id="calendarWebService" class="org.apache.openmeetings.axis.services.CalendarWebService" />
+  	<bean id="jabberWebService" class="org.apache.openmeetings.axis.services.JabberWebService" />
+	<bean id="serverWebService" class="org.apache.openmeetings.axis.services.ServerWebService" />
 
 	<!-- Servlet Facade Beans -->
-	<bean id="backupExport" class="org.openmeetings.servlet.outputhandler.BackupExport" />
+	<bean id="backupExport" class="org.apache.openmeetings.servlet.outputhandler.BackupExport" />
 </beans>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Mon Sep 10 03:55:51 2012
@@ -39,7 +39,7 @@
     
     -->
     <listener>
-        <listener-class>org.openmeetings.utils.OMContextListener</listener-class>
+        <listener-class>org.apache.openmeetings.utils.OMContextListener</listener-class>
     </listener>
     
     <filter>
@@ -54,7 +54,7 @@
     
     <filter>
         <filter-name>ServletRequestExFilter</filter-name>
-        <filter-class>org.openmeetings.servlet.outputhandler.ServletRequestExFilter</filter-class>
+        <filter-class>org.apache.openmeetings.servlet.outputhandler.ServletRequestExFilter</filter-class>
         <init-param>
             <param-name>uriEncoding</param-name>
             <param-value>UTF-8</param-value>
@@ -72,7 +72,7 @@
 		<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
 		<init-param>
 			<param-name>applicationClassName</param-name>
-			<param-value>org.openmeetings.web.app.Application</param-value>
+			<param-value>org.apache.openmeetings.web.app.Application</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>
@@ -104,27 +104,27 @@
     </servlet>
     <servlet>
         <servlet-name>DownloadHandler</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.DownloadHandler</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.DownloadHandler</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Install</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.Install</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.Install</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>LangExport</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.LangExport</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.LangExport</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Export</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.Export</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.Export</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ExportToImage</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.ExportToImage</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.ExportToImage</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ActivateUser</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.ActivateUser</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.ActivateUser</servlet-class>
     </servlet>
     <!-- Axis2 Settings -->
     <servlet>
@@ -138,19 +138,19 @@
     </servlet>
     <servlet>
 		<servlet-name>Calendar</servlet-name>
-		<servlet-class>org.openmeetings.servlet.outputhandler.CalendarServlet</servlet-class>
+		<servlet-class>org.apache.openmeetings.servlet.outputhandler.CalendarServlet</servlet-class>
 	</servlet>
     <servlet>
         <description>DefaultIndex</description>
         <display-name>DefaultIndex</display-name>
         <servlet-name>DefaultIndex</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.DefaultIndex</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.DefaultIndex</servlet-class>
     </servlet> 
     <servlet>
         <description>BackupExport</description>
         <display-name>BackupExport</display-name>
         <servlet-name>BackupExport</servlet-name>
-        <servlet-class>org.openmeetings.servlet.outputhandler.BackupExportFacade</servlet-class>
+        <servlet-class>org.apache.openmeetings.servlet.outputhandler.BackupExportFacade</servlet-class>
     </servlet>
 	
 	<servlet-mapping>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.bat
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.bat?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.bat (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.bat Mon Sep 10 03:55:51 2012
@@ -17,5 +17,5 @@ set OM_CONTEXT=openmeetings
 
 set CLASSPATH=%RED5_HOME%\*;%RED5_HOME%\conf;%RED5_HOME%\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
 
-java -cp "%CLASSPATH%" -Dcontext=%OM_CONTEXT% -Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector org.openmeetings.cli.Admin %*
+java -cp "%CLASSPATH%" -Dcontext=%OM_CONTEXT% -Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector org.apache.openmeetings.cli.Admin %*
 

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.sh
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.sh?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.sh (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/red5/admin.sh Mon Sep 10 03:55:51 2012
@@ -17,5 +17,5 @@ export OM_CONTEXT=openmeetings
 
 export CLASSPATH=$RED5_HOME/*:$RED5_HOME/conf:$RED5_HOME/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
 
-java -cp "$CLASSPATH" -Dcontext=${OM_CONTEXT} -Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector org.openmeetings.cli.Admin $*
+java -cp "$CLASSPATH" -Dcontext=${OM_CONTEXT} -Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector org.apache.openmeetings.cli.Admin $*
 

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Sep 10 03:55:51 2012
@@ -269,8 +269,8 @@
 				<include name="**" />
 				<exclude name="**/test/**" />
 				<exclude name="**/axis/**" />
-				<exclude name="org/openmeetings/screen/**" />
-				<exclude name="org/openmeetings/doc/**" />
+				<exclude name="org/apache/openmeetings/screen/**" />
+				<exclude name="org/apache/openmeetings/doc/**" />
 				<exclude name="**/client/**" />
 				<exclude name="**/*.png" />
 				<exclude name="**/*.vm" />
@@ -298,8 +298,8 @@
 				<include name="**" />
 				<exclude name="**/test/**" />
 				<exclude name="**/axis/**" />
-				<exclude name="org/openmeetings/screen/**" />
-				<exclude name="org/openmeetings/doc/**" />
+				<exclude name="org/apache/openmeetings/screen/**" />
+				<exclude name="org/apache/openmeetings/doc/**" />
 				<exclude name="**/client/**" />
 				<exclude name="**/*.png" />
 				<exclude name="**/*.vm" />
@@ -344,7 +344,7 @@
 		<echo file="${om_aar_folder}/services.list" append="false">${om_aar_name}${line.separator}version.aar${line.separator}</echo>
 		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-WebService-${jar.suffix}.jar">
 			<fileset dir="${main.out.dir}">
-				<include name="**/openmeetings/axis/**" />
+				<include name="**/apache/openmeetings/axis/**" />
 				<include name="META-INF/LICENSE" />
 				<include name="META-INF/NOTICE" />
 			</fileset>
@@ -363,7 +363,7 @@
 		<!-- Screen Share -->
 		<jar destfile="${screenshare.out.dir}/${project.distname}-screenshare-${jar.suffix}.jar">
 			<fileset dir="${main.out.dir}">
-				<include name="org/openmeetings/screen/**" />
+				<include name="org/apache/openmeetings/screen/**" />
 				<include name="META-INF/LICENSE" />
 				<include name="META-INF/NOTICE" />
 			</fileset>
@@ -380,9 +380,9 @@
 		<tstamp prefix="doc">
 			<format property="TODAY_YEAR" pattern="yyyy" locale="en" />
 		</tstamp>
-	    <javadoc packagenames="org.openmeetings.app.remote.*"
+	    <javadoc packagenames="org.apache.openmeetings.remote.*"
 	           sourcepath="src"
-	           excludepackagenames="org.openmeetings.test.*"
+	           excludepackagenames="org.apache.openmeetings.test.*"
 	           defaultexcludes="yes"
 	           destdir="build/api"
 	           author="true"
@@ -695,10 +695,10 @@
 
 	<target name="build.only.webservice.doc" depends="anakia">
 		<javadoc classpathref="build.webservice.classpath" useexternalfile="true">
-			<fileset dir="src/org/openmeetings/axis/services">
+			<fileset dir="src/org/apache/openmeetings/axis/services">
 				<include name="*WebService.java" />
 			</fileset>
-			<doclet name="org.openmeetings.doc.WebServiceDoclet" pathref="build.webservice.classpath" />
+			<doclet name="org.apache.openmeetings.doc.WebServiceDoclet" pathref="build.webservice.classpath" />
 		</javadoc>
 
 		<copy todir="${dist.webapps.dir}/docs">
@@ -760,7 +760,7 @@
 			<formatter type="${junit.test.formatter}" />
 			<batchtest todir="${junit.report.dir}">
 				<fileset dir="${main.out.dir}">
-					<include name="org/openmeetings/test/**/${junit.test.pattern}.class" />
+					<include name="org/apache/openmeetings/test/**/${junit.test.pattern}.class" />
 					<exclude name="**/*$$*.class" />
 				</fileset>
 			</batchtest>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html Mon Sep 10 03:55:51 2012
@@ -259,7 +259,7 @@ limitations under the License.
     			  Get the next Calendar event for the current user of the SID
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.calendar.Appointment
+                  Return Type: org.apache.openmeetings.persistence.beans.calendar.Appointment
                 </p>
     			<p>Params:</p>
     			    			
@@ -303,7 +303,7 @@ limitations under the License.
     			  Get the next Calendar event for userId
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.calendar.Appointment
+                  Return Type: org.apache.openmeetings.persistence.beans.calendar.Appointment
                 </p>
     			<p>Params:</p>
     			    				<b>Warning:</b><i> Params in this method do not seem to be correctly documentated</i>
@@ -1021,7 +1021,7 @@ limitations under the License.
     			  Load a calendar event by its room id
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.calendar.Appointment
+                  Return Type: org.apache.openmeetings.persistence.beans.calendar.Appointment
                 </p>
     			<p>Params:</p>
     			    			

Modified: incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/FileService.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/FileService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/FileService.html Mon Sep 10 03:55:51 2012
@@ -180,7 +180,7 @@ limitations under the License.
  room id isOwner = 1 parentFolderId = -2
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.FileImportError[]
+                  Return Type: org.apache.openmeetings.axis.services.FileImportError[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -315,7 +315,7 @@ limitations under the License.
  room id isOwner = 1 parentFolderId = -2
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.FileImportError[]
+                  Return Type: org.apache.openmeetings.axis.services.FileImportError[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -927,7 +927,7 @@ limitations under the License.
     			  Get a LibraryPresentation-Object for a certain file
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.file.dto.LibraryPresentation
+                  Return Type: org.apache.openmeetings.data.file.dto.LibraryPresentation
                 </p>
     			<p>Params:</p>
     			    			
@@ -981,7 +981,7 @@ limitations under the License.
     			  Get a File Explorer Object by a given Room and owner id
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.file.dto.FileExplorerObject
+                  Return Type: org.apache.openmeetings.data.file.dto.FileExplorerObject
                 </p>
     			<p>Params:</p>
     			    			
@@ -1041,7 +1041,7 @@ limitations under the License.
     			  Get a File Explorer Object by a given Room
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.file.dto.FileExplorerObject
+                  Return Type: org.apache.openmeetings.data.file.dto.FileExplorerObject
                 </p>
     			<p>Params:</p>
     			    			
@@ -1099,7 +1099,7 @@ limitations under the License.
     			  Get FileExplorerItem list by parent folder
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.files.FileExplorerItem[]
+                  Return Type: org.apache.openmeetings.persistence.beans.files.FileExplorerItem[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -1179,7 +1179,7 @@ limitations under the License.
     			  Get FileExplorerItem[] by parent and owner id
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.files.FileExplorerItem[]
+                  Return Type: org.apache.openmeetings.persistence.beans.files.FileExplorerItem[]
                 </p>
     			<p>Params:</p>
     			    			

Modified: incubator/openmeetings/trunk/singlewebapp/docs/RestAPISample.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RestAPISample.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RestAPISample.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RestAPISample.html Mon Sep 10 03:55:51 2012
@@ -655,7 +655,7 @@ limitations under the License.
                                                 <p>Result: </p>
                                                 <div class="xmlcode">
 				&lt;ns:getSessionResponse/&gt;<br />
-				&lt;ns:return type="org.openmeetings.app.hibernate.beans.basic.Sessiondata"/&gt;<br />
+				&lt;ns:return type="org.apache.openmeetings.hibernate.beans.basic.Sessiondata"/&gt;<br />
 				<div style="margin-left:20px">
 					&lt;ax219:id&gt;156971&lt;/ax219:id/&gt;<br />
 					&lt;ax219:language_id xsi:nil="true"//&gt;<br />
@@ -687,7 +687,7 @@ limitations under the License.
                                                 <p>Result:</p>
                                                 <div class="xmlcode">
 				&lt;ns:getErrorByCodeResponse/&gt;<br />
-				&lt;ns:return type="org.openmeetings.app.data.beans.basic.ErrorResult"/&gt;<br />
+				&lt;ns:return type="org.apache.openmeetings.data.beans.basic.ErrorResult"/&gt;<br />
 				<div style="margin-left:20px">
 					&lt;ax218:errmessage&gt;Username not found&lt;/ax218:errmessage/&gt;<br />
 					&lt;ax218:errorId&gt;-10&lt;/ax218:errorId/&gt;<br />

Modified: incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html Mon Sep 10 03:55:51 2012
@@ -260,7 +260,7 @@ limitations under the License.
  audience rooms.
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.rooms.Rooms[]
+                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -364,7 +364,7 @@ limitations under the License.
     			  Gets a list of flv recordings
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.FLVRecordingReturn[]
+                  Return Type: org.apache.openmeetings.axis.services.FLVRecordingReturn[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -418,7 +418,7 @@ limitations under the License.
     			  Gets a list of flv recordings
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.FLVRecordingReturn[]
+                  Return Type: org.apache.openmeetings.axis.services.FLVRecordingReturn[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -530,7 +530,7 @@ limitations under the License.
     			  Gets a list of flv recordings
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.flvrecord.FlvRecording[]
+                  Return Type: org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -582,7 +582,7 @@ limitations under the License.
     			  Get list of recordings
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.flvrecord.FlvRecording[]
+                  Return Type: org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -632,7 +632,7 @@ limitations under the License.
     			  List of available room types
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.rooms.RoomTypes[]
+                  Return Type: org.apache.openmeetings.persistence.beans.rooms.RoomTypes[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -694,7 +694,7 @@ limitations under the License.
     			  Returns current users for rooms ids
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.RoomCountBean[]
+                  Return Type: org.apache.openmeetings.axis.services.RoomCountBean[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -818,7 +818,7 @@ limitations under the License.
     			  returns a conference room object
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.rooms.Rooms
+                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms
                 </p>
     			<p>Params:</p>
     			    			
@@ -870,7 +870,7 @@ limitations under the License.
     			  
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.rooms.Rooms
+                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms
                 </p>
     			<p>Params:</p>
     			    			
@@ -922,7 +922,7 @@ limitations under the License.
     			  Returns a object of type RoomReturn
     			</p>
     			<p>
-                  Return Type: org.openmeetings.axis.services.RoomReturn
+                  Return Type: org.apache.openmeetings.axis.services.RoomReturn
                 </p>
     			<p>Params:</p>
     			    			
@@ -981,7 +981,7 @@ limitations under the License.
  orderby or rooms_id
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.beans.basic.SearchResult
+                  Return Type: org.apache.openmeetings.data.beans.basic.SearchResult
                 </p>
     			<p>Params:</p>
     			    			
@@ -1065,7 +1065,7 @@ limitations under the License.
  Room-Object
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.beans.basic.SearchResult
+                  Return Type: org.apache.openmeetings.data.beans.basic.SearchResult
                 </p>
     			<p>Params:</p>
     			    			

Modified: incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html Mon Sep 10 03:55:51 2012
@@ -85,7 +85,7 @@ limitations under the License.
     			  Method to retrieve the list of the servers participating in cluster
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.basic.Server[]
+                  Return Type: org.apache.openmeetings.persistence.beans.basic.Server[]
                 </p>
     			<p>Params:</p>
     			    			

Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Mon Sep 10 03:55:51 2012
@@ -194,7 +194,7 @@ limitations under the License.
  Sessiondata, this contains a sessionId, use that sessionId in all Methods
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.persistence.beans.basic.Sessiondata
+                  Return Type: org.apache.openmeetings.persistence.beans.basic.Sessiondata
                 </p>
     			<p>Params:</p>
     			    			
@@ -289,7 +289,7 @@ limitations under the License.
  different one see the list of languages
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.beans.basic.ErrorResult
+                  Return Type: org.apache.openmeetings.data.beans.basic.ErrorResult
                 </p>
     			<p>Params:</p>
     			    			
@@ -2151,7 +2151,7 @@ limitations under the License.
     			  Search users and return them
     			</p>
     			<p>
-                  Return Type: org.openmeetings.app.data.beans.basic.SearchResult
+                  Return Type: org.apache.openmeetings.data.beans.basic.SearchResult
                 </p>
     			<p>Params:</p>
     			    			

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Mon Sep 10 03:55:51 2012
@@ -22,52 +22,52 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-		<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-		<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-		<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-		<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Server</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-		<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-		<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-        <class>org.openmeetings.app.persistence.beans.rooms.RoomClient</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-		<class>org.openmeetings.app.persistence.beans.user.Users</class>
-		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorValues</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.persistence.beans.invitation.Invitations</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+        <class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserSipData</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Users</class>
+		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Mon Sep 10 03:55:51 2012
@@ -22,55 +22,55 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-		<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-		<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-		<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-		<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Server</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-		<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-		<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-        <class>org.openmeetings.app.persistence.beans.rooms.RoomClient</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-		<class>org.openmeetings.app.persistence.beans.user.Users</class>
-		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
-		<class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
-        <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
-        <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorValues</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.persistence.beans.invitation.Invitations</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+        <class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserSipData</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Users</class>
+		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
+        <class>org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions</class>
+        <class>org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Mon Sep 10 03:55:51 2012
@@ -22,55 +22,55 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-		<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-		<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-		<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-		<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Server</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-		<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-		<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-        <class>org.openmeetings.app.persistence.beans.rooms.RoomClient</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-		<class>org.openmeetings.app.persistence.beans.user.Users</class>
-		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
-        <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
-        <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
-        <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorValues</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.persistence.beans.invitation.Invitations</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+        <class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserSipData</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Users</class>
+		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
+        <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
+        <class>org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions</class>
+        <class>org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 		    <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Mon Sep 10 03:55:51 2012
@@ -22,52 +22,52 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-		<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-		<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-		<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-		<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Server</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-		<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-		<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-        <class>org.openmeetings.app.persistence.beans.rooms.RoomClient</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-		<class>org.openmeetings.app.persistence.beans.user.Users</class>
-		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorValues</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.persistence.beans.invitation.Invitations</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+        <class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserSipData</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Users</class>
+		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1382635&r1=1382634&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Mon Sep 10 03:55:51 2012
@@ -22,52 +22,52 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-		<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-		<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-		<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-		<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-		<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-		<class>org.openmeetings.app.persistence.beans.basic.Server</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-		<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-		<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-		<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-		<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-		<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-		<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-		<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-        <class>org.openmeetings.app.persistence.beans.rooms.RoomClient</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-		<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-		<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-		<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-		<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-		<class>org.openmeetings.app.persistence.beans.user.Users</class>
-		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
+		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.ErrorValues</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
+		<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
+		<class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+		<class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.persistence.beans.invitation.Invitations</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
+		<class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
+		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+        <class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
+		<class>org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
+		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
+		<class>org.apache.openmeetings.persistence.beans.user.UserSipData</class>
+		<class>org.apache.openmeetings.persistence.beans.user.Users</class>
+		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>