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 2013/05/12 14:10:17 UTC

svn commit: r1481533 - in /openmeetings/trunk/singlewebapp: WebContent/languages/ src/org/apache/openmeetings/data/basic/dao/ src/org/apache/openmeetings/remote/ src/org/apache/openmeetings/web/app/ src/org/apache/openmeetings/web/components/admin/room...

Author: solomax
Date: Sun May 12 12:10:16 2013
New Revision: 1481533

URL: http://svn.apache.org/r1481533
Log:
[OPENMEETINGS-620] LDAP login is added;
	minor issues across the application are fixed;

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.java
Modified:
    openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
    openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Sun May 12 12:10:16 2013
@@ -4667,4 +4667,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1547" name="widget_welcome_desc">
     <value>Widget displaying basic user info and support links</value>
   </string>
+  <string id="1548" name="widgets_tab">
+    <value>Widgets</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java Sun May 12 12:10:16 2013
@@ -242,24 +242,18 @@ public class LdapConfigDao implements ID
 	}
 
 	public List<LdapConfig> getActiveLdapConfigs() {
-		try {
-			log.debug("selectMaxFromConfigurations ");
+		log.debug("selectMaxFromConfigurations ");
 
-			String hql = "select c from LdapConfig c "
-					+ "where c.deleted = false "
-					+ "AND c.isActive = :isActive ";
+		String hql = "select c from LdapConfig c "
+				+ "where c.deleted = false "
+				+ "AND c.isActive = :isActive ";
+
+		// get all users
+		TypedQuery<LdapConfig> query = em
+				.createQuery(hql, LdapConfig.class);
+		query.setParameter("isActive", true);
 
-			// get all users
-			TypedQuery<LdapConfig> query = em
-					.createQuery(hql, LdapConfig.class);
-			query.setParameter("isActive", true);
-			List<LdapConfig> ll = query.getResultList();
-
-			return ll;
-		} catch (Exception ex2) {
-			log.error("[getActiveLdapConfigs] ", ex2);
-		}
-		return null;
+		return query.getResultList();
 	}
 
 	public List<LdapConfig> getLdapConfigs() {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java Sun May 12 12:10:16 2013
@@ -18,8 +18,8 @@
  */
 package org.apache.openmeetings.remote;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
@@ -80,15 +80,11 @@ public class LdapConfigService {
 			ldapConfig.setName("local DB [internal]");
 			ldapConfig.setLdapConfigId(-1);
 			
-			List<LdapConfig> returnldapConfigs = new LinkedList<LdapConfig>();
+			List<LdapConfig> returnldapConfigs = new ArrayList<LdapConfig>();
 			returnldapConfigs.add(ldapConfig);
-			
-			for (LdapConfig ldapConfigStored : ldapConfigs) {
-				returnldapConfigs.add(ldapConfigStored);
-			}
+			returnldapConfigs.addAll(ldapConfigs);
 			
 	        return returnldapConfigs;
-	        
 		} catch (Exception err) {
 			log.error("[getActiveLdapConfigs]",err);
 		}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java Sun May 12 12:10:16 2013
@@ -60,6 +60,7 @@ public class Application extends Authent
 	
 	@Override
 	protected void init() {
+		getSecuritySettings().setAuthenticationStrategy(new OmAuthenticationStrategy());
 		IPageSettings pageSettings = getPageSettings();
 		pageSettings.addComponentResolver(new MessageResolver());
 		pageSettings.addComponentResolver(new MessageTagHandler());
@@ -114,6 +115,10 @@ public class Application extends Authent
 		});
 	}
 	
