Author: seba.wagner
Date: Sat Sep 20 15:23:35 2008
New Revision: 1562
Modified:
trunk/webapp/filetest.keystore
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/ScreenJob.java
trunk/webapp/webapp/openmeetings/languages/arabic.xml
trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
trunk/webapp/webapp/openmeetings/languages/deutsch.xml
trunk/webapp/webapp/openmeetings/languages/english.xml
trunk/webapp/webapp/openmeetings/languages/french.xml
trunk/webapp/webapp/openmeetings/languages/hungarian.xml
trunk/webapp/webapp/openmeetings/languages/indonesian.xml
trunk/webapp/webapp/openmeetings/languages/italian.xml
trunk/webapp/webapp/openmeetings/languages/japanese.xml
trunk/webapp/webapp/openmeetings/languages/korean.xml
trunk/webapp/webapp/openmeetings/languages/portugues.xml
trunk/webapp/webapp/openmeetings/languages/russian.xml
trunk/webapp/webapp/openmeetings/languages/spanish.xml
trunk/webapp/webapp/openmeetings/languages/swedish.xml
Log:
some tests with screensharing client to get the close event
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Modified:
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
Sat Sep 20 15:23:35 2008
@@ -11,6 +11,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -80,6 +81,7 @@
//check if this Client is still inside
the Room
boolean userIsInRoom = false;
+ boolean doProcess = false;
HashMap<String, RoomClient> clientList
= Application.getClientList();
for (Iterator iter =
clientList.keySet().iterator();iter.hasNext();) {
@@ -89,95 +91,113 @@
if (rcl.getRoom_id() !=
null &&
rcl.getRoom_id().toString().equals(room)) {
log.debug("User
is inside Room");
userIsInRoom =
true;
+ doProcess =
true;
} else {
log.debug("User
already left room, block Screen - logical Room
Leave");
- return;
+ OutputStream
out = httpServletResponse.getOutputStream();
+ String
returnValue = "close";
+
out.write(returnValue.getBytes());
+ //return;
}
}
}
if (!userIsInRoom) {
log.debug("User already left
room, block Screen - Browser Closed");
- return;
+ OutputStream out =
httpServletResponse.getOutputStream();
+ String returnValue = "close";
+
out.write(returnValue.getBytes());
+ //return;
}
- //make a complete name out of
domain(organisation) + roomname
- String roomName = domain + "_" + room;
- //trim whitespaces cause it is a
directory name
- roomName =
StringUtils.deleteWhitespace(roomName);
-
- //Get the current User-Directory
-
- String current_dir =
getServletContext().getRealPath("/");
- log.debug("Current_dir: " +
current_dir);
-
- String working_dir = "";
-
log.debug(MultipartRequest.MAX_READ_BYTES);
-
- working_dir = current_dir + "desktop" +
File.separatorChar + roomName
+ File.separatorChar;
-
- //Add the Folder for the Room if it
does not exist yet
- File localFolder = new
File(working_dir);
- if (!localFolder.exists()) {
- localFolder.mkdir();
- }
-
- log.debug("#### UploadHandler
working_dir: "+ working_dir);
-
- ServletMultipartRequest upload = new
ServletMultipartRequest(httpServletRequest, 104857600); // max 100 mb
-
- InputStream is =
upload.getFileContents("Filedata");
-
- //trim whitespace
- String fileSystemName =
StringUtils.deleteWhitespace(upload.getFileSystemName("Filedata"));
-
- String newFileSystemName =
StringComparer.getInstance()
- .compareForRealPaths(
-
fileSystemName.substring(0,
-
fileSystemName.length() - 4));
- String newFileSystemExtName =
fileSystemName.substring(
- fileSystemName.length()
- 4,
-
fileSystemName.length()).toLowerCase();
-
- //trim long names cause cannot output
that
- if (newFileSystemName.length() >= 17) {
- newFileSystemName =
newFileSystemName.substring(0,16);
- }
-
- String completeName = working_dir +
newFileSystemName+"_"+sid;
-
- File f = new File(completeName +
newFileSystemExtName);
- if (f.exists()) {
- f.delete();
- }
-
- log.debug("*****2 ***** completeName:
"+ completeName +
newFileSystemExtName);
- FileOutputStream fos = new
FileOutputStream(completeName +
newFileSystemExtName);
-
- byte[] buffer = new byte[1024];
- int len = 0;
+ if (doProcess) {
+ //make a complete name out of
domain(organisation) + roomname
+ String roomName = domain + "_"
+ room;
+ //trim whitespaces cause it is
a directory name
+ roomName =
StringUtils.deleteWhitespace(roomName);
+
+ //Get the current User-Directory
+
+ String current_dir =
getServletContext().getRealPath("/");
+ log.debug("Current_dir: " +
current_dir);
+
+ String working_dir = "";
+
log.debug(MultipartRequest.MAX_READ_BYTES);
+
+ working_dir = current_dir +
"desktop" + File.separatorChar +
roomName + File.separatorChar;
+
+ //Add the Folder for the Room
if it does not exist yet
+ File localFolder = new
File(working_dir);
+ if (!localFolder.exists()) {
+ localFolder.mkdir();
+ }
+
+ log.debug("#### UploadHandler
working_dir: "+ working_dir);
+
+ ServletMultipartRequest upload
= new
ServletMultipartRequest(httpServletRequest, 104857600); // max 100 mb
+
+ InputStream is =
upload.getFileContents("Filedata");
+
+ //trim whitespace
+ String fileSystemName =
StringUtils.deleteWhitespace(upload.getFileSystemName("Filedata"));
+
+ String newFileSystemName =
StringComparer.getInstance()
+
.compareForRealPaths(
+
fileSystemName.substring(0,
+
fileSystemName.length() - 4));
+ String newFileSystemExtName =
fileSystemName.substring(
+
fileSystemName.length() - 4,
+
fileSystemName.length()).toLowerCase();
+
+ //trim long names cause cannot
output that
+ if (newFileSystemName.length()
>= 17) {
+ newFileSystemName =
newFileSystemName.substring(0,16);
+ }
+
+ String completeName =
working_dir + newFileSystemName+"_"+sid;
+
+ File f = new File(completeName
+ newFileSystemExtName);
+ if (f.exists()) {
+ f.delete();
+ }
+
+ log.debug("*****2 *****
completeName: "+ completeName +
newFileSystemExtName);
+ FileOutputStream fos = new
FileOutputStream(completeName +
newFileSystemExtName);
+
+ byte[] buffer = new byte[1024];
+ int len = 0;
+
+ while ( (len= is.read(buffer,
0, buffer.length)) >-1 ) {
+ fos.write(buffer, 0,
len);
+ }
+
+ fos.close();
+ is.close();
+
+
+
+ LinkedHashMap<String,Object> hs
= new LinkedHashMap<String,Object>();
+ hs.put("user",
Usermanagement.getInstance().getUser(users_id));
+ hs.put("message", "desktop");
+ hs.put("action", "newSlide");
+ hs.put("fileName",
newFileSystemName+"_"+sid+newFileSystemExtName);
+
+
+
+
Application.getInstance().sendMessageByRoomAndDomain(Long.valueOf(room).longValue(),hs);
- while ( (len= is.read(buffer, 0,
buffer.length)) >-1 ) {
- fos.write(buffer, 0, len);
}
-
- fos.close();
- is.close();
-
-
-
- LinkedHashMap<String,Object> hs = new
LinkedHashMap<String,Object>();
- hs.put("user",
Usermanagement.getInstance().getUser(users_id));
- hs.put("message", "desktop");
- hs.put("action", "newSlide");
- hs.put("fileName",
newFileSystemName+"_"+sid+newFileSystemExtName);
-
-
Application.getInstance().sendMessageByRoomAndDomain(Long.valueOf(room).longValue(),hs);
} else {
log.debug("user not logged in");
}
+
+
+// OutputStream out =
httpServletResponse.getOutputStream();
+// String returnValue = "ok";
+// out.write(returnValue.getBytes());
+//
}
} catch (Exception e) {
log.error("ee " + e);
Modified:
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
==============================================================================
---
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
(original)
+++
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
Sat Sep 20 15:23:35 2008
@@ -159,20 +159,21 @@
System.out.println("sendJpegToUrl complete ");
+ StartScreen.instance.showBandwidthWarning("send
complete ");
+
// read the output from the URL
- try {
- DataInputStream in = new DataInputStream(
- new
BufferedInputStream(c.getInputStream()));
- String sIn = in.readLine();
- while (sIn != null) {
- if (sIn != null) {
- System.out.println(sIn);
- }
- sIn = in.readLine();
+ DataInputStream in = new DataInputStream(
+ new
BufferedInputStream(c.getInputStream()));
+ String sIn = in.readLine();
+ while (sIn != null) {
+ if (sIn != null) {
+ System.out.println(sIn);
}
- } catch (Exception e) {
- e.printStackTrace();
- }
+ sIn += in.readLine();
+ }
+
+ StartScreen.instance.showBandwidthWarning("Input
Stream: "+sIn);
+
Date endTime2 = new Date();
long timeInSeconds2 =
(endTime2.getTime()-this.startDate.getTime())/1000;
@@ -181,6 +182,7 @@
ConnectionBean.isloading = false;
} catch (Exception e) {
+ StartScreen.instance.showBandwidthWarning("Exception:
"+e.getMessage());
e.printStackTrace();
}
}
Modified:
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/ScreenJob.java
==============================================================================
---
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/ScreenJob.java
(original)
+++
trunk/webapp/src/screenviewer/org/openmeetings/webstart/screen/ScreenJob.java
Sat Sep 20 15:23:35 2008
@@ -15,8 +15,9 @@
System.out.println("ScreenJob is executing.");
if (ConnectionBean.isloading){
StartScreen.instance.showBandwidthWarning("Your Bandwidth is
bad.
Frames have been droped. You can alter the Quality settings to reduce
Bandwidth usage.");
+ ConnectionBean.isloading = false;
} else {
- StartScreen.instance.showBandwidthWarning("");
+ StartScreen.instance.showBandwidthWarning("sending");
new
CaptureScreen(ConnectionBean.connectionURL,ConnectionBean.SID,ConnectionBean.room,ConnectionBean.domain,ConnectionBean.publicSID);
}
}
Modified: trunk/webapp/webapp/openmeetings/languages/arabic.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/arabic.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/arabic.xml Sat Sep 20
15:23:35 2008
@@ -1680,4 +1680,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
(original)
+++ trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml Sat
Sep 20 15:23:35 2008
@@ -1680,4 +1680,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
(original)
+++ trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml Sat
Sep 20 15:23:35 2008
@@ -1680,4 +1680,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/deutsch.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/deutsch.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/deutsch.xml Sat Sep 20
15:23:35 2008
@@ -1673,5 +1673,14 @@
</string>
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
- </string>
+ </string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/english.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/english.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/english.xml Sat Sep 20
15:23:35 2008
@@ -1674,4 +1674,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/french.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/french.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/french.xml Sat Sep 20
15:23:35 2008
@@ -1678,5 +1678,14 @@
</string>
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
- </string>
+ </string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/hungarian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/hungarian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/hungarian.xml Sat Sep 20
15:23:35 2008
@@ -1674,4 +1674,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/indonesian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/indonesian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/indonesian.xml Sat Sep 20
15:23:35 2008
@@ -1674,4 +1674,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/italian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/italian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/italian.xml Sat Sep 20
15:23:35 2008
@@ -1674,4 +1674,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/japanese.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/japanese.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/japanese.xml Sat Sep 20
15:23:35 2008
@@ -1683,4 +1683,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/korean.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/korean.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/korean.xml Sat Sep 20
15:23:35 2008
@@ -1680,4 +1680,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/portugues.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/portugues.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/portugues.xml Sat Sep 20
15:23:35 2008
@@ -1695,5 +1695,14 @@
</string>
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
+ </string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
</string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/russian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/russian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/russian.xml Sat Sep 20
15:23:35 2008
@@ -1680,4 +1680,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/spanish.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/spanish.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/spanish.xml Sat Sep 20
15:23:35 2008
@@ -1679,4 +1679,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
Modified: trunk/webapp/webapp/openmeetings/languages/swedish.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/swedish.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/swedish.xml Sat Sep 20
15:23:35 2008
@@ -1683,4 +1683,13 @@
<string id="556" name="connectionLostMessage">
<value>The Connection to the Server is lost. You need to reload the
Application or/and check your Network.</value>
</string>
+ <string id="557" name="557">
+ <value>Pointer</value>
+ </string>
+ <string id="558" name="sync message header">
+ <value>Synchronizing</value>
+ </string>
+ <string id="559" name="Synchronizing message">
+ <value>Synchronizing Users, please wait</value>
+ </string>
</language>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
