You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by a_...@apache.org on 2013/08/08 12:22:09 UTC

svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Author: a_horuzhenko
Date: Thu Aug  8 10:22:08 2013
New Revision: 1511672

URL: http://svn.apache.org/r1511672
Log:
[OPENMEETINGS-740] Basic login via OAuth2 has been implemented.

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
Modified:
    openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
    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/czech.xml
    openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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/META-INF/db2_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java

Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Thu Aug  8 10:22:08 2013
@@ -284,6 +284,7 @@
 	<bean id="chatDao" class="org.apache.openmeetings.data.chat.ChatDao" />
 	<bean id="clientDao" class="org.apache.openmeetings.data.conference.dao.ClientDao" />
 	<bean id="mailMessageDao" class="org.apache.openmeetings.data.basic.dao.MailMessageDao" />
+	<bean id="oauth2Dao" class="org.apache.openmeetings.data.oauth.OAuth2Dao" />
 
 	<!-- No Interface -->
 	<bean id="manageCryptStyle" class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Aug  8 10:22:08 2013
@@ -4735,4 +4735,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</value>
+  </string>
 </language>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal Eメール</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal e-майл</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Конфигурировать OAuth2</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Название</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Активен</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>URL значка</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>URL запроса ключа</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>URL запроса токена</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>URL запроса данных</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>Настройка OAuth2</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Имя пар-ра "логин"</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Имя пар-ра "email"</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Имя параметра "имя"</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Имя пар-ра "фамилия"</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Атрибуты запроса токена</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Uri возврата</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,106 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</value>
+  </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Aug  8 10:22:08 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
   <string id="1570" name="remindertype_iCal_email">
     <value>iCal email</value>
   </string>
+  <string id="1571" name="oauth2">
+    <value>OAuth2</value>
+  </string>
+  <string id="1572" name="oauth2">
+    <value>Manage OAuth2 configurations</value>
+  </string>
+  <string id="1573" name="oauth2">
+    <value>Name</value>
+  </string>
+  <string id="1574" name="oauth2">
+    <value>Enabled</value>
+  </string>
+  <string id="1575" name="oauth2">
+    <value>Icon URL</value>
+  </string>
+  <string id="1576" name="oauth2">
+    <value>client_id</value>
+  </string>
+  <string id="1577" name="oauth2">
+    <value>client_secret</value>
+  </string>
+  <string id="1578" name="oauth2">
+    <value>Request key URL</value>
+  </string>
+  <string id="1579" name="oauth2">
+    <value>Request token URL</value>
+  </string>
+  <string id="1580" name="oauth2">
+    <value>Request info URL</value>
+  </string>
+  <string id="1581" name="oauth2">
+    <value>OAuth2 config</value>
+  </string>
+  <string id="1582" name="oauth2">
+    <value>Login param name</value>
+  </string>
+  <string id="1583" name="oauth2">
+    <value>Email param name</value>
+  </string>
+  <string id="1584" name="oauth2">
+    <value>Firstname param name</value>
+  </string>
+  <string id="1585" name="oauth2">
+    <value>Lastname param name</value>
+  </string>
+  <string id="1586" name="oauth2">
+    <value>Request token attributes</value>
+  </string>
+  <string id="1587" name="oauth2">
+    <value>Redirect uri</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Thu Aug  8 10:22:08 2013
@@ -73,6 +73,7 @@
 		<class>org.apache.openmeetings.persistence.beans.user.User</class>
 		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
+		<class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Thu Aug  8 10:22:08 2013
@@ -73,6 +73,7 @@
 		<class>org.apache.openmeetings.persistence.beans.user.User</class>
 		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
+		<class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Thu Aug  8 10:22:08 2013
@@ -73,6 +73,7 @@
 		<class>org.apache.openmeetings.persistence.beans.user.User</class>
 		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
+		<class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Thu Aug  8 10:22:08 2013
@@ -73,6 +73,7 @@
 		<class>org.apache.openmeetings.persistence.beans.user.User</class>
 		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
+		<class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Modified: openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Thu Aug  8 10:22:08 2013
@@ -73,6 +73,7 @@
 		<class>org.apache.openmeetings.persistence.beans.user.User</class>
 		<class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
 		<class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
