etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,553 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

538 Commits

Author SHA1 Message Date
Koushik Das 61fe959bb4 Removed invalid assertions from code. Now the MS can be run with assertions enabled (using -ea flag) 2014-07-10 12:18:29 +05:30
Santhosh Edukulla d51e8f44ae CLOUDSTACK-7079: Fixed the issue where rollback was called after commit. As well, added few null checks 2014-07-09 15:58:43 +05:30
Likitha Shetty 4f969057b2 CLOUDSTACK-7030. After the restart of MS in a clustered MS pool, not all hung worker VMs are recycled. 
Recycle worker VMs that originally belonged to other management servers too because in case of MS restart, the owner MS might change.
 2014-07-07 13:38:47 +05:30
Santhosh Edukulla a600d8408e Fixed Resource Leaks, null dereferences, few other issues reported by coverity 2014-07-04 16:17:58 +05:30
Santhosh Edukulla b2283d7a28 Fixed few resource leaks and added secstoragefirewallcfg command support to simulator 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-24 23:19:47 +02:00
Santhosh Edukulla 1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-21 12:38:46 +02:00
Hugo Trippaers 0c28f36ff1 Fix a number of resource leaks reported by Coverity 2014-06-13 14:42:35 +02:00
Min Chen 25580c7cd1 CLOUDSTACK-6859:Management Server PermGen run out of memory after some 
time due to class leak.
 2014-06-06 23:57:26 -07:00
Marcus Sorensen 20a31b43d6 CLOUDSTACK-6784: Expose data types via API so consumers of API can validate data 2014-05-27 15:23:23 -06:00
Marcus Sorensen 2a5bf65c78 CLOUDSTACK-6785: Allow async jobs to supply an injectedjobid 2014-05-27 15:23:02 -06:00
Min Chen ba848087f8 Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
Kelven Yang 09ec127470 CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin 2014-05-21 16:17:39 -07:00
Murali Reddy 6f2a193b7c CLOUDSTACK-6720: Async job events are not published on event bus 
fix ensures publishOnEventBus() is called on submit, update, complete
phase of job procesing
 2014-05-20 17:13:58 +05:30
Kelven Yang 521ac796dd Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server. 2014-05-06 15:48:22 -07:00
Nitin Mehta 1d45b75298 CLOUDSTACK-6499: 
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
 2014-04-24 17:27:02 -07:00
Min Chen da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker 
interface that takes multiple controlled entities.
 2014-04-17 17:53:01 -07:00
Ding Yuan c031eb7d38 CLOUDSTACK-6242: exception handling improvements 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-15 08:07:15 +02:00
Kelven Yang cd8801f6f7 Do app-level iteration to avoid mysql deadlocks 2014-04-02 15:46:50 -07:00
Kelven Yang 66486d4322 BUG-ID: CS-19697: Deal with possible DB deadlock issue, return the job into queue for next turn 2014-04-02 14:59:04 -07:00
Kelven Yang b6cc6dd8e3 CLOUDSTACK-6305: protect lock leaking from unhandled exception 2014-03-28 15:30:07 -07:00
Laszlo Hornyak 54c83c168f removed redundant Integer instantiation in GenericDaoBase 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-28 18:40:25 +01:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Kelven Yang ec01791936 Fix the missing java imports from automatic merge 2014-03-14 14:22:23 -07:00
Kelven Yang 12f7cbcb76 Deal with concurrent state update for VM and Host objects. 2014-03-14 14:07:39 -07:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Kelven Yang 5310e66f30 Do not use row lock in sync-queue scheduling to work around mysql locking issues. 2014-03-13 16:59:56 -07:00
Kelven Yang 8e27120be4 Seperate job executor pools to avoid thread starvation situation. 2014-03-13 16:59:56 -07:00
Min Chen 84a528fad6 Merge branch 'master' into rbac 2014-03-13 14:52:37 -07:00
Alena Prokharchyk 90c485e5d6 Fixed some problems reported by FindBugs 2014-03-13 13:45:30 -07:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Kelven Yang 5dd4fb22ef Remove cancelled jobs from job monitoring, correct mis-calculated time-unit in job cancellation. 2014-03-03 17:44:58 -08:00
Kelven Yang b21662f890 make sure XS report VM state even if there is no running VM on the host. 2014-02-28 15:35:59 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang a8c9238d3d CLOUDSTACK-6065: Fix NPE problem caused by the lack of context setup in threads from agent manager thread pool 2014-02-28 15:35:59 -08:00
Kelven Yang 441be43b8c CLOUDSTACK-5358: Bring back concurrency control in sync-queue management 2014-02-28 15:35:57 -08:00
Hugo Trippaers a0f932437c Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag 2014-02-27 09:51:02 +01:00
Hugo Trippaers ac00ab0087 Cleanup all mysql dependencies and set all to provided. 2014-02-21 14:55:11 +01:00
Hugo Trippaers 19b15a1bdc Fix parameter index in getCount function. 2014-02-20 15:13:29 +01:00
Hugo Trippaers f1139848e5 Slight optimization, don't run checkstyle on container or non-java projects. 2014-02-18 12:24:11 +01:00
Hugo Trippaers 443acac927 Fix functional issue introduced by some findbug changes. 2014-02-14 18:37:47 +01:00
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Antonio Fornie cbea6d26e8 Fix and test GroupBy SQL query creation 
Signed-off-by: Ian Southam <isoutham@schubergphilis.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:46 +01:00
Ian Southam 5a6ad11fa2 findbugs findings 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-14 18:37:46 +01:00
Alena Prokharchyk e0de79b170 Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00
Laszlo Hornyak dea320f7b9 RAT fix 
added license header to test
 2014-01-25 20:50:14 +01:00