+	public static OmAuthenticationStrategy getAuthenticationStrategy() {
+		return (OmAuthenticationStrategy)get().getSecuritySettings().getAuthenticationStrategy();
+	}
+	
 	public final static String toAbsolutePath(final String relativePagePath) {
 	       HttpServletRequest req = (HttpServletRequest)((WebRequest)RequestCycle.get().getRequest()).getContainerRequest();
 	       return RequestUtils.toAbsolutePath(req.getRequestURL().toString(), relativePagePath);

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1481533&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java Sun May 12 12:10:16 2013
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.app;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
+import org.apache.wicket.util.string.Strings;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class OmAuthenticationStrategy extends DefaultAuthenticationStrategy {
+	/** The separator used to concatenate the username and password */
+	private static final String VALUE_SEPARATOR = "-sep-";
+	private static final String COOKIE_KEY = "LoggedIn";
+	private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
+	/** The cookie name to store the username/password/domain */
+	private final String cookieKey;
+	
+	public OmAuthenticationStrategy() {
+		super(COOKIE_KEY);
+		cookieKey = COOKIE_KEY;
+	}
+	
+	/**
+	 * @see org.apache.wicket.authentication.IAuthenticationStrategy#load()
+	 */
+	@Override
+	public String[] load()
+	{
+		String value = getCookieUtils().load(cookieKey);
+		if (Strings.isEmpty(value) == false)
+		{
+			try
+			{
+				value = getCrypt().decryptUrlSafe(value);
+			}
+			catch (RuntimeException e)
+			{
+				log.info(
+					"Error decrypting login cookie: {}. The cookie will be deleted. Possible cause is that a session-relative encryption key was used to encrypt this cookie while this decryption attempt is happening in a different session, eg user coming back to the application after session expiration",
+					cookieKey);
+				getCookieUtils().remove(cookieKey);
+				value = null;
+			}
+			if (Strings.isEmpty(value) == false)
+			{
+				String username = null;
+				String password = null;
+				String domain = null;
+
+				String[] values = value.split(VALUE_SEPARATOR);
+				if ((values.length > 0) && (Strings.isEmpty(values[0]) == false))
+				{
+					username = values[0];
+				}
+				if ((values.length > 1) && (Strings.isEmpty(values[1]) == false))
+				{
+					password = values[1];
+				}
+				if ((values.length > 2) && (Strings.isEmpty(values[2]) == false))
+				{
+					domain = values[2];
+				}
+
+				return new String[] { username, password, domain };
+			}
+		}
+
+		return null;
+	}
+
+	public void save(final String username, final String password, final String domain) {
+		String value = username + VALUE_SEPARATOR + password + VALUE_SEPARATOR + domain;
+
+		String encryptedValue = getCrypt().encryptUrlSafe(value);
+
+		getCookieUtils().save(cookieKey, encryptedValue);
+
+	}
+}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Sun May 12 12:10:16 2013
@@ -36,6 +36,7 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.user.UserManager;
 import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.ldap.LdapLoginManagement;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
 import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
 import org.apache.openmeetings.persistence.beans.user.User;
@@ -46,6 +47,7 @@ import org.apache.openmeetings.web.compo
 import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
 import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
+import org.apache.wicket.util.string.Strings;
 
 import ro.fortsoft.wicket.dashboard.Dashboard;
 import ro.fortsoft.wicket.dashboard.DefaultDashboard;
@@ -93,11 +95,12 @@ public class WebSession extends Abstract
 		return (userId > -1);
 	}
 
