Author: solomax
Date: Fri Mar 17 04:39:40 2017
New Revision: 1787284
URL: http://svn.apache.org/viewvc?rev=1787284&view=rev
Log:
[OPENMEETINGS-1595] more work on mobile client
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/trunk/pom.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
Fri Mar 17 04:39:40 2017
@@ -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;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Fri Mar 17 04:39:40 2017
@@ -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 Authent
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);
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Fri Mar 17 04:39:40 2017
@@ -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());
}
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Fri Mar 17 04:39:40 2017
@@ -703,8 +703,7 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>true</doUpdate>
+
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
</configuration>
</plugin>
<plugin>
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
Fri Mar 17 04:39:40 2017
@@ -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;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Fri Mar 17 04:39:40 2017
@@ -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 Authent
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);
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Fri Mar 17 04:39:40 2017
@@ -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());
}
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1787284&r1=1787283&r2=1787284&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Fri Mar 17 04:39:40 2017
@@ -703,8 +703,7 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>true</doUpdate>
+
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
</configuration>
</plugin>
<plugin>
