You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/03/22 04:18:16 UTC

svn commit: r1303646 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/languages/ docs/ src/app/org/openmeetings/app/rss/ src/app/org/openmeetings/servlet/outputhandler/ src/templates/ src/test/org/openmeetings/test/backup/ xdocs/

Author: solomax
Date: Thu Mar 22 03:18:16 2012
New Revision: 1303646

URL: http://svn.apache.org/viewvc?rev=1303646&view=rev
Log:
OPENMEETINGS-94 is partially fixed

Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
    incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html
    incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
    incubator/openmeetings/trunk/singlewebapp/src/templates/install_welcome_EN.vm
    incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
    incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java
    incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml
    incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Mar 22 03:18:16 2012
@@ -3,7 +3,7 @@
 <!--###############################################
 This File is auto-generated by the LanguageEditor 
 to add new Languages or modify/customize it use the LanguageEditor 
-see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details 
+see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details 
 ###############################################-->
 <language>
   <string id="1" name="conference">

Modified: incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html Thu Mar 22 03:18:16 2012
@@ -34,11 +34,8 @@ limitations under the License.
             <meta name="email" value="sebawagner@apache.org">
             
            
-            
-            
-            
-            
-            
+                                    
+                        
             <title>Apache OpenMeetings - How to restrict access to your Openmeetings server</title>
             <link rel="stylesheet" type="text/css" href="css/openmeetings.css">
             <link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
@@ -862,15 +859,15 @@ limitations under the License.
       </td></tr>
       <tr><td>
         <blockquote>
-                                    <p>You can protect your OpenMeetings instance from beeing accessed
-				from 3th party by using the file:
+                                    <p>You can protect your OpenMeetings instance from beeing accessed
+				from 3th party by using the file:
 			</p>
                                                 <p>$RED5_HOME/webapps/openmeetings/WEB-INF/red5-web.properties </p>
                                                 <p>Content: </p>
-                                                <div class="xmlcode">
-				webapp.virtualHosts=*,localhost, 127.0.0.1
+                                                <div class="xmlcode">
+				webapp.virtualHosts=*,localhost, 127.0.0.1
 			</div>
-                                                <a href="http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties" rel="nofollow">http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties
+                                                <a href="http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties" rel="nofollow">http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties
 			</a>
                             </blockquote>
         </p>
@@ -886,32 +883,32 @@ limitations under the License.
       </td></tr>
       <tr><td>
         <blockquote>
-                                    <p>And you can restrict the access also for the client side: Every
-				Flash Plugin will check a file called "crossdomain.xml" before it
+                                    <p>And you can restrict the access also for the client side: Every
+				Flash Plugin will check a file called "crossdomain.xml" before it
 				tries to access the server using rtmp/RPC. This file is located: </p>
                                                 <p>$RED5_HOME/webapps/root/crossdomain.xml </p>
                                                 <p>Content: </p>
-                                                <div class="xmlcode">
-				&lt;?xml version="1.0"?&gt;<br />
-				&lt;cross-domain-policy&gt;<br />
-				        &lt;site-control permitted-cross-domain-policies="all"/&gt;<br />
-				        &lt;allow-access-from domain="localhost" to-ports="20-65535"/&gt;<br />
-				        &lt;allow-access-from domain="*.local" to-ports="20-65535"/&gt;<br />
-				&lt;/cross-domain-policy&gt;<br />
+                                                <div class="xmlcode">
+				&lt;?xml version="1.0"?&gt;<br />
+				&lt;cross-domain-policy&gt;<br />
+				        &lt;site-control permitted-cross-domain-policies="all"/&gt;<br />
+				        &lt;allow-access-from domain="localhost" to-ports="20-65535"/&gt;<br />
+				        &lt;allow-access-from domain="*.local" to-ports="20-65535"/&gt;<br />
+				&lt;/cross-domain-policy&gt;<br />
 			</div>
-                                                <p>
-				Sample file:
-				<a href="http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/root/crossdomain.xml" rel="nofollow">http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/root/crossdomain.xml
-				</a>
+                                                <p>
+				Sample file:
+				<a href="http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml" rel="nofollow">http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml
+				</a>
 			</p>