-	public boolean signIn(String login, String password) {
+	public boolean signIn(String login, String password, String ldapConfigFileName) {
 		Sessiondata sessData = getBean(SessiondataDao.class).startsession();
 		SID = sessData.getSession_id();
-		Object u = getBean(UserManager.class).loginUser(SID, login, password,
-				null, null, false);
+		Object u = Strings.isEmpty(ldapConfigFileName)
+				? getBean(UserManager.class).loginUser(SID, login, password, null, null, false)
+				: getBean(LdapLoginManagement.class).doLdapLogin(login, password, null, null, SID, ldapConfigFileName);
 		
 		if (u instanceof User) {
 			User user = (User)u;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java Sun May 12 12:10:16 2013
@@ -75,7 +75,7 @@ public class RoomForm extends AdminBaseF
 
 		add(new DropDownChoice<RoomType>("roomtype", Application.getBean(
 				RoomManager.class).getAllRoomTypes(WebSession.getLanguage()),
-				new ChoiceRenderer<RoomType>("label", "roomtypes_id")));
+				new ChoiceRenderer<RoomType>("label.value", "roomtypes_id")));
 
 		add(new TextArea<String>("comment"));
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java Sun May 12 12:10:16 2013
@@ -63,7 +63,7 @@ public class CalendarPanel extends UserP
 		
 		Options options = new Options();
 		//options.set("theme", true);
-		options.set("header", "{left: 'prev,next today', center: 'title', right: 'month,agendaWeek,agendaDay'}");
+		options.set("header", "{left: 'prevYear,prev,next,nextYear today', center: 'title', right: 'month,agendaWeek,agendaDay'}");
 		options.set("allDaySlot", false);
 		options.set("axisFormat", "'HH(:mm)'");
 		options.set("defaultEventMinutes", 60);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html Sun May 12 12:10:16 2013
@@ -30,7 +30,7 @@
 				<td><wicket:ommessage key="804"/></td>
 				<td>
 					<input type="button" wicket:ommessage="value:788"/><br/>
-					<input type="button" wicket:ommessage="value:291"/>
+					<input wicket:id="calendar" type="button" wicket:ommessage="value:291"/>
 				</td>
 			</tr>
 		</table>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.java Sun May 12 12:10:16 2013
@@ -18,6 +18,12 @@
  */
 package org.apache.openmeetings.web.components.user.dashboard;
 
+import org.apache.openmeetings.web.components.user.calendar.CalendarPanel;
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.model.Model;
 
 import ro.fortsoft.wicket.dashboard.Widget;
@@ -28,5 +34,14 @@ public class StartWidgetView extends Wid
 
 	public StartWidgetView(String id, Model<Widget> model) {
 		super(id, model);
+		add(new Button("calendar").add(new AjaxEventBehavior("onclick") {
+			private static final long serialVersionUID = -1736827409409436737L;
+
+			@Override
+			protected void onEvent(AjaxRequestTarget target) {
+				MarkupContainer contents = ((MainPage)getPage()).getContents();
+				target.add(contents.replace(new CalendarPanel("child")));
+			}
+		}));
 	}
 }

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html Sun May 12 12:10:16 2013
@@ -35,7 +35,7 @@
    				<h3><wicket:ommessage key="281"/></h3>
    				<a wicket:ommessage="href:282"><wicket:ommessage key="286"/></a><br/>
    				<a wicket:ommessage="href:283"><wicket:ommessage key="287"/></a><br/>