+		<class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java?rev=1511672&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java Thu Aug  8 10:22:08 2013
@@ -0,0 +1,75 @@
+package org.apache.openmeetings.data.oauth;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer;
+import org.apache.openmeetings.utils.DaoHelper;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class OAuth2Dao implements IDataProviderDao<OAuthServer> {
+
+	public final static String[] searchFields = {"name"};
+	@PersistenceContext
+	private EntityManager em;
+	
+	public List<OAuthServer> getEnabledOAuthServers() {
+		TypedQuery<OAuthServer> query = em.createNamedQuery("getEnabledOAuthServers", OAuthServer.class);
+		return query.getResultList();
+	}
+	
+	public OAuthServer get(long id) {
+		TypedQuery<OAuthServer> query = em.createNamedQuery("getOAuthServerById", OAuthServer.class);
+		query.setParameter("id", id);
+		OAuthServer result = null;
+		try {
+			result = query.getSingleResult();
+		} catch (NoResultException e) {}
+		return result;
+	}
+
+	public List<OAuthServer> get(int start, int count) {
+		TypedQuery<OAuthServer> query = em.createNamedQuery("getAllOAuthServers", OAuthServer.class);
+		query.setFirstResult(start);
+		query.setMaxResults(count);
+		return query.getResultList();
+	}
+
+	public List<OAuthServer> get(String search, int start, int count, String order) {
+		TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true, false, null, searchFields), Long.class);
+		q.setFirstResult(start);
+		q.setMaxResults(count);
+		return null;
+	}
+
+	public long count() {
+		TypedQuery<Long> q = em.createNamedQuery("countOAuthServers", Long.class);
+		return q.getSingleResult();
+	}
+
+	public long count(String search) {
+		TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true, true, null, searchFields), Long.class);
+		return q.getSingleResult();
+	}
+
+	public OAuthServer update(OAuthServer server, Long userId) {
+		if (server.getId() == null) {
+			em.persist(server);
+		} else {
+			server = em.merge(server);
+		}
+		return server;
+	}
+
+	public void delete(OAuthServer server, Long userId) {
+		server.setDeleted(true);
+		update(server, userId);
+	}
+
+}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1511672&r1=1511671&r2=1511672&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Thu Aug  8 10:22:08 2013
@@ -52,6 +52,7 @@ import org.apache.openmeetings.data.cale
 import org.apache.openmeetings.data.conference.PollManager;
 import org.apache.openmeetings.data.conference.RoomManager;
 import org.apache.openmeetings.data.conference.dao.SipDao;
+import org.apache.openmeetings.data.oauth.OAuth2Dao;
 import org.apache.openmeetings.data.user.OrganisationManager;
 import org.apache.openmeetings.data.user.UserManager;
 import org.apache.openmeetings.data.user.dao.SalutationDao;
@@ -61,6 +62,8 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
 import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
 import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer;
+import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer.RequestMethod;
 import org.apache.openmeetings.utils.ImportHelper;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.dom4j.Document;