-                                                <p>
-					If you accessing your application behind an Apache Webservre (using
-					mod_proxy or mod_jk2) be careful to make the crossdomain.xml
-					accessible. Flash will always search for this file in the www-root
-					directory of every URL you connect to. You might use
-					<a href="https://addons.mozilla.org/de/firefox/addon/firebug/" rel="nofollow">FireBug
-					</a>
-					for example to lookup requests.
+                                                <p>
+					If you accessing your application behind an Apache Webservre (using
+					mod_proxy or mod_jk2) be careful to make the crossdomain.xml
+					accessible. Flash will always search for this file in the www-root
+					directory of every URL you connect to. You might use
+					<a href="https://addons.mozilla.org/de/firefox/addon/firebug/" rel="nofollow">FireBug
+					</a>
+					for example to lookup requests.
 				</p>
                             </blockquote>
         </p>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html Thu Mar 22 03:18:16 2012
@@ -985,9 +985,9 @@ limitations under the License.
                                                 <div class="xmlcode">
 				&lt;currentappname&gt;OpenMeetings&lt;/currentappname&gt;
 				<br />
-				&lt;currentappnameurl&gt;http://openmeetings.googlecode.com&lt;/currentappnameurl&gt;
+				&lt;currentappnameurl&gt;http://incubator.apache.org/openmeetings&lt;/currentappnameurl&gt;
 				<br />
