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

745 Commits

Author SHA1 Message Date
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