Modified: incubator/openmeetings/trunk/singlewebapp/docs/svn.html URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/svn.html?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/docs/svn.html (original) +++ incubator/openmeetings/trunk/singlewebapp/docs/svn.html Mon May 7 16:41:14 2012 @@ -36,7 +36,7 @@ limitations under the License. - <title>Apache OpenMeetings - Source Code</title> + <title>Apache OpenMeetings [Incubating] - Source Code</title> <link rel="stylesheet" type="text/css" href="css/openmeetings.css"> <link rel="stylesheet" type="text/css" href="css/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="css/coin-slider-styles.css">
Modified: incubator/openmeetings/trunk/singlewebapp/docs/team-list.html URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/team-list.html?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/docs/team-list.html (original) +++ incubator/openmeetings/trunk/singlewebapp/docs/team-list.html Mon May 7 16:41:14 2012 @@ -36,7 +36,7 @@ limitations under the License. - <title>Apache OpenMeetings - Project Team</title> + <title>Apache OpenMeetings [Incubating] - Project Team</title> <link rel="stylesheet" type="text/css" href="css/openmeetings.css"> <link rel="stylesheet" type="text/css" href="css/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="css/coin-slider-styles.css"> Modified: incubator/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html (original) +++ incubator/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html Mon May 7 16:41:14 2012 @@ -36,7 +36,7 @@ limitations under the License. - <title>Apache OpenMeetings - Theme and color</title> + <title>Apache OpenMeetings [Incubating] - Theme and color</title> <link rel="stylesheet" type="text/css" href="css/openmeetings.css"> <link rel="stylesheet" type="text/css" href="css/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="css/coin-slider-styles.css"> Modified: incubator/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html (original) +++ incubator/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html Mon May 7 16:41:14 2012 @@ -36,7 +36,7 @@ limitations under the License. - <title>Apache OpenMeetings - VoIP and SIP Integration</title> + <title>Apache OpenMeetings [Incubating] - VoIP and SIP Integration</title> <link rel="stylesheet" type="text/css" href="css/openmeetings.css"> <link rel="stylesheet" type="text/css" href="css/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="css/coin-slider-styles.css"> Modified: incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm (original) +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon May 7 16:41:14 2012 @@ -266,7 +266,27 @@ function checkEmail() </fieldset> <fieldset id="userConf1"> - <legend>Converters</legend> + <legend>Converters</legend> + <li> + <label for="swftools_zoom">SWFTools Zoom</label> + <input name="swftools_zoom" id="swftools_zoom" size="4" value="72" + 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<br/> + Enter the dpi that swftools will use for PDF to SWF conversion. Default is 72 dpi.<br/> + see also <a href="http://incubator.apache.org/openmeetings/installation.html"; target="_blank">Installation</a></i></p> + + </li> + <li> + <label for="swftools_jpegquality">SWFTools JPEG Quality</label> + <input name="swftools_jpegquality" id="swftools_jpegquality" size="3" value="85" + 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<br/> + Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:85)<br/> + see also <a href="http://incubator.apache.org/openmeetings/installation.html"; target="_blank">Installation</a></i> + </p> + </li> + <li> <label for="swftools_path">SWFTools Path</label> <input name="swftools_path" id="swftools_path" size="27" 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" /> Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateSWF.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateSWF.java?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateSWF.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateSWF.java Mon May 7 16:41:14 2012 @@ -53,6 +53,24 @@ public class GenerateSWF { return pathToSWFTools; } + private String getSwfZoom() { + String valueForSwfZoom = cfgManagement.getConfValue("swftools_zoom", String.class, ""); + // WARNING CODE NOT COMPLETE: If SWFTools zoom (dpi) should be an integer between 50 and 600 with a default value of 100 dpi + if (valueForSwfZoom.equals("")) { + valueForSwfZoom = "72"; + } + return valueForSwfZoom; + } + + private String getSwfJpegQuality() { + String valueForSwfJpegQuality = cfgManagement.getConfValue("swftools_jpegquality", String.class, ""); + // WARNING CODE NOT COMPLETE: If SWFTools JPEG Quality should be an integer between 1 and 100, with a default value of 85 + if (valueForSwfJpegQuality.equals("")) { + valueForSwfJpegQuality = "85"; + } + return valueForSwfJpegQuality; + } + public HashMap<String, String> generateSwf(String current_dir, String originalFolder, String destinationFolder, String fileNamePure) { @@ -62,7 +80,8 @@ public class GenerateSWF { "insertstop", // insert Stop command into every frame "-s","poly2bitmap", //http://www.swftools.org/gfx_tutorial.html#Rendering_pages_to_SWF_files "-i", // change draw order to reduce pdf complexity - "-j", "100", // JPEG Quality to 100 + "-j", " " + getSwfJpegQuality(), // JPEG Quality + "-s", " zoom=" + getSwfZoom(), // set zoom dpi originalFolder + fileNamePure + ".pdf", destinationFolder + fileNamePure + ".swf" }; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java Mon May 7 16:41:14 2012 @@ -240,6 +240,7 @@ public class ImportInitvalues { salutationmanagement.addUserSalutation("Ms", 262); salutationmanagement.addUserSalutation("Mrs", 841); salutationmanagement.addUserSalutation("Dr", 842); + salutationmanagement.addUserSalutation("Prof", 1464); log.debug("Salutations ADDED"); } @@ -294,6 +295,12 @@ public class ImportInitvalues { cfgManagement.addConfByKey(3, "default_lang_id", cfg.defaultLangId, null, "Default System Language ID see language.xml"); + cfgManagement.addConfByKey(3, "swftools_zoom", cfg.swfZoom, null, + "dpi for conversion of PDF to SWF"); + + cfgManagement.addConfByKey(3, "swftools_jpegquality", cfg.swfJpegQuality, null, + "compression quality for conversion of PDF to SWF"); + cfgManagement.addConfByKey(3, "swftools_path", cfg.swfPath, null, "Path To SWF-Tools"); Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java Mon May 7 16:41:14 2012 @@ -18,6 +18,8 @@ public class InstallationConfig { public String mailReferer = "[email protected]"; public String mailUseTls = "0"; //paths + public String swfZoom = ""; + public String swfJpegQuality = ""; public String swfPath = ""; public String imageMagicPath = ""; public String ffmpegPath = ""; @@ -63,7 +65,8 @@ public class InstallationConfig { + ", smtpPort=" + smtpPort + ", smtpServer=" + smtpServer + ", mailAuthName=" + mailAuthName + ", mailAuthPass=" + mailAuthPass + ", mailReferer=" + mailReferer - + ", mailUseTls=" + mailUseTls + ", swfPath=" + swfPath + + ", mailUseTls=" + mailUseTls + ", swfZoom=" + swfZoom + + ", swfJpegQuality=" + swfJpegQuality + ", swfPath=" + swfPath + ", imageMagicPath=" + imageMagicPath + ", ffmpegPath=" + ffmpegPath + ", soxPath=" + soxPath + ", jodPath=" + jodPath + ", defaultLangId=" + defaultLangId + ", sendEmailAtRegister=" Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java Mon May 7 16:41:14 2012 @@ -242,6 +242,8 @@ public class Install extends VelocityVie cfg.replyToOrganizer = httpServletRequest.getParameter("replyToOrganizer"); cfg.defaultLangId = httpServletRequest.getParameter("configdefaultLang"); + cfg.swfZoom = httpServletRequest.getParameter("swftools_zoom"); + cfg.swfJpegQuality = httpServletRequest.getParameter("swftools_jpegquality"); cfg.swfPath = httpServletRequest.getParameter("swftools_path"); cfg.imageMagicPath = httpServletRequest.getParameter("imagemagick_path"); cfg.sendEmailAtRegister = httpServletRequest.getParameter("sendEmailAtRegister"); Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/stringhandlers/ChatString.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/stringhandlers/ChatString.java?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/stringhandlers/ChatString.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/stringhandlers/ChatString.java Mon May 7 16:41:14 2012 @@ -45,25 +45,6 @@ public class ChatString { return instance; } - //Testing stuff -// LinkedList<String> emot = new LinkedList<String>(); -// emot.add("smily"); -// emot.add("\\:\\)"); -// emot.add("y"); -// log.error("CHECK EMOT: "+ emot.get(0)); -// -// list = this.splitStr(list,emot); -// -// -// emot = new LinkedList<String>(); -// emot.add("sad"); -// emot.add("\\:\\("); -// emot.add("y"); -// log.error("CHECK EMOT: "+ emot.get(0)); -// -// list = this.splitStr(list,emot); - - public LinkedList<String[]> parseChatString(String message) { try { LinkedList<String[]> list = new LinkedList<String[]>(); Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/Upgrade.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/Upgrade.xml?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/xdocs/Upgrade.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/xdocs/Upgrade.xml Mon May 7 16:41:14 2012 @@ -17,14 +17,13 @@ <body> - <section name="Upgrading OpenMeetings"> + <section name="Upgrading OpenMeetings via the Web-Interface"> <p>There is a System Backup and Import tool. Login as Administrator and Goto > Backup </p> - <a class="fancybox-buttons" data-fancybox-group="button" - href="images/backup.png"> - <img src="images/backup.png" alt="" width="600" height="145" /> + <a class="fancybox-buttons" data-fancybox-group="button" href="images/backup.png"> + <img src="images/backup.png" alt="" width="600" height="145" /> </a> <p> The Text in the Administration>Backup section actually just says @@ -38,6 +37,40 @@ </p> </section> + <section name="Upgrading OpenMeetings from command line"> + <p> + <i>You need OpenMeetings 2.x or later to have the command line + feature available + </i> + </p> + <p> + Alternatively to the Web-Installer you can also export and import + via the command line. + <br /> + Cd to your red5-home directory, type "admin" and hit enter. You will + get options available. + <br /> + <br /> + A typical export would be: + <br /> + <tt>admin -b -file backup_today.zip</tt> + <br /> + <br /> + A typical import would be: + <br /> + <tt>admin -r -file backup_yesterday.zip</tt> + <br /> + <br /> + You can also combine the installation with a backup, that way you + will create exactly the user table that existed in the backup. + <br /> + A typical install from backup would be: + <br /> + <tt>admin -i -file backup_yesterday.zip</tt> + </p> + + </section> + </body> </document> \ No newline at end of file Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml Mon May 7 16:41:14 2012 @@ -17,7 +17,7 @@ <body> - <section name="Features and overview"> + <section name="Apache OpenMeetings [Incubating] - Features and overview"> <div id="coin-slider"> <a href="#"> Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/project.xml?rev=1335111&r1=1335110&r2=1335111&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/project.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/project.xml Mon May 7 16:41:14 2012 @@ -2,7 +2,7 @@ <project name="Apache OpenMeetings Project" href="http://incubator.apache.org/openmeetings/";> - <title>Apache OpenMeetings</title> + <title>Apache OpenMeetings [Incubating]</title> <!-- --> <logo href="/images/logo-2.jpg">Apache OpenMeetings</logo>
