0cfe96bd00
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/network/IpAddress.java
server/src/com/cloud/network/NetworkServiceImpl.java
setup/db/db/schema-410to420.sql
2013-04-17 15:51:05 -07:00
b910c2b245
Removing unused bean property
2013-04-16 15:17:03 -07:00
014689e45e
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/network/Network.java
plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-16 09:55:45 -07:00
8d33353b40
Removing the auto-wiring of AffinityGroupProcessors since this is an optional component
2013-04-15 16:02:05 -07:00
a4fc1d7d65
Internal LB:
...
1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB
2013-04-15 14:42:20 -07:00
20614598bf
Fixed typos
...
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
3795048fcc
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/async/AsyncJob.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/BaseCmd.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-04-11 14:16:33 -07:00
3403b54773
Added AffinityGroup View in order to include VM details while listing AffinityGroups.
2013-04-11 13:23:23 -07:00
f0018b4512
Internal LB:
...
1)Added InternalLoadBalancerManager and corresponding Impl
2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well
2013-04-10 16:29:05 -07:00
34bcb2d026
InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation
2013-04-10 16:28:06 -07:00
08f855d4e4
InternalLB:
...
1) Added new set of Interfaces - including the new VO - for the internal load balancer
2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-04-10 16:27:33 -07:00
271d232d62
QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
...
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
120d834186
Fixing the regression introduced by spring refactor to stream line oss
...
and non oss components.
sincle the GSLB service impl has different configuration, moving it out
the bean definition from applicationContext to ComponentContext and
non-ossComponentContext
2013-04-09 19:19:34 +05:30
1274d8f68a
CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly, merge the fix with latest master changes
2013-04-04 15:52:45 -07:00
c062808912
CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly
2013-04-04 15:35:18 -07:00
2dbdc46337
CLOUDSTACK-1734: Make SHA1 default password encoding mechanism
...
Description:
Making SHA256SALT the default encoding algorithm to encode
passwords when creating/updating users.
Introducing a new configurable list to allow admins to
separately configure the order of preference for encoding
and authentication schemes.
Since passwords are now sent by clients as clear text,
fixing the Plain text authenticator to check against the
password passed in rather than its md5 digest.
2013-04-02 17:40:50 -07:00
aa79ccf985
CLOUDSTACK-922: LXC Support in Cloudstack.
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00
2654e645c7
Fixup after merging 4.1 fixes to master
2013-03-29 11:12:36 -07:00
85971b5194
CLOUDSTACK-1818: make DababaseCreator ready to invoke DatabaseUpgradeChecker, adjust Component startup sequence for integrity checkers
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
3ab744d100
CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
8bb0990144
CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis (rebase fixups)
2013-03-29 11:12:36 -07:00
16216720c6
CLOUDSTACK-1276, CLOUDSTACK-1729: Remove autoscanning, ensure adpater execution order in runtime
2013-03-29 11:11:20 -07:00
333dd810d2
CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory
2013-03-05 19:03:30 -05:00
64d794ea36
Restore old caching policy on DAOs under Spring configuration
2013-01-31 16:00:13 -08:00
af67d87662
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
f304df44df
Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP
2013-01-14 17:44:31 -08:00
6dfbcee63d
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -08:00
9faf00bdc8
Fix license on xml.in, jsp and ucls files on javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:34:34 -08:00
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
cf5d935d81
Seperate configurable components out and let them be loaded from Spring configuration file
2013-01-09 14:39:16 -08:00
cc23a23324
Fix startup sequence for classes that have due Manager/Adapter interfaces
2013-01-08 18:42:12 -08:00
107fccdf69
Add AsyncCallFuture
2013-01-03 17:24:26 -08:00
25d14418b9
Replace Adapters<T> with standard List<T> to work with Spring injection
2013-01-03 13:33:52 -08:00
877e16029c
Fix a few Spring issues to Bootstrap javaline server
2012-12-21 16:49:27 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
d70154609a
Wire up injection for dynamically constructed objects
2012-10-29 16:16:07 -07:00
8e59b3acfb
Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files
2012-10-19 15:32:24 -07:00
Alena Prokharchyk
Prachi Damle
Pascal Borreli
Chiradeep Vittal
Murali Reddy
Kelven Yang
Vijayendra Bhamidipati
Phong Nguyen
Rohit Yadav
Kelven Yang