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 2014/05/28 10:21:13 UTC

svn commit: r1597942 - in /openmeetings/trunk/singlewebapp: ./ openmeetings-server/src/site/resources/js/ openmeetings-server/src/site/xdoc/ openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ openmeetings-web/src/main/java/org/apache/openm...

Author: solomax
Date: Wed May 28 08:21:12 2014
New Revision: 1597942

URL: http://svn.apache.org/r1597942
Log:
Site is updated (partially); JDK is switched to 1.7

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/resources/js/site.js
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/BuildInstructions.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MySQLConfig.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Upgrade.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/commercial-support.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/demo.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/downloads.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/get-involved.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/mail-lists.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/team-list.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/themes-and-branding.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
    openmeetings/trunk/singlewebapp/pom.xml

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/resources/js/site.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/resources/js/site.js?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/resources/js/site.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/resources/js/site.js Wed May 28 08:21:12 2014
@@ -33,9 +33,10 @@ $(document).ready(function() {
 				var v = getMenu(a).height() != 0;
 				a.children('i').removeClass(v ? 'icon-chevron-down' : 'icon-chevron-right').addClass(v ? 'icon-chevron-right' : 'icon-chevron-down');
 			})
-			m.attr('id', a.attr('href').substr(1)).addClass('collapse in');
+			m.attr('id', a.attr('href').substr(1));
 			if (!m.find('li.active').length) {
-				m.collapse();
+				m.collapse('hide');
+				a.children('i').removeClass('icon-chevron-down').addClass('icon-chevron-right');
 			}
 		}
 	});

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/BuildInstructions.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/BuildInstructions.xml Wed May 28 08:21:12 2014
@@ -30,7 +30,7 @@
 			<p>
 				You can find Nightly Builds of the software at:
 				<a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"
-					rel="nofollow" target="_BLANK">
+					rel="nofollow" target="_blank">
 					https://builds.apache.org/view/M-R/view/OpenMeetings/
 				</a>
 			</p>
@@ -46,53 +46,32 @@
 					<li>Apache ANT (minimum) 1.8.3</li>
 					<li>
 						SVN Command line client (Subversion 1.7 required!)
-						<a href="http://subversion.apache.org/packages.html" target="_BLANK"
+						<a href="http://subversion.apache.org/packages.html" target="_blank"
 							rel="nofollow">http://subversion.apache.org/packages.html</a>
 					</li>
 				</ul>
 			</div>
 
 			<p>Get the source: </p>
-			<div class="xmlcode">
-				svn checkout
-				https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/
-			</div>
+			<source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/]]></source>
 			<p>Run the command: </p>
-			<div class="xmlcode">
-				ant
-			</div>
+			<source><![CDATA[ant ]]></source>
 			<p>There is no need to compile the client additionally! The ant task
 				does it all! You will find a directory dist that contains
 				OpenMeetings and a red5-server.
 			</p>
 			<p>To compile the client you can also use ant: </p>
-			<div class="xmlcode">
-				ant
-				<span style="margin-left: 200px;"># compiles a complete package into the folder dist
-				</span>
-				<br />
-				ant compile.laszlo.main
-				<span style="margin-left: 70px;"># compiles the client into main.as3.swf10.swf and
-					main.swf8.swf</span>
-				<br />
-				ant compile.laszlo.main.debug
-				<span style="margin-left: 30px;"># compiles the debug-client into
-					maindebug.as3.swf10.swf and maindebug.swf8.swf
-				</span>
-				<br />
-				ant -Ddb=&lt;name of DB&gt;
-				<span style="margin-left: 50px;"># will copy &lt;name of DB&gt;_persistense.xml to
-					persistense.xml
-				</span>
-				<br />
-				<span style="margin-left: 230px;">#(for ex. ant -Ddb=mysql will set mysql as default
-					DB)
-				</span>
-			</div>
+			<source>
+<![CDATA[
+ant                             # compiles a complete package into the folder dist
+ant compile.laszlo.main         # compiles the client into main.as3.swf10.swf and main.swf8.swf
+ant compile.laszlo.main.debug   # compiles the debug-client into maindebug.as3.swf10.swf and maindebug.swf8.swf
+ant -Ddb=<name of DB>           # will copy <name of DB>_persistense.xml to persistense.xml
+                                #(for ex. ant -Ddb=mysql will set mysql as default DB)
+]]>
+			</source>
 			<p>To compile just the openmeetings JAR file: </p>
-			<div class="xmlcode">
-				ant jar.only
-			</div>
+			<source><![CDATA[ant jar.only]]></source>
 			<p>
 				To run Junit tests using ANT see
 				<a href="JUnitTesting.html">JUnitTesting</a>
