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 2017/05/01 06:08:55 UTC
[09/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1595] more
work on mobile client
[OPENMEETINGS-1595] more work on mobile client
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/daafaa8d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/daafaa8d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/daafaa8d
Branch: refs/heads/3.2.x
Commit: daafaa8dcb648c27a6d1e60d7aba16fd130f3372
Parents: 4df09e5
Author: Maxim Solodovnik <so...@apache.org>
Authored: Fri Mar 17 04:39:40 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Fri Mar 17 04:39:40 2017 +0000
----------------------------------------------------------------------
.../apache/openmeetings/db/entity/basic/Client.java | 14 ++++++++++----
.../org/apache/openmeetings/web/app/Application.java | 5 ++---
.../org/apache/openmeetings/web/common/MainPanel.java | 1 +
pom.xml | 3 +--
4 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/daafaa8d/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index b626e30..8ec7b27 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -56,6 +56,7 @@ public class Client implements IClient {
private Long roomId;
private final String uid;
private final String sid;
+ private String remoteAddress;
private final Set<Right> rights = new HashSet<>();
private final Set<Activity> activities = new HashSet<>();
private final Date connectedSince;
@@ -65,10 +66,6 @@ public class Client implements IClient {
private int width = 0;
private int height = 0;
- public Client(String sessionId, Long userId, UserDao dao) {
- this(sessionId, 0, userId, dao);
- }
-
public Client(String sessionId, int pageId, Long userId, UserDao dao) {
this.sessionId = sessionId;
this.pageId = pageId;
@@ -86,6 +83,7 @@ public class Client implements IClient {
uid = rcl.getPublicSID();
sid = UUID.randomUUID().toString();
this.roomId = rcl.getRoomId();
+ this.remoteAddress = rcl.getUserip();
}
public String getSessionId() {
@@ -277,6 +275,14 @@ public class Client implements IClient {
this.height = height;
}
+ public String getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public void setRemoteAddress(String remoteAddress) {
+ this.remoteAddress = remoteAddress;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/daafaa8d/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index ebf7a73..51d57f9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
@@ -236,8 +235,8 @@ public class Application extends AuthenticatedWebApplication implements IApplica
sendRoom(new RoomMessage(roomId, c.getUserId(), RoomMessage.Type.roomExit));
getBean(ConferenceLogDao.class).add(
ConferenceLog.Type.roomLeave
- , getUserId(), "0", roomId
- , WebSession.get().getClientInfo().getProperties().getRemoteAddress()
+ , c.getUserId(), "0", roomId
+ , c.getRemoteAddress()
, "" + roomId);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/daafaa8d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 1cad933..7d7332d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -225,6 +225,7 @@ public class MainPanel extends Panel {
protected void onConnect(ConnectedMessage msg) {
super.onConnect(msg);
client = new Client(getSession().getId(), msg.getKey().hashCode(), getUserId(), getBean(UserDao.class));
+ client.setRemoteAddress(WebSession.get().getClientInfo().getProperties().getRemoteAddress());
addOnlineUser(client);
log.debug("WebSocketBehavior::onConnect [uid: {}, session: {}, key: {}]", client.getUid(), msg.getSessionId(), msg.getKey());
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/daafaa8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 094e3f0..85461aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -703,8 +703,7 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>true</doUpdate>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
</configuration>
</plugin>
<plugin>