Repository: openmeetings Updated Branches: refs/heads/3.3.x aadcd3e4e -> 1c9a0dfe5
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml index 21367c0..1aca2ae 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml @@ -7,21 +7,21 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <!-- persistence.xml schema --> <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"> + 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.apache.openmeetings.db.entity.basic.Configuration</class> @@ -69,13 +69,13 @@ <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp2.BasicDataSource" /> <property name="openjpa.ConnectionProperties" value="DriverClassName=oracle.jdbc.driver.OracleDriver - , Url=jdbc:oracle:thin:@localhost:1521:openmeetings + , Url=jdbc:oracle:thin:@localhost:1521:openmeetings , create=true - , MaxActive=100 - , MaxWait=10000 - , TestOnBorrow=true - , Username=SYSTEM - , Password=admin" /> + , MaxActive=100 + , MaxWait=10000 + , TestOnBorrow=true + , Username=${db_user} + , Password=${db_pass}" /> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" /> <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" /> <property name="openjpa.DataCache" value="true" /> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml index baa331f..a9ae783 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml @@ -7,21 +7,21 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <!-- persistence.xml schema --> <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"> + 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.apache.openmeetings.db.entity.basic.Configuration</class> @@ -74,8 +74,8 @@ , MaxWait=10000 , TestOnBorrow=true , poolPreparedStatements=true - , Username=postgres - , Password=1" /> + , Username=${db_user} + , Password=${db_pass}" /> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" /> <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" /> <property name="openjpa.DataCache" value="true" /> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml new file mode 100644 index 0000000..1e8bce6 --- /dev/null +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml @@ -0,0 +1,267 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; + xmlns:jaxrs="http://cxf.apache.org/jaxrs"; + xmlns:jaxws="http://cxf.apache.org/jaxws"; + xmlns:p="http://www.springframework.org/schema/p"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"; + > + <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean"> + <property name="persistenceUnitName" value="openmeetings" /> + </bean> + <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> + <property name="entityManagerFactory" ref="entityManagerFactory" /> + </bean> + <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" /> + + <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" /> + <context:annotation-config /> + <context:component-scan base-package="org.apache.openmeetings" /> + + <!-- New Class for the Streaming Handlers --> + <bean id="web.handler" class="org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter" /> + + <!-- Session configuration start --> + + <bean id="openmeetings.SessionManager" class="org.apache.openmeetings.core.session.SessionManager"> + <property name="cache"> + <!-- Memory based session cache by default --> + <ref bean="openmeetings.HashMapStore" /> + <!-- The following section should be used in clustering mode + <ref bean="openmeetings.DatabaseStore" /> + --> + </property> + </bean> + + <!-- Singleton for memory based cache --> + <bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.core.session.store.HashMapStore" /> + <!-- Database cache --> + <bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.core.session.store.DatabaseStore" /> + + <bean id="whiteboardCache" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardCache" /> + <!-- WhiteboardObjectSyncManager can stay in the memory, even on cluster! --> + <bean id="whiteboardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardObjectSyncManager" /> + + <!-- Cluster related config start --> + <bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.core.session.ServerUtil"> + <!-- Need to be uncommented and set to the real ID if in cluster mode + <property name="serverId" value="1" /> + --> + </bean> + + <!-- Start of Services --> + <bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" /> + <bean id="languageservice.service" class="org.apache.openmeetings.core.remote.LanguageService" /> + <bean id="whiteboardservice.service" class="org.apache.openmeetings.core.remote.WhiteboardService" /> + <bean id="userservice.service" class="org.apache.openmeetings.core.remote.UserService" /> + <bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" /> + <bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" /> + <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" /> + <bean id="errorservice.service" class="org.apache.openmeetings.core.remote.ErrorService" /> + <bean id="recordingservice.service" class="org.apache.openmeetings.core.remote.RecordingService" /> + <bean id="mobile.service" class="org.apache.openmeetings.core.remote.MobileService" /> + <bean id="openmeetings.RecordingConverterTask" class="org.apache.openmeetings.core.data.record.converter.RecordingConverterTask" /> + <bean id="openmeetings.InterviewConverterTask" class="org.apache.openmeetings.core.data.record.converter.InterviewConverterTask" /> + <bean id="openmeetings.InterviewConverter" class="org.apache.openmeetings.core.converter.InterviewConverter" /> + <bean id="openmeetings.RecordingConverter" class="org.apache.openmeetings.core.converter.RecordingConverter" /> + <bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" /> + + <!-- 1800000 == 30 min + 3600000 == 1 hour + 5000 == 5 sec + 300000 == 5 min + 900000 == 15 min + --> + <bean id="cleanupJob" class="org.apache.openmeetings.service.quartz.scheduler.CleanupJob" + p:sessionTimeout="1800000" p:testSetupTimeout="3600000" p:roomFilesTtl="3600000" /> + <bean id="cleanSessionsJobDetails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="cleanupJob" p:targetMethod="cleanSessions" p:concurrent="false" /> + <bean id="triggerCleanSessions" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="cleanSessionsJobDetails" p:startDelay="5000" p:repeatInterval="300000" /> + <bean id="cleanTestSetupJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="cleanupJob" p:targetMethod="cleanTestSetup" p:concurrent="false" /> + <bean id="triggerCleanTestSetup" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="cleanTestSetupJobDetail" p:startDelay="1800000" p:repeatInterval="1800000" /> + <bean id="cleanRoomFilesJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="cleanupJob" p:targetMethod="cleanRoomFiles" p:concurrent="false" /> + <bean id="triggerCleanRoomFiles" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="cleanRoomFilesJobDetail" p:startDelay="10000" p:repeatInterval="1800000" /> <!-- p:startDelay="1800000" --> + <bean id="cleanExpiredRecJobDetails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="cleanupJob" p:targetMethod="cleanExpiredRecordings" p:concurrent="false" /> + <bean id="triggerCleanExpiredRec" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="cleanExpiredRecJobDetails" p:startDelay="5000" p:repeatInterval="3600000" /> + + <bean id="reminderJob" class="org.apache.openmeetings.service.quartz.scheduler.ReminderJob"/> + <bean id="meetingReminderJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="reminderJob" p:targetMethod="remindMeetings" p:concurrent="false" /> + <bean id="triggerMeetingReminder" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="meetingReminderJobDetail" p:startDelay="5000" p:repeatInterval="100000"/> + <bean id="expiringRecordingJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="reminderJob" p:targetMethod="remindExpiringRecordings" p:concurrent="false" /> + <bean id="triggerExpiringRecording" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="expiringRecordingJobDetail" p:startDelay="5000" p:repeatInterval="3600000"/> + + <!-- Mail related jobs --> + <bean id="mailHandler" class="org.apache.openmeetings.core.mail.MailHandler" /> + <bean id="resetSendingMailStatus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="mailHandler" p:targetMethod="resetSendingStatus" p:concurrent="false" /> + <bean id="triggerResetSendingMailStatus" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="resetSendingMailStatus" p:startDelay="60000" p:repeatInterval="900000" /> + <bean id="sendMails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" + p:targetObject-ref="mailHandler" p:targetMethod="sendMails" p:concurrent="false" /> + <bean id="triggerSendMails" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" + p:jobDetail-ref="sendMails" p:startDelay="60000" p:repeatInterval="60000" /> + + <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> + <property name="triggers"> + <list> + <ref bean="triggerCleanSessions" /> + <ref bean="triggerCleanTestSetup" /> + <ref bean="triggerCleanRoomFiles" /> + <ref bean="triggerCleanExpiredRec" /> + <ref bean="triggerMeetingReminder" /> + <ref bean="triggerExpiringRecording" /> + <ref bean="triggerResetSendingMailStatus" /> + <ref bean="triggerSendMails" /> + </list> + </property> + </bean> + <!-- End of Services --> + + <!-- Interface Transactional --> + <bean id="roommanagement" class="org.apache.openmeetings.core.data.conference.RoomManager" /> + <bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/> + <bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"> + <!-- Should be uncommented and updated with real values for Asterisk + <constructor-arg><value>127.0.0.1</value></constructor-arg> + <constructor-arg><value>5038</value></constructor-arg> + <constructor-arg><value>openmeetings</value></constructor-arg> + <constructor-arg><value>12345</value></constructor-arg> + <constructor-arg><value>10000</value></constructor-arg> + --> + </bean> + <bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" /> + <bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" /> + <bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" /> + <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" /> + <bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" /> + <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" /> + <bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" /> + <bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" /> + <bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" /> + <bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" /> + <bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" /> + <bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" /> + <bean id="roomModeratorDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" /> + <bean id="roomGroupDao" class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/> + <bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" /> + <bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" /> + <bean id="fileItemLogDao" class="org.apache.openmeetings.db.dao.file.FileItemLogDao" /> + <bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" /> + <bean id="recordingDao" class="org.apache.openmeetings.db.dao.record.RecordingDao" /> + <bean id="recordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDataDao" /> + <bean id="recordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao" /> + <bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" /> + <bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" /> + <bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" /> + <bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" /> + <bean id="privateMessageDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageDao" /> + <bean id="soapLoginDao" class="org.apache.openmeetings.db.dao.server.SOAPLoginDao" /> + <bean id="userContactDao" class="org.apache.openmeetings.db.dao.user.UserContactDao" /> + <bean id="userDao" class="org.apache.openmeetings.db.dao.user.UserDao" /> + <bean id="serverDao" class="org.apache.openmeetings.db.dao.server.ServerDao" /> + <bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao" /> + <bean id="clientDao" class="org.apache.openmeetings.db.dao.room.ClientDao" /> + <bean id="mailMessageDao" class="org.apache.openmeetings.db.dao.basic.MailMessageDao" /> + <bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" /> + <bean id="omCalendarDao" class="org.apache.openmeetings.db.dao.calendar.OmCalendarDao" /> + + <!-- No Interface --> + <bean id="imageConverter" class="org.apache.openmeetings.core.converter.ImageConverter" /> + <bean id="documentConverter" class="org.apache.openmeetings.core.converter.DocumentConverter" /> + <bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" /> + <bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" /> + <bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" /> + <bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" /> + <bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" /> + <bean id="whiteboardManager" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" /> + <bean id="backupExport" class="org.apache.openmeetings.backup.BackupExport" /> + <bean id="backupImport" class="org.apache.openmeetings.backup.BackupImport" /> + <bean id="appointmentManager" class="org.apache.openmeetings.service.calendar.caldav.AppointmentManager" destroy-method="destroy"/> + <bean id="iCalUtils" class="org.apache.openmeetings.service.calendar.caldav.iCalUtils"/> + + <!-- Thread Executor --> + <bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"> + <property name="corePoolSize" value="5" /> + <property name="maxPoolSize" value="10" /> + <property name="queueCapacity" value="25" /> + </bean> + + <!-- CXF beans --> + <bean id="calendarWebService" class="org.apache.openmeetings.webservice.CalendarWebService" /> + <bean id="errorWebService" class="org.apache.openmeetings.webservice.ErrorWebService" /> + <bean id="fileWebService" class="org.apache.openmeetings.webservice.FileWebService" /> + <bean id="groupWebService" class="org.apache.openmeetings.webservice.GroupWebService" /> + <bean id="infoWebService" class="org.apache.openmeetings.webservice.InfoWebService" /> + <bean id="recordWebService" class="org.apache.openmeetings.webservice.RecordingWebService" /> + <bean id="roomWebService" class="org.apache.openmeetings.webservice.RoomWebService" /> + <bean id="serverWebService" class="org.apache.openmeetings.webservice.ServerWebService" /> + <bean id="userWebService" class="org.apache.openmeetings.webservice.UserWebService" /> + <bean id="netTestWebService" class="org.apache.openmeetings.webservice.NetTestWebService" /> + + <!-- (writeXsiType=false) --> + <jaxrs:server id="server" address="/"> + <jaxrs:serviceBeans> + <ref bean="calendarWebService"/> + <ref bean="errorWebService"/> + <ref bean="fileWebService"/> + <ref bean="groupWebService"/> + <ref bean="infoWebService"/> + <ref bean="recordWebService"/> + <ref bean="roomWebService"/> + <ref bean="serverWebService"/> + <ref bean="userWebService"/> + <ref bean="netTestWebService"/> <!-- JaxRs only --> + </jaxrs:serviceBeans> + <jaxrs:providers> + <bean id="appDtoMessageBodyWriter" class="org.apache.openmeetings.webservice.util.AppointmentMessageBodyWriter" /> + <bean id="appDtoListMessageBodyWriter" class="org.apache.openmeetings.webservice.util.AppointmentListMessageBodyWriter" /> + <bean id="omParamProvider" class="org.apache.openmeetings.webservice.util.OmParamConverterProvider"/> + </jaxrs:providers> + </jaxrs:server> + <jaxws:endpoint id="calendarServiceWS" address="/CalendarService" implementor="#calendarWebService"/> + <jaxws:endpoint id="errorServiceWS" address="/ErrorService" implementor="#errorWebService" /> + <jaxws:endpoint id="groupServiceWS" address="/GroupService" implementor="#groupWebService" /> + <jaxws:endpoint id="infoServiceWS" address="/InfoService" implementor="#infoWebService" /> + <jaxws:endpoint id="fileServiceWS" address="/FileService" implementor="#fileWebService" /> + <jaxws:endpoint id="recordServiceWS" address="/RecordService" implementor="#recordWebService" /> + <jaxws:endpoint id="roomServiceWS" address="/RoomService" implementor="#roomWebService" /> + <jaxws:endpoint id="serverServiceWS" address="/ServerService" implementor="#serverWebService" /> + <jaxws:endpoint id="userServiceWS" address="/UserService" implementor="#userWebService" /> +</beans> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml deleted file mode 100644 index 1e8bce6..0000000 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml +++ /dev/null @@ -1,267 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:tx="http://www.springframework.org/schema/tx"; - xmlns:context="http://www.springframework.org/schema/context"; - xmlns:jaxrs="http://cxf.apache.org/jaxrs"; - xmlns:jaxws="http://cxf.apache.org/jaxws"; - xmlns:p="http://www.springframework.org/schema/p"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"; - > - <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean"> - <property name="persistenceUnitName" value="openmeetings" /> - </bean> - <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> - <property name="entityManagerFactory" ref="entityManagerFactory" /> - </bean> - <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" /> - - <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" /> - <context:annotation-config /> - <context:component-scan base-package="org.apache.openmeetings" /> - - <!-- New Class for the Streaming Handlers --> - <bean id="web.handler" class="org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter" /> - - <!-- Session configuration start --> - - <bean id="openmeetings.SessionManager" class="org.apache.openmeetings.core.session.SessionManager"> - <property name="cache"> - <!-- Memory based session cache by default --> - <ref bean="openmeetings.HashMapStore" /> - <!-- The following section should be used in clustering mode - <ref bean="openmeetings.DatabaseStore" /> - --> - </property> - </bean> - - <!-- Singleton for memory based cache --> - <bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.core.session.store.HashMapStore" /> - <!-- Database cache --> - <bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.core.session.store.DatabaseStore" /> - - <bean id="whiteboardCache" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardCache" /> - <!-- WhiteboardObjectSyncManager can stay in the memory, even on cluster! --> - <bean id="whiteboardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardObjectSyncManager" /> - - <!-- Cluster related config start --> - <bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.core.session.ServerUtil"> - <!-- Need to be uncommented and set to the real ID if in cluster mode - <property name="serverId" value="1" /> - --> - </bean> - - <!-- Start of Services --> - <bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" /> - <bean id="languageservice.service" class="org.apache.openmeetings.core.remote.LanguageService" /> - <bean id="whiteboardservice.service" class="org.apache.openmeetings.core.remote.WhiteboardService" /> - <bean id="userservice.service" class="org.apache.openmeetings.core.remote.UserService" /> - <bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" /> - <bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" /> - <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" /> - <bean id="errorservice.service" class="org.apache.openmeetings.core.remote.ErrorService" /> - <bean id="recordingservice.service" class="org.apache.openmeetings.core.remote.RecordingService" /> - <bean id="mobile.service" class="org.apache.openmeetings.core.remote.MobileService" /> - <bean id="openmeetings.RecordingConverterTask" class="org.apache.openmeetings.core.data.record.converter.RecordingConverterTask" /> - <bean id="openmeetings.InterviewConverterTask" class="org.apache.openmeetings.core.data.record.converter.InterviewConverterTask" /> - <bean id="openmeetings.InterviewConverter" class="org.apache.openmeetings.core.converter.InterviewConverter" /> - <bean id="openmeetings.RecordingConverter" class="org.apache.openmeetings.core.converter.RecordingConverter" /> - <bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" /> - - <!-- 1800000 == 30 min - 3600000 == 1 hour - 5000 == 5 sec - 300000 == 5 min - 900000 == 15 min - --> - <bean id="cleanupJob" class="org.apache.openmeetings.service.quartz.scheduler.CleanupJob" - p:sessionTimeout="1800000" p:testSetupTimeout="3600000" p:roomFilesTtl="3600000" /> - <bean id="cleanSessionsJobDetails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="cleanupJob" p:targetMethod="cleanSessions" p:concurrent="false" /> - <bean id="triggerCleanSessions" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="cleanSessionsJobDetails" p:startDelay="5000" p:repeatInterval="300000" /> - <bean id="cleanTestSetupJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="cleanupJob" p:targetMethod="cleanTestSetup" p:concurrent="false" /> - <bean id="triggerCleanTestSetup" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="cleanTestSetupJobDetail" p:startDelay="1800000" p:repeatInterval="1800000" /> - <bean id="cleanRoomFilesJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="cleanupJob" p:targetMethod="cleanRoomFiles" p:concurrent="false" /> - <bean id="triggerCleanRoomFiles" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="cleanRoomFilesJobDetail" p:startDelay="10000" p:repeatInterval="1800000" /> <!-- p:startDelay="1800000" --> - <bean id="cleanExpiredRecJobDetails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="cleanupJob" p:targetMethod="cleanExpiredRecordings" p:concurrent="false" /> - <bean id="triggerCleanExpiredRec" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="cleanExpiredRecJobDetails" p:startDelay="5000" p:repeatInterval="3600000" /> - - <bean id="reminderJob" class="org.apache.openmeetings.service.quartz.scheduler.ReminderJob"/> - <bean id="meetingReminderJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="reminderJob" p:targetMethod="remindMeetings" p:concurrent="false" /> - <bean id="triggerMeetingReminder" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="meetingReminderJobDetail" p:startDelay="5000" p:repeatInterval="100000"/> - <bean id="expiringRecordingJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="reminderJob" p:targetMethod="remindExpiringRecordings" p:concurrent="false" /> - <bean id="triggerExpiringRecording" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="expiringRecordingJobDetail" p:startDelay="5000" p:repeatInterval="3600000"/> - - <!-- Mail related jobs --> - <bean id="mailHandler" class="org.apache.openmeetings.core.mail.MailHandler" /> - <bean id="resetSendingMailStatus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="mailHandler" p:targetMethod="resetSendingStatus" p:concurrent="false" /> - <bean id="triggerResetSendingMailStatus" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="resetSendingMailStatus" p:startDelay="60000" p:repeatInterval="900000" /> - <bean id="sendMails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean" - p:targetObject-ref="mailHandler" p:targetMethod="sendMails" p:concurrent="false" /> - <bean id="triggerSendMails" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" - p:jobDetail-ref="sendMails" p:startDelay="60000" p:repeatInterval="60000" /> - - <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> - <property name="triggers"> - <list> - <ref bean="triggerCleanSessions" /> - <ref bean="triggerCleanTestSetup" /> - <ref bean="triggerCleanRoomFiles" /> - <ref bean="triggerCleanExpiredRec" /> - <ref bean="triggerMeetingReminder" /> - <ref bean="triggerExpiringRecording" /> - <ref bean="triggerResetSendingMailStatus" /> - <ref bean="triggerSendMails" /> - </list> - </property> - </bean> - <!-- End of Services --> - - <!-- Interface Transactional --> - <bean id="roommanagement" class="org.apache.openmeetings.core.data.conference.RoomManager" /> - <bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/> - <bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"> - <!-- Should be uncommented and updated with real values for Asterisk - <constructor-arg><value>127.0.0.1</value></constructor-arg> - <constructor-arg><value>5038</value></constructor-arg> - <constructor-arg><value>openmeetings</value></constructor-arg> - <constructor-arg><value>12345</value></constructor-arg> - <constructor-arg><value>10000</value></constructor-arg> - --> - </bean> - <bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" /> - <bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" /> - <bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" /> - <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" /> - <bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" /> - <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" /> - <bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" /> - <bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" /> - <bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" /> - <bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" /> - <bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" /> - <bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" /> - <bean id="roomModeratorDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" /> - <bean id="roomGroupDao" class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/> - <bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" /> - <bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" /> - <bean id="fileItemLogDao" class="org.apache.openmeetings.db.dao.file.FileItemLogDao" /> - <bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" /> - <bean id="recordingDao" class="org.apache.openmeetings.db.dao.record.RecordingDao" /> - <bean id="recordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDataDao" /> - <bean id="recordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao" /> - <bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" /> - <bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" /> - <bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" /> - <bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" /> - <bean id="privateMessageDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageDao" /> - <bean id="soapLoginDao" class="org.apache.openmeetings.db.dao.server.SOAPLoginDao" /> - <bean id="userContactDao" class="org.apache.openmeetings.db.dao.user.UserContactDao" /> - <bean id="userDao" class="org.apache.openmeetings.db.dao.user.UserDao" /> - <bean id="serverDao" class="org.apache.openmeetings.db.dao.server.ServerDao" /> - <bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao" /> - <bean id="clientDao" class="org.apache.openmeetings.db.dao.room.ClientDao" /> - <bean id="mailMessageDao" class="org.apache.openmeetings.db.dao.basic.MailMessageDao" /> - <bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" /> - <bean id="omCalendarDao" class="org.apache.openmeetings.db.dao.calendar.OmCalendarDao" /> - - <!-- No Interface --> - <bean id="imageConverter" class="org.apache.openmeetings.core.converter.ImageConverter" /> - <bean id="documentConverter" class="org.apache.openmeetings.core.converter.DocumentConverter" /> - <bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" /> - <bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" /> - <bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" /> - <bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" /> - <bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" /> - <bean id="whiteboardManager" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" /> - <bean id="backupExport" class="org.apache.openmeetings.backup.BackupExport" /> - <bean id="backupImport" class="org.apache.openmeetings.backup.BackupImport" /> - <bean id="appointmentManager" class="org.apache.openmeetings.service.calendar.caldav.AppointmentManager" destroy-method="destroy"/> - <bean id="iCalUtils" class="org.apache.openmeetings.service.calendar.caldav.iCalUtils"/> - - <!-- Thread Executor --> - <bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"> - <property name="corePoolSize" value="5" /> - <property name="maxPoolSize" value="10" /> - <property name="queueCapacity" value="25" /> - </bean> - - <!-- CXF beans --> - <bean id="calendarWebService" class="org.apache.openmeetings.webservice.CalendarWebService" /> - <bean id="errorWebService" class="org.apache.openmeetings.webservice.ErrorWebService" /> - <bean id="fileWebService" class="org.apache.openmeetings.webservice.FileWebService" /> - <bean id="groupWebService" class="org.apache.openmeetings.webservice.GroupWebService" /> - <bean id="infoWebService" class="org.apache.openmeetings.webservice.InfoWebService" /> - <bean id="recordWebService" class="org.apache.openmeetings.webservice.RecordingWebService" /> - <bean id="roomWebService" class="org.apache.openmeetings.webservice.RoomWebService" /> - <bean id="serverWebService" class="org.apache.openmeetings.webservice.ServerWebService" /> - <bean id="userWebService" class="org.apache.openmeetings.webservice.UserWebService" /> - <bean id="netTestWebService" class="org.apache.openmeetings.webservice.NetTestWebService" /> - - <!-- (writeXsiType=false) --> - <jaxrs:server id="server" address="/"> - <jaxrs:serviceBeans> - <ref bean="calendarWebService"/> - <ref bean="errorWebService"/> - <ref bean="fileWebService"/> - <ref bean="groupWebService"/> - <ref bean="infoWebService"/> - <ref bean="recordWebService"/> - <ref bean="roomWebService"/> - <ref bean="serverWebService"/> - <ref bean="userWebService"/> - <ref bean="netTestWebService"/> <!-- JaxRs only --> - </jaxrs:serviceBeans> - <jaxrs:providers> - <bean id="appDtoMessageBodyWriter" class="org.apache.openmeetings.webservice.util.AppointmentMessageBodyWriter" /> - <bean id="appDtoListMessageBodyWriter" class="org.apache.openmeetings.webservice.util.AppointmentListMessageBodyWriter" /> - <bean id="omParamProvider" class="org.apache.openmeetings.webservice.util.OmParamConverterProvider"/> - </jaxrs:providers> - </jaxrs:server> - <jaxws:endpoint id="calendarServiceWS" address="/CalendarService" implementor="#calendarWebService"/> - <jaxws:endpoint id="errorServiceWS" address="/ErrorService" implementor="#errorWebService" /> - <jaxws:endpoint id="groupServiceWS" address="/GroupService" implementor="#groupWebService" /> - <jaxws:endpoint id="infoServiceWS" address="/InfoService" implementor="#infoWebService" /> - <jaxws:endpoint id="fileServiceWS" address="/FileService" implementor="#fileWebService" /> - <jaxws:endpoint id="recordServiceWS" address="/RecordService" implementor="#recordWebService" /> - <jaxws:endpoint id="roomServiceWS" address="/RoomService" implementor="#roomWebService" /> - <jaxws:endpoint id="serverServiceWS" address="/ServerService" implementor="#serverWebService" /> - <jaxws:endpoint id="userServiceWS" address="/UserService" implementor="#userWebService" /> -</beans> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml b/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml index 6b2df68..b265961 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml @@ -37,5 +37,5 @@ <property name="virtualHosts" value="${webapp.virtualHosts}" /> </bean> - <import resource="classes/openmeetings-applicationContext.xml" /> + <import resource="classes/applicationContext.xml" /> </beans> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 973ef1c..2871563 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -35,7 +35,7 @@ <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class> <init-param> <param-name>config-location</param-name> - <param-value>classpath:openmeetings-applicationContext.xml</param-value> + <param-value>classpath:applicationContext.xml</param-value> </init-param> <load-on-startup>1</load-on-startup> <async-supported>true</async-supported> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java index 96e7d3f..c7fcea4 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java @@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @TestExecutionListeners({}) -@ContextConfiguration(locations={"classpath:openmeetings-applicationContext.xml"}, inheritLocations = true) +@ContextConfiguration(locations={"classpath:applicationContext.xml"}, inheritLocations = true) public abstract class AbstractSpringTest extends AbstractJUnit4SpringContextTests { @BeforeClass http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 852e1a5..317fef8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,8 @@ <site.basedir>${project.basedir}</site.basedir> <src.pack.skip>false</src.pack.skip> <derby.version>10.13.1.1</derby.version> + <db_user></db_user> + <db_pass></db_pass> </properties> <profiles> <profile> @@ -87,6 +89,13 @@ </properties> </profile> <profile> + <id>default-db-cred</id> + <properties> + <db_user>root</db_user> + <db_pass></db_pass> + </properties> + </profile> + <profile> <id>rc</id> <build> <plugins> @@ -857,7 +866,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
