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
7397716fcd
added missing files
2012-11-01 13:57:34 -07: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
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
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
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
Mice Xia
55bcfaf805
CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI
2012-09-13 11:21:11 +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
Darren Shepherd
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
Kelven Yang
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
Chiradeep Vittal
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
Mice Xia
00b2a8040b
Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder
2012-08-13 15:30:42 +08:00
Sheng Yang
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Alex Huang
e83c60a057
added JoinType to remove the j2ee source code in CloudStack
2012-08-08 13:42:08 -07:00
Alex Huang
f04c006f9a
Added javax.persistence and javax.ejb jar packages to replace the files removed. Added a new annotation to replace the encrypt attributed added to the Column annotation. Removed join attribute added to SecondaryTable in previous commit
2012-08-08 12:58:24 -07:00
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Alex Huang
a617ccc898
Added missing file
2012-08-07 15:52:34 -07:00
Alex Huang
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
Alex Huang
1d3a443237
Added support for component libraries in plugins
2012-08-07 15:40:01 -07:00
Sheng Yang
84a1a311f9
S2S VPN: CS-15511: Add PFS support for VPN connection
2012-08-06 15:27:13 -07:00
Alena Prokharchyk
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
Chip Childers
95ce55f0a1
License header updates for the utils folder
2012-08-03 14:15:09 -04:00
Alena Prokharchyk
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
Alena Prokharchyk
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
Sheng Yang
e8d2ca48b4
S2S VPN: Update the supported crypto list
...
We would support 3DES, AES128, AES192, AES256.
2012-07-30 16:43:55 -07:00
Sheng Yang
e9ae7336c1
CS-15649: Remove DES from s2s vpn support policy
...
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
Sheng Yang
c0fcca3990
CS-15511: Not allow pfs parameter for customer VPN gateway
2012-07-19 15:10:31 -07:00
Alena Prokharchyk
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