@@ -105,6 +108,8 @@ public class ImportInitvalues {
 	private PollManager pollManager;
 	@Autowired
 	private SipDao sipDao;
+	@Autowired
+	private OAuth2Dao oauthDao;
 	private int progress = 0;
 
 	public int getProgress() {
@@ -213,10 +218,13 @@ public class ImportInitvalues {
 				true, false, 3, "Administration of LDAP Configs", 6, false,
 				1460L);
 
-		navimanagement.addMainStructure("adminModuleBackup", null, 21, 367,
+		navimanagement.addMainStructure("adminModuleOAuth", null, 21, 1571, 
+				true, false, 3, "Administration of OAuth2 servers", 6, false, 1572L);
+
+		navimanagement.addMainStructure("adminModuleBackup", null, 22, 367,
 				true, false, 3, "Administration of Backups", 6, false, 1461L);
 
-		navimanagement.addMainStructure("adminModuleServers", null, 22, 1498,
+		navimanagement.addMainStructure("adminModuleServers", null, 23, 1498,
 				true, false, 3, "Administration of Servers", 6, false, 1499L);
 		log.debug("MainMenu ADDED");
 	}
@@ -971,6 +979,41 @@ public class ImportInitvalues {
 		log.debug("All languages are imported");
 	}
 
+	public void loadInitialOAuthServers() throws Exception {
+		// Yandex
+		OAuthServer yandexServer = new OAuthServer();
+		yandexServer.setName("Yandex");
+		yandexServer.setClientId("<put your client_id>");
+		yandexServer.setClientSecret("<put your client_secret>");
+		yandexServer.setEmailParamName("default_email");
+		yandexServer.setEnabled(false);
+		yandexServer.setLoginParamName("default_email");
+		yandexServer.setRequestInfoUrl("https://login.yandex.ru/info?format=json&oauth_token={$access_token}");
+		yandexServer.setRequestTokenUrl("https://oauth.yandex.ru/token");
+		yandexServer.setRequestKeyUrl("https://oauth.yandex.ru/authorize?response_type=code&client_id={$client_id}");
+		yandexServer.setRequestTokenAttributes("grant_type=authorization_code&code={$code}&client_id={$client_id}&client_secret={$client_secret}");
+		yandexServer.setRequestTokenMethod(RequestMethod.POST);
+		oauthDao.update(yandexServer, null);
+		
+		// Google
+		OAuthServer googleServer = new OAuthServer();
+		googleServer.setName("Google");
+		googleServer.setEnabled(false);
+		googleServer.setClientId("<put your client_id>");
+		googleServer.setClientSecret("<put your client_secret>");
+		googleServer.setRequestKeyUrl("https://accounts.google.com/o/oauth2/auth?redirect_uri={$redirect_uri}&response_type=code&client_id={$client_id}"
+				+ "&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile");
+		googleServer.setRequestTokenUrl("https://accounts.google.com/o/oauth2/token");
+		googleServer.setRequestTokenMethod(RequestMethod.POST);
+		googleServer.setRequestTokenAttributes("code={$code}&client_id={$client_id}&client_secret={$client_secret}&redirect_uri={$redirect_uri}&grant_type=authorization_code");
+		googleServer.setRequestInfoUrl("https://www.googleapis.com/oauth2/v1/userinfo?access_token={$access_token}");
+		googleServer.setLoginParamName("email");
+		googleServer.setEmailParamName("email");
+		googleServer.setFirstnameParamName("given_name");
+		googleServer.setLastnameParamName("family_name");
+		oauthDao.update(googleServer, null);
+	}
+	
 	// ------------------------------------------------------------------------------
 
 	/**
@@ -1021,6 +1064,8 @@ public class ImportInitvalues {
 
 		loadConfiguration(cfg);
 		progress = 88;
+		loadInitialOAuthServers();
+		progress = 91;
 	}
 
 	public void loadAll(InstallationConfig cfg, boolean force) throws Exception {

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java?rev=1511672&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java Thu Aug  8 10:22:08 2013
@@ -0,0 +1,226 @@
+package org.apache.openmeetings.persistence.beans.user.oauth;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+
+@Entity
+@Table(name = "oauth_servers")
+@NamedQueries({
+	@NamedQuery(name = "getEnabledOAuthServers", query = "select s from OAuthServer as s where s.enabled = true and s.deleted = false"),
+	@NamedQuery(name = "getOAuthServerById", query = "select s from OAuthServer as s where s.id = :id"),
+	@NamedQuery(name = "getAllOAuthServers", query = "select s from OAuthServer as s where s.deleted = false"),
+	@NamedQuery(name = "countOAuthServers", query = "select count(s) from OAuthServer s WHERE s.deleted = false")
+})
+public class OAuthServer implements Serializable, IDataProviderEntity {
+	
+	private static final long serialVersionUID = -9034438721147720175L;
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Long id;
+	@Column(name = "name")
+	private String name;
+	@Column(name = "icon_url")
+	private String iconUrl;
+	@Column(name = "enabled")
+	private Boolean enabled;
+	@Column(name = "client_id")
+	private String clientId;
+	@Column(name = "client_secret")
+	private String clientSecret;
+	@Column(name = "request_key_url")
+	private String requestKeyUrl;
+	@Column(name = "request_token_url")
+	private String requestTokenUrl;
+	@Column(name = "request_token_attributes")
+	private String requestTokenAttributes;
+	@Column(name = "request_method")
+	private RequestMethod requestTokenMethod;
+	@Column(name = "request_info_url")
+	private String requestInfoUrl;
+	@Column(name = "login_param_name")
+	private String loginParamName;
+	@Column(name = "email_param_name")
+	private String emailParamName;
+	@Column(name = "firstname_param_name")
+	private String firstnameParamName;
+	@Column(name = "lastname_param_name")
+	private String lastnameParamName;
+	@Column(name = "deleted")
+	private boolean deleted;
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIconUrl() {
+		return iconUrl;
+	}
+
+	public void setIconUrl(String iconUrl) {
+		this.iconUrl = iconUrl;
+	}
+
+	public Boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getClientId() {
+		return clientId;
+	}
+
+	public void setClientId(String clientId) {
+		this.clientId = clientId;
+	}
+
+	public String getClientSecret() {
+		return clientSecret;
+	}
+
+	public void setClientSecret(String clientSecret) {
+		this.clientSecret = clientSecret;
+	}
+
+	public String getRequestKeyUrl() {
+		return requestKeyUrl;
+	}
+
+	public void setRequestKeyUrl(String requestKeyUrl) {
+		this.requestKeyUrl = requestKeyUrl;
+	}
+
+	public String getRequestTokenUrl() {
+		return requestTokenUrl;
+	}
+
+	public void setRequestTokenUrl(String requestTokenUrl) {
+		this.requestTokenUrl = requestTokenUrl;
+	}
+
+	public String getRequestTokenAttributes() {
+		return requestTokenAttributes;
+	}
+
+	public void setRequestTokenAttributes(String requestTokenAttributes) {
+		this.requestTokenAttributes = requestTokenAttributes;
+	}
+
+	public RequestMethod getRequestTokenMethod() {
+		return requestTokenMethod;
+	}
+
+	public void setRequestTokenMethod(RequestMethod requestTokenMethod) {
+		this.requestTokenMethod = requestTokenMethod;
+	}
+
+	public String getRequestInfoUrl() {
+		return requestInfoUrl;
+	}
+
+	public void setRequestInfoUrl(String requestInfoUrl) {
+		this.requestInfoUrl = requestInfoUrl;
+	}
+
+	public String getLoginParamName() {
+		return loginParamName;
+	}
+
+	public void setLoginParamName(String loginParamName) {
+		this.loginParamName = loginParamName;
+	}
+
+	public String getEmailParamName() {
+		return emailParamName;
+	}
+
+	public void setEmailParamName(String emailParamName) {
+		this.emailParamName = emailParamName;
+	}
+
+	public String getFirstnameParamName() {
+		return firstnameParamName;
+	}
+
+	public void setFirstnameParamName(String firstnameParamName) {
+		this.firstnameParamName = firstnameParamName;
+	}
+
+	public String getLastnameParamName() {
+		return lastnameParamName;
+	}
+
+	public void setLastnameParamName(String lastnameParamName) {
+		this.lastnameParamName = lastnameParamName;
+	}
+
+	public boolean getDeleted() {
+		return deleted;
+	}
+
+	public void setDeleted(boolean deleted) {
+		this.deleted = deleted;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "OAuthServer [id=" + id + ", name=" + name + ", iconUrl="
+				+ iconUrl + ", enabled=" + enabled + ", clientId=" + clientId
+				+ ", clientSecret=" + clientSecret + ", requestKeyUrl="
+				+ requestKeyUrl + ", requestTokenUrl=" + requestTokenUrl
+				+ ", requestTokenAttributes=" + requestTokenAttributes
+				+ ", requestTokenMethod=" + requestTokenMethod
+				+ ", requestInfoUrl=" + requestInfoUrl + ", loginParamName="
+				+ loginParamName + ", emailParamName=" + emailParamName
+				+ ", firstnameParamName=" + firstnameParamName
+				+ ", lastnameParamName=" + lastnameParamName + ", deleted="
+				+ deleted + "]";
+	}
+
+	public enum RequestMethod {
+		POST("post"),
+		GET("get");
+		
+		private String name;
+
+		private RequestMethod(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public String toString() {
+			return name;
+		}
+	}
+	
+}



Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by Maxim Solodovnik <so...@gmail.com>.
>> Why is the table name now "om_user" instead of "user" ?

In derby "user" is reserved table
This is not fixed in OpenJPA


On Sun, Aug 11, 2013 at 8:40 AM, seba.wagner@gmail.com <
seba.wagner@gmail.com> wrote:

> Okay nevermind, I read the commit history, it has nothing todo with the
> OAuth changes.
>
> Thanks,
> Sebastian
>
>
> 2013/8/11 seba.wagner@gmail.com <se...@gmail.com>
>
> > Why is the table name now "om_user" instead of "user" ?
> >
> > Sebastian
> >
> >
> > 2013/8/8 Artyom Horuzhenko <ak...@gmail.com>
> >
> >> Ok, I'll do it
> >>
> >>
> >> 2013/8/8 Maxim Solodovnik <so...@gmail.com>
> >>
> >> > Yes
> >> >
> >> > On Thursday, August 8, 2013, Artyom Horuzhenko wrote:
> >> >
> >> > > Do you mean backup and restore?
> >> > >
> >> > >
> >> > > 2013/8/8 Maxim Solodovnik <so...@gmail.com>
> >> > >
> >> > > > I believe this new entities should be added to import/export
> >> > > >
> >> > > > On Thursday, August 8, 2013, wrote:
> >> > > >
> >> > > > > Author: a_horuzhenko
> >> > > > > Date: Thu Aug  8 10:22:08 2013
> >> > > > > New Revision: 1511672
> >> > > > >
> >> > > > > URL: http://svn.apache.org/r1511672
> >> > > > > Log:
> >> > > > > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
> >> > > > >
> >> > > > > Added:
> >> > > > >
> >> > > >
> >> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> >> > > > > Modified:
> >> > > > >
> >> > > > >
> >> > > >
> >> > >
> >> >
> >>
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >> > > > >
> >> 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/czech.xml
> >> > > > >
> >> openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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
> >> > >
> >> >
> >> >
> >> > --
> >> > WBR
> >> > Maxim aka solomax
> >> >
> >>
> >
> >
> >
> > --
> > Sebastian Wagner
> > https://twitter.com/#!/dead_lock
> > http://www.webbase-design.de
> > http://www.wagner-sebastian.com
> > seba.wagner@gmail.com
> >
>
>
>
> --
> Sebastian Wagner
> https://twitter.com/#!/dead_lock
> http://www.webbase-design.de
> http://www.wagner-sebastian.com
> seba.wagner@gmail.com
>



-- 
WBR
Maxim aka solomax

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by "seba.wagner@gmail.com" <se...@gmail.com>.
Okay nevermind, I read the commit history, it has nothing todo with the
OAuth changes.

Thanks,
Sebastian


2013/8/11 seba.wagner@gmail.com <se...@gmail.com>

> Why is the table name now "om_user" instead of "user" ?
>
> Sebastian
>
>
> 2013/8/8 Artyom Horuzhenko <ak...@gmail.com>
>
>> Ok, I'll do it
>>
>>
>> 2013/8/8 Maxim Solodovnik <so...@gmail.com>
>>
>> > Yes
>> >
>> > On Thursday, August 8, 2013, Artyom Horuzhenko wrote:
>> >
>> > > Do you mean backup and restore?
>> > >
>> > >
>> > > 2013/8/8 Maxim Solodovnik <so...@gmail.com>
>> > >
>> > > > I believe this new entities should be added to import/export
>> > > >
>> > > > On Thursday, August 8, 2013, wrote:
>> > > >
>> > > > > Author: a_horuzhenko
>> > > > > Date: Thu Aug  8 10:22:08 2013
>> > > > > New Revision: 1511672
>> > > > >
>> > > > > URL: http://svn.apache.org/r1511672
>> > > > > Log:
>> > > > > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
>> > > > >
>> > > > > Added:
>> > > > >
>> > > >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
>> > > > > Modified:
>> > > > >
>> > > > >
>> > > >
>> > >
>> >
>> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> > > > >
>> 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/czech.xml
>> > > > >
>> openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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
>> > >
>> >
>> >
>> > --
>> > WBR
>> > Maxim aka solomax
>> >
>>
>
>
>
> --
> Sebastian Wagner
> https://twitter.com/#!/dead_lock
> http://www.webbase-design.de
> http://www.wagner-sebastian.com
> seba.wagner@gmail.com
>



-- 
Sebastian Wagner
https://twitter.com/#!/dead_lock
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by "seba.wagner@gmail.com" <se...@gmail.com>.
Why is the table name now "om_user" instead of "user" ?

Sebastian


2013/8/8 Artyom Horuzhenko <ak...@gmail.com>

> Ok, I'll do it
>
>
> 2013/8/8 Maxim Solodovnik <so...@gmail.com>
>
> > Yes
> >
> > On Thursday, August 8, 2013, Artyom Horuzhenko wrote:
> >
> > > Do you mean backup and restore?
> > >
> > >
> > > 2013/8/8 Maxim Solodovnik <so...@gmail.com>
> > >
> > > > I believe this new entities should be added to import/export
> > > >
> > > > On Thursday, August 8, 2013, wrote:
> > > >
> > > > > Author: a_horuzhenko
> > > > > Date: Thu Aug  8 10:22:08 2013
> > > > > New Revision: 1511672
> > > > >
> > > > > URL: http://svn.apache.org/r1511672
> > > > > Log:
> > > > > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
> > > > >
> > > > > Added:
> > > > >
> > > >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> > > > > Modified:
> > > > >
> > > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > > > >     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/czech.xml
> > > > >     openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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
> > >
> >
> >
> > --
> > WBR
> > Maxim aka solomax
> >
>



-- 
Sebastian Wagner
https://twitter.com/#!/dead_lock
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by Artyom Horuzhenko <ak...@gmail.com>.
Ok, I'll do it


2013/8/8 Maxim Solodovnik <so...@gmail.com>

> Yes
>
> On Thursday, August 8, 2013, Artyom Horuzhenko wrote:
>
> > Do you mean backup and restore?
> >
> >
> > 2013/8/8 Maxim Solodovnik <so...@gmail.com>
> >
> > > I believe this new entities should be added to import/export
> > >
> > > On Thursday, August 8, 2013, wrote:
> > >
> > > > Author: a_horuzhenko
> > > > Date: Thu Aug  8 10:22:08 2013
> > > > New Revision: 1511672
> > > >
> > > > URL: http://svn.apache.org/r1511672
> > > > Log:
> > > > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
> > > >
> > > > Added:
> > > >
> > > openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> > > > Modified:
> > > >
> > > >
> > >
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > > >     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/czech.xml
> > > >     openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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
> >
>
>
> --
> WBR
> Maxim aka solomax
>

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by Maxim Solodovnik <so...@gmail.com>.
Yes

On Thursday, August 8, 2013, Artyom Horuzhenko wrote:

> Do you mean backup and restore?
>
>
> 2013/8/8 Maxim Solodovnik <so...@gmail.com>
>
> > I believe this new entities should be added to import/export
> >
> > On Thursday, August 8, 2013, wrote:
> >
> > > Author: a_horuzhenko
> > > Date: Thu Aug  8 10:22:08 2013
> > > New Revision: 1511672
> > >
> > > URL: http://svn.apache.org/r1511672
> > > Log:
> > > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
> > >
> > > Added:
> > >
> > openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> > > Modified:
> > >
> > >
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > >     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/czech.xml
> > >     openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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
>


-- 
WBR
Maxim aka solomax

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by Artyom Horuzhenko <ak...@gmail.com>.
Do you mean backup and restore?


2013/8/8 Maxim Solodovnik <so...@gmail.com>

> I believe this new entities should be added to import/export
>
> On Thursday, August 8, 2013, wrote:
>
> > Author: a_horuzhenko
> > Date: Thu Aug  8 10:22:08 2013
> > New Revision: 1511672
> >
> > URL: http://svn.apache.org/r1511672
> > Log:
> > [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
> >
> > Added:
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> > Modified:
> >
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >     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/czech.xml
> >     openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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/META-INF/db2_persistence.xml
> >     openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
> >     openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> >     openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
> >     openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
> >
> >
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
> >
> > Modified:
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > URL:
> >
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > (original)
> > +++
> >
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> > Thu Aug  8 10:22:08 2013
> > @@ -284,6 +284,7 @@
> >         <bean id="chatDao"
> > class="org.apache.openmeetings.data.chat.ChatDao" />
> >         <bean id="clientDao"
> > class="org.apache.openmeetings.data.conference.dao.ClientDao" />
> >         <bean id="mailMessageDao"
> > class="org.apache.openmeetings.data.basic.dao.MailMessageDao" />
> > +       <bean id="oauth2Dao"
> > class="org.apache.openmeetings.data.oauth.OAuth2Dao" />
> >
> >         <!-- No Interface -->
> >         <bean id="manageCryptStyle"
> > class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />
> >
> > Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> > URL:
> >
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
> >
> >
> ==============================================================================
> > --- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> > (original)
> > +++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu
> > Aug  8 10:22:08 2013
> > @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
> >    <string id="1570" name="remindertype_iCal_email">
> >      <value>iCal email</value>
> >    </string>
> > +  <string id="1571" name="oauth2">
> > +    <value>OAuth2</value>
> > +  </string>
> > +  <string id="1572" name="oauth2">
> > +    <value>Manage OAuth2 configurations</value>
> > +  </string>
> > +  <string id="1573" name="oauth2">
> > +    <value>Name</value>
> > +  </string>
> > +  <string id="1574" name="oauth2">
> > +    <value>Enabled</value>
> > +  </string>
> > +  <string id="1575" name="oauth2">
> > +    <value>Icon URL</value>
> > +  </string>
> > +  <string id="1576" name="oauth2">
> > +    <value>client_id</value>
> > +  </string>
> > +  <string id="1577" name="oauth2">
> > +    <value>client_secret</value>
> > +  </string>
> > +  <string id="1578" name="oauth2">
> > +    <value>Request key URL</value>
> > +  </string>
> > +  <string id="1579" name="oauth2">
> > +    <value>Request token URL</value>
> > +  </string>
> > +  <string id="1580" name="oauth2">
> > +    <value>Request info URL</value>
> > +  </string>
> > +  <string id="1581" name="oauth2">
> > +    <value>OAuth2 config</value>
> > +  </string>
> > +  <string id="1582" name="oauth2">
> > +    <value>Login param name</value>
> > +  </string>
> > +  <string id="1583" name="oauth2">
> > +    <value>Email param name</value>
> > +  </string>
> > +  <string id="1584" name="oauth2">
> > +    <value>Firstname param name</value>
> > +  </string>
> > +  <string id="1585" name="oauth2">
> > +    <value>Lastname param name</value>
> > +  </string>
> > +  <string id="1586" name="oauth2">
> > +    <value>Request token attributes</value>
> > +  </string>
> > +  <string id="1587" name="oauth2">
> > +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
> >
> >
> ==============================================================================
> > --- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> > (original)
> > +++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> Thu
> > Aug  8 10:22:08 2013
> > @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
> >    <string id="1570" name="remindertype_iCal_email">
> >      <value>iCal email</value>
> >    </string>
> > +  <string id="1571" name="oauth2">
> > +    <value>OAuth2</value>
> > +  </string>
> > +  <string id="1572" name="oauth2">
> > +    <value>Manage OAuth2 configurations</value>
> > +  </string>
> > +  <string id="1573" name="oauth2">
> > +    <value>Name</value>
> > +  </string>
> > +  <string id="1574" name="oauth2">
> > +    <value>Enabled</value>
> > +  </string>
> > +  <string id="1575" name="oauth2">
> > +    <value>Icon URL</value>
> > +  </string>
> > +  <string id="1576" name="oauth2">
> > +    <value>client_id</value>
> > +  </string>
> > +  <string id="1577" name="oauth2">
> > +    <value>client_secret</value>
> > +  </string>
> > +  <string id="1578" name="oauth2">
> > +    <value>Request key URL</value>
> > +  </string>
> > +  <string id="1579" name="oauth2">
> > +    <value>Request token URL</value>
> > +  </string>
> > +  <string id="1580" name="oauth2">
> > +    <value>Request info URL</value>
> > +  </string>
> > +  <string id="1581" name="oauth2">
> > +    <value>OAuth2 config</value>
> > +  </string>
> > +  <string id="1582" name="oauth2">
> > +    <value>Login param name</value>
> > +  </string>
> > +  <string id="1583" name="oauth2">
> > +    <value>Email param name</value>
> > +  </string>
> > +  <string id="1584" name="oauth2">
> > +    <value>Firstname param name</value>
> > +  </string>
> > +  <string id="1585" name="oauth2">
> > +    <value>Lastname param name</value>
> > +  </string>
> > +  <string id="1586" name="oauth2">
> > +    <value>Request token attributes</value>
> > +  </string>
> > +  <string id="1587" name="oauth2">
> > +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
> >
> >
> ==============================================================================
> > --- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> > (original)
> > +++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu
> > Aug  8 10:22:08 2013
> > @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
> >    <string id="1570" name="remindertype_iCal_email">
> >      <value>iCal email</value>
> >    </string>
> > +  <string id="1571" name="oauth2">
> > +    <value>OAuth2</value>
> > +  </string>
> > +  <string id="1572" name="oauth2">
> > +    <value>Manage OAuth2 configurations</value>
> > +  </string>
> > +  <string id="1573" name="oauth2">
> > +    <value>Name</value>
> > +  </string>
> > +  <string id="1574" name="oauth2">
> > +    <value>Enabled</value>
> > +  </string>
> > +  <string id="1575" name="oauth2">
> > +    <value>Icon URL</value>
> > +  </string>
> > +  <string id="1576" name="oauth2">
> > +    <value>client_id</value>
> > +  </string>
> > +  <string id="1577" name="oauth2">
> > +    <value>client_secret</value>
> > +  </string>
> > +  <string id="1578" name="oauth2">
> > +    <value>Request key URL</value>
> > +  </string>
> > +  <string id="1579" name="oauth2">
> > +    <value>Request token URL</value>
> > +  </string>
> > +  <string id="1580" name="oauth2">
> > +    <value>Request info URL</value>
> > +  </string>
> > +  <string id="1581" name="oauth2">
> > +    <value>OAuth2 config</value>
> > +  </string>
> > +  <string id="1582" name="oauth2">
> > +    <value>Login param name</value>
> > +  </string>
> > +  <string id="1583" name="oauth2">
> > +    <value>Email param name</value>
> > +  </string>
> > +  <string id="1584" name="oauth2">
> > +    <value>Firstname param name</value>
> > +  </string>
> > +  <string id="1585" name="oauth2">
> > +    <value>Lastname param name</value>
> > +  </string>
> > +  <string id="1586" name="oauth2">
> > +    <value>Request token attributes</value>
> > +  </string>
> > +  <string id="1587" name="oauth2">
> > +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
> >
> >
> ==============================================================================
> > --- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> > (original)
> > +++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu
> Aug
> >  8 10:22:08 2013
> > @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
> >    <string id="1570" name="remindertype_iCal_email">
> >      <value>iCal email</value>
> >    </string>
> > +  <string id="1571" name="oauth2">
> > +    <value>OAuth2</value
>
>
>
> --
> WBR
> Maxim aka solomax
>

Re: svn commit: r1511672 [1/2] - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/languages/ src/META-INF/ src/org/apache/openmeetings/data/oauth/ src/org/apache/openmeetings/installation/ src/org/apache/openmeetings/persistence/beans/us...

Posted by Maxim Solodovnik <so...@gmail.com>.
I believe this new entities should be added to import/export

On Thursday, August 8, 2013, wrote:

> Author: a_horuzhenko
> Date: Thu Aug  8 10:22:08 2013
> New Revision: 1511672
>
> URL: http://svn.apache.org/r1511672
> Log:
> [OPENMEETINGS-740] Basic login via OAuth2 has been implemented.
>
> Added:
>     openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/oauth/OAuth2Dao.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
> Modified:
>
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>     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/czech.xml
>     openmeetings/trunk/singlewebapp/WebContent/languages/danish.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.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/META-INF/db2_persistence.xml
>     openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
>     openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>     openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
>     openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
>
> Modified:
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> (original)
> +++
> openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> Thu Aug  8 10:22:08 2013
> @@ -284,6 +284,7 @@
>         <bean id="chatDao"
> class="org.apache.openmeetings.data.chat.ChatDao" />
>         <bean id="clientDao"
> class="org.apache.openmeetings.data.conference.dao.ClientDao" />
>         <bean id="mailMessageDao"
> class="org.apache.openmeetings.data.basic.dao.MailMessageDao" />
> +       <bean id="oauth2Dao"
> class="org.apache.openmeetings.data.oauth.OAuth2Dao" />
>
>         <!-- No Interface -->
>         <bean id="manageCryptStyle"
> class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />
>
> Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1511672&r1=1511671&r2=1511672&view=diff
>
> ==============================================================================
> --- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> (original)
> +++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu
> Aug  8 10:22:08 2013
> @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
>    <string id="1570" name="remindertype_iCal_email">
>      <value>iCal email</value>
>    </string>
> +  <string id="1571" name="oauth2">
> +    <value>OAuth2</value>
> +  </string>
> +  <string id="1572" name="oauth2">
> +    <value>Manage OAuth2 configurations</value>
> +  </string>
> +  <string id="1573" name="oauth2">
> +    <value>Name</value>
> +  </string>
> +  <string id="1574" name="oauth2">
> +    <value>Enabled</value>
> +  </string>
> +  <string id="1575" name="oauth2">
> +    <value>Icon URL</value>
> +  </string>
> +  <string id="1576" name="oauth2">
> +    <value>client_id</value>
> +  </string>
> +  <string id="1577" name="oauth2">
> +    <value>client_secret</value>
> +  </string>
> +  <string id="1578" name="oauth2">
> +    <value>Request key URL</value>
> +  </string>
> +  <string id="1579" name="oauth2">
> +    <value>Request token URL</value>
> +  </string>
> +  <string id="1580" name="oauth2">
> +    <value>Request info URL</value>
> +  </string>
> +  <string id="1581" name="oauth2">
> +    <value>OAuth2 config</value>
> +  </string>
> +  <string id="1582" name="oauth2">
> +    <value>Login param name</value>
> +  </string>
> +  <string id="1583" name="oauth2">
> +    <value>Email param name</value>
> +  </string>
> +  <string id="1584" name="oauth2">
> +    <value>Firstname param name</value>
> +  </string>
> +  <string id="1585" name="oauth2">
> +    <value>Lastname param name</value>
> +  </string>
> +  <string id="1586" name="oauth2">
> +    <value>Request token attributes</value>
> +  </string>
> +  <string id="1587" name="oauth2">
> +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
>
> ==============================================================================
> --- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> (original)
> +++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu
> Aug  8 10:22:08 2013
> @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
>    <string id="1570" name="remindertype_iCal_email">
>      <value>iCal email</value>
>    </string>
> +  <string id="1571" name="oauth2">
> +    <value>OAuth2</value>
> +  </string>
> +  <string id="1572" name="oauth2">
> +    <value>Manage OAuth2 configurations</value>
> +  </string>
> +  <string id="1573" name="oauth2">
> +    <value>Name</value>
> +  </string>
> +  <string id="1574" name="oauth2">
> +    <value>Enabled</value>
> +  </string>
> +  <string id="1575" name="oauth2">
> +    <value>Icon URL</value>
> +  </string>
> +  <string id="1576" name="oauth2">
> +    <value>client_id</value>
> +  </string>
> +  <string id="1577" name="oauth2">
> +    <value>client_secret</value>
> +  </string>
> +  <string id="1578" name="oauth2">
> +    <value>Request key URL</value>
> +  </string>
> +  <string id="1579" name="oauth2">
> +    <value>Request token URL</value>
> +  </string>
> +  <string id="1580" name="oauth2">
> +    <value>Request info URL</value>
> +  </string>
> +  <string id="1581" name="oauth2">
> +    <value>OAuth2 config</value>
> +  </string>
> +  <string id="1582" name="oauth2">
> +    <value>Login param name</value>
> +  </string>
> +  <string id="1583" name="oauth2">
> +    <value>Email param name</value>
> +  </string>
> +  <string id="1584" name="oauth2">
> +    <value>Firstname param name</value>
> +  </string>
> +  <string id="1585" name="oauth2">
> +    <value>Lastname param name</value>
> +  </string>
> +  <string id="1586" name="oauth2">
> +    <value>Request token attributes</value>
> +  </string>
> +  <string id="1587" name="oauth2">
> +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
>
> ==============================================================================
> --- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> (original)
> +++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu
> Aug  8 10:22:08 2013
> @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
>    <string id="1570" name="remindertype_iCal_email">
>      <value>iCal email</value>
>    </string>
> +  <string id="1571" name="oauth2">
> +    <value>OAuth2</value>
> +  </string>
> +  <string id="1572" name="oauth2">
> +    <value>Manage OAuth2 configurations</value>
> +  </string>
> +  <string id="1573" name="oauth2">
> +    <value>Name</value>
> +  </string>
> +  <string id="1574" name="oauth2">
> +    <value>Enabled</value>
> +  </string>
> +  <string id="1575" name="oauth2">
> +    <value>Icon URL</value>
> +  </string>
> +  <string id="1576" name="oauth2">
> +    <value>client_id</value>
> +  </string>
> +  <string id="1577" name="oauth2">
> +    <value>client_secret</value>
> +  </string>
> +  <string id="1578" name="oauth2">
> +    <value>Request key URL</value>
> +  </string>
> +  <string id="1579" name="oauth2">
> +    <value>Request token URL</value>
> +  </string>
> +  <string id="1580" name="oauth2">
> +    <value>Request info URL</value>
> +  </string>
> +  <string id="1581" name="oauth2">
> +    <value>OAuth2 config</value>
> +  </string>
> +  <string id="1582" name="oauth2">
> +    <value>Login param name</value>
> +  </string>
> +  <string id="1583" name="oauth2">
> +    <value>Email param name</value>
> +  </string>
> +  <string id="1584" name="oauth2">
> +    <value>Firstname param name</value>
> +  </string>
> +  <string id="1585" name="oauth2">
> +    <value>Lastname param name</value>
> +  </string>
> +  <string id="1586" name="oauth2">
> +    <value>Request token attributes</value>
> +  </string>
> +  <string id="1587" name="oauth2">
> +    <value>Redirect uri</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=1511672&r1=1511671&r2=1511672&view=diff
>
> ==============================================================================
> --- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> (original)
> +++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Aug
>  8 10:22:08 2013
> @@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
>    <string id="1570" name="remindertype_iCal_email">
>      <value>iCal email</value>
>    </string>
> +  <string id="1571" name="oauth2">
> +    <value>OAuth2</value



-- 
WBR
Maxim aka solomax