@@ -120,12 +99,12 @@
 					<li>Apache ANT (minimum) 1.8.3</li>
 					<li>
 						Subclipse 1.8 (Subversion 1.7 required!)
-						<a href="http://subclipse.tigris.org/" target="_BLANK" rel="nofollow">http://subclipse.tigris.org/
+						<a href="http://subclipse.tigris.org/" target="_blank" rel="nofollow">http://subclipse.tigris.org/
 						</a>
 					</li>
 					<li>
 						SVN Command line client (Subversion 1.7 required!)
-						<a href="http://subversion.apache.org/packages.html" target="_BLANK"
+						<a href="http://subversion.apache.org/packages.html" target="_blank"
 							rel="nofollow">http://subversion.apache.org/packages.html</a>
 					</li>
 					<li>Spring IDE for Eclipse (installable via Help &gt; Eclipse
@@ -136,7 +115,7 @@
 						New Software)
 						URL: http://www.apache.org/dist/ant/ivyde/updatesite
 						detailed steps can be found here:
-						<a href="http://ant.apache.org/ivy/ivyde/download.cgi" target="_BLANK"
+						<a href="http://ant.apache.org/ivy/ivyde/download.cgi" target="_blank"
 							rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
 					</li>
 					<li>MySQL (or Postgres, or other Databases supported by openJPA)
@@ -162,9 +141,7 @@
 				<p>To download the required JARs for building and developing
 					OpenMeetings you need to run the ANT comand:
 				</p>
-				<div class="xmlcode">
-					ant -Ddb=&lt;your_DB&gt; prepare-eclipse
-				</div>
+				<source><![CDATA[ant -Ddb=<your_DB> prepare-eclipse]]></source>
 				<p>After the ANT command you need to press F5 and rebuild the
 					project from inside Eclipse
 				</p>
@@ -256,9 +233,7 @@
 				</p>
 				<div>
 					11) Please run
-					<div class="xmlcode">
-						ant prepare-eclipse
-					</div>
+					<source><![CDATA[ant prepare-eclipse]]></source>
 					to download all necessary jar files, and perform source
 					<tt>Refresh</tt>
 					to resolve all compilation issues.
@@ -287,14 +262,14 @@
 					Getting Started with OpenLaszlo, checkout
 					<a
 						href="http://www.openlaszlo.org/lps4.2/laszlo-explorer/index.jsp?lzr=swf8"
-						target="_BLANK" rel="nofollow">Laszlo-in-10-Minutes</a>
+						target="_blank" rel="nofollow">Laszlo-in-10-Minutes</a>
 					and the
-					<a href="http://www.openlaszlo.org/lps4.2/docs/" target="_BLANK"
+					<a href="http://www.openlaszlo.org/lps4.2/docs/" target="_blank"
 						rel="nofollow">Application
 						Developer's Guide
 					</a>
 					or try the
-					<a href="http://www.openlaszlo.org/getstarted" target="_BLANK"
+					<a href="http://www.openlaszlo.org/getstarted" target="_blank"
 						rel="nofollow">ScreenCast</a>
 				</li>
 				<li>
@@ -323,13 +298,13 @@
 				before starting the build process.
 				<br />
 				For Apache Ivy see:
-				<a href="http://ant.apache.org/ivy/faq.html" target="_BLANK" rel="nofollow">http://ant.apache.org/ivy/faq.html
+				<a href="http://ant.apache.org/ivy/faq.html" target="_blank" rel="nofollow">http://ant.apache.org/ivy/faq.html
 				</a>
 				<br />
 				For SVN Command Line Client (From CollabNet 1.7) see:
 				<a
 					href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"
-					target="_BLANK" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
+					target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
 				</a>
 			</p>
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml Wed May 28 08:21:12 2014
@@ -51,22 +51,17 @@
 			name="Changing first day in week for calendar from Sunday to Monday">
 
 			<p>in the public/config.xml change the key: </p>
-			<div class="xmlcode">
-				&lt;!--
-				<br />
-				First day in the Week used by the Calendar
-				<br />
-				0 means Sunday
-				<br />
-				1 means Monday
-				<br />
-				this is the way how the Celendar inits a week
-				<br />
-				--&gt;
-				<br />
-				&lt;firstdayinweek&gt;0&lt;/firstdayinweek&gt;
-				<br />
-			</div>
+			<source>
+<![CDATA[
+<!--
+First day in the Week used by the Calendar
+0 means Sunday
+1 means Monday
+this is the way how the Celendar inits a week
+-->
+<firstdayinweek>0</firstdayinweek>
+]]>
+			</source>
 		</section>
 
 		<section

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml Wed May 28 08:21:12 2014
@@ -33,7 +33,7 @@
 			<ul>
 				<li>
 					Multiple OM servers should be set up as described in
