Commit Graph

59 Commits

Author SHA1 Message Date
Daan Hoogland 9e97030e79 Updating pom.xml version numbers for release 4.4.3
Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-03-25 10:36:19 +01:00
Daan Hoogland f9dce0bf23 missed code in merge of Avoid distributing private key for realhostip.com 2015-03-19 08:34:36 +01:00
Nitin Mehta c2dc53c2a1 Avoid distributing private key for realhostip.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/AgentHookBase.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
2015-03-18 20:35:18 +01:00
Rohit Yadav b1f54db18f utils: use a better extended implementation of SSLSocketFactory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
2015-03-16 15:52:38 +05:30
Rohit Yadav 0269456152 CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
2015-01-21 18:11:38 +05:30
Daan Hoogland 7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-25 15:36:02 +01:00
Daan Hoogland e0420a6fec Updating pom.xml version numbers for release 4.4.2
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-21 03:41:26 +01:00
Daan Hoogland b9620c2cbe Updating pom.xml version numbers for release 4.4.2-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-10-19 20:46:15 +02:00
Daan Hoogland c9383c441e Updating pom.xml version numbers for release 4.4.1-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-07-23 16:55:31 +02:00
Kelven Yang dfb9f49117 Remove inner retry loop when CPVM tries to reconnect to host 2014-02-28 15:35:58 -08:00
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Ian Southam 33c2c87287 Findbugs finding
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:46 +01:00
Anshul Gangwar 13e0f293ed CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration. 2014-02-06 13:47:38 +05:30
Alex Huang 54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Anshul Gangwar 62ef61794d Fixed check style error 2014-01-23 10:54:09 +05:30
Anshul Gangwar 6ebbec239d CLOUDSTACK-5716: fixed can't type special character in console view 2014-01-23 10:54:09 +05:30
Anshul Gangwar 3e2f7dda9e CLOUDSTACK-5702: Fixed mouse doesn't work for console 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Sanjay Tripathi f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
wilderrodrigues d19688103b Fixing coverity issues related to resource leak on FileInputStream being created anonymously
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 12:51:44 +01:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang 224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Hugo Trippaers 6c26104282 Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00
Sanjay Tripathi 7bff499bd3 CLOUDSTACK-4434: EN: Ubuntu: Direct input "- _ ", "? /", "keyboard /" ,"keyboard -" keys are not working well for the US keyboard. 2013-09-05 13:05:21 +05:30
Hugo Trippaers 7cb4753b3a Properly clean the target dir of the console-proxy server 2013-08-13 17:57:55 +02:00
Hugo Trippaers e7f8c6a0a6 More logical naming and disabling the plugin as it is not used for anything 2013-08-13 17:57:55 +02:00
Sanjay Tripathi ead3b848d5 CLOUDSTACK-2909: Fix for ; and : keys for IE and chrome. 2013-08-12 18:27:41 +05:30
Sanjay Tripathi 7c708e00d2 CLOUDSTACK-2909: Fix for EN-US keys. Keys are ' and " 2013-08-09 18:49:13 +05:30
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Sanjay Tripathi 6ec2bb1518 CLOUDSTACK-2909: patch to fix TAB in US keyboard. 2013-07-30 18:02:27 +05:30
Sanjay Tripathi 33122478c3 CLOUDSTACK-1961: Common issues found in English OS with EN-US standard Keyboard. 2013-07-30 18:02:18 +05:30
Wei Zhou 521dcbdcc0 CLOUDSTACK-1475: fix RegisterISO error after Update SSL Certificate 2013-07-11 16:08:26 +02:00
Sanjay Tripathi 8bd1d27315 CLOUDSTACK-1960: Fix for UK Keyboard - Bar symbol i.e. "|". 2013-07-11 10:41:45 +05:30
Rajesh Battala 6d140538c5 CLOUDSTACK-3004: remove duplicate ssvm-check.sh
ssvm_check.sh remove the duplicate file from consoleproxy and include the
script from secondary storage folder while packing iso

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-15 11:21:46 +05:30
Sanjay Tripathi 18163eaa4d CLOUDSTACK-1960: Key remapping fails to input the keys \ | . of UK Keyboard 2013-06-14 10:21:22 +05:30
Kelven Yang f38c4e9ea6 Bug CS-17825: Don't rely on XS to cleanup idle session but proactively close it from console proxy 2013-06-10 17:46:42 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Kelven Yang 34f8f795e1 CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation 2013-04-15 16:52:22 -07:00
Chiradeep Vittal 778a59fbf6 QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since
a. they are trivial
b. they are modified by the java code (stripping the license)

QuickCloud: proper path for log.home

QuickCloud: proper path for secstorage.sh
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 936973aff7 QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 21b4635948 QuickCloud: also look for consoleproxy.properties using PropertiesUtil.
When executed with mvn exec:java, the path 'conf' is not on the classpath
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 16790446e5 QuickCloud: start console proxy service from mvn exec:java 2013-04-09 14:45:25 -07:00