You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/11/10 03:59:28 UTC

svn commit: r1713575 [7/7] - in /openmeetings: branches/3.1.x/ branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ branches/3.1.x/ope...

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Informazione: Ogni utente connesso riceve un messaggio con il nuovo sondaggio.</entry>
   <entry key="24">Crea un sondaggio</entry>
   <entry key="25">Cancella</entry>
-  <entry key="26">Si/No</entry>
-  <entry key="27">Numerico 1-10</entry>
   <entry key="28">Sondaggio</entry>
   <entry key="29">Devi essere moderatore per creare una domanda</entry>
   <entry key="30">Il tuo voto è stato registrato.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Errore</entry>
   <entry key="error.type.info">Messaggio</entry>
+  <entry key="poll.type.yesNo">Si/No</entry>
+  <entry key="poll.type.numeric">Numerico 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">ヒント: 接続中の全参加者に対して、投票を促すメッセージを送信します</entry>
   <entry key="24">投票の作成</entry>
   <entry key="25">キャンセル</entry>
-  <entry key="26">はい/いいえ</entry>
-  <entry key="27">1～10の数字</entry>
   <entry key="28">投票</entry>
   <entry key="29">質問を作成するには司会者になる必要があります</entry>
   <entry key="30">投票が登録されました</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">教授</entry>
   <entry key="error.type.error">エラー</entry>
   <entry key="error.type.info">メッセージ</entry>
+  <entry key="poll.type.yesNo">はい/いいえ</entry>
+  <entry key="poll.type.numeric">1～10の数字</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Each connected user receives a message with the new poll.</entry>
   <entry key="24">선거를 만드셨습니다.</entry>
   <entry key="25">무효</entry>
-  <entry key="26">네/아니오</entry>
-  <entry key="27">숫자 1-10</entry>
   <entry key="28">투표</entry>
   <entry key="29">질문을 만들기 위해서 의장이 되어야합니다.</entry>
   <entry key="30">당신의 투표가 등록 되었습니다.</entry>
@@ -280,6 +278,8 @@
   <entry key="258">Go to last Page</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
+  <entry key="261">Mr.</entry>
+  <entry key="262">Ms.</entry>
   <entry key="263">Configuration</entry>
   <entry key="264">ID</entry>
   <entry key="265">Key</entry>
@@ -1869,4 +1869,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Error</entry>
   <entry key="error.type.info">Message</entry>
+  <entry key="poll.type.yesNo">네/아니오</entry>
+  <entry key="poll.type.numeric">숫자 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Informatie: Iedere gebruiker krijgt een bericht over de stembus.</entry>
   <entry key="24">Stembus aanmaken</entry>
   <entry key="25">Annuleren</entry>
-  <entry key="26">Ja/Nee</entry>
-  <entry key="27">Getal 1-10</entry>
   <entry key="28">Stembus</entry>
   <entry key="29">Je moet een organisator zijn om een vraag aan te maken</entry>
   <entry key="30">Jouw stem is geregistreerd.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Foutmelding</entry>
   <entry key="error.type.info">Bericht</entry>
+  <entry key="poll.type.yesNo">Ja/Nee</entry>
+  <entry key="poll.type.numeric">Getal 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Uwaga: Każdy połączony użytkownik otrzyma wiadomość z nowym głosowaniem.</entry>
   <entry key="24">Utwórz głosowanie.</entry>
   <entry key="25">Anuluj</entry>
-  <entry key="26">Tak/Nie</entry>
-  <entry key="27">Liczba 1-10</entry>
   <entry key="28">Głosowanie</entry>
   <entry key="29">Musisz być moderatorem aby utworzyć pytanie</entry>
   <entry key="30">Twój głos został zarejestrowany.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Informacja</entry>
   <entry key="error.type.info">Błąd</entry>
+  <entry key="poll.type.yesNo">Tak/Nie</entry>
+  <entry key="poll.type.numeric">Liczba 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Cada usuário conectado recebe uma menssagem com a nova enquete.</entry>
   <entry key="24">Criar uma enquete</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sim/Não</entry>
-  <entry key="27">Numérico 1-10</entry>
   <entry key="28">Enquete</entry>
   <entry key="29">Eles podem ser moderadores/professores nessa área de enquetes</entry>
   <entry key="30">Seu voto foi registrado.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Erro</entry>
   <entry key="error.type.info">Mensagem</entry>
+  <entry key="poll.type.yesNo">Sim/Não</entry>
+  <entry key="poll.type.numeric">Numérico 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Cada usuário conectado recebe uma menssagem com a nova enquete.</entry>
   <entry key="24">Criar uma enquete</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sim/Não</entry>
