Author: solomax
Date: Wed Jul 3 05:54:32 2013
New Revision: 1499219
URL: http://svn.apache.org/r1499219
Log:
[OPENMEETINGS-484] swftools related config parameters are added to the
documentation;
Default values are set and verified while installing
Modified:
openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Modified: openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html?rev=1499219&r1=1499218&r2=1499219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html (original)
+++ openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html Wed Jul 3
05:54:32 2013
@@ -861,6 +861,34 @@ limitations under the License.
2.1.x
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ swftools_zoom
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 100
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ DPI for conversion of PDF to SWF (should be an integer between 50 and
600 with a default value of 100 DPI)
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 2.0.x
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ swftools_jpegquality
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 85
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ Compression quality for conversion of PDF to SWF (should be an
integer between 1 and 100, with a default value of 85)
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 2.0.x
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1499219&r1=1499218&r2=1499219&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Jul 3 05:54:32 2013
@@ -323,11 +323,11 @@ public class ImportInitvalues {
null, "Default System Language ID see
languages.xml");
configurationDao.add("swftools_zoom", cfg.swfZoom, null,
- "dpi for conversion of PDF to SWF");
+ "dpi for conversion of PDF to SWF (should be an
integer between 50 and 600 with a default value of 100 dpi)");
configurationDao.add("swftools_jpegquality",
cfg.swfJpegQuality, null,
- "compression quality for conversion of PDF to
SWF");
+ "compression quality for conversion of PDF to
SWF (should be an integer between 1 and 100, with a default value of 85)");
configurationDao.add("swftools_path", cfg.swfPath, null,
"Path To SWF-Tools");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java?rev=1499219&r1=1499218&r2=1499219&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
Wed Jul 3 05:54:32 2013
@@ -44,8 +44,8 @@ public class InstallationConfig implemen
public String mailReferer = "[email protected]";
public String mailUseTls = "0";
//paths
- public String swfZoom = "";
- public String swfJpegQuality = "";
+ public String swfZoom = "100";
+ public String swfJpegQuality = "85";
public String swfPath = "";
public String imageMagicPath = "";
public String ffmpegPath = "";
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=1499219&r1=1499218&r2=1499219&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 Jul 3 05:54:32 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.page
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.wicket.validation.validator.RangeValidator.range;
import static
org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.io.Serializable;
@@ -227,8 +228,8 @@ public class InstallWizard extends Wizar
public ParamsStep3() {
super(paramsStep2);
- add(new TextField<String>("cfg.swfZoom"));
- add(new TextField<String>("cfg.swfJpegQuality"));
+ add(new TextField<String>("cfg.swfZoom").add(range(50, 600)));
+ add(new TextField<String>("cfg.swfJpegQuality").add(range(1,
100)));
add(new TextField<String>("cfg.swfPath"));
add(new TextField<String>("cfg.imageMagicPath"));
add(new TextField<String>("cfg.ffmpegPath"));
Modified: openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml?rev=1499219&r1=1499218&r2=1499219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml Wed Jul 3
05:54:32 2013
@@ -127,6 +127,18 @@
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Subject of SMS reminder message </td>
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.1.x </td>
</tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> swftools_zoom </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 100 </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> DPI for conversion of PDF to SWF (should be an
integer between 50 and 600 with a default value of 100 DPI) </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.0.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> swftools_jpegquality </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 85 </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Compression quality for conversion of PDF to SWF
(should be an integer between 1 and 100, with a default value of 85) </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.0.x </td>
+ </tr>
</table>
</section>