-				&lt;currentappnamebugurl&gt;http://code.google.com/p/openmeetings/issues/list&lt;/currentappnamebugurl&gt;
+				&lt;currentappnamebugurl&gt;https://issues.apache.org/jira/browse/OPENMEETINGS&lt;/currentappnamebugurl&gt;
 				<br />
 			</div>
                             </blockquote>

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java Thu Mar 22 03:18:16 2012
@@ -82,7 +82,7 @@ public class LoadAtomRssFeed {
 			conn.setRequestProperty("user-agent",
 					"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)");
 			conn.setRequestProperty("Referer",
-					"http://code.google.com/p/openmeetings/");
+					"http://incubator.apache.org/openmeetings/");
 			conn.connect();
 
 			SAXReader reader = new SAXReader();

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java Thu Mar 22 03:18:16 2012
@@ -562,7 +562,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -774,7 +774,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -873,7 +873,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1020,7 +1020,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1058,7 +1058,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1136,7 +1136,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1216,7 +1216,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1356,7 +1356,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1390,7 +1390,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1435,7 +1435,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1475,7 +1475,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1530,7 +1530,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");
@@ -1565,7 +1565,7 @@ public class BackupExport {
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java Thu Mar 22 03:18:16 2012
@@ -231,7 +231,7 @@ public class Export extends HttpServlet 
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the Backup Tool \n"
 				+ "you should use the BackupPanel to modify or change this file \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("root");

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java Thu Mar 22 03:18:16 2012
@@ -196,7 +196,7 @@ public class LangExport extends HttpServ
 		document.addComment("###############################################\n"
 				+ "This File is auto-generated by the LanguageEditor \n"
 				+ "to add new Languages or modify/customize it use the LanguageEditor \n"
-				+ "see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details \n"
+				+ "see http://incubator.apache.org/openmeetings/LanguageEditor.html for Details \n"
 				+ "###############################################");
 
 		Element root = document.addElement("language");

Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/install_welcome_EN.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/install_welcome_EN.vm?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/install_welcome_EN.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/install_welcome_EN.vm Thu Mar 22 03:18:16 2012
@@ -28,8 +28,8 @@ limitations under the License.
 
 <ol><li>
 <h4><a name="Recommendation_for_production_environment"></a>Recommendation for production environment<a target="_blank" href="#Recommendation_for_production_environment" class="section_anchor"></a></h4>
-</li><blockquote>By default $APP_NAME uses the integrated Apache Derby database. For production environment you should consider using <a target="_blank" href="http://code.google.com/p/openmeetings/wiki/Configuration_Mysql">MySQL</a>, <a target="_blank" href="http://code.google.com/p/openmeetings/wiki/Configuration_Postgres">Postgres</a> or for example <a target="_blank" href="http://code.google.com/p/openmeetings/wiki/Configuration_IBM_DB2">IBM DB2</a> or <a href="http://code.google.com/p/openmeetings/wiki/Configuration_Oracle" target="_blank">Oracle</a>
-</blockquote><li><h4><a name="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling Image Upload and import to whiteboard<a href="#Enabling_Image_Upload_and_import_to_whiteboard" class="section_anchor"></a></h4></li><ul><li>Install <strong>ImageMagick</strong> on the server, you can get more information on <a target="_blank" href="http://www.imagemagick.org" rel="nofollow">http://www.imagemagick.org</a> regarding installation. The instructions for installation can be found there <a target="_blank" href="http://www.imagemagick.org/script/binary-releases.php" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>, however on most linux systems you can get it via your favorite package managers (apt-get it) </li></ul><li><h4><a name="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling import of PDFs into whiteboard<a href="#Enabling_import_of_PDFs_into_whiteboard" class="section_anchor"></a></h4></li><ul><li>Install <strong>GhostScript</strong> on the 
 server, you can get more information on <a target="_blank" href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a> regarding installation. The instructions for installation can be found there, however on most linux systems you can get it via your favorite package managers (apt-get it). </li><li>Install <strong>SWFTools</strong> on the server, you can get more information on <a target="_blank" href="http://www.swftools.org/" rel="nofollow">http://www.swftools.org/</a> regarding installation. Some of the Linux distributions already have it in there package manager see <a target="_blank" href="http://packages.debian.org/unstable/utils/swftools" rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>), the recommended version of <strong>SWFTools</strong> is 0.9 as prior version have a bug that does lead to wrong object dimensions in the Whiteboard </li></ul><li><h4><a name="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_O
 ffice_Docu"></a>Enabling import of .doc, .docx, .ppt, .pptx, ... all Office Documents into whitebaord<a href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu" class="section_anchor"></a></h4></li><ul><li><strong>OpenOffice-Service</strong> started and listening on port 8100, see <a target="_blank" href="http://code.google.com/p/openmeetings/wiki/OpenOfficeConverter">OpenOfficeConverter</a> for details </li></ul><li><h4><a name="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling Recording and import of .avi, .flv, .mov and .mp4 into whiteboard<a href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into" class="section_anchor"></a></h4></li><ul><li>Install <strong>FFMpeg</strong>. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from <a target="_blank" href="http://ffmpeg.arrozcru.org/builds/" rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx Users should be 
 able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame! </li><li>Install <strong>SoX</strong> <a href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>. You should install SoX in a up to date copy! SoX 12.xx will NOT work! </li></ul></ol>
+</li><blockquote>By default $APP_NAME uses the integrated Apache Derby database. For production environment you should consider using <a target="_blank" href="http://incubator.apache.org/openmeetings/MySQLConfig.html">MySQL</a>, <a target="_blank" href="http://incubator.apache.org/openmeetings/PostgresConfig.html">Postgres</a> or for example <a target="_blank" href="http://incubator.apache.org/openmeetings/IBMDB2Config.html">IBM DB2</a> or <a href="http://incubator.apache.org/openmeetings/OracleConfig.html" target="_blank">Oracle</a>
+</blockquote><li><h4><a name="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling Image Upload and import to whiteboard<a href="#Enabling_Image_Upload_and_import_to_whiteboard" class="section_anchor"></a></h4></li><ul><li>Install <strong>ImageMagick</strong> on the server, you can get more information on <a target="_blank" href="http://www.imagemagick.org" rel="nofollow">http://www.imagemagick.org</a> regarding installation. The instructions for installation can be found there <a target="_blank" href="http://www.imagemagick.org/script/binary-releases.php" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>, however on most linux systems you can get it via your favorite package managers (apt-get it) </li></ul><li><h4><a name="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling import of PDFs into whiteboard<a href="#Enabling_import_of_PDFs_into_whiteboard" class="section_anchor"></a></h4></li><ul><li>Install <strong>GhostScript</strong> on the 
 server, you can get more information on <a target="_blank" href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a> regarding installation. The instructions for installation can be found there, however on most linux systems you can get it via your favorite package managers (apt-get it). </li><li>Install <strong>SWFTools</strong> on the server, you can get more information on <a target="_blank" href="http://www.swftools.org/" rel="nofollow">http://www.swftools.org/</a> regarding installation. Some of the Linux distributions already have it in there package manager see <a target="_blank" href="http://packages.debian.org/unstable/utils/swftools" rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>), the recommended version of <strong>SWFTools</strong> is 0.9 as prior version have a bug that does lead to wrong object dimensions in the Whiteboard </li></ul><li><h4><a name="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_O
 ffice_Docu"></a>Enabling import of .doc, .docx, .ppt, .pptx, ... all Office Documents into whitebaord<a href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu" class="section_anchor"></a></h4></li><ul><li><strong>OpenOffice-Service</strong> started and listening on port 8100, see <a target="_blank" href="http://incubator.apache.org/openmeetings/OpenOfficeConverter.html">OpenOfficeConverter</a> for details </li></ul><li><h4><a name="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling Recording and import of .avi, .flv, .mov and .mp4 into whiteboard<a href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into" class="section_anchor"></a></h4></li><ul><li>Install <strong>FFMpeg</strong>. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from <a target="_blank" href="http://ffmpeg.arrozcru.org/builds/" rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx Users should 
 be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame! </li><li>Install <strong>SoX</strong> <a href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>. You should install SoX in a up to date copy! SoX 12.xx will NOT work! </li></ul></ol>
 
 <h3><A HREF="?command=step1">Continue with STEP 1</A></h3>
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Thu Mar 22 03:18:16 2012
@@ -17,7 +17,7 @@ limitations under the License.
 	<information> 
 		<title>Screen Sharing Application</title> 
 		<vendor>$APP_NAME</vendor> 
-		<homepage>http://code.google.com/p/openmeetings/</homepage>
+		<homepage>http://incubator.apache.org/openmeetings/</homepage>
 		<icon href="icon.jpg" />
 		<icon kind="splash" href="splashicon.jpg" />
 		<description>ScreenViewer Client Application</description> 

Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java Thu Mar 22 03:18:16 2012
@@ -63,7 +63,7 @@ public class TestStringReplace {
 					"###############################################\n" +
 					"This File is auto-generated by the Backup Tool \n" +
 					"you should use the BackupPanel to modify or change this file \n" +
-					"see http://code.google.com/p/openmeetings/wiki/BackupPanel for Details \n" +
+					"see http://incubator.apache.org/openmeetings/Upgrade.html for Details \n" +
 					"###############################################");
 			
 			Element root = document.addElement("root");

Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml Thu Mar 22 03:18:16 2012
@@ -29,8 +29,8 @@
 			</div>
 			Sample file:
 			<a
-				href="http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties"
-				rel="nofollow">http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties
+				href="http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties"
+				rel="nofollow">http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.properties
 			</a>
 		</section>
 
@@ -53,8 +53,8 @@
             <p>
 				Sample file:
 				<a
-					href="http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/root/crossdomain.xml"
-					rel="nofollow">http://code.google.com/p/openmeetings/source/browse/trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/root/crossdomain.xml
+					href="http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml"
+					rel="nofollow">http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml
 				</a>
 			</p>
 				<p>

Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml?rev=1303646&r1=1303645&r2=1303646&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml Thu Mar 22 03:18:16 2012
@@ -134,9 +134,9 @@
 			<div class="xmlcode">
 				&lt;currentappname&gt;OpenMeetings&lt;/currentappname&gt;
 				<br />
-				&lt;currentappnameurl&gt;http://openmeetings.googlecode.com&lt;/currentappnameurl&gt;
+				&lt;currentappnameurl&gt;http://incubator.apache.org/openmeetings&lt;/currentappnameurl&gt;
 				<br />
-				&lt;currentappnamebugurl&gt;http://code.google.com/p/openmeetings/issues/list&lt;/currentappnamebugurl&gt;
+				&lt;currentappnamebugurl&gt;https://issues.apache.org/jira/browse/OPENMEETINGS&lt;/currentappnamebugurl&gt;
 				<br />
 			</div>