-  <entry key="27">Numérico 1-10</entry>
   <entry key="28">Enquete</entry>
   <entry key="29">Eles podem ser moderadores/professores nessa área de enquetes</entry>
   <entry key="30">Seu voto foi registrado.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Erro</entry>
   <entry key="error.type.info">Mensagem</entry>
+  <entry key="poll.type.yesNo">Sim/Não</entry>
+  <entry key="poll.type.numeric">Numérico 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Информация: каждый подключённый участник получает сообщение с новым опросом.</entry>
   <entry key="24">Создать опрос</entry>
   <entry key="25">Отменить</entry>
-  <entry key="26">Да/Нет</entry>
-  <entry key="27">Число 1 - 10</entry>
   <entry key="28">Опрос</entry>
   <entry key="29">Для создания опроса Вы должны быть модератором/лектором в этой комнате.</entry>
   <entry key="30">Вы проголосовали.</entry>
@@ -1882,4 +1880,6 @@
   <entry key="user.salutation.prof">Проф-р</entry>
   <entry key="error.type.error">Ошибка</entry>
   <entry key="error.type.info">Сообщение</entry>
+  <entry key="poll.type.yesNo">Да/Нет</entry>
+  <entry key="poll.type.numeric">Число 1 - 10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Všetci pripojení používatelia prijímajú správu s novým hlasovaním</entry>
   <entry key="24">Vytvoriť hlasovanie</entry>
   <entry key="25">Zrušiť</entry>
-  <entry key="26">Áno/Nie</entry>
-  <entry key="27">Čísla 1-10</entry>
   <entry key="28">Hlasovanie</entry>
   <entry key="29">Musíte byť moderátor pre vytvorenie otázky</entry>
   <entry key="30">Váš hlas bol zaznamenaný</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Chyba</entry>
   <entry key="error.type.info">Správa</entry>
+  <entry key="poll.type.yesNo">Áno/Nie</entry>
+  <entry key="poll.type.numeric">Čísla 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Varje ansluten användare får ett meddelande med den nya röstningen.</entry>
   <entry key="24">Skapa en omröstning</entry>
   <entry key="25">Avbryt</entry>
-  <entry key="26">Ja/Nej</entry>
-  <entry key="27">Numerisk 1-10</entry>
   <entry key="28">Röst</entry>
   <entry key="29">Du måste vara Moderator för att skapa en omröstning</entry>
   <entry key="30">Din röst är accepterad</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Bearbetar</entry>
   <entry key="error.type.info">Meddelande</entry>
+  <entry key="poll.type.yesNo">Ja/Nej</entry>
+  <entry key="poll.type.numeric">Numerisk 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">ข้อมูล: ผู้ใช้ที่เชื่อมต่ออยู่แต่ละรายได้รับข้อความพร้อมด้วยโพลล์ใหม่</entry>
   <entry key="24">จัดทำโพลล์</entry>
   <entry key="25">ยกเลิก</entry>
-  <entry key="26">ใช่/ไม่</entry>
-  <entry key="27">เลข 1-10</entry>
   <entry key="28">โพลล์</entry>
   <entry key="29">ต้องเป็นผู้ดำเนินรายการจึงจะตั้งคำถามได้</entry>
   <entry key="30">การโหวตของคุณได้รับการลงทะเบียนแล้ว</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">ขัดข้อง</entry>
   <entry key="error.type.info">ข้อความ</entry>
+  <entry key="poll.type.yesNo">ใช่/ไม่</entry>
+  <entry key="poll.type.numeric">เลข 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Bilgi: Bağlı her kullanıcı yeni anketle ilgili bir mesaj alır.</entry>
   <entry key="24">Bir anket yarat</entry>
   <entry key="25">Ä°ptal</entry>
-  <entry key="26">Evet/Hayır</entry>
-  <entry key="27">Sayısal 1-10</entry>
   <entry key="28">Anket</entry>
   <entry key="29">Soru oluşturabilmek için Düzenleyici olmanız gerekmekte</entry>
   <entry key="30">Oyunuz kaydedildi.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Hata</entry>
   <entry key="error.type.info">Mesaj</entry>
+  <entry key="poll.type.yesNo">Evet/Hayır</entry>
+  <entry key="poll.type.numeric">Sayısal 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Інформація: кожен пов'язани користувач отримує повідомлення з новим опитуванням</entry>
   <entry key="24">Створити опитування</entry>
   <entry key="25">Відмінити</entry>
