apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,065 Commits 308 Branches 324 Tags
Commit Graph

705 Commits

Author SHA1 Message Date
Kelven Yang
8eadeba37c Fix the compiling issue for usage server caused by mering the Spring work 2012-11-07 15:20:01 -08:00
Kelven Yang
d79f1f6fdc Replace Adapters and PluggableServices, use Spring to load them 2012-11-07 15:03:24 -08:00
Kelven Yang
453b31f3f4 Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring 2012-11-07 15:03:23 -08:00
Kelven Yang
0e9924fcee Add autowiring+AOP support to injected components 2012-11-07 15:03:23 -08:00
Kelven Yang
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
Alex Huang
91e68b5f2c A bunch of .project changes again 2012-11-04 19:25:03 -08:00
Alex Huang
7397716fcd added missing files 2012-11-01 13:57:34 -07:00
Hugo Trippaers
f65b268a2e Active the testrun by default in maven 
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
 2012-10-30 14:15:07 +01:00
Edison Su
f36b2f9970 add more files 2012-10-29 17:46:15 -07:00
Kelven Yang
d70154609a Wire up injection for dynamically constructed objects 2012-10-29 16:16:07 -07:00
Edison Su
0debd8a393 add more classes 2012-10-29 09:32:28 -07:00
Hugo Trippaers
6a9c588d33 Fix loading of external script so they will be loaded from the webapp classloader. 
This change will allow the Script class to look for resources in the classpath of the webapp. This makes it possible to distribute the management server as a single prepackaged war. An added benefit is easier integration with IDE's that have the option to start webapps internally.

Also fixes a bug/feature in the URL handling were some components of the script path were translated to urlencoding. This  change means that files are more often found in the first two steps of the findScript method which saves some filesystem calls.
 2012-10-26 15:32:00 +02:00
Kelven Yang
16ed8701da Test of using Spring DI to implement Basic/Premium configuration 2012-10-25 18:22:32 -07:00
Kelven Yang
c272cf6b69 add TransactionContextBuilder based on Spring AOP 2012-10-25 15:01:12 -07:00
Alex Huang
525f96b7ae fixed tab problems 2012-10-25 13:13:47 -07:00
Min Chen
7b7f4cd1fd CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction. 2012-10-25 13:06:50 -07:00
Edison Su
6a7215cedc fix default templateadaptor is not injected 2012-10-24 16:00:57 -07:00
Alex Huang
f92ce72639 Correct dependency errors 2012-10-24 11:12:40 -07:00
Edison Su
059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Hugo Trippaers
5b2e1f42b7 The adapterlist needs to be merged instead of overwritten in 
ComponentLocator.

When using the extend option in the components-nonoss.xml the adapter
lsit was overwritten (putAll on the map), but it should be merged
instead. This prevented adapters from the parent to be loaded.
 2012-10-22 11:13:34 +02:00
Kelven Yang
8e59b3acfb Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files 2012-10-19 15:32:24 -07:00
Kelven Yang
8ef9e32cfd Architecture refactoring - Stateless management server - Spring Framework initiatives 2012-10-19 15:24:15 -07:00
Kishan Kavala
f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Kelven Yang
24530a274e Architecture refactoring - Stateless management server - EventBus 2012-10-15 18:10:38 -07:00
Alena Prokharchyk
8f2d9a09e5 CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 
Fixes the count in commands:

listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes

Conflicts:

	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2012-10-12 13:58:59 -07:00
Kelven Yang
5d7509e964 Merge DB query builders from master 2012-10-11 18:24:33 -07:00
Kelven Yang
5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Edison Su
06d516a80c if db.properties.override missing, shouldn't panic 2012-10-10 16:20:35 -07:00
Hugo Trippaers
f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers
aa6355ffe6 Updated master to 4.1.0 
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
 2012-10-01 11:00:55 -07:00
Chip Childers
b10031ba97 CLOUDSTACK-135 - Removed extra LICENSE file. 2012-09-19 11:51:16 -04:00
Alex Huang
387c6fc135 Merge branch 'master' into javelin 2012-09-17 15:31:37 -07:00
Edison Su
e903f83872 fix simulator compilation 2012-09-14 13:38:08 -07:00
Alex Huang
db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Manikanta Kattamuri
cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04:00
Mice Xia
55bcfaf805 CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI 2012-09-13 11:21:11 +08:00
Mice Xia
c86711a5a9 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-11 17:37:10 -07:00
Mice Xia
0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00
Alex Huang
1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Alex Huang
e41cb9ff74 More changes 2012-09-05 13:39:32 -07:00
Rajesh Battala
39aa7d86af Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework 
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
 2012-08-31 11:44:58 -07:00
Alex Huang
28982486e7 New String Util 2012-08-30 18:56:35 -07:00
Alex Huang
b9ddcf8cfe Started an object model for the orchestration platform 2012-08-30 15:54:33 -07:00
Alex Huang
6309253de1 Deleted some useless files 2012-08-30 09:59:25 -07:00
Hugo Trippaers
a6be8c76c3 Reverting part of commit ff7c964a6621cf56d555120e9740dc87cf37b9eb (Add 
ability to do jetty:run in eclipse). This change breaks the ability to
upload scripts to XenServer (and possibly other places). Needs some
investigation before enabling this again.
 2012-08-30 16:10:28 +02:00
Kelven Yang
2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
Darren Shepherd
ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Darren Shepherd
43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Darren Shepherd
590f52df82 Include some missing resources in the jars 2012-08-28 08:59:20 -07:00
olivier lamy
40f9d84ea9 versions defined in parent pom 2012-08-27 21:54:27 +02:00