-					<a href="installation.html" target="_BLANK">
+					<a href="installation.html" target="_blank">
 						<b>Installation</b>
 					</a>
 				</li>
@@ -45,8 +45,8 @@
 			</ul>
 		</section>
 		<section name="Database">
-			All servers should be configured to use the same database. It can be on the server or on the one node 
-			of the cluster. 
+			<p>All servers should be configured to use the same database. It can be on the server or on the one node 
+			of the cluster.</p> 
 			<ul>
 				<li>Add users who can connect to the database remotely</li>
 				<li>Update <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml</tt>
@@ -57,8 +57,8 @@
 			</ul>
 		</section>
 		<section name="File systems">
-			If files and recordings using the same physical folders the files and recordings will be available for 
-			each node. You can do this using Samba or NFS, for example. For using NFS do the following:
+			<p>If files and recordings using the same physical folders the files and recordings will be available for 
+			each node. You can do this using Samba or NFS, for example. For using NFS do the following:</p>
 			<ul>
 				<li>Install NFS to the data server. In the file <tt>/etc/exports</tt> add the following lines:
 					<div class="xmlcode">
@@ -84,7 +84,7 @@
 			</ul> 
 		</section>
 		<section name="OM nodes configuration">
-			In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt>:
+			<p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt>:</p>
 			<ul>
 				<li>
 					For each node uncomment line:
@@ -102,7 +102,7 @@
 			</ul>
 		</section>
 		<section name="Configuring cluster in Administration">
-			Run red5 on each node. Login to the system as admin.
+			<p>Run red5 on each node. Login to the system as admin.</p>
 			<ul>
 				<li>Go to the <tt>Administration -&gt; Users</tt> and create Webservice user (only access via SOAP).</li>
 				<li>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/DrupalPlugin.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/DrupalPlugin.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/DrupalPlugin.xml Wed May 28 08:21:12 2014
@@ -28,10 +28,10 @@
 		<section name="Drupal Plugin for OpenMeetings">
 			<p>
 				Plugin for Drupal currently is not open source. 
-				Please contact <a href="commercial-support.html" target="_BLANK" rel="nofollow">Commercial Support</a> to get it. 
+				Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. 
 				<br/>
 				A demo version+video of the Drupal plugin is available at
-				<a href="http://drupal.openmeetings.de/" target="_BLANK" rel="nofollow">drupal.openmeetings.de</a>.
+				<a href="http://drupal.openmeetings.de/" target="_blank" rel="nofollow">drupal.openmeetings.de</a>.
 			</p>
 		</section>
 		
@@ -40,7 +40,7 @@
 				You simply download the ZIP or TAR package and unzip it to Drupal "mod" directory.
 				<br/>
 				For a detailed description on how to install plugins in Drupal please review their 
-				<a href="http://drupal.org/documentation/install/modules-themes" target="_BLANK" rel="nofollow">handbook</a>.
+				<a href="http://drupal.org/documentation/install/modules-themes" target="_blank" rel="nofollow">handbook</a>.
 				<br />
 				Then you visit the module interface of Drupal, where you will find the new module.
 				You should switch it to "enabled" to get the "Configure" and "Permissions" buttons.

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MSSQLConfig.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MSSQLConfig.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MSSQLConfig.xml Wed May 28 08:21:12 2014
@@ -50,7 +50,7 @@
 				<ul>
 					<li>
 						You need to download the JDBC driver from Microsoft
-						<a href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&amp;id=11774" target="_BLANK"
+						<a href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&amp;id=11774" target="_blank"
 							rel="nofollow">http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&amp;id=11774</a>
 						Unarchive appropriate file from it (sqljdbc.jar or sqljdbc4.jar) and place it into:
 						<tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MoodlePlugin.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MoodlePlugin.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MoodlePlugin.xml Wed May 28 08:21:12 2014
@@ -32,11 +32,11 @@
 				<br/>
 				You can find the OpenMeetings Plugin also in the
 				<a href="http://moodle.org/plugins/view.php?plugin=mod_openmeetings"
-					target="_BLANK" rel="nofollow">Moodle Plugin database</a>
+					target="_blank" rel="nofollow">Moodle Plugin database</a>
 				.
 				<br/>
 				A demo version of the Moodle plugin is available at
-				<a href="http://moodle.openmeetings.de" target="_BLANK" rel="nofollow">moodle.openmeetings.de
+				<a href="http://moodle.openmeetings.de" target="_blank" rel="nofollow">moodle.openmeetings.de
 				</a>
 				.
 			</p>
