From 898fa1a930060c6450388991f0c8a9dd23bb0d24 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sun, 3 Jul 2011 12:17:58 -0700 Subject: [PATCH 1/4] Add configuration for nginx for breaking out API demos into their own package --- bbb-api-demo/demo.nginx | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 bbb-api-demo/demo.nginx diff --git a/bbb-api-demo/demo.nginx b/bbb-api-demo/demo.nginx new file mode 100644 index 0000000000..d072b6faea --- /dev/null +++ b/bbb-api-demo/demo.nginx @@ -0,0 +1,23 @@ + # Forward request to /demo to tomcat. This is for + # the BigBlueButton api demos. + location /demo { + proxy_pass http://127.0.0.1:8080; + proxy_redirect default; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + # Allow 30M uploaded presentation document. + client_max_body_size 30m; + client_body_buffer_size 128k; + + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + + proxy_buffer_size 4k; + proxy_buffers 4 32k; + proxy_busy_buffers_size 64k; + proxy_temp_file_write_size 64k; + + include fastcgi_params; + } + From 12fdbfb7f0a58f12d2bd20a11b39ae1cf50137f2 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Mon, 4 Jul 2011 10:45:07 -0700 Subject: [PATCH 2/4] removed bbb_api_conf.jsp as it will be auto generated from install scripts --- bbb-api-demo/src/main/webapp/bbb_api_conf.jsp | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 bbb-api-demo/src/main/webapp/bbb_api_conf.jsp diff --git a/bbb-api-demo/src/main/webapp/bbb_api_conf.jsp b/bbb-api-demo/src/main/webapp/bbb_api_conf.jsp deleted file mode 100755 index e2edb2c8eb..0000000000 --- a/bbb-api-demo/src/main/webapp/bbb_api_conf.jsp +++ /dev/null @@ -1,14 +0,0 @@ - -<%! -// This is the security salt that must match the value set in the BigBlueButton server -//String salt = "4951c2aea43e5af6d9598610b9e0b6c7"; -//String salt = "5e5ff0968546b8aaacce0462a99bca30"; -String salt = "c9181cea77a2f2a4c93a0e17d723b942"; -// This is the URL for the BigBlueButton server 4951c2aea43e5af6d9598610b9e0b6c7 -String BigBlueButtonURL = "http://192.168.0.104/bigbluebutton/"; -%> - - - - - From 3b4f871023502cc00cab4b18c6b1e55f2b252e34 Mon Sep 17 00:00:00 2001 From: Localization Server Date: Tue, 5 Jul 2011 16:00:03 +0000 Subject: [PATCH 3/4] Updating locale --- bigbluebutton-client/locale/pl_PL/bbbResources.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties index 52d2d27fa2..a349870b3d 100755 --- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties +++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties @@ -12,7 +12,7 @@ bbb.viewers.presentBtn.toolTip = Wybierz uczestnika, który poprowadzi prezentac bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip = Kliknij podwójnie, aby wyświetlić. bbb.highlighter.toolbar.undo = Cofnij bbb.desktopPublish.minimizeBtn.toolTip = Minimalizuj okno. -bbb.viewers.presentBtn.label = Przełącz Prezentera +bbb.viewers.presentBtn.label = Ustaw Prezentera bbb.viewers.kickUserBtn.toolTip = Usuń użytkownika bbb.listeners.ejectTooltip = Usuń użytkownika bbb.presentation.uploadcomplete = Wgrywanie na serwer zakończone. Konwertujemy dokument, proszę czekać. @@ -30,7 +30,7 @@ bbb.chat.cmpColorPicker.toolTip = Kolor tekstu bbb.listenerItem.muteUnmute.toolTip = Wycisz, lub cofnij wyciszenie słuchacza bbb.chat.chatOptions = Opcje czatu bbb.presentation.uploadwindow.closeLabel = Naciśnij OK aby zamknąć okno -bbb.viewers.title = Użytkownocy{0} {1} +bbb.viewers.title = Użytkownicy {0} {1} bbb.settings.flash.label = Błędna wersja Flash bbb.presentation.ok = OK bbb.mainToolbar.helpBtn = Pomoc @@ -56,7 +56,7 @@ bbb.presentation.error.convert.maxnbpagereach = Błąd: wgrany dokument ma zbyt bbb.desktopView.title = Współdzielenie pulpitu bbb.settings.java.label = Błąd wersji komponentu Java bbb.presentation.forwardBtn.toolTip = Następny slajd -bbb.settings.java.text = Zainstalowana wersja Javay to {0} . Do używania funkcji BigBlueButton Udostępniania Pulpitu wymagana wersja to {1} . Naciśnij przycisk znajdujący się poniżej, aby zainstalować najnowsza wersje Java JRE. +bbb.settings.java.text = Zainstalowana wersja Javy to {0} . Do używania funkcji BigBlueButton Udostępniania Pulpitu wymagana wersja to {1} . Naciśnij przycisk znajdujący się poniżej, aby zainstalować najnowsza wersje Java JRE. bbb.fileupload.genThumbText = Tworzę miniatury.. bbb.viewers.viewersGrid.statusItemRenderer = Status bbb.desktopPublish.title = Udostępnianie pulpitu: Podgląd prezentera From 313a21813b86e533302367a6534ae370e94a0f78 Mon Sep 17 00:00:00 2001 From: Localization Server Date: Wed, 6 Jul 2011 14:20:02 +0000 Subject: [PATCH 4/4] Updating locale --- bigbluebutton-client/locale/pl_PL/bbbResources.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties index a349870b3d..58c32c7ad6 100755 --- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties +++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties @@ -88,7 +88,7 @@ bbb.settings.java.command = Zainstaluj najnowszą wersje Java bbb.mainToolbar.logoutBtn = Wylogowanie bbb.chat.privateMsgAwaiting2 = * Oczekuje prywatna wiadomość * bbb.presentation.document.supported = Wgrany dokument jest obsługiwany. Zaczynam konwertować... -bbb.listeners.title = Słuchacze{0} {1} +bbb.listeners.title = Słuchacze {0} {1} bbb.fileupload.presentationNamesLbl = Wgrane prezentacje: bbb.pageTitle = BigBlueButton bbb.mainshell.resetLayoutBtn.toolTip = Resetuj układ