Repository: openmeetings Updated Branches: refs/heads/master 4ea8152ec -> 832167d56
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/832167d5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/832167d5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/832167d5 Branch: refs/heads/master Commit: 832167d561148addff7e89d63261297bb57ba5b4 Parents: 4ea8152 Author: Maxim Solodovnik <[email protected]> Authored: Tue May 16 23:53:41 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue May 16 23:59:27 2017 +0700 ---------------------------------------------------------------------- .gitignore | 1 - .../src/site/xdoc/BuildInstructions.xml | 6 +-- .../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 ++ .../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 +++--- pom.xml | 11 ++++- 51 files changed, 240 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/832167d5/.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/832167d5/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/832167d5/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="[email protected]">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/832167d5/openmeetings-web/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index b064a88..d34c368 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/832167d5/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 19a3da5..9e6ee6e 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 @@ -1667,6 +1667,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/832167d5/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 6419f1a..102e481 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 @@ -1667,6 +1667,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/832167d5/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 08ce7a0..0eeee5f 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 @@ -1667,6 +1667,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/832167d5/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 0110576..1a156dd 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 @@ -1667,6 +1667,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/832167d5/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 bfd40e6..6b2a196 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 @@ -1667,6 +1667,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/832167d5/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 423299f..36cf544 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 @@ -1667,6 +1667,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/832167d5/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 c53c5f0..448377f 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 @@ -1669,6 +1669,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/832167d5/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 11ad84f..bff4e65 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 @@ -1667,6 +1667,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/832167d5/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 6922c7f..62a2b63 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 @@ -1668,7 +1668,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/832167d5/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 ca64c6e..9b735a1 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 @@ -1667,6 +1667,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/832167d5/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 cd11ccf..4f40424 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 @@ -1667,6 +1667,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/832167d5/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 39e470f..9739ffa 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 @@ -1662,6 +1662,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/832167d5/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 ae7df4a..6fb2b4f 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 @@ -1667,6 +1667,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/832167d5/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 fc899ba..9654bb4 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 @@ -1657,6 +1657,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/832167d5/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 3bd53e4..84229db 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 @@ -1667,6 +1667,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/832167d5/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 bf76c36..9161b9c 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 @@ -1668,6 +1668,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/832167d5/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 0054fc7..d3e6e78 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 @@ -1667,6 +1667,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/832167d5/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 e4e5140..631e709 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 @@ -1669,6 +1669,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/832167d5/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 a4c8d39..b915777 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 @@ -1667,6 +1667,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/832167d5/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 cad4793..0373d05 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 @@ -1667,6 +1667,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/832167d5/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 0469082..2ded8fc 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 @@ -1667,6 +1667,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/832167d5/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 679d43b..abf7da3 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 @@ -1667,6 +1667,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/832167d5/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 2adbc50..b062f6a 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 @@ -1668,6 +1668,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/832167d5/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 ffa9f8b..5ddfc4d 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 @@ -1667,6 +1667,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/832167d5/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 0f32477..7dd7fcb 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 @@ -1667,6 +1667,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/832167d5/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 355ac52..8c083c0 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 @@ -1667,6 +1667,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/832167d5/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 021b9f4..fe66685 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 @@ -1667,6 +1667,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/832167d5/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 645b9ea..c516e28 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 @@ -1669,6 +1669,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/832167d5/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 9bdae00..dae7e11 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 @@ -1661,6 +1661,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/832167d5/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 b2966eb..413cccd 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 @@ -1667,6 +1667,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/832167d5/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/832167d5/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/832167d5/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/832167d5/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/832167d5/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/832167d5/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 633e976..b24344b 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/832167d5/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/832167d5/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/832167d5/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 0fdf955..b19e99f 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/832167d5/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/832167d5/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 6a138b9..1355008 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/832167d5/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 4304fe5..e447fda 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/832167d5/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 46237d3..1cac922 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/832167d5/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 798ec15..c7000f2 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" /> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/832167d5/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 2a62983..f8dd5dd 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/832167d5/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 a93c70d..95f7d00 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/832167d5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 243d913..9091953 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>