Laszlo Hornyak e4da3775c9 removed redundant Long, Short, Double, Float and Boolean instantiations 
- Added unit tests
- Added javadoc

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-01-25 20:09:45 +01:00
Min Chen 33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Hugo Trippaers 7ab3e277c4 Cosmetics 2014-01-22 10:11:20 +01:00
Alena Prokharchyk a0197006ef Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package 2014-01-21 17:19:52 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Kelven Yang a9733b5df2 CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations 2014-01-17 11:55:14 -08:00
Kelven Yang 14e399410b CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes 2014-01-15 16:22:27 -08:00
Kelven Yang 7164fc6e73 CLOUDSTACK-5696: Fix sync issue with out-of-band changes 2014-01-15 13:11:02 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management 
of keys out of management server
 2014-01-14 13:11:35 -08:00
Min Chen bae498c89e Handle search of those entities without db view created using new ACL 
model.
 2014-01-13 21:55:56 -08:00
Alex Huang bc1eec9f70 Fixed a missing package name 2014-01-09 16:48:19 -08:00
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Kelven Yang a05d71a80c CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow 2014-01-09 14:29:13 -08:00
Kelven Yang 87381d4236 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-09 14:29:12 -08:00
Kelven Yang 69f49839d3 CLOUDSTACK-5726: Using runtime discovered dao (in AsyncJobManagerImpl.submitAsyncJob) to persist record has a problem to locate the right DAO instance, it causes corrupted field value be stored in database. Put in a work-around fix first to always initialize record fields in all cases 2014-01-09 14:29:12 -08:00
Kelven Yang 832c8e4728 CLOUDSTACK-5669: Always retrieve the most recent job result in OutComeImpl 2014-01-09 14:29:12 -08:00
Kelven Yang bf9a554522 CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Harikrishna Patnala fd0fabd3e2 CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page 
Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.

Signed-off-by: Koushik Das <koushik@apache.org>
 2014-01-02 16:18:21 +05:30
Damodar Reddy 9190b03056 CLOUDSTACK-5457: DBHA features is broken due to RuntimeException thrown from underlying layer. Fixed my catching in ClusterManagerImpl 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-12-19 17:07:13 +05:30
Kelven Yang 3c965d0685 CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations 2013-12-18 16:14:07 -08:00
Antonio Fornie 55a6df4501 Resources leaks, refactoring and testing 
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)

Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)

Create Unit and Integration Tests for UsageSanityChecker

Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
 2013-12-18 10:55:04 +01:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Kelven Yang 26c1ba296c CLOUDSTACK-669: put user vm work under new vmsync model 2013-12-11 16:29:59 -08:00