-   				<wicket:ommessage key="1527"/><br/>
+				<a target="_blank" href="?swf=networktesting.swf10.swf"><wicket:ommessage key="1527"/></a><br/>
 			</td>
    		</tr>
    	</table>

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.html?rev=1481533&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.html (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.html Sun May 12 12:10:16 2013
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+    	  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+</wicket:panel>
+</html>

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.java?rev=1481533&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/MessagesContactsPanel.java Sun May 12 12:10:16 2013
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.user.profile;
+
+import org.apache.openmeetings.web.components.UserPanel;
+
+public class MessagesContactsPanel extends UserPanel {
+	private static final long serialVersionUID = 8098087441571734957L;
+
+	public MessagesContactsPanel(String id) {
+		super(id);
+	}
+}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java Sun May 12 12:10:16 2013
@@ -62,12 +62,14 @@ public class SettingsPanel extends UserP
 		super(id);
 		RepeatingView tabs = new RepeatingView("tabs");
 		addTab(tabs, WebSession.getString(1170), getTabId(PROFILE_TAB_ID));
+		addTab(tabs, WebSession.getString(1188), getTabId(MESSAGES_TAB_ID));
 		addTab(tabs, WebSession.getString(1171), getTabId(EDIT_PROFILE_TAB_ID));
 		addTab(tabs, WebSession.getString(1172), getTabId(SEARCH_TAB_ID));
-		addTab(tabs, "[Widgets]", getTabId(DASHBOARD_TAB_ID)); //FIXME localize
+		addTab(tabs, WebSession.getString(1548), getTabId(DASHBOARD_TAB_ID));
 		
 		RepeatingView panels = new RepeatingView("panels");
 		addPanel(panels, getTabId(PROFILE_TAB_ID), new UserProfilePanel("tab", getUserId()));
+		addPanel(panels, getTabId(MESSAGES_TAB_ID), new MessagesContactsPanel("tab"));
 		addPanel(panels, getTabId(EDIT_PROFILE_TAB_ID), new ProfilePanel("tab"));
 		addPanel(panels, getTabId(SEARCH_TAB_ID), new UserSearchPanel("tab"));
 		addPanel(panels, getTabId(DASHBOARD_TAB_ID), new WidgetsPanel("tab"));

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Sun May 12 12:10:16 2013
@@ -18,10 +18,10 @@
  */
 package org.apache.openmeetings.web.pages;
 
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.web.components.user.profile.SettingsPanel.MESSAGES_TAB_ID;
 import static org.apache.openmeetings.web.components.user.profile.SettingsPanel.PROFILE_TAB_ID;
 
-import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.components.ConfirmableAjaxLink;
 import org.apache.openmeetings.web.components.MenuPanel;
@@ -44,7 +44,7 @@ import org.slf4j.Logger;
 @AuthorizeInstantiation("USER")
 public class MainPage extends BasePage {
 	private static final long serialVersionUID = 6421960759218157999L;
-	private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, OpenmeetingsVariables.webAppRootKey);
+	private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
 	private final MenuPanel menu;
 	private final MarkupContainer contents;
 	

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1481533&r1=1481532&r2=1481533&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java Sun May 12 12:10:16 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.web.pages.auth;
 
+import static org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
 import static org.apache.openmeetings.web.app.Application.getBean;
 import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
 
@@ -27,6 +28,7 @@ import java.util.List;
 import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
 import org.apache.openmeetings.remote.LdapConfigService;
 import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -62,6 +64,7 @@ public class SignInDialog extends Abstra
     private RegisterDialog r;
     private ForgetPasswordDialog f;
     private LdapConfig domain;
+    private String ldapConfigFileName;
 	
 	public SignInDialog(String id) {
 		super(id, WebSession.getString(108));
@@ -143,16 +146,13 @@ public class SignInDialog extends Abstra
 
 	@Override
 	protected void onSubmit(AjaxRequestTarget target) {
-		IAuthenticationStrategy strategy = getApplication().getSecuritySettings().getAuthenticationStrategy();
-		//TODO add LDAP, separate login from other parts:
-		//	LdapLoginManagement.doLdapLogin(String user, String passwd, Client currentClient
-		//		, IClient client, String SID, String domain)
-		//
-		if (WebSession.get().signIn(login, password)) {
+		ldapConfigFileName = domain.getConfigFileName() == null ? "" : domain.getConfigFileName();
+		OmAuthenticationStrategy strategy = getAuthenticationStrategy();
+		if (WebSession.get().signIn(login, password, ldapConfigFileName)) {
 			WebSession.get().setArea(area);
  			setResponsePage(Application.get().getHomePage());
 			if (rememberMe) {
-				strategy.save(login, password);
+				strategy.save(login, password, ldapConfigFileName);
 			} else {
 				strategy.remove();
 			}
@@ -171,15 +171,16 @@ public class SignInDialog extends Abstra
 			if (WebSession.get().isSignedIn()) {
 				alreadyLoggedIn();
 			} else {
-				IAuthenticationStrategy strategy = getApplication().getSecuritySettings().getAuthenticationStrategy();
+				IAuthenticationStrategy strategy = getAuthenticationStrategy();
 				// get username and password from persistence store
 				String[] data = strategy.load();
 
-				if ((data != null) && (data.length > 1)) {
+				if ((data != null) && (data.length > 2)) {
 					// try to sign in the user
-					if (WebSession.get().signIn(data[0], data[1])) {
+					if (WebSession.get().signIn(data[0], data[1], data[2])) {
 						login = data[0];
 						password = data[1];
+						ldapConfigFileName = data[2];
 
 						alreadyLoggedIn();
 					} else {