You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2014/01/01 10:48:53 UTC
[1/3] git commit: updated refs/heads/4.3 to 0b643dd
Updated Branches:
refs/heads/4.3 4d0505625 -> 0b643ddf0
CLOUDSTACK-5702: Fixed mouse doesn't work for console
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4d4d4b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4d4d4b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4d4d4b0
Branch: refs/heads/4.3
Commit: a4d4d4b09aaff5b5606d1f9f58b2b80c92aee0a9
Parents: 4d05056
Author: Anshul Gangwar <an...@citrix.com>
Authored: Wed Jan 1 12:16:23 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jan 1 15:03:48 2014 +0530
----------------------------------------------------------------------
.../consoleproxy/ConsoleProxyRdpClient.java | 29 ++++++++++++++------
1 file changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d4d4b0/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
index 73c00be..6b317ff 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
@@ -161,22 +161,23 @@ public class ConsoleProxyRdpClient extends ConsoleProxyClientBase {
updateFrontEndActivityTime();
int mousecode = mapMouseButton(code);
- int modifier = mapMouseModifier(code, modifiers);
- /*if (event == InputEventType.MOUSE_DOWN) {
- _mouseEventSource.mousePressed(new MouseEvent(_canvas, MouseEvent.MOUSE_PRESSED, System.currentTimeMillis(), modifier, x, y, 1, false, mousecode));
+ if (event == InputEventType.MOUSE_DOWN) {
+ _mouseEventSource.mousePressed(new MouseEvent(_canvas, MouseEvent.MOUSE_PRESSED, System.currentTimeMillis(), mapMouseDownModifier(code, modifiers), x, y, 1, false,
+ mousecode));
}
if (event == InputEventType.MOUSE_UP) {
- _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), modifier, x, y, 1, false, mousecode)));
+ _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), mapMouseUpModifier(code, modifiers), x, y, 1, false,
+ mousecode)));
}
- if (event == InputEventType.MOUSE_DBLCLICK) {
- _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), modifier, x, y, 2, false, mousecode)));
- }*/
+ if (event == InputEventType.MOUSE_MOVE) {
+ _mouseEventSource.mouseMoved(new MouseEvent(_canvas, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), mapModifier(modifiers), x, y, 0, false));
+ }
}
- public int mapMouseModifier(int code, int modifiers) {
+ public int mapMouseDownModifier(int code, int modifiers) {
int mod = mapModifier(modifiers);
switch (code) {
case 0:
@@ -188,6 +189,18 @@ public class ConsoleProxyRdpClient extends ConsoleProxyClientBase {
return mod;
}
+ public int mapMouseUpModifier(int code, int modifiers) {
+ int mod = mapModifier(modifiers);
+ switch (code) {
+ case 0:
+ return mod = mod | MouseEvent.BUTTON1_MASK;
+ case 2:
+ return mod = mod | MouseEvent.BUTTON3_MASK;
+ default:
+ }
+ return mod;
+ }
+
private int mapModifier(int modifiers) {
int mod = 0;
if ((modifiers & SHIFT_KEY_MASK) != (_lastModifierStates & SHIFT_KEY_MASK)) {
[3/3] git commit: updated refs/heads/4.3 to 0b643dd
Posted by de...@apache.org.
CLOUDSTACK-5705: fixed the thumbnail not wrking for hyperv
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b643ddf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b643ddf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b643ddf
Branch: refs/heads/4.3
Commit: 0b643ddf09f25b569d7219de026aeda144a3b33f
Parents: e74889a
Author: Anshul Gangwar <an...@citrix.com>
Authored: Wed Jan 1 14:42:19 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jan 1 15:05:34 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b643ddf/server/src/com/cloud/servlet/ConsoleProxyServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index a587337..8a55b39 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -361,7 +361,16 @@ public class ConsoleProxyServlet extends HttpServlet {
String sid = vm.getVncPassword();
String tag = String.valueOf(vm.getId());
tag = _identityService.getIdentityUuid("vm_instance", tag);
- String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
+
+ int port = -1;
+ if (portInfo.second() == -9) {
+ //for hyperv
+ port = Integer.parseInt(_ms.findDetail(hostVo.getId(), "rdp.server.port").getValue());
+ } else {
+ port = portInfo.second();
+ }
+
+ String ticket = genAccessTicket(parsedHostInfo.first(), String.valueOf(port), sid, tag);
ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(getEncryptorPassword());
ConsoleProxyClientParam param = new ConsoleProxyClientParam();
@@ -370,6 +379,12 @@ public class ConsoleProxyServlet extends HttpServlet {
param.setClientHostPassword(sid);
param.setClientTag(tag);
param.setTicket(ticket);
+ if (portInfo.second() == -9) {
+ //For Hyperv Clinet Host Address will send Instance id
+ param.setHypervHost(host);
+ param.setUsername(_ms.findDetail(hostVo.getId(), "username").getValue());
+ param.setPassword(_ms.findDetail(hostVo.getId(), "password").getValue());
+ }
if (parsedHostInfo.second() != null && parsedHostInfo.third() != null) {
param.setClientTunnelUrl(parsedHostInfo.second());
param.setClientTunnelSession(parsedHostInfo.third());
[2/3] git commit: updated refs/heads/4.3 to 0b643dd
Posted by de...@apache.org.
CLOUDSTACK-5703: putting rdp server port value in host details
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e74889ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e74889ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e74889ac
Branch: refs/heads/4.3
Commit: e74889ac91c919ab26852da3d93133eaeae874c8
Parents: a4d4d4b
Author: Anshul Gangwar <an...@citrix.com>
Authored: Wed Jan 1 14:15:31 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jan 1 15:05:09 2014 +0530
----------------------------------------------------------------------
.../HypervResource/HypervResourceController.cs | 1 +
server/src/com/cloud/servlet/ConsoleProxyServlet.java | 13 +++++--------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e74889ac/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 6f8b786..1b2b6c5 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1873,6 +1873,7 @@ namespace HypervResource
string productVersion = System.Environment.OSVersion.Version.Major.ToString() + "." +
System.Environment.OSVersion.Version.Minor.ToString();
details.Add("product_version", productVersion);
+ details.Add("rdp.server.port", 2179);
}
// Detect CPUs, speed, memory
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e74889ac/server/src/com/cloud/servlet/ConsoleProxyServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index e0aaa6d..a587337 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -388,25 +388,22 @@ public class ConsoleProxyServlet extends HttpServlet {
private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO hostVo) {
StringBuffer sb = new StringBuffer(rootUrl);
String host = hostVo.getPrivateIpAddress();
- String username = _ms.findDetail(hostVo.getId(), "username").getValue();
- String password = _ms.findDetail(hostVo.getId(), "password").getValue();
Pair<String, Integer> portInfo = _ms.getVncPort(vm);
if (s_logger.isDebugEnabled())
s_logger.debug("Port info " + portInfo.first());
Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
+
int port = -1;
- String sid;
-
if (portInfo.second() == -9) {
//for hyperv
- port = 2179;
+ port = Integer.parseInt(_ms.findDetail(hostVo.getId(), "rdp.server.port").getValue());
} else {
port = portInfo.second();
}
- sid = vm.getVncPassword();
+ String sid = vm.getVncPassword();
UserVmDetailVO details = _userVmDetailsDao.findDetail(vm.getId(), "keyboard");
String tag = vm.getUuid();
@@ -426,8 +423,8 @@ public class ConsoleProxyServlet extends HttpServlet {
if (portInfo.second() == -9) {
//For Hyperv Clinet Host Address will send Instance id
param.setHypervHost(host);
- param.setUsername(username);
- param.setPassword(password);
+ param.setUsername(_ms.findDetail(hostVo.getId(), "username").getValue());
+ param.setPassword(_ms.findDetail(hostVo.getId(), "password").getValue());
}
if (parsedHostInfo.second() != null && parsedHostInfo.third() != null) {
param.setClientTunnelUrl(parsedHostInfo.second());