Author: solomax
Date: Wed May 22 11:32:51 2013
New Revision: 1485159
URL: http://svn.apache.org/r1485159
Log:
[OPENMEETINGS-639] parameters are separated to several screens
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.html
- copied unchanged from r1485033,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$CongradulationsStep.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
- copied, changed from r1485033,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.html
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$CongradulationsStep.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep.html
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.java?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongradulationsPanel.java
Wed May 22 11:32:51 2013
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.web.pages.install;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class CongradulationsPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
+ public CongradulationsPanel(String id) {
+ super(id);
+
+ add(new Link<Void>("url") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+
setResponsePage(Application.get().getHomePage());
+ }
+ });
+ }
+}
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24InstallStep.html?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
Wed May 22 11:32:51 2013
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+ Install
+</wicket:panel>
+</html>
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
(from r1485033,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep.html)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep1.html?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep1.html&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep.html&r1=1485033&r2=1485159&rev=1485159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
Wed May 22 11:32:51 2013
@@ -47,182 +47,5 @@
<input wicket:id="cfg.group" title="Enter a
default Organisation" type="text" /></li>
</ul>
</fieldset>
-
- <fieldset id="userConf">
- <legend>Configuration</legend>
- <ul>
- <li><label for="configdefault">Allow self-registering
(allow_frontend_register)</label>
- <select
wicket:id="allowFrontendRegister"></select>
- </li>
- <li><label wicket:for="sendEmailAtRegister">Send Email
to new registered Users (sendEmailAtRegister)</label>
- <select
wicket:id="sendEmailAtRegister"></select>
- </li>
- <li><label
wicket:for="sendEmailWithVerficationCode">New Users need to verify their EMail
(sendEmailWithVerficationCode)</label>
- <select
wicket:id="sendEmailWithVerficationCode"></select>
- </li>
- <li><label wicket:for="createDefaultRooms">Default
Rooms of all types will be created</label>
- <select wicket:id="createDefaultRooms"></select>
- </li>
- <li><label wicket:for="cfg.mailReferer">Mail-Referer
(system_email_addr)</label>
- <input wicket:id="cfg.mailReferer" title="Enter
a Referer" type="text" />
- </li>
- <li><label wicket:for="cfg.smtpServer">SMTP-Server
(smtp_server)</label>
- <input wicket:id="cfg.smtpServer" title="Enter
a SMTP-Server" type="text" />
- </li>
- <li><label wicket:for="cfg.smtpPort">SMTP-Server
Port(default Smtp-Server Port is 25) (smtp_port)</label>
- <input wicket:id="cfg.smtpPort" title="Enter a
SMTP-Server.Port normally 25" type="text" />
- </li>
- <li><label wicket:for="cfg.mailAuthName">SMTP-Username
(email_userpass)</label>
- <input wicket:id="cfg.mailAuthName"
title="Enter the mail-username" type="text" />
- </li>
- <li><label wicket:for="cfg.mailAuthPass">SMTP-Userpass
(email_userpass)</label>
- <input wicket:id="cfg.mailAuthPass"
title="Enter the mail-userpass" type="password" />
- </li>
- <li><label wicket:for="mailUseTls">Enable TLS in Mail
Server Auth</label>
- <select wicket:id="mailUseTls"></select>
- </li>
- <li><label wicket:for="replyToOrganizer">Set inviter's
email
- address as ReplyTo in email invitations
(inviter.email.as.replyto)</label>
- <select wicket:id="replyToOrganizer"></select>
- </li>
- <li><label wicket:for="defaultLangId">Default
Language</label>
- <select wicket:id="defaultLangId"></select>
- </li>
- <li><label wicket:for="cfg.defaultExportFont">Default
Font for Export [default_export_font]</label>
- <select
wicket:id="cfg.defaultExportFont"></select>
- </li>
- </ul>
- </fieldset>
-
- <fieldset id="userConf1">
- <legend>Converters</legend>
- <ul>
- <li><label wicket:for="cfg.swfZoom">SWFTools
Zoom</label>
- <input wicket:id="cfg.swfZoom" title="Enter the dpi
that swftools will use for PDF to SWF conversion"
- type="text" />
- <p>
- <i>You can test if swftools is
installed into system path by
- opening a shell or cmd-prompt
and type pdf2swf Enter the dpi
- that swftools will use for PDF
to SWF conversion. Default is 72
- dpi. see also <a
-
href="http://openmeetings.apache.org/installation.html";
- target="_blank">Installation</a>
- </i>
- </p></li>
- <li><label wicket:for="cfg.swfJpegQuality">SWFTools
JPEG Quality</label>
- <input wicket:id="cfg.swfJpegQuality"
- title="Enter the quality of embedded jpeg
pictures to quality. 0 is worst (small), 100 is best (big). (default:85)"
- type="text" />
- <p>
- <i>You can test if swftools is
installed into system path by
- opening a shell or cmd-prompt
and type pdf2swf Enter the
- quality of embedded jpeg
pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)
see also <a
-
href="http://openmeetings.apache.org/installation.html";
- target="_blank">Installation</a>
- </i>
- </p>
- </li>
- <li><label wicket:for="cfg.swfPath">SWFTools
Path</label>
- <input wicket:id="cfg.swfPath"
- title="Enter the path to swftools for example
C:/swftools (Windows) or leave blank if swftools is a known to your system path"
- type="text" />
- <p>
- <i>You can test if swftools is
installed into system path by
- opening a shell or cmd-prompt
and type pdf2swf If this shows
- a list of options leave this
field blank otherwise you have to
- specify the path to pdf2swf on
your system see also <a
-
href="http://openmeetings.apache.org/installation.html";
- target="_blank">Installation</a>
- </i>
- </p></li>
- <li><label wicket:for="cfg.imageMagicPath">ImageMagick
Path</label>
- <input wicket:id="cfg.imageMagicPath"
- title="Enter the path to ImageMagick, leave
blank if ImageMagick is successfully installed to system-path"
- type="text" />
- <p>
- <i>see also <a
-
href="http://openmeetings.apache.org/installation.html";
-
target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.ffmpegPath">FFMPEG
Path</label>
- <input wicket:id="cfg.ffmpegPath"
- title="Enter the path to FFMPEG, leave blank if
FFMPEG is successfully installed to system-path"
- type="text" />
- <p>
- <i>see also <a
-
href="http://openmeetings.apache.org/installation.html";
-
target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.soxPath">SoX Path</label>
- <input wicket:id="cfg.soxPath"
- title="Enter the path to SoX, leave blank if
SoX is successfully installed to system-path"
- type="text" />
- <p>
- <i>see also <a
-
href="http://openmeetings.apache.org/installation.html";
-
target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.jodPath">JOD Path</label>
- <input wicket:id="cfg.jodPath"
- title="The path to JOD library
(http://code.google.com/p/jodconverter), configure the path to point to the lib
directory of JOD that contains also the jodconverter-core-version.jar"
- type="text" />
- <p>
- <i>see also <a
-
href="http://openmeetings.apache.org/installation.html";
-
target="_blank">Installation</a></i>
- </p></li>
- <li><label
wicket:for="cfg.officePath">OpenOffice/LibreOffice Path for jodconverter</label>
- <input wicket:id="cfg.officePath"
- title="The path to OpenOffice/LibreOffice
(optional) please set this to the real path in case jodconverter is unable to
find OpenOffice/LibreOffice installation automatically"
- type="text" />
- <p>The path to OpenOffice/LibreOffice
(optional) please set this
- to the real path in case jodconverter
is unable to find
- OpenOffice/LibreOffice
installation</p></li>
- </ul>
- </fieldset>
-
- <fieldset id="userConf2">
-
- <legend>Crypt Type</legend>
- <ul>
- <li><label wicket:for="cfg.cryptClassName">Crypt
Class</label>
- <input wicket:id="cfg.cryptClassName"
type="text"
- title="Enter the Class name of the Encryption
Class. DO NOT ALTER THIS IF YOU ARE NOT SURE" />
- <p>
- <i> You can use this default crypt type
which is equal to
- PHP-MD5 function or BSD-Style
encryption by
using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
- for more information or to
write your own Crypt-Style see: <a
-
href="http://openmeetings.apache.org/CustomCryptMechanism.html";
- target="_blank">Custom Crypt
Mechanism</a> You can edit this
- value later BUT previous
created Users and Sessions might be not
- usable anymore
- </i>
- </p></li>
- </ul>
- </fieldset>
-
- <fieldset id="red5sip">
- <legend>red5SIP Configuration</legend>
- <ul>
- <li><label wicket:for="red5SipEnable">Enable SIP</label>
- <select wicket:id="red5SipEnable"></select>
- <p>
- <i> Enable red5SIP integration </i>
- </p> </li>
-
- <li><label wicket:for="cfg.red5SipRoomPrefix">SIP rooms
prefix</label>
- <input wicket:id="cfg.red5SipRoomPrefix"
type="text" />
- <p>
- <i>Prefix for phone number of
conference rooms</i>
- </p></li>
-
- <li><label wicket:for="cfg.red5SipExtenContext">SIP
extensions context</label>
- <input wicket:id="cfg.red5SipExtenContext"
type="text" />
- <p>
- <i>Context of Asterisk extensions</i>
- </p></li>
- </ul>
- </fieldset>
</wicket:panel>
</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep2.html?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
Wed May 22 11:32:51 2013
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+ <fieldset id="userConf">
+ <legend>Configuration</legend>
+ <ul>
+ <li><label for="configdefault">Allow self-registering
(allow_frontend_register)</label>
+ <select
wicket:id="allowFrontendRegister"></select>
+ </li>
+ <li><label wicket:for="sendEmailAtRegister">Send Email
to new registered Users (sendEmailAtRegister)</label>
+ <select
wicket:id="sendEmailAtRegister"></select>
+ </li>
+ <li><label
wicket:for="sendEmailWithVerficationCode">New Users need to verify their EMail
(sendEmailWithVerficationCode)</label>
+ <select
wicket:id="sendEmailWithVerficationCode"></select>
+ </li>
+ <li><label wicket:for="createDefaultRooms">Default
Rooms of all types will be created</label>
+ <select wicket:id="createDefaultRooms"></select>
+ </li>
+ <li><label wicket:for="cfg.mailReferer">Mail-Referer
(system_email_addr)</label>
+ <input wicket:id="cfg.mailReferer" title="Enter
a Referer" type="text" />
+ </li>
+ <li><label wicket:for="cfg.smtpServer">SMTP-Server
(smtp_server)</label>
+ <input wicket:id="cfg.smtpServer" title="Enter
a SMTP-Server" type="text" />
+ </li>
+ <li><label wicket:for="cfg.smtpPort">SMTP-Server
Port(default Smtp-Server Port is 25) (smtp_port)</label>
+ <input wicket:id="cfg.smtpPort" title="Enter a
SMTP-Server.Port normally 25" type="text" />
+ </li>
+ <li><label wicket:for="cfg.mailAuthName">SMTP-Username
(email_userpass)</label>
+ <input wicket:id="cfg.mailAuthName"
title="Enter the mail-username" type="text" />
+ </li>
+ <li><label wicket:for="cfg.mailAuthPass">SMTP-Userpass
(email_userpass)</label>
+ <input wicket:id="cfg.mailAuthPass"
title="Enter the mail-userpass" type="password" />
+ </li>
+ <li><label wicket:for="mailUseTls">Enable TLS in Mail
Server Auth</label>
+ <select wicket:id="mailUseTls"></select>
+ </li>
+ <li><label wicket:for="replyToOrganizer">Set inviter's
email
+ address as ReplyTo in email invitations
(inviter.email.as.replyto)</label>
+ <select wicket:id="replyToOrganizer"></select>
+ </li>
+ <li><label wicket:for="defaultLangId">Default
Language</label>
+ <select wicket:id="defaultLangId"></select>
+ </li>
+ <li><label wicket:for="cfg.defaultExportFont">Default
Font for Export [default_export_font]</label>
+ <select
wicket:id="cfg.defaultExportFont"></select>
+ </li>
+ </ul>
+ </fieldset>
+</wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
Wed May 22 11:32:51 2013
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+ <fieldset id="userConf1">
+ <legend>Converters</legend>
+ <ul>
+ <li><label wicket:for="cfg.swfZoom">SWFTools
Zoom</label>
+ <input wicket:id="cfg.swfZoom" title="Enter the dpi
that swftools will use for PDF to SWF conversion"
+ type="text" />
+ <p>
+ <i>You can test if swftools is
installed into system path by
+ opening a shell or cmd-prompt
and type pdf2swf Enter the dpi
+ that swftools will use for PDF
to SWF conversion. Default is 72
+ dpi. see also <a
+
href="http://openmeetings.apache.org/installation.html";
+ target="_blank">Installation</a>
+ </i>
+ </p></li>
+ <li><label wicket:for="cfg.swfJpegQuality">SWFTools
JPEG Quality</label>
+ <input wicket:id="cfg.swfJpegQuality"
+ title="Enter the quality of embedded jpeg
pictures to quality. 0 is worst (small), 100 is best (big). (default:85)"
+ type="text" />
+ <p>
+ <i>You can test if swftools is
installed into system path by
+ opening a shell or cmd-prompt
and type pdf2swf Enter the
+ quality of embedded jpeg
pictures to quality. 0 is worst (small),
+ 100 is best (big). (default:85)
see also <a
+
href="http://openmeetings.apache.org/installation.html";
+ target="_blank">Installation</a>
+ </i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.swfPath">SWFTools
Path</label>
+ <input wicket:id="cfg.swfPath"
+ title="Enter the path to swftools for example
C:/swftools (Windows) or leave blank if swftools is a known to your system path"
+ type="text" />
+ <p>
+ <i>You can test if swftools is
installed into system path by
+ opening a shell or cmd-prompt
and type pdf2swf If this shows
+ a list of options leave this
field blank otherwise you have to
+ specify the path to pdf2swf on
your system see also <a
+
href="http://openmeetings.apache.org/installation.html";
+ target="_blank">Installation</a>
+ </i>
+ </p></li>
+ <li><label wicket:for="cfg.imageMagicPath">ImageMagick
Path</label>
+ <input wicket:id="cfg.imageMagicPath"
+ title="Enter the path to ImageMagick, leave
blank if ImageMagick is successfully installed to system-path"
+ type="text" />
+ <p>
+ <i>see also <a
+
href="http://openmeetings.apache.org/installation.html";
+
target="_blank">Installation</a></i>
+ </p></li>
+ <li><label wicket:for="cfg.ffmpegPath">FFMPEG
Path</label>
+ <input wicket:id="cfg.ffmpegPath"
+ title="Enter the path to FFMPEG, leave blank if
FFMPEG is successfully installed to system-path"
+ type="text" />
+ <p>
+ <i>see also <a
+
href="http://openmeetings.apache.org/installation.html";
+
target="_blank">Installation</a></i>
+ </p></li>
+ <li><label wicket:for="cfg.soxPath">SoX Path</label>
+ <input wicket:id="cfg.soxPath"
+ title="Enter the path to SoX, leave blank if
SoX is successfully installed to system-path"
+ type="text" />
+ <p>
+ <i>see also <a
+
href="http://openmeetings.apache.org/installation.html";
+
target="_blank">Installation</a></i>
+ </p></li>
+ <li><label wicket:for="cfg.jodPath">JOD Path</label>
+ <input wicket:id="cfg.jodPath"
+ title="The path to JOD library
(http://code.google.com/p/jodconverter), configure the path to point to the lib
directory of JOD that contains also the jodconverter-core-version.jar"
+ type="text" />
+ <p>
+ <i>see also <a
+
href="http://openmeetings.apache.org/installation.html";
+
target="_blank">Installation</a></i>
+ </p></li>
+ <li><label
wicket:for="cfg.officePath">OpenOffice/LibreOffice Path for jodconverter</label>
+ <input wicket:id="cfg.officePath"
+ title="The path to OpenOffice/LibreOffice
(optional) please set this to the real path in case jodconverter is unable to
find OpenOffice/LibreOffice installation automatically"
+ type="text" />
+ <p>The path to OpenOffice/LibreOffice
(optional) please set this
+ to the real path in case jodconverter
is unable to find
+ OpenOffice/LibreOffice
installation</p></li>
+ </ul>
+ </fieldset>
+</wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep4.html?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
Wed May 22 11:32:51 2013
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+ <fieldset id="userConf2">
+
+ <legend>Crypt Type</legend>
+ <ul>
+ <li><label wicket:for="cfg.cryptClassName">Crypt
Class</label>
+ <input wicket:id="cfg.cryptClassName"
type="text"
+ title="Enter the Class name of the Encryption
Class. DO NOT ALTER THIS IF YOU ARE NOT SURE" />
+ <p>
+ <i> You can use this default crypt type
which is equal to
+ PHP-MD5 function or BSD-Style
encryption by
using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+ for more information or to
write your own Crypt-Style see: <a
+
href="http://openmeetings.apache.org/CustomCryptMechanism.html";
+ target="_blank">Custom Crypt
Mechanism</a> You can edit this
+ value later BUT previous
created Users and Sessions might be not
+ usable anymore
+ </i>
+ </p></li>
+ </ul>
+ </fieldset>
+
+ <fieldset id="red5sip">
+ <legend>red5SIP Configuration</legend>
+ <ul>
+ <li><label wicket:for="red5SipEnable">Enable SIP</label>
+ <select wicket:id="red5SipEnable"></select>
+ <p>
+ <i> Enable red5SIP integration </i>
+ </p> </li>
+
+ <li><label wicket:for="cfg.red5SipRoomPrefix">SIP rooms
prefix</label>
+ <input wicket:id="cfg.red5SipRoomPrefix"
type="text" />
+ <p>
+ <i>Prefix for phone number of
conference rooms</i>
+ </p></li>
+
+ <li><label wicket:for="cfg.red5SipExtenContext">SIP
extensions context</label>
+ <input wicket:id="cfg.red5SipExtenContext"
type="text" />
+ <p>
+ <i>Context of Asterisk extensions</i>
+ </p></li>
+ </ul>
+ </fieldset>
+</wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.html?rev=1485159&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.html
Wed May 22 11:32:51 2013
@@ -0,0 +1,48 @@
+<?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.
+-->
+<wicket:panel xmlns:wicket="http://wicket.apache.org";>
+ <div class="wicketExtensionsWizard">
+ <form wicket:id="form" class="wicketExtensionsWizardForm">
+ <table class="wicketExtensionsWizardOuterTable">
+ <tr>
+ <td valign="top"><span
wicket:id="overview"></span></td>
+ <td valign="top">
+ <table
class="wicketExtensionsWizardInnerTable">
+ <tr
class="wicketExtensionsWizardHeaderRow">
+ <td
valign="top" class="wicketExtensionsWizardHeader"><span
+
wicket:id="header"></span></td>
+ </tr>
+ <tr
class="wicketExtensionsWizardFeedbackRow">
+ <td
valign="top" class="wicketExtensionsWizardFeedback"><span
+
wicket:id="feedback"></span></td>
+ </tr>
+ <tr
class="wicketExtensionsWizardViewRow">
+ <td
valign="top" class="wicketExtensionsWizardView"><div
+
wicket:id="view" class="wicketExtensionsWizardViewInner"></div></td>
+ </tr>
+ <tr
class="wicketExtensionsWizardButtonBarRow">
+ <td
valign="top" class="wicketExtensionsWizardButtonBar"><span
+
wicket:id="buttons"></span></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</wicket:panel>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1485159&r1=1485158&r2=1485159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
Wed May 22 11:32:51 2013
@@ -18,8 +18,10 @@
*/
package org.apache.openmeetings.web.pages.install;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static
org.apache.openmeetings.installation.InstallationConfig.USER_LOGIN_MINIMUM_LENGTH;
+import static
org.apache.openmeetings.installation.InstallationConfig.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.wicket.validation.validator.RangeValidator.minimum;
import java.io.Serializable;
import java.util.ArrayList;
@@ -30,60 +32,153 @@ import java.util.List;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
+import org.apache.wicket.extensions.wizard.IWizardStep;
import org.apache.wicket.extensions.wizard.Wizard;
-import org.apache.wicket.extensions.wizard.WizardModel;
-import org.apache.wicket.extensions.wizard.WizardStep;
+import org.apache.wicket.extensions.wizard.dynamic.DynamicWizardModel;
+import org.apache.wicket.extensions.wizard.dynamic.DynamicWizardStep;
+import org.apache.wicket.extensions.wizard.dynamic.IDynamicWizardStep;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
+import org.apache.wicket.model.ResourceModel;
//TODO maybe JQ wizard should be used
public class InstallWizard extends Wizard {
- private static final Logger log =
Red5LoggerFactory.getLogger(InstallWizard.class, webAppRootKey);
- private static final long serialVersionUID = -8460835123671633121L;
+ private static final long serialVersionUID = 1L;
private InstallationConfig cfg;
private CompoundPropertyModel<InstallWizard> model;
private final static List<SelectOption> yesNoList =
Arrays.asList(SelectOption.NO, SelectOption.YES);
private final static List<String> allFonts =
Arrays.asList("TimesNewRoman", "Verdana", "Arial");
+ private final IDynamicWizardStep welcomeStep;
+ private final IDynamicWizardStep paramsStep1;
+ private final IDynamicWizardStep paramsStep2;
+ private final IDynamicWizardStep paramsStep3;
+ private final IDynamicWizardStep paramsStep4;
+ private final IDynamicWizardStep installStep;
- private final class WelcomeStep extends WizardStep {
- private static final long serialVersionUID =
323088743806847666L;
+ //onInit, applyState
+ public InstallWizard(String id) throws Exception {
+ super(id);
+ //TODO enable install after first params
+ cfg = new InstallationConfig();
+ setDefaultModel(model = new
CompoundPropertyModel<InstallWizard>(this));
+ welcomeStep = new WelcomeStep();
+ paramsStep1 = new ParamsStep1();
+ paramsStep2 = new ParamsStep2();
+ paramsStep3 = new ParamsStep3();
+ paramsStep4 = new ParamsStep4();
+ //TODO add install/progress step
+ installStep = new InstallStep();
+
+ DynamicWizardModel wmodel = new DynamicWizardModel(welcomeStep);
+ wmodel.setCancelVisible(false);
+ wmodel.setLastVisible(true);
+ init(wmodel);
+ }
+
+ @Override
+ protected Component newButtonBar(String id) {
+ Panel bBar = (Panel)super.newButtonBar(id);
+ AjaxButton finish = new AjaxButton("finish", new
ResourceModel("org.apache.wicket.extensions.wizard.finish")) {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isEnabled() {
+ IWizardStep activeStep =
getWizardModel().getActiveStep();
+ return ((activeStep != null) &&
getWizardModel().isLastStep(activeStep));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ // TODO Auto-generated method stub
+ super.onSubmit(target, form);
+ }
+ };
+ return bBar.replace(finish);
+ }
+
+ @Override
+ public void onFinish() {
+ super.onFinish();
+ }
+
+ private final class WelcomeStep extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
public WelcomeStep() {
+ super(null);
//TODO localize
//TODO add check for DB connection
setTitleModel(Model.of(cfg.appName + " -
Installation"));
setSummaryModel(Model.of(""));
add(new Label("app", cfg.appName));
}
+
+ public boolean isLastStep() {
+ return false;
+ }
+
+ public IDynamicWizardStep next() {
+ return paramsStep1;
+ }
}
- private final class ParamsStep extends WizardStep {
- private static final long serialVersionUID =
-2420496234328471542L;
-
- //TODO separate to separate steps
- public ParamsStep() throws Exception {
+ private final class ParamsStep1 extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
+
+ public ParamsStep1() throws Exception {
+ super(welcomeStep);
//TODO localize
- //TODO validation
setTitleModel(Model.of(cfg.appName + " -
Installation"));
setSummaryModel(Model.of(""));
- add(new RequiredTextField<String>("cfg.username"));
- add(new PasswordTextField("cfg.password"));
- add(new RequiredTextField<String>("cfg.email"));
+ add(new
RequiredTextField<String>("cfg.username").add(minimum(USER_LOGIN_MINIMUM_LENGTH)));
+ add(new
PasswordTextField("cfg.password").add(minimum(USER_PASSWORD_MINIMUM_LENGTH)));
+ add(new
RequiredTextField<String>("cfg.email").add(RfcCompliantEmailAddressValidator.getInstance()));
add(new TzDropDown("ical_timeZone"));
add(new RequiredTextField<String>("cfg.group"));
+ }
+
+ public boolean isLastStep() {
+ return false;
+ }
+
+ public IDynamicWizardStep next() {
+ return paramsStep2;
+ }
+
+ @Override
+ public boolean isLastAvailable() {
+ return true;
+ }
+
+ @Override
+ public IDynamicWizardStep last() {
+ return installStep;
+ }
+ }
+
+ private final class ParamsStep2 extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
+
+ public ParamsStep2() throws Exception {
+ super(paramsStep1);
+ //TODO localize
+ //TODO validation
+ setTitleModel(Model.of(cfg.appName + " -
Installation"));
+ setSummaryModel(Model.of(""));
add(new YesNoDropDown("allowFrontendRegister"));
add(new YesNoDropDown("sendEmailAtRegister"));
add(new YesNoDropDown("sendEmailWithVerficationCode"));
@@ -98,6 +193,33 @@ public class InstallWizard extends Wizar
add(new YesNoDropDown("replyToOrganizer"));
add(new LangDropDown("defaultLangId"));
add(new DropDownChoice<String>("cfg.defaultExportFont", allFonts));
+ }
+
+ public boolean isLastStep() {
+ return false;
+ }
+
+ public IDynamicWizardStep next() {
+ return paramsStep3;
+ }
+
+ @Override
+ public boolean isLastAvailable() {
+ return true;
+ }
+
+ @Override
+ public IDynamicWizardStep last() {
+ return installStep;
+ }
+ }
+
+ private final class ParamsStep3 extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
+
+ public ParamsStep3() {
+ super(paramsStep2);
+
add(new TextField<String>("cfg.swfZoom"));
add(new TextField<String>("cfg.swfJpegQuality"));
add(new TextField<String>("cfg.swfPath"));
@@ -106,6 +228,32 @@ public class InstallWizard extends Wizar
add(new TextField<String>("cfg.soxPath"));
add(new TextField<String>("cfg.jodPath"));
add(new TextField<String>("cfg.officePath"));
+ }
+
+ public boolean isLastStep() {
+ return false;
+ }
+
+ public IDynamicWizardStep next() {
+ return paramsStep4;
+ }
+
+ @Override
+ public boolean isLastAvailable() {
+ return true;
+ }
+
+ @Override
+ public IDynamicWizardStep last() {
+ return installStep;
+ }
+ }
+
+ private final class ParamsStep4 extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
+
+ public ParamsStep4() {
+ super(paramsStep3);
add(new RequiredTextField<String>("cfg.cryptClassName"));
//Validate class
//TODO add check for red5sip connection
@@ -113,50 +261,41 @@ public class InstallWizard extends Wizar
add(new TextField<String>("cfg.red5SipRoomPrefix"));
add(new TextField<String>("cfg.red5SipExtenContext"));
}
+
+ public boolean isLastStep() {
+ return false;
+ }
+
+ public IDynamicWizardStep next() {
+ return installStep;
+ }
@Override
- public void applyState() {
- // TODO Auto-generated method stub
- super.applyState();
+ public boolean isLastAvailable() {
+ return true;
}
- }
+
+ @Override
+ public IDynamicWizardStep last() {
+ return installStep;
+ }
+}
- private final class CongradulationsStep extends WizardStep {
- private static final long serialVersionUID =
630278992275373536L;
+ private final class InstallStep extends DynamicWizardStep {
+ private static final long serialVersionUID = 1L;
- public CongradulationsStep() {
- add(new Link<Void>("url") {
- private static final long serialVersionUID =
-8589303259501551418L;
+ public InstallStep() {
+ super(paramsStep4);
+
+ }
- @Override
- public void onClick() {
-
setResponsePage(Application.get().getHomePage());
- }
- });
+ public boolean isLastStep() {
+ return true;
}
- }
-
- //onInit, applyState
- public InstallWizard(String id) {
- super(id);
-
- cfg = new InstallationConfig();
- setDefaultModel(model = new
CompoundPropertyModel<InstallWizard>(this));
- WizardModel wmodel = new WizardModel();
- try {
- wmodel.add(new WelcomeStep());
- wmodel.add(new ParamsStep());
- //TODO add install/progress step
- wmodel.add(new CongradulationsStep());
- } catch (Exception e) {
- log.error("Error while creating Wizard!", e);
+
+ public IDynamicWizardStep next() {
+ return null;
}
- init(wmodel);
- }
-
- @Override
- public void onCancel() {
- setResponsePage(Application.isInstalled() ?
Application.get().getHomePage() : InstallWizardPage.class);
}
private static class SelectOption implements Serializable {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizardPage.java?rev=1485159&r1=1485158&r2=1485159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
Wed May 22 11:32:51 2013
@@ -18,17 +18,29 @@
*/
package org.apache.openmeetings.web.pages.install;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.BaseNotInitedPage;
import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.basic.Label;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class InstallWizardPage extends BaseNotInitedPage {
+ private static final Logger log =
Red5LoggerFactory.getLogger(InstallWizard.class, webAppRootKey);
private static final long serialVersionUID = -438388395397826138L;
public InstallWizardPage() {
if (Application.isInstalled()) {
throw new
RestartResponseException(Application.get().getHomePage());
}
- add(new InstallWizard("wizard"));
+ try {
+ add(new InstallWizard("wizard"));
+ } catch (Exception e) {
+ //TODO add correct error handling
+ log.error("Error while initing wizard, please check
your installation", e);//FIXME
+ add(new Label("wizard", "Error while initing wizard,
please check your installation"));//FIXME
+ }
}
}
