apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,446 Commits 304 Branches 324 Tags
Commit Graph

48 Commits

Author SHA1 Message Date
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08: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
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
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
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
Alex Huang
b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -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
af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Hugo Trippaers
15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
frank
2056524411 CLOUDSTACK-4224 
UCS:UI: Delete UCS returns unknown API

Conflicts:

	plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
 2013-08-12 12:10:35 -07:00
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
 2013-08-08 15:02:40 -07:00
frank
d38ed20568 CloudStack CLOUDSTACK-4160 
listUcsManagers API needs to be able to take in id parameter
 2013-08-08 15:02:13 -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
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
frank
7cbd66f71c CloudStack CLOUDSTACK-4160 
listUcsManagers API needs to be able to take in id parameter
 2013-08-07 14:45:50 -07:00
Prasanna Santhanam
d2dff5b5e8 Squeak. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 6c1d9170ac00ec48fef1b4c1e2e11b074ff75e91)
 2013-08-07 10:40:32 +05:30
frank
578c4444d7 CLOUDSTACK-4093 
UCS:API: Need delete UCS_manager API
 2013-08-06 18:01:59 -07:00
frank
84ed1fee6b CloudStack CLOUDSTACK-3307 
UCS:DB: Same UCS manager can be added multiple times
 2013-08-05 11:10: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
frank
2d5f24ceb1 CLOUDSTACK-3918 
com.cloud.ucs.manager.UcsManagerImpl cannot parse default config
 2013-07-29 15:30:09 -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
frank
697b7c9471 make UCS api name better 2013-07-26 11:28:47 -07:00
frank
42738c2fda change associatesUcsProfileToBlade to async api 2013-07-25 15:26:51 -07:00
Amogh Vasekar
a47faa9d28 Adding HTTPS support for UCS, refactored code for o.a.c.httpclient.contrib 
CLOUDSTACK-3285
UCS: Need support for HTTP redirects and HTTPS Certificate handling
 2013-07-24 13:55:23 -07:00
Amogh Vasekar
5ff83e9c31 Adding encryption flag 
CLOUDSTACK-3308
UCS:DB: UCS Manager password should not get stored in plain text.
 2013-07-22 15:45:17 -07:00
frank
56fad86920 CLOUDSTACK-3428 
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fix entityType in api command
 2013-07-19 17:47:00 -07:00
frank
0633608f80 CLOUDSTACK-3453 
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
 2013-07-19 16:16:41 -07:00
frank
49e3278c42 CLOUDSTACK-3426 
UCS: Session cookie refresh must be supported.

add missing plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsCookie.java
 2013-07-18 16:43:21 -07:00
frank
9379190da9 CLOUDSTACK-3426 
UCS: Session cookie refresh must be supported.

fixed resolved
 2013-07-18 16:43:21 -07:00
frank
d7781c3e37 CLOUDSTACK-3307 
UCS:DB: Same UCS manager can be added multiple times

fixed resolved
 2013-07-18 11:44:32 -07:00
frank
ed6164fe00 CLOUDSTACK-3428 
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fixed resolved
 2013-07-18 11:44:32 -07:00
Amogh Vasekar
0331b8fe5d CLOUDSTACK-3234: Adding cookie to associate profile blade API 
Signed-off by: Animesh Chaturvedi <animesh@apache.org>
 2013-07-11 16:27:11 -07:00
Sheng Yang
7e44f81273 UCS: Add missing beans 
Also move the API to the right place
 2013-06-27 14:54:45 -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
Nitin Mehta
e5c542aaf1 rat: Fix the license, the mouse is squeaking, Frank stepped on it :) 2013-03-01 11:19:27 +05:30
frank
bd0fc2f354 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
 2013-02-28 15:42:48 -08:00
frank
dcef281bad CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

change API response in line with new API response convention

Conflicts:

	api/src/org/apache/cloudstack/api/ApiConstants.java
 2013-02-28 15:40:41 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -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
Rohit Yadav
fec9934656 ucs: Fix ucs plugin's pom, removes xml marktag 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 09:16:17 -08:00
Rohit Yadav
c9e764818b rat: Fix license headers on ucs plugin etc. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 08:57:16 -08:00
Hugo Trippaers
9755d9b4a2 Keep naming more or less consistent 2013-02-02 12:43:15 +01:00
frank
8416d81b99 Merge branch 'ucs' into javelin 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java
 2013-01-31 14:44:07 -08:00
frank
1a1d716d90 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:30:06 -08:00
frank
997e9fb7b0 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:29:54 -08:00
frank
301b0b9090 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

init
 2013-01-25 15:00:09 -08:00