-  <entry key="26">Так/Ні</entry>
-  <entry key="27">В числовому порядку 1-10</entry>
   <entry key="28">Опитування</entry>
   <entry key="29">Для створення опитування Ви повинні бути модератором/інструктором даної кімнати.</entry>
   <entry key="30">Ви проголосували.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">Помилка</entry>
   <entry key="error.type.info">Повідомлення</entry>
+  <entry key="poll.type.yesNo">Так/Ні</entry>
+  <entry key="poll.type.numeric">В числовому порядку 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">提示:每个连接用户将收到一个新投票的消息提示.</entry>
   <entry key="24">创建投票</entry>
   <entry key="25">取消</entry>
-  <entry key="26">是/否</entry>
-  <entry key="27">数字 1-10</entry>
   <entry key="28">投票</entry>
   <entry key="29">主持人才能提问</entry>
   <entry key="30">已您的投票.</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">教授</entry>
   <entry key="error.type.error">错误</entry>
   <entry key="error.type.info">消息</entry>
+  <entry key="poll.type.yesNo">是/否</entry>
+  <entry key="poll.type.numeric">数字 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">信息:每個接入用戶收到新的民意信息</entry>
   <entry key="24">創造一個新的民調</entry>
   <entry key="25">取诮</entry>
-  <entry key="26">是/否</entry>
-  <entry key="27">數字的 1-10</entry>
   <entry key="28">民調</entry>
   <entry key="29">必須是主持人能提出問題</entry>
   <entry key="30">你的投票己登記</entry>
@@ -1869,4 +1867,6 @@
   <entry key="user.salutation.prof">Prof</entry>
   <entry key="error.type.error">錯误</entry>
   <entry key="error.type.info">訊息</entry>
+  <entry key="poll.type.yesNo">是/否</entry>
+  <entry key="poll.type.numeric">數字的 1-10</entry>
 </properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.web.app;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -31,7 +30,7 @@ import org.apache.wicket.protocol.ws.api
  * @author solomax
  *
  */
-public class Client implements IDataProviderEntity, Serializable {
+public class Client implements IDataProviderEntity {
 	private static final long serialVersionUID = 1L;
 
 	public enum Right {
@@ -140,13 +139,10 @@ public class Client implements IDataProv
 
 	@Override
 	public Long getId() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public void setId(Long id) {
-		// TODO Auto-generated method stub
-		
 	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Tue Nov 10 02:59:26 2015
@@ -191,6 +191,7 @@ public class GeneralUserForm extends For
 	public String getEmail() {
 		return email.getValue();
 	}
+
 	@Override
 	protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
 		return new PanelMarkupSourcingStrategy(false);

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java Tue Nov 10 02:59:26 2015
@@ -29,7 +29,6 @@ public abstract class BaseNotInitedPage
 	private static final long serialVersionUID = 1L;
 	private static final InstallationConfig installCfg = new InstallationConfig(); 
 
-
 	@Override
 	protected String getApplicationName() {
 		return installCfg.appName;

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java Tue Nov 10 02:59:26 2015
@@ -62,7 +62,7 @@ public class KickMessageDialog extends A
 	}
 
 	@Override
-	public void onClose(IPartialPageRequestHandler arg0, DialogButton arg1) {
+	public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
 		WebSession.setKickedByAdmin(false);
 		Application.get().restartResponseAtSignInPage();
 	}

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Tue Nov 10 02:59:26 2015
@@ -27,16 +27,15 @@ import java.util.List;
 import org.apache.openmeetings.db.dao.room.PollDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.room.PollType;
 import org.apache.openmeetings.db.entity.room.RoomPoll;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.room.RoomPanel;
 import org.apache.openmeetings.web.room.message.RoomMessage;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.model.CompoundPropertyModel;
@@ -67,7 +66,7 @@ public class CreatePollDialog extends Ab
 		User u = getBean(UserDao.class).get(getUserId());
 		p.setCreator(u);
 		p.setRoom(getBean(RoomDao.class).get(roomId));
-		p.setType(getBean(PollDao.class).getTypes().get(0));
+		p.setType(RoomPoll.Type.yesNo);
 		form.setModelObject(p);
 		target.add(form);
 	}
@@ -106,28 +105,18 @@ public class CreatePollDialog extends Ab
 			super(id, model);
 			add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410))));
 			add(new TextArea<String>("question"));
