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 2017/05/16 16:53:55 UTC
[1/2] openmeetings git commit: no jira: dummy user/passwords are
removed from *persistence.xml
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>
[2/2] openmeetings git commit: no jira: dummy user/passwords are
removed from *persistence.xml
Posted by so...@apache.org.
no jira: dummy user/passwords are removed from *persistence.xml
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1c9a0dfe
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1c9a0dfe
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1c9a0dfe
Branch: refs/heads/3.3.x
Commit: 1c9a0dfe56be5f634b9f07630ce496cc7b22505c
Parents: aadcd3e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue May 16 23:53:41 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue May 16 23:53:41 2017 +0700
----------------------------------------------------------------------
.gitignore | 1 -
.../openmeetings/db/util/ApplicationHelper.java | 2 +-
.../src/site/xdoc/BuildInstructions.xml | 6 +-
.../src/site/xdoc/Clustering.xml | 2 +-
.../src/site/xdoc/WebsiteGuide.xml | 18 +-
openmeetings-web/pom.xml | 49 +++-
.../web/app/Application.properties.xml | 3 +
.../web/app/Application_ar.properties.xml | 3 +
.../web/app/Application_bg.properties.xml | 3 +
.../web/app/Application_ca.properties.xml | 3 +
.../web/app/Application_cs.properties.xml | 3 +
.../web/app/Application_da.properties.xml | 3 +
.../web/app/Application_de.properties.xml | 3 +
.../web/app/Application_el.properties.xml | 3 +
.../web/app/Application_es.properties.xml | 5 +-
.../web/app/Application_fa.properties.xml | 3 +
.../web/app/Application_fi.properties.xml | 3 +
.../web/app/Application_fr.properties.xml | 3 +
.../web/app/Application_gl.properties.xml | 3 +
.../web/app/Application_hu.properties.xml | 3 +
.../web/app/Application_id.properties.xml | 3 +
.../web/app/Application_it.properties.xml | 3 +
.../web/app/Application_ja.properties.xml | 3 +
.../web/app/Application_ko.properties.xml | 3 +
.../web/app/Application_nl.properties.xml | 3 +
.../web/app/Application_pl.properties.xml | 3 +
.../web/app/Application_pt.properties.xml | 3 +
.../web/app/Application_pt_BR.properties.xml | 3 +
.../web/app/Application_ru.properties.xml | 3 +
.../web/app/Application_sk.properties.xml | 3 +
.../web/app/Application_sv.properties.xml | 3 +
.../web/app/Application_th.properties.xml | 3 +
.../web/app/Application_tr.properties.xml | 3 +
.../web/app/Application_uk.properties.xml | 3 +
.../web/app/Application_zh_CN.properties.xml | 3 +
.../web/app/Application_zh_TW.properties.xml | 3 +
.../web/pages/install/CongratulationsPanel.html | 12 +-
.../web/pages/install/InstallWizard$DbStep.html | 48 ++--
.../install/InstallWizard$InstallStep.html | 6 +-
.../install/InstallWizard$ParamsStep1.html | 7 +-
.../install/InstallWizard$ParamsStep2.html | 6 +-
.../install/InstallWizard$ParamsStep3.html | 6 +-
.../install/InstallWizard$ParamsStep4.html | 7 +-
.../install/InstallWizard$WelcomeStep.html | 6 +-
.../web/pages/install/InstallWizard.java | 3 +
.../web/pages/install/InstallWizardPage.html | 6 +-
.../install/InstallWizard_es.properties.xml | 6 +-
.../classes/META-INF/db2_persistence.xml | 14 +-
.../classes/META-INF/derby_persistence.xml | 14 +-
.../classes/META-INF/mssql_persistence.xml | 13 +-
.../classes/META-INF/mysql_persistence.xml | 14 +-
.../classes/META-INF/oracle_persistence.xml | 22 +-
.../classes/META-INF/postgresql_persistence.xml | 14 +-
.../WEB-INF/classes/applicationContext.xml | 267 +++++++++++++++++++
.../classes/openmeetings-applicationContext.xml | 267 -------------------
.../src/main/webapp/WEB-INF/red5-web.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../openmeetings/test/AbstractSpringTest.java | 2 +-
pom.xml | 11 +-
59 files changed, 515 insertions(+), 410 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f28090a..d87639c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@ target
# OM
openmeetings-server/red5-server
-openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index 5079c61..c509be4 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -100,7 +100,7 @@ public class ApplicationHelper {
OMContextListener omcl = new OMContextListener();
omcl.contextInitialized(new ServletContextEvent(sc));
XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
- xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
+ xmlContext.setConfigLocation("classpath:applicationContext.xml");
xmlContext.setServletContext(sc);
xmlContext.refresh();
sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-server/src/site/xdoc/BuildInstructions.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 9c65f2b..c6af2af 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -71,19 +71,19 @@ mvn install -P allModules -pl openmeetings-flash # compiles a comp
<p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p>
<source>
<![CDATA[
-mvn clean install -P unpacked,mysql -DskipTests=true -Dwicket.mode=DEVELOPMENT
+mvn clean install -P allModules,unpacked,mysql,default-db-cred -DskipTests=true -Dwicket.mode=DEVELOPMENT
]]>
</source>
<p>After modifications are made you can run <i>"quick"</i> build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT
+mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT
]]>
</source>
<p>Any number of projects can be specified during build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT
+mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT
]]>
</source>
<div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-server/src/site/xdoc/Clustering.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml
index a1ccc27..9d073d1 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -80,7 +80,7 @@
</ul>
</section>
<section name="OM nodes configuration">
- <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt>:</p>
+ <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/applicationContext.xml</tt>:</p>
<ul>
<li>
For each node uncomment line:
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index 723bb33..a8dc062 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -13,15 +13,13 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Website Guide</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
-
<section name="How to update Apache OpenMeetings website">
<subsection name="Required tools">
<div>
@@ -31,12 +29,11 @@
</ul>
</div>
</subsection>
-
<subsection name="Introduction">
<div>
<p>
The Apache OpenMeetings HTML websites are generated from XML files.
- You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked]]></source> that generates the HTML files
+ You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> that generates the HTML files
and then you copy generated HTML files into appropriate place and commit to Git both: XML and HTML files.
</p>
<p>
@@ -44,7 +41,6 @@
</p>
</div>
</subsection>
-
<subsection name="Editing the website">
<div>
<p>
@@ -53,18 +49,16 @@
<br />
<a href="https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git">https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git</a><br/>
</p>
-
<div>
To update the website you need to clone master:<br />
<a href="https://git-wip-us.apache.org/repos/asf/openmeetings-site.git">https://git-wip-us.apache.org/repos/asf/openmeetings-site.git</a> <br/>
edit the files in the folder <tt>openmeetings-server/src/site</tt><br/>
then you run the command:
- <source><![CDATA[mvn install -Dunpacked=true]]></source>
+ <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source>
control the output locally in the folder <tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/>
copy site contents into target folder: <source><![CDATA[cp -r openmeetings-server/target/server/webapps/openmeetings/docs/* ../site/]]></source>
And then commit your changes into the Git <i>both</i> the edited xml(s) and generated html files.
</div>
-
<p>
The public website is automatically synced with the Git repository.<br/>
Changes to the Git should be immediately synced to the production website.<br/>
@@ -74,7 +68,6 @@
</p>
</div>
</subsection>
-
<subsection name="Adding a new menu entry">
<div>
To add a new menu entry in the left side panel you need to modify the file:
@@ -82,9 +75,6 @@
<tt>openmeetings-server/src/site/site.xml</tt>
</div>
</subsection>
-
</section>
-
</body>
-
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index def410e..5b47824 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -58,6 +58,13 @@
<archiveClasses>true</archiveClasses>
<packagingExcludes>**/*.class</packagingExcludes>
<filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
+ <webResources>
+ <webResource>
+ <directory>${project.build.directory}/generated-res</directory>
+ <targetPath>WEB-INF/classes/META-INF</targetPath>
+ <filtering>true</filtering>
+ </webResource>
+ </webResources>
</configuration>
<executions>
<execution>
@@ -179,8 +186,8 @@
</configuration>
</execution>
<execution>
- <id>copy-web-templates</id>
- <phase>process-resources</phase>
+ <id>copy-test-web-templates</id>
+ <phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -208,6 +215,14 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/generated-test-res</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/test-root/WEB-INF/classes/</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
<skip>${om.quick.build}</skip>
</configuration>
@@ -218,13 +233,27 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution><!-- FIXME should be refactored -->
+ <execution>
<id>select-db</id>
- <phase>generate-sources</phase>
+ <phase>generate-resources</phase>
<configuration>
<target>
<copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
- tofile="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml"
+ tofile="${project.build.directory}/generated-res/persistence.xml"
+ overwrite="true" force="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-db</id>
+ <phase>generate-test-resources</phase>
+ <configuration>
+ <target>
+ <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml"
+ tofile="${project.build.directory}/generated-test-res/META-INF/persistence.xml"
overwrite="true" force="true"/>
</target>
</configuration>
@@ -243,24 +272,16 @@
<excludedGroups>org.apache.openmeetings.test.selenium.SeleniumTests,org.apache.openmeetings.test.selenium.HeavyTests</excludedGroups>
<systemPropertyVariables>
<om.home>${project.build.directory}/test-root</om.home>
- <languages.home>${project.basedir}/src/main/webapp/languages</languages.home>
+ <languages.home>${project.build.directory}/test-root/languages</languages.home>
<red5.root>red5.root</red5.root>
<backups.dir>${old-backups.dir}</backups.dir>
<logback.ContextSelector>org.red5.logging.LoggingContextSelector</logback.ContextSelector>
<catalina.useNaming>true</catalina.useNaming>
</systemPropertyVariables>
- <additionalClasspathElements>
- <additionalClasspathElement>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</additionalClasspathElement>
- </additionalClasspathElements>
<skip>${maven.test.skip}</skip>
</configuration>
</plugin>
</plugins>
- <testResources>
- <testResource>
- <directory>${project.basedir}/src/main/webapp/WEB-INF/classes</directory>
- </testResource>
- </testResources>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index bb66839..0d4e044 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 98b745a..8371f2c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 6c8f5f7..5e1aae0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index c3a4397..d5df80d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 6992065..c4ee81d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index a781513..3ec06f0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index e295db4..09dde5d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1680,6 +1680,9 @@
Standardmäßig verwendet {0} die integrierte
{1} Datenbank. In Produktivumgebungen wird jedoch der Einsatz von {2}, {3}, {4}, {5} or {6} empfohlen.
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index cf352af..0502970 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index c4c44da..e97b9d0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -1679,7 +1679,10 @@
{0} viene predeterminado para emplear la base de datos {1}. Para
medios de producción considere emplear {2}, {3}, {4}, {5} u {6}
</blockquote>
- ]]></entry>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
+ ]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.postgresql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/PostgresConfig.html">PostgreSql</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index e7ae399..46b931e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 982ccc9..3a4b178 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 4cb0941..7dd4376 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -1670,6 +1670,9 @@
Par défaut {0} utilise la base de données {1}. Dans un environnement de production vous devriez opter pour
{2}, {3}, {4}, {5} or {6}.
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index dc5566e..f65e62a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 946e5b0..79c563f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -1664,6 +1664,9 @@
Az {0} alapértelmezette a beépített {1} adatbázist használja.
További lehetőségként használható a {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 108ba7e..8f33e78 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index fb6547f..76ca287 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -1679,6 +1679,9 @@
Per default {0} usa il database integrato {1}. Per
ambienti di produzione dovresti considerare l'uso di {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index dd6d2bb..c7d00c1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 522c304..1fef58e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -1680,6 +1680,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index a700a59..ebc4415 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 3676fc0..c3dd3a3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 2d86b78..f035dcd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 1fb79d0..688ffb0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index cbd9122..d29780a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -1679,6 +1679,9 @@
По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>ВНИМАНИЕ</strong> Пожалуйста используйте логин БД, который трудно угадать и 'сложный' пароль с длинной не менее 8 символов.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 3d19f6c..1f080bb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 88eb501..9050c60 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 50cd0cc..6e0ed4a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 42339f2..40ed855 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index edbe70c..4235524 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -1679,6 +1679,9 @@
По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 73e1352..fd4eab7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -1668,6 +1668,9 @@
<blockquote>
默认 {0} 使用集成 {1} 数据库。对于生产环境，你应该考虑使用 {2}，{3}，{4}，{5} 或 {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 2acdbe7..8fb60b1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -1678,6 +1678,9 @@
By default {0} uses the integrated {1} database. For
production environment you should consider using {2}, {3}, {4}, {5} or {6}
</blockquote>
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
+ <p><strong>NOTE</strong> Please use unpredictable DB login and 'strong' password with length 8 characters or more.</p>
+ </div>
]]></entry>
<entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="http://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
index 7aedb6e..9015383 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -32,25 +32,19 @@
<br />
<br />
<br />
-
<b> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.mail"/></span></b>
<br />
<br />
-
<span style="font-size: 1.3em"><a
href="http://openmeetings.apache.org/mail-lists.html" target="_blank">http://openmeetings.apache.org/mail-lists.html</a></span>
<br />
<br />
-
-
<b> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.commercial"/></span></b>
<br />
<br />
-
<span style="font-size: 1.3em"><a
href="http://openmeetings.apache.org/commercial-support.html"
target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
<br />
-
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
index 71a4dd3..803f52d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -24,27 +24,27 @@
<legend class="ui-widget-header"><wicket:message key="install.wizard.db.step.field.title"/></legend>
<div wicket:id="note"></div>
<form class="adminForm" wicket:id="form">
- <div class="formelement">
- <label wicket:for="dbType"><wicket:message key="install.wizard.db.step.dbtype" /></label> <select wicket:id="dbType"></select>
- </div>
- <div wicket:id="hostelem" class="formelement">
- <label wicket:for="host"><wicket:message key="install.wizard.db.step.host" /></label> <input type="text" wicket:id="host"/>
- </div>
- <div wicket:id="portelem" class="formelement">
- <label wicket:for="port"><wicket:message key="install.wizard.db.step.port" /></label> <input type="text" wicket:id="port"/>
- </div>
- <div class="formelement">
- <label wicket:for="dbname"><wicket:message key="install.wizard.db.step.dbname" /></label> <input type="text" wicket:id="dbname"/>
- </div>
- <div class="formelement">
- <label wicket:for="login"><wicket:message key="install.wizard.db.step.user" /></label> <input type="text" wicket:id="login"/>
- </div>
- <div class="formelement">
- <label wicket:for="password"><wicket:message key="install.wizard.db.step.pass" /></label> <input type="text" wicket:id="password"/>
- </div>
- <div class="formelement" style="max-width:860px;">
- <button class="align-right" wicket:id="check"><wicket:message key="install.wizard.db.step.check"/></button>
- </div>
+ <div class="formelement">
+ <label wicket:for="dbType"><wicket:message key="install.wizard.db.step.dbtype" /></label> <select wicket:id="dbType"></select>
+ </div>
+ <div wicket:id="hostelem" class="formelement">
+ <label wicket:for="host"><wicket:message key="install.wizard.db.step.host" /></label> <input type="text" wicket:id="host"/>
+ </div>
+ <div wicket:id="portelem" class="formelement">
+ <label wicket:for="port"><wicket:message key="install.wizard.db.step.port" /></label> <input type="text" wicket:id="port"/>
+ </div>
+ <div class="formelement">
+ <label wicket:for="dbname"><wicket:message key="install.wizard.db.step.dbname" /></label> <input type="text" wicket:id="dbname"/>
+ </div>
+ <div class="formelement">
+ <label wicket:for="login"><wicket:message key="install.wizard.db.step.user" /></label> <input type="text" wicket:id="login"/>
+ </div>
+ <div class="formelement">
+ <label wicket:for="password"><wicket:message key="install.wizard.db.step.pass" /></label> <input type="text" wicket:id="password"/>
+ </div>
+ <div class="formelement" style="max-width:860px;">
+ <button class="align-right" wicket:id="check"><wicket:message key="install.wizard.db.step.check"/></button>
+ </div>
</form>
</fieldset>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
index d59cb47..3246950 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
index c0f842c..6e404a9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -37,7 +37,6 @@
</li>
</ul>
</fieldset>
-
<fieldset class="ui-widget-content" id="userGroupa">
<legend class="ui-widget-header"><wicket:message key="install.wizard.params.step1.groupdata"/></legend>
<ul class="paramList">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
index ea9f953..5243424 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
index 7f6f695..47b9096 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
index ff2c842..4d67fa6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -34,7 +34,6 @@
</li>
</ul>
</fieldset>
-
<fieldset class="ui-widget-content" id="red5sip">
<legend class="ui-widget-header"><wicket:message key="install.wizard.params.step4.red5SIP"/></legend>
<ul class="paramList">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
index 21b4422..f98649f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index fc006ba..8a1fdd0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -328,6 +328,9 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
try {
File conf = OmFileHelper.getPersistence(type);
props = ConnectionPropertiesPatcher.getConnectionProperties(conf);
+ // resetting default login/password
+ props.setLogin(null);
+ props.setPassword(null);
} catch (Exception e) {
form.warn(getString("install.wizard.db.step.errorprops"));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
index df874bf..2e535ad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard_es.properties.xml
index 3f046b5..3a3e798 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard_es.properties.xml
@@ -7,16 +7,16 @@
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.
-
+
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c9a0dfe/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
index 388277e..46fc2ef 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_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=db2admin
- , Password=admin" />
+ , 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/derby_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
index 1d2b86b..e70e0a5 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_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 @@
MaxActive=100,
MaxWait=10000,
TestOnBorrow=true,
- Username=user,
- Password=secret" />
+ 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/mssql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
index e1124ba..61060be 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -7,20 +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,8 +70,8 @@
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
, Url=jdbc:sqlserver://localhost:1433;databaseName=openmeetings
- , Username=Username
- , Password=Password" />
+ , Username=${db_user}
+ , Password=${db_pass}" />
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Runtime=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/mysql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
index 5263a8e..06525f8 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_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=root
- , Password=" />
+ , 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" />