tuna 79a7ce871e make SDN GRE work with XCP 1.6 2013-12-09 23:33:14 +07:00
wilderrodrigues 226b193488 Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 14:20:29 +01: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 eaa250fd3c Formatted again after all the tab expansions and eol removals 2013-11-21 04:47:01 -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 62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Kelven Yang 278ef81a83 side-by-side VM sync management at manager level 2013-11-20 17:59:38 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Laszlo Hornyak 065e5afa08 Tests for DBUtil 
This patch adds test for the lock management:
- getGlobalLock
- releaseGlobalLock

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-11-16 15:44:31 +01:00
Harikrishna Patnala c29cd9d3c7 CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot 
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot

CLOUDSTACK-5163: missing parameters in configuration table
 2013-11-15 12:19:31 +05:30
Damodar Reddy 67fc2f53e2 CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue) 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-11-14 11:10:48 +05:30
Laszlo Hornyak 5420cbe981 added license header 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-11-12 08:09:37 +01:00
Laszlo Hornyak f629d405eb Test for DbUtil 
test cases for
- isPersistable
- getColumnName

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-11-10 23:24:01 +01:00
Damodar Reddy dcd3c44279 CLOUDSTACK-4916: To Enable Master High Availability using mysql connector params and mysql's 2 way replication 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-11-08 16:18:14 +05:30
Min Chen dc3d279272 CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing 
from BVT suite, during LIST api call.
 2013-11-07 15:19:19 -08:00
Hugo Trippaers 5cb3cd64e5 Fix CID 1116741,1116742 Resource leak 2013-11-07 16:23:20 +01:00
Darren Shepherd 24c0513eea Add servlet filter class that is compatible with the Spring Modularization 2013-11-06 15:24:44 -07:00
Kelven Yang 191dc80fa4 VM power state for job oritented sync processing 2013-11-05 19:00:37 -08:00
Darren Shepherd 80813375ae Allow disabling modules and extensions from module.properties 
Discovery of modules is based on classpath scanning.  In some situations it
may not be possible or desirable to change the classpath.  To force a
module to not load you can create a file called modules.properties on the
classpath that can exclude specific modules from loading.  Additionally
this same file can be used to exclude a specific extension.  Extension
loading is typically done through global configuration.  If you want to set
up an environment and you don't even want the extension/module loaded on
the first start, then using the config file is appropriate.

Example: modules.properties

modules.exclude=storage-image-s3,storage-volume-solidfire
extensions.exclude=ClusterScopeStoragePoolAllocator,ZoneWideStoragePoolAllocator

Typically you would want to place this file in /etc/cloudstack/management
 2013-11-05 11:03:06 -07:00
Alena Prokharchyk 78b1ac4126 CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page 
Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java
 2013-10-31 15:25:57 -07:00
Darren Shepherd afaf6370dd Fix change that broke db.properties.override 2013-10-31 09:21:34 -07:00
Darren Shepherd 1460196496 Centralize loading of db.properties to one place 
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
 2013-10-30 17:03:13 -07:00
Laszlo Hornyak dbaa818d1e InputStream use fix 
Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:34 +02:00
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
Darren Shepherd 76c22eae5b Update to use new Transaction API 2013-10-23 11:23:18 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-10-23 10:40:44 -07:00
Darren Shepherd edeaf98117 Cleaner and more type safe Transaction API for checked exceptions 2013-10-23 10:02:43 -07:00
Anthony Xu e33ae74067 CLOUDSTACK-4649: 
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.

Anthony
 2013-10-22 17:54:51 -07:00
Darren Shepherd 323bbccd50 Add unit tests for Transaction 2013-10-17 16:07:11 -07:00
Darren Shepherd 711ad386d1 Random cleanup 2013-10-16 16:18:49 -07:00
Darren Shepherd 7364d55ccd Removed unneeded method 2013-10-16 09:48:19 -07:00
Darren Shepherd f62e28c1ec New Transaction API 
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
 2013-10-16 09:21:00 -07:00
Kishan Kavala 81f1a0b831 CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required 
Conflicts:
	framework/db/src/com/cloud/utils/db/GenericDaoBase.java
 2013-10-16 19:28:42 +05:30
Laszlo Hornyak bd8536739c remove txn attribute from DB 
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-04 10:15:39 -07:00
Darren Shepherd 12146ce40c Move ConfigurationDao and ConfigDepot to system context 
Previously ConfigurationDao and ConfigDepot was in the bootstrap context
which was not needed.  Moving down to system to be more consistent with
the database upgrade checks.
 2013-10-03 09:14:00 -07:00
