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

142 Commits

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