@@ -50,7 +50,7 @@
 				$MOODLE_HOME/mod/openmeetings/*.php
 				<br />
 				Then you visit the admin interface of Moodle, for example
-				<a href="http://$your_moodle_host/$MOODLE_WWW_ROOT/admin" target="_BLANK"
+				<a href="http://$your_moodle_host/$MOODLE_WWW_ROOT/admin" target="_blank"
 					rel="nofollow">http://$your_moodle_host/$MOODLE_WWW_ROOT/admin</a> 
 					<br/>
 				Moodle will detect that there is a new plugin and will show the plugin installation screen:

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MySQLConfig.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MySQLConfig.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MySQLConfig.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/MySQLConfig.xml Wed May 28 08:21:12 2014
@@ -49,7 +49,7 @@
 				<ul>
 					<li>
 						You need to download the JConnector from mysql
-						<a href="http://www.mysql.com/downloads/connector/j/" target="_BLANK"
+						<a href="http://www.mysql.com/downloads/connector/j/" target="_blank"
 							rel="nofollow">http://www.mysql.com/downloads/connector/j/</a>
 						and place it into:
 						<tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml Wed May 28 08:21:12 2014
@@ -43,7 +43,7 @@
 			<p>
 				Installation of JODConverter means: You donwload the ZIP binary from
 				their
-				<a href="http://code.google.com/p/jodconverter/" target="_BLANK"
+				<a href="http://code.google.com/p/jodconverter/" target="_blank"
 					rel="nofollow">website</a>
 				and then configure in Apache OpenMeetings Administration >
 				Configuration (or during installation) the config key

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml Wed May 28 08:21:12 2014
@@ -35,7 +35,7 @@
 						<li>Apache ANT (minimum) 1.8.3</li>
 						<li>
 							SVN Command line client (Subversion 1.7 required!)
-							<a href="http://subversion.apache.org/packages.html" target="_BLANK"
+							<a href="http://subversion.apache.org/packages.html" target="_blank"
 								rel="nofollow">http://subversion.apache.org/packages.html</a>
 						</li>
 						<li>A text editor</li>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml Wed May 28 08:21:12 2014
@@ -33,12 +33,12 @@
 			<p>
 				You can find the OpenMeetings Plugin also in the
 				<a href="http://www.sugarforge.org/projects/openmeetings/"
-					target="_BLANK" rel="nofollow">SugarCRM Plugin database</a>
+					target="_blank" rel="nofollow">SugarCRM Plugin database</a>
 				.
 			</p>
 			<p>
 				A demo version of the SugarCRM plugin is available at
-				<a href="http://demo.e-schwert.de/sugarcrm/" target="_BLANK" rel="nofollow">demo.e-schwert.de</a>
+				<a href="http://demo.e-schwert.de/sugarcrm/" target="_blank" rel="nofollow">demo.e-schwert.de</a>
 				. Username: demo Password: Demouser55 
 			</p>
 		</section>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Upgrade.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Upgrade.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Upgrade.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Upgrade.xml Wed May 28 08:21:12 2014
@@ -76,7 +76,7 @@
 				that existed in the backup.<br />
 				A typical install from backup would be:<br />
 				<tt>./admin.sh -i -file backup_yesterday.zip</tt><br/>
-				please see <a href="CommandLineAdmin.html" target="_BLANK" rel="nofollow">Command Line Admin</a> for more options
+				please see <a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a> for more options
 			</p>
 			<p><b>Detailed steps</b></p>
 			<ol>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebcamResolutions.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebcamResolutions.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebcamResolutions.xml Wed May 28 08:21:12 2014
@@ -30,27 +30,27 @@
 				available the user can choose from. </p>
 			<p>You can add/remove resolutions and also change the default
 				selection. In the public/config.xml there is a section: </p>
-			<div class="xmlcode">
-				&lt;availableCameraResolutions&gt;<br/>
-				<div style="margin-left:20px">
-				    &lt;resolution type="4:3 (~6 KByte/sec)" width="40" height="30" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="4:3 (~12 KByte/sec)" width="80" height="60" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="4:3 (~20 KByte/sec)" width="120" height="90" isDefault="true" /&gt;<br/>
-				    &lt;resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="4:3 (~40 KByte/sec)" width="240" height="180" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="4:3  (~60 KByte/sec)" width="480" height="360" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="4:3 (~68 KByte/sec)" width="640" height="480" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="XGA 4:3" width="1024" height="768" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="16:9" width="256" height="150" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="pseudo 16:9" width="480" height="234" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="16:9" width="512" height="300" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="nHD 16:9" width="640" height="360" isDefault="false" /&gt;<br/>
-				    &lt;resolution type="16:9" width="1024" height="600" isDefault="false" /&gt;<br/>
-				    </div>
-				&lt;/availableCameraResolutions&gt;			 
-			</div>	
+			<source>
+<![CDATA[
+<availableCameraResolutions>
+    <resolution type="4:3 (~6 KByte/sec)" width="40" height="30" isDefault="false" />
+    <resolution type="4:3 (~12 KByte/sec)" width="80" height="60" isDefault="false" />
+    <resolution type="4:3 (~20 KByte/sec)" width="120" height="90" isDefault="true" />
+    <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" isDefault="false" />
+    <resolution type="4:3 (~40 KByte/sec)" width="240" height="180" isDefault="false" />
+    <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" isDefault="false" />
+    <resolution type="4:3  (~60 KByte/sec)" width="480" height="360" isDefault="false" />
+    <resolution type="4:3 (~68 KByte/sec)" width="640" height="480" isDefault="false" />
+    <resolution type="XGA 4:3" width="1024" height="768" isDefault="false" />
+    <resolution type="16:9" width="256" height="150" isDefault="false" />
+    <resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" />
+    <resolution type="pseudo 16:9" width="480" height="234" isDefault="false" />
+    <resolution type="16:9" width="512" height="300" isDefault="false" />
+    <resolution type="nHD 16:9" width="640" height="360" isDefault="false" />
+    <resolution type="16:9" width="1024" height="600" isDefault="false" />
+</availableCameraResolutions>
+]]>
+			</source>
 		      
 		    <p>Tip: You might edit the public/config.xml with an XML aware editor that correctly 
 		    handles the XSD defintion to avoid misconfiguration. The openmeetings-config.xsd 

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebsiteGuide.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebsiteGuide.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebsiteGuide.xml Wed May 28 08:21:12 2014
@@ -74,9 +74,7 @@
 						</a> <br/>
 						edit the files in the folder <tt>xdocs</tt><br/>
 						then you run the command:
-						<div class="xmlcode">
-							ant anakia
-						</div>
+						<source><![CDATA[ant anakia]]></source>
 						control the output locally in the folder <tt>docs</tt><br/>
 						And then checkin into the SVN <i>both</i> the edited xml and generated html files.
 					</div>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/commercial-support.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/commercial-support.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/commercial-support.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/commercial-support.xml Wed May 28 08:21:12 2014
@@ -32,17 +32,17 @@
 			</p>
 			<ul>
 				<li>
-					<a href="http://www.webbase-design.de/" target="_BLANK">webbase-design.de
+					<a href="http://www.webbase-design.de/" target="_blank">webbase-design.de
 					</a>
 					owned by Sebastian Wagner
 				</li>
 				<li>
-					<a href="http://www.dataved.ru" target="_BLANK">dataved.ru
+					<a href="http://www.dataved.ru" target="_blank">dataved.ru
 					</a>
 					run by Alexei Fedotov, Maxim Solodovnik, Timur Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev
 				</li>
 				<li>
-                    <a href="http://www.samoo.es" target="_BLANK" rel="nofollow">samoo.es</a>
+                    <a href="http://www.samoo.es" target="_blank" rel="nofollow">samoo.es</a>
                     provides support for the Sakai Plugin
                 </li>
 			</ul>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/demo.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/demo.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/demo.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/demo.xml Wed May 28 08:21:12 2014
@@ -33,7 +33,7 @@
 				This is a list of servers that you can use for testing OpenMeetings.
 			</p>
 			<p>
-				<a href="http://demo.dataved.ru/openmeetings" target="_BLANK" rel="nofollow">http://demo.dataved.ru/openmeetings</a>
+				<a href="http://demo.dataved.ru/openmeetings" target="_blank" rel="nofollow">http://demo.dataved.ru/openmeetings</a>
 			</p>
 
 		</section>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/downloads.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/downloads.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/downloads.xml Wed May 28 08:21:12 2014
@@ -87,14 +87,14 @@
 			<subsection name="Plugins / Non ASF downloads">
 			
 				<p>
-					If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out <a href="http://code.google.com/a/apache-extras.org/hosting/search?q=openmeetings" target="_BLANK" rel="nofollow">apache-extras.org</a>.
+					If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out <a href="http://code.google.com/a/apache-extras.org/hosting/search?q=openmeetings" target="_blank" rel="nofollow">apache-extras.org</a>.
 				</p>
 			
 				<p>
 					OpenMeetings releases that are not part of the ASF can be downloaded from the
 					old
 					<a href="http://code.google.com/p/openmeetings/downloads/list"
-						target="_BLANK">GoogleCode website</a>
+						target="_blank">GoogleCode website</a>
 				</p>
 			</subsection>
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/get-involved.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/get-involved.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/get-involved.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/get-involved.xml Wed May 28 08:21:12 2014
@@ -80,7 +80,7 @@
 				<br />
 				<a
 					href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list"
-					target="_BLANK">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list
+					target="_blank">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list
 				</a>
 			</p>
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml Wed May 28 08:21:12 2014
@@ -29,7 +29,7 @@
 			<p>
 				To update from past versions or migrate see <a href="Upgrade.html">Upgrade</a>.<br/>
 				If you are looking for commercial help have a look at
-				<a href="commercial-support.html" target="_BLANK" rel="nofollow">commercial support</a>.
+				<a href="commercial-support.html" target="_blank" rel="nofollow">commercial support</a>.
 			</p>
 			<div>
 				<a href="downloads.html" rel="nofollow">
@@ -40,7 +40,7 @@
 					<i>
 						Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked 
 						archive and type ./admin.sh or admin.bat, please see
-						<a href="CommandLineAdmin.html" target="_BLANK" rel="nofollow">Command Line Admin</a>
+						<a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a>
 						for more options
 					</i>
 				</p>
@@ -68,13 +68,13 @@
 						Install
 						<b>ImageMagick</b>
 						on the server, you can get more information on
-						<a href="http://www.imagemagick.org" rel="nofollow" target="_BLANK">http://www.imagemagick.org
+						<a href="http://www.imagemagick.org" rel="nofollow" target="_blank">http://www.imagemagick.org
 						</a>
 						regarding installation. The instructions
 						for installation can be
 						found there
 						<a href="http://www.imagemagick.org/script/binary-releases.php"
-							target="_BLANK" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php
+							target="_blank" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php
 						</a>
 						,
 						however on
@@ -92,7 +92,7 @@
 								<b>GhostScript</b>
 								on the server, you can get more
 								information on
-								<a href="http://www.ghostscript.com/download/gsdnld.html" target="_BLANK"
+								<a href="http://www.ghostscript.com/download/gsdnld.html" target="_blank"
 									rel="nofollow">
 									http://www.ghostscript.com/download/gsdnld.html
 								</a>
@@ -108,13 +108,13 @@
 								<b>SWFTools</b>
 								on the server, you can get more information
 								on
-								<a href="http://www.swftools.org/" target="_BLANK" rel="nofollow">http://www.swftools.org/
+								<a href="http://www.swftools.org/" target="_blank" rel="nofollow">http://www.swftools.org/
 								</a>
 								regarding installation. Some of the
 								Linux distributions already
 								have it in there package manager (see
 								<a href="http://packages.debian.org/unstable/utils/swftools"
-									target="_BLANK" rel="nofollow">http://packages.debian.org/unstable/utils/swftools
+									target="_blank" rel="nofollow">http://packages.debian.org/unstable/utils/swftools
 								</a>
 								), the
 								recommended version of SWFTools is 0.9 as prior version
@@ -132,7 +132,7 @@
 					<div style="margin-top: 10px; margin-bottom:10px">
 						<ul>
 							<li>
-								<a href="http://code.google.com/p/jodconverter/" target="_BLANK"
+								<a href="http://code.google.com/p/jodconverter/" target="_blank"
 									rel="nofollow">JODConverter</a>
 								installed (needed since v2.x)
 							</li>
@@ -156,7 +156,7 @@
 								. You should get FFMPEG in an up to date copy! OpenMeetings is
 								tested with FFMPEG Version 10.3 and latest build from GIT
 								For Windows you can download a Build for example from
-								<a href="http://ffmpeg.zeranoe.com/builds/" target="_BLANK"
+								<a href="http://ffmpeg.zeranoe.com/builds/" target="_blank"
 									rel="nofollow">http://ffmpeg.zeranoe.com/builds/ </a>
 								Linux or OSx Users should be able to use one of the various
 								Installation Instructions on the Web. You need to enable
@@ -165,7 +165,7 @@
 							<li>
 								Install
 								<b>SoX</b>
-								<a href="http://sox.sourceforge.net/" target="_BLANK" rel="nofollow">http://sox.sourceforge.net/
+								<a href="http://sox.sourceforge.net/" target="_blank" rel="nofollow">http://sox.sourceforge.net/
 								</a>
 								. You should install SoX in a up
 								to date copy! SoX 12.xx will NOT

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/mail-lists.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/mail-lists.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/mail-lists.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/mail-lists.xml Wed May 28 08:21:12 2014
@@ -42,13 +42,13 @@
 				<b>Note: </b>If your email bounces with status messages like "Delivery Status Notification" it is 
 				likely that you have send your mail as HTML mail. Apache does not like sending HTML emails, see:
 				<br/> 
-				<a href="http://www.apache.org/dev/contrib-email-tips.html#do-not-send-html-mail" target="_BLANK" rel="nofollow">http://www.apache.org/dev/contrib-email-tips.html#do-not-send-html-mail</a>
+				<a href="http://www.apache.org/dev/contrib-email-tips.html#do-not-send-html-mail" target="_blank" rel="nofollow">http://www.apache.org/dev/contrib-email-tips.html#do-not-send-html-mail</a>
 			</p>
 			
 			<p>
 				You can search the entire mailing list very easy by using markmail.com, by using the term 
 				"openmeetings" plus your search. Try yourself: <br/>
-				<a href="http://markmail.org/search/?q=openmeetings" target="_BLANK" rel="nofollow">http://markmail.org/search/?q=openmeetings</a>
+				<a href="http://markmail.org/search/?q=openmeetings" target="_blank" rel="nofollow">http://markmail.org/search/?q=openmeetings</a>
 			</p>
 
 			<table>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/team-list.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/team-list.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/team-list.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/team-list.xml Wed May 28 08:21:12 2014
@@ -39,7 +39,7 @@
 				If you would like to contribute to Podling, please see the
 				<a
 					href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list"
-					target="_BLANK">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list
+					target="_blank">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list
 				</a>
 				to find areas where you can contribute.
 				If there is nothing in there
@@ -64,7 +64,7 @@
 					<td>Sebastian Wagner</td>
 					<td>Independent</td>
 					<td>
-						<a href="https://twitter.com/#!/dead_lock" target="_BLANK" rel="nofollow">https://twitter.com/#!/dead_lock
+						<a href="https://twitter.com/#!/dead_lock" target="_blank" rel="nofollow">https://twitter.com/#!/dead_lock
 						</a>
 					</td>
 				</tr>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/themes-and-branding.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/themes-and-branding.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/themes-and-branding.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/themes-and-branding.xml Wed May 28 08:21:12 2014
@@ -41,7 +41,7 @@
 			<p>
 				<a
 					href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/openmeetings/public/theme.xml"
-					target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/openmeetings/public/theme.xml
+					target="_blank" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/openmeetings/public/theme.xml
 				</a>
 			</p>
 			<p>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Wed May 28 08:21:12 2014
@@ -118,7 +118,7 @@
 					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>.
+					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>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Wed May 28 08:21:12 2014
@@ -116,7 +116,7 @@
 					aktiviert sein!
 				</li>
 				<li>Installieren Sie <strong>SoX</strong> <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					Sie sollten die neueste Version verwenden! SoX 12.xx wird NICHT funktionieren!
 				</li>
 			</ul>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Wed May 28 08:21:12 2014
@@ -113,7 +113,7 @@
 					Es necesario activar libmp3lame!
 				</li>
 				<li>Instalar <strong>SoX</strong> <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					Instalar una copia de SOX actualizada! SOX 12.xx no funcionar‡!
 				</li>
 			</ul>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Wed May 28 08:21:12 2014
@@ -95,7 +95,7 @@
 					rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a>. Pour Linux ou OSx vous devriez utiliser l'une des nombreuses instructions d'installation sur le web.  Vous devez activer libmp3lame !
 				</li>
 				<li>Installez <strong>SoX</strong> <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					Vous devez installer la dernière version ! SoX 12.xx ne fonctionnera PAS !
 				</li>
 			</ul>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Wed May 28 08:21:12 2014
@@ -110,7 +110,7 @@
 					Szükséges a libmp3lame kóder engedélyezése/implementálása!
 				</li>
 				<li>Telepítse a <strong>SoX</strong> programot innen: <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					A SoX friss verzióit használja! SoX 12.xx nem/hibásan működik!
 				</li>
 			</ul>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Wed May 28 08:21:12 2014
@@ -115,7 +115,7 @@
 					existentes na Web. Voc&ecirc; precisa habilitar o libmp3lame!
 				</li>
 				<li>Instale <strong>SoX</strong> <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					Voc&ecirc; deve instalar a vers&atilde;o mais recente do SoX! 
 					SoX 12.xx N&Atilde;O funcionar&aacute;!
 				</li>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Wed May 28 08:21:12 2014
@@ -118,7 +118,7 @@
 					Инструкций по установке из Сети. Вы должны установить libmp3lame!
 				</li>
 				<li>Установите <strong>SoX</strong> <a
-					href="http://sox.sourceforge.net/" target="_BLANK">http://sox.sourceforge.net/</a>.
+					href="http://sox.sourceforge.net/" target="_blank">http://sox.sourceforge.net/</a>.
 					Вы должны установить последнюю версию SoX! SoX 12.xx не будет
 					работать!
 				</li>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Wed May 28 08:21:12 2014
@@ -63,6 +63,7 @@ import org.apache.wicket.model.AbstractR
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.Strings;
 
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.core.Options;
@@ -270,8 +271,7 @@ public class SignInDialog extends Abstra
 					protected void populateItem(final ListItem<OAuthServer> item) {
 						Button btn = new Button("oauthBtn");
 						Image icon = new Image("icon", new Model<String>());
-						icon.setVisible(item.getModelObject().getIconUrl() != null && 
-								!"".equals(item.getModelObject().getIconUrl()));
+						icon.setVisible(!Strings.isEmpty(item.getModelObject().getIconUrl()));
 						icon.add(new AttributeModifier("src", new AbstractReadOnlyModel<String>() {
 
 							private static final long serialVersionUID = 7257002837120721882L;

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml Wed May 28 08:21:12 2014
@@ -3279,7 +3279,7 @@ see http://openmeetings.apache.org/Langu
     <value>Allow/Deny right to Remote Control Screen (during screen sharing)</value>
   </string>
   <string id="1085" name="right click screen share">
-    <value>1) Your PC to remote PC: To copy and paste text from your clipboard into the remote controlled screen, click on the screen, then right click in the text field and choose &lt;i&gt;Insert&lt;/i&gt; from the context (right click) menu.&lt;br/&gt;&lt;br/&gt;2) From remote PC to your PC: To copy text from the remote PC to your PC's clipboard, highlight the text with the mouse on the remote screen, then right-click on the remote screen and choose &lt;i&gt;Copy highlighted text&lt;/i&gt;&lt;br/&gt;&lt;br/&gt;&lt;u&gt;&lt;FONT color='#0000CC'&gt;&lt;A HREF="http://www.youtube.com/watch?v=Ukqa01O48uI" TARGET="_BLANK"&gt;watch the demo&lt;/A&gt;&lt;/FONT&gt;&lt;/u&gt;</value>
+    <value>1) Your PC to remote PC: To copy and paste text from your clipboard into the remote controlled screen, click on the screen, then right click in the text field and choose &lt;i&gt;Insert&lt;/i&gt; from the context (right click) menu.&lt;br/&gt;&lt;br/&gt;2) From remote PC to your PC: To copy text from the remote PC to your PC's clipboard, highlight the text with the mouse on the remote screen, then right-click on the remote screen and choose &lt;i&gt;Copy highlighted text&lt;/i&gt;&lt;br/&gt;&lt;br/&gt;&lt;u&gt;&lt;FONT color='#0000CC'&gt;&lt;A HREF="http://www.youtube.com/watch?v=Ukqa01O48uI" TARGET="_blank"&gt;watch the demo&lt;/A&gt;&lt;/FONT&gt;&lt;/u&gt;</value>
   </string>
   <string id="1086" name="right click screen share">
     <value>Copy and paste text from your PC to remote PC and vice versa.</value>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml Wed May 28 08:21:12 2014
@@ -3279,7 +3279,7 @@ see http://openmeetings.apache.org/Langu
     <value>Allow/Deny right to Remote Control Screen (During Screen Sharing)</value>
   </string>
   <string id="1085" name="right click screen share">
-    <value>1) Your PC to remote PC: To copy and paste text from your clipboard into the remote controlled screen, click on the screen, then right click in the text field and choose &lt;i&gt;Insert&lt;/i&gt; from the context (right click) menu.&lt;br/&gt;&lt;br/&gt;2) From remote PC to your PC: To copy text from the remote PC to your PC's clipboard, highlight the text with the mouse on the remote screen, then right-click on the remote screen and choose &lt;i&gt;Copy highlighted text&lt;/i&gt;&lt;br/&gt;&lt;br/&gt;&lt;u&gt;&lt;FONT color='#0000CC'&gt;&lt;A HREF="http://www.youtube.com/watch?v=Ukqa01O48uI" TARGET="_BLANK"&gt;watch the demo&lt;/A&gt;&lt;/FONT&gt;&lt;/u&gt;</value>
+    <value>1) Your PC to remote PC: To copy and paste text from your clipboard into the remote controlled screen, click on the screen, then right click in the text field and choose &lt;i&gt;Insert&lt;/i&gt; from the context (right click) menu.&lt;br/&gt;&lt;br/&gt;2) From remote PC to your PC: To copy text from the remote PC to your PC's clipboard, highlight the text with the mouse on the remote screen, then right-click on the remote screen and choose &lt;i&gt;Copy highlighted text&lt;/i&gt;&lt;br/&gt;&lt;br/&gt;&lt;u&gt;&lt;FONT color='#0000CC'&gt;&lt;A HREF="http://www.youtube.com/watch?v=Ukqa01O48uI" TARGET="_blank"&gt;watch the demo&lt;/A&gt;&lt;/FONT&gt;&lt;/u&gt;</value>
   </string>
   <string id="1086" name="right click screen share">
     <value>Copy and Paste text from your PC to remote PC and vice-versa.</value>

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1597942&r1=1597941&r2=1597942&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Wed May 28 08:21:12 2014
@@ -415,8 +415,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.5.1</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 						<optimize>true</optimize>
 						<debug>true</debug>
 					</configuration>