Darren Shepherd 67186429e1 Spring Modularization 
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
 2013-10-02 15:41:04 -07:00
Darren Shepherd aed5e9dc2a Add Manage Context framework 
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
 2013-10-02 13:09:52 -07:00
Darren Shepherd 4590813836 Fix UsageServer startup 
Add back @Component to ConfigurationDaoImpl and scan for the package in
Spring config.
 2013-10-01 10:30:36 -07:00
Darren Shepherd 19ef999e36 Wrong field was used in check 2013-09-30 10:07:28 -07:00
Darren Shepherd 2e29c89b84 Default null value in ConfigKey results in NPE on second start 2013-09-30 08:54:02 -07:00
Alena Prokharchyk 3ae80acb40 Added missing license to SearchBase.java - fixed broken RAT check 2013-09-28 22:18:27 -07:00
Alex Huang b998fba4da Added comments for the search builder classes on how to use them 2013-09-28 11:50:02 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang 5fd47cc873 Added QueryBuilder 2013-09-28 07:53:28 -07:00
Alex Huang 38e69fb9f9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:27 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Alex Huang 3e813ce61d Committing review 13891. 2013-09-23 14:59:58 -07:00
Alex Huang bf6a5ff023 Added a ManagementServer scope but it isn't used yet. Added @Deprecated to one of the constructors 2013-09-18 09:34:24 -07:00
Kelven Yang 5820b071b8 CLOUDSTACK-4659: Add the missing feature back for GC VMware worker VMs 2013-09-17 14:06:52 -07:00
Alex Huang a05ec6df33 Fixed up the agent separation. Added comments for config packaging. 2013-09-06 15:40:39 -07:00
Alex Huang 1f5699b29f Fixed unit tests 2013-09-06 15:40:39 -07:00
Alex Huang 8f556e6d88 Made changes to configuration. Eliminated ConfigValue and only use ConfigKey 2013-09-06 15:40:38 -07:00
Alex Huang b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang 5b439f0748 Revert "Revert "Added missing files"" 
This reverts commit 48053001fb2303d4acfb77d23fe3733941e83781.
 2013-09-06 15:40:35 -07:00
Alex Huang 06493d5b5c Revert "Added missing files" 
This reverts commit a1dfc227e895d724f68c0206643825b3ba43116c.
 2013-09-06 15:40:35 -07:00
Alex Huang 375eadd3d3 Added missing files 2013-09-06 15:40:34 -07:00
Alex Huang 435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Kelven Yang 249e2e8f59 Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection 2013-09-04 14:49:44 -07:00
Alex Huang abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Alex Huang 4ba359c3fe Moved VirtualMachineManager into engine 2013-08-19 14:13:28 -07:00
Hugo Trippaers d57796b94f Fix XML validation errors 2013-08-13 08:25:45 +02:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefc.
 2013-08-08 15:02:40 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang 5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang 5161ded69c Removed the configuration parameters from Config.java 2013-08-07 16:41:05 -07:00
Alex Huang 49cd4fa380 Connected config gathering to CloudStack 2013-08-07 16:41:04 -07:00
Alex Huang 90cfca0501 Passed the unit test 2013-08-07 16:41:03 -07:00
Alex Huang e4f20c7ced config in place 2013-08-07 16:41:03 -07:00
Alex Huang 31509cf6da Added new files 2013-08-07 16:41:02 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Alex Huang dd0536f9d3 Changed tabs to space 2013-08-02 11:07:54 -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
Alex Huang 1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Alex Huang 3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Alex Huang 1caa566280 created a project for db framework 2013-07-25 19:00:26 -07:00
Alex Huang 9aaa378b08 Moved ClusterManager into it's own package. Removed the agent load balancing code. 2013-07-25 19:00:26 -07:00
Prasanna Santhanam de38cd815f Fix typo in class name 
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-29 13:50:25 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Chip Childers 0365d555cf Adding a name to the framework/jobs/pom.xml file 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-05-20 19:17:33 +01:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Alex Huang 074df0b415 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00
Alex Huang ad2777c547 Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
Alex Huang e0d8f01ecd Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema. 2013-05-06 16:34:16 -07:00
Min Chen db65dfbb12 Work around an issue in using IPC callback for 
HypervisorTemplateAdapter.
 2013-05-06 15:10:31 -07:00