-			add(new DropDownChoice<PollType>("type", getBean(PollDao.class).getTypes()
-					, new IChoiceRenderer<PollType>() {
+			add(new DropDownChoice<RoomPoll.Type>("type", Arrays.asList(RoomPoll.Type.values())
+					, new ChoiceRenderer<RoomPoll.Type>() {
 						private static final long serialVersionUID = 1L;
 
 						@Override
-						public Object getDisplayValue(PollType pt) {
-							return getString("" + pt.getLabelId());
+						public Object getDisplayValue(RoomPoll.Type pt) {
+							return getString("poll.type." + pt.name());
 						}
 
 						@Override
-						public String getIdValue(PollType pt, int index) {
-							return "" + pt.getId();
-						}
-
-						@Override
-						public PollType getObject(String id, IModel<? extends List<? extends PollType>> choices) {
-							for (PollType pt : choices.getObject()) {
-								if (getIdValue(pt, -1).equals(id)) {
-									return pt;
-								}
-							}
-							return null;
+						public String getIdValue(RoomPoll.Type pt, int index) {
+							return pt.name();
 						}
 					})
 					.setRequired(true).setLabel(Model.of(Application.getString(21))));

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Tue Nov 10 02:59:26 2015
@@ -201,7 +201,7 @@ public class PollResultsDialog extends A
     }
     
     private String[] getTicks(RoomPoll p) {
-		return p != null && p.getType().isNumeric()
+		return p != null && RoomPoll.Type.numeric == p.getType()
 				? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}
 				: new String[] {Application.getString(34), Application.getString(35)};
     }
@@ -215,8 +215,8 @@ public class PollResultsDialog extends A
 	}
 	
 	private Integer[] getValues(RoomPoll p) {
-		Integer[] values = initValues(p != null && p.getType().isNumeric() ? 10 : 2);
-		if (p != null && p.getType().isNumeric()) {
+		Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2);
+		if (p != null && RoomPoll.Type.numeric == p.getType()) {
 			for (RoomPollAnswer a : p.getAnswers()) {
 				values[a.getPointList() - 1] ++;
 			}
@@ -309,7 +309,7 @@ public class PollResultsDialog extends A
 
 		public void updateModel(IPartialPageRequestHandler handler) {
 			List<RoomPoll> list = new ArrayList<RoomPoll>();
-			RoomPoll p = getBean(PollDao.class).getPoll(roomId);
+			RoomPoll p = getBean(PollDao.class).getByRoom(roomId);
 			if (p != null) {
 				list.add(p);
 			}

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Tue Nov 10 02:59:26 2015
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.apache.openmeetings.db.dao.room.PollDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.RoomPoll;
 import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.web.app.Application;
@@ -75,12 +76,12 @@ public class VoteDialog extends Abstract
 	
 	public void updateModel(IPartialPageRequestHandler target) {
 		RoomPollAnswer a = new RoomPollAnswer();
-		a.setRoomPoll(getBean(PollDao.class).getPoll(roomId));
+		a.setRoomPoll(getBean(PollDao.class).getByRoom(roomId));
 		User u = getBean(UserDao.class).get(getUserId());
 		a.setVotedUser(u);
 		user.setObject(getName(a.getRoomPoll().getCreator()));
 		form.setModelObject(a);
-		boolean typeNum = a.getRoomPoll() != null && a.getRoomPoll().getType() != null && a.getRoomPoll().getType().isNumeric();
+		boolean typeNum = a.getRoomPoll() != null && RoomPoll.Type.numeric == a.getRoomPoll().getType();
 		form.typeBool.setVisible(!typeNum);
 		form.typeInt.setVisible(typeNum);
 		target.add(form);

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Nov 10 02:59:26 2015
@@ -324,7 +324,7 @@ public class AppointmentDialog extends A
 								}
 							}
 							return null;
-						} //new ChoiceRenderer<AppointmentReminderType>("label.value", "id")
+						}
 					}));
 			
 			add(roomType.setEnabled(createRoom).setOutputMarkupId(true));

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Tue Nov 10 02:59:26 2015
@@ -51,7 +51,7 @@ public class UserProfilePanel extends Us
 		add(new Label("regdate"));
 		add(new TextArea<String>("userOffers").setEnabled(false));
 		add(new TextArea<String>("userSearchs").setEnabled(false));
-		if (getUserId() == model.getObject().getId() || model.getObject().isShowContactData() 
+		if (getUserId() == model.getObject().getId() || model.getObject().isShowContactData()
 				|| (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId())))
 		{
 			addressDenied.setVisible(false);

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Tue Nov 10 02:59:26 2015
@@ -117,7 +117,6 @@ public abstract class RecordingResourceR
 							}
 						}
 					}
-						
 				} else {
 					rr.setError(HttpServletResponse.SC_NOT_FOUND);
 				}

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Tue Nov 10 02:59:26 2015
@@ -111,12 +111,12 @@ public class UserChoiceProvider implemen
 	}
 
 	@Override
-    public void toJson(User choice, JSONWriter writer) throws JSONException {
-    	writer
-    		.key("id").value(getId(choice))
-    		.key("text").value(FormatHelper.formatUser(choice, true))
-    		.key("contact").value(choice.getType() == Type.contact);
-    }
+	public void toJson(User choice, JSONWriter writer) throws JSONException {
+		writer
+			.key("id").value(getId(choice))
+			.key("text").value(FormatHelper.formatUser(choice, true))
+			.key("contact").value(choice.getType() == Type.contact);
+	}
 
 	@Override
 	public void detach() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -43,7 +43,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
@@ -75,8 +74,7 @@
 			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
 			<property name="openjpa.Log" value="DefaultLevel=WARN, Runtime=INFO" />
 			<property name="openjpa.DataCache" value="true" />
-			<!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
-			<property name="openjpa.QueryCache" value="false" />
+			<property name="openjpa.QueryCache" value="true" />
 			<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
 			<property name="openjpa.jdbc.QuerySQLCache" value="false" />
 		</properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
@@ -78,10 +77,9 @@
 					, Username=root
 					, Password=" />
 			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
-			<property name="openjpa.Log" value="DefaultLevel=WARN, Runtime=INFO" />
+			<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
 			<property name="openjpa.DataCache" value="true" />
-			<!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
-			<property name="openjpa.QueryCache" value="false" />
+			<property name="openjpa.QueryCache" value="true" />
 			<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
 			<property name="openjpa.jdbc.QuerySQLCache" value="false" />
 		</properties>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
 		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml Tue Nov 10 02:59:26 2015
@@ -91,7 +91,7 @@
         <param-name>parentContextKey</param-name>
         <param-value>default.context</param-value>
     </context-param>
-	
+    
     <!-- remove the following servlet tags if you want to disable remoting for this application -->
 	<servlet>
 		<servlet-name>spring-mvc</servlet-name>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg Tue Nov 10 02:59:26 2015
@@ -78,6 +78,7 @@ ldap_sync_password_to_om=true
 ldap_group_mode=NONE
 
 ldap_group_query=(&(memberUid=%s)(objectClass=posixGroup))
+
 # Ldap user attributes mapping
 # Set the following internal OM user attributes to their corresponding Ldap-attribute
 ldap_user_attr_lastname=sn

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Tue Nov 10 02:59:26 2015
@@ -58,16 +58,16 @@ public abstract class AbstractJUnitDefau
 	public void setUp() throws Exception {
 		super.setUp();
 		configurationDao.getCryptKey();
-        if (userDao.count() < 1) {
-            makeDefaultScheme();
-            log.info("Default scheme created successfully");
-        } else {
-            log.info("Default scheme already created");
-        }
+		if (userDao.count() < 1) {
+			makeDefaultScheme();
+			log.info("Default scheme created successfully");
+		} else {
+			log.info("Default scheme already created");
+		}
 		if (configKeyCryptClassName == null) {
 			assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
 		}
-    }
+	}
 
 	public Appointment createAppointment() {
 		Date appointmentstart = new Date();

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Tue Nov 10 02:59:26 2015
@@ -59,7 +59,7 @@ public class TestAppointmentAddAppointme
 		Boolean isDaily = false;
 		Long categoryId = 1L;
 		Boolean isWeekly = false;
-		Long remind = 3L;
+		String remind = Appointment.Reminder.ical.name();
 		Boolean isYearly = false;
 		String[] mmClient = new String[1];
 		for (int i = 0; i < 1; i++) {

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Tue Nov 10 02:59:26 2015
@@ -19,7 +19,6 @@
 package org.apache.openmeetings.test.calendar;
 
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
 import java.util.List;
 
 import org.apache.openmeetings.db.dao.user.UserDao;
@@ -34,7 +33,7 @@ public class TestDatabaseStructureUsersS
 	private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureUsersSearch.class, webAppRootKey);
 
 	@Autowired
-    private UserDao userDao;
+	private UserDao userDao;
 
 	@Test
 	public void testAddingGroup(){
@@ -47,3 +46,4 @@ public class TestDatabaseStructureUsersS
 		}
 	}
 }
+

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue Nov 10 02:59:26 2015
@@ -26,7 +26,7 @@
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
 	<artifactId>openmeetings-parent</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Openmeetings</name>
 	<description>TODO</description>