Kelven Yang d44e25efba add unit test to message bus in master branch 2013-04-29 14:36:03 -07:00
Kelven Yang 85e73d18f5 Refactor message bus facitlity to avoid confusing with event bus for external notification, planning to use it in VMSync 2013-04-29 14:36:03 -07:00
Brian Spindler 469c4dd139 Removing ^M's from code. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-04 00:53:20 +05:30
Hugo Trippaers c8fd16c03d Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672 
Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version
 2013-03-28 15:00:04 +01:00
Noa Resare 2f135be15f CLOUDSTACK-1415: Debian & Ubuntu packaging work 
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
 2013-02-27 15:44:46 +00:00
Murali Reddy 3e0bdaac1e CLOUDSTACK-1391: EventBus is not getting injected after javelin merge 
added logic to inject event bus using ComponentContext.getComponent

Conflicts:
	server/src/com/cloud/storage/listener/SnapshotStateListener.java
 2013-02-27 18:55:22 +05:30
Edison Su 8eca74134a rebase to master 2013-02-21 11:22:50 -08:00
Edison Su a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Hugo Trippaers 9755d9b4a2 Keep naming more or less consistent 2013-02-02 12:43:15 +01:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Murali Reddy 1a348c85fd adding apache license heders to the files that are faling RAT check 2013-02-01 11:41:30 +05:30
Murali Reddy e7a554fc6a Merging events framework branch into master. This commit will bring 
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
 2013-02-01 01:37:24 +05:30
Alex Huang 9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Rohit Yadav ea3f5ecb54 Fix license for xml files in javelin 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:31:47 -08:00
Rohit Yadav ba20e7f85a Fix license headers for java files in javelin 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:27:09 -08:00
Alex Huang cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -08:00
Edison Su 2d6133c61e change the top level async call using future 2013-01-04 17:17:57 -08:00
Kelven Yang ed17281f0d Accissibility fix when invoking callback method 2013-01-03 17:55:47 -08:00
Kelven Yang 3435ee0604 Get rid of due-mode in AsyncCallFuture, it is too confusing and we don't have a use case of it 2013-01-03 17:43:32 -08:00
Kelven Yang 107fccdf69 Add AsyncCallFuture 2013-01-03 17:24:26 -08:00
Kelven Yang 25d14418b9 Replace Adapters<T> with standard List<T> to work with Spring injection 2013-01-03 13:33:52 -08:00
Kelven Yang 6504fc6b09 Enforce strong typing for getting result from AsyncMethod 2013-01-02 15:48:45 -08:00
Alex Huang 54cce5fa18 Getting things to compile 2012-12-28 16:07:56 -08:00
Edison Su d99161399e so many traps in rpc call: you can't use aop in a thread, you need to intercept finalize call etc 2012-12-24 02:37:32 -08:00
Kelven Yang 877e16029c Fix a few Spring issues to Bootstrap javaline server 2012-12-21 16:49:27 -08:00
Kelven Yang 1d5019c3d0 add RPC client side implementation 2012-12-20 17:55:06 -08:00
Edison Su 8aaf5ba3a0 fix unit test 2012-12-19 16:01:58 -08:00
Edison Su 8214f18897 fix build, due to refactor rpc 2012-12-19 12:02:11 -08:00
Kelven Yang ea713c70a2 remove parent concept from AsyncCallbackDispatcher, let user of AyncMethod handle high level concept of chaining 2012-12-19 11:05:24 -08:00
Kelven Yang 644b783110 Modify RPC callback style to be in consist with the latest AsyncMethod callback style 2012-12-18 17:09:56 -08:00
Kelven Yang e6ac3fd199 Add chain support to AsyncCallDispatcher 2012-12-18 14:15:38 -08:00
Kelven Yang c1ed9a9010 Modify Async callback setup convention 2012-12-17 20:37:19 -08:00
Edison Su aefb657c41 Finally, get async api call works for storage subsystem 2012-12-17 18:12:46 -08:00
Edison Su 716a5673d0 1st try to add async api in the storage component, it's ugly like hell 2012-12-14 18:25:40 -08:00
Kelven Yang 01a4a51abf Refactor and finalize framework IPC java package structure 2012-12-13 18:44:57 -08:00
Kelven Yang e998ee59f6 fix some RPC problem 2012-12-13 18:10:02 -08:00
Kelven Yang e72417a1e7 Fixes/tests on sample management server on new RPC/Async framework 2012-12-13 15:19:01 -08:00
Kelven Yang a6c441fcc5 Fixes/tests on sample management server on new RPC/Async framework 2012-12-13 15:19:01 -08:00
Kelven Yang 75285f90ba Add sample management server with loosely coupled sample components to test out the new RPC/messaging framework 2012-12-12 18:02:05 -08:00
Kelven Yang 11e9baca37 Add server side transport driver 2012-12-12 11:44:53 -08:00
Kelven Yang f52950689b Hook server side RPC provider with a server side transport 2012-12-11 17:53:46 -08:00
Kelven Yang 98a1295fb3 Add transport implementation for RPC/Async framework 2012-12-10 18:11:18 -08:00
Alex Huang 57c9b4c6b1 Figured out how to add annotations to jackson 2012-12-07 15:21:22 -08:00
Kelven Yang 9375ea0bbd Add Void class for AsyncMethod to indicate void return 2012-12-06 17:46:13 -08:00
Kelven Yang e78ccf1dd5 Give flexibility to write in-place AsyncMethod callback hanlder 2012-12-06 17:11:39 -08:00
Kelven Yang 6fd6b38b43 Add AsyncMethod support 2012-12-06 15:14:45 -08:00
Edison Su 0836bb8ec9 add state machine for templateonprimarystorage, thus we don't need hold lock 2012-12-04 19:02:14 -08:00
Kelven Yang eee58d7804 Add RpcAddressable to allow upper layer adding address mapping logic for its business object 2012-12-04 11:52:29 -08:00
Kelven Yang 1688919218 Add compilable client RPC test file 2012-12-04 10:43:08 -08:00
Kelven Yang d836b14a64 add anonymouse client RPC endpoint support 2012-12-03 16:29:14 -08:00
Kelven Yang 28db7981b9 add IPC test 2012-12-03 14:52:19 -08:00
Kelven Yang fc16e1ea1a Finish RPC service server side implementation 2012-11-28 18:03:20 -08:00
Kelven Yang 1d75063217 Finish RPC calling side implementation 2012-11-27 20:31:33 -08:00
Kelven Yang d4cb74c77b Add more RPC implementation code 2012-11-21 17:11:11 -08:00
Kelven Yang d62da2a7b5 Make RPC naming convention clear for RPC users, add handler and event dispatchers 2012-11-20 15:42:51 -08:00
Kelven Yang 17f2af409e modify RPC API flavor to be in Java Future<T> style 2012-11-19 17:37:13 -08:00
Kelven Yang 7a3ffb47e6 Add pipeline concept to RPC facility, fix javelin build issue 2012-11-15 16:15:24 -08:00
Kelven Yang 28b682c8db Add concept of caller context and message serilizer to messaging layer 2012-11-15 15:59:37 -08:00
Kelven Yang 2cae511464 Connnect event bus to messaging layer 2012-11-14 19:28:59 -08:00
Kelven Yang b38d9b82b6 CloudStack messaging refactoring skeleton 2012-11-13 17:59:39 -08:00
Edison Su 059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Edison Su a75916d45f add license header 2012-10-16 10:26:01 -07:00
Edison Su 0a7d03c90b javelin is revived 2012-10-15 15:42:59 -07:00
Alex Huang 298d224f83 Added extra maven files 2012-09-11 18:14:42 -07:00
Alex Huang 65f1991785 added missing files 2012-09-06 16:30:54 -07:00
Alex Huang 6d0e3bd8f0 Jobs changes 2012-09-06 16:30:21 -07:00
Alex Huang c0ccabb5a3 Here's the actual object model. This will allow developers to follow how CloudStack works by following the object model 2012-08-30 16:00:20 -07:00
Alex Huang 49c9f1f0ab more class file changes from maven 2012-08-30 10:00:47 -07:00
Kelven Yang 2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
Edison Su e07f8449f4 add storage interface 2012-08-24 18:24:26 -07:00
Alex Huang 07d00ebbfa modules 2012-08-23 18:11:47 -07:00