6743 Commits

Author SHA1 Message Date
Adrian Cole
954b5f914b Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds: (33 commits)
  optimize imports
  reset loginpassword/privatekey when explicitly set
  revised tests that AdminAccess change recently broke
  Issue 1028:vCloud Director 1.5: require x-vcloud-authorization header on vcloud api
  Add SYSTEM scope from DMTF CIMI. FGCP provider needs it.
  Issue-1020 Add full name option for AdminUser and UserAdd
  Add missing @Override in TransientStorageStrategy
  format and imports
  Ensure that EventBus is a singleton
  Introduce LocalAsyncBlobStore
  Miscellaneous local blobstore cleanups
  Prefer valueOf over explicit object creation
  Move helper method to TransientStorageStrategy
  Move copy(MutableBlobMetadata) to BlobStoreUtils
  Cloudstack VirtualMachines can have negative cpuUsed values for some reason
  removed dead code
  corrected destroyNodes bug
  Fixed compilation failures caused by 70fa74df1a6
  Remove encodeString() and encodeString(String)
  Shuffle blobstore parameters to match superclass
  ...
2012-07-24 10:05:43 -07:00
Adrian Cole
3128eb25fc Merge pull request #747 from vijaykiran/optimize-imports
optimize imports
2012-07-24 08:06:54 -07:00
vijaykiran
829e4af9ee optimize imports 2012-07-24 07:53:52 +02:00
Adrian Cole
9d007a40b7 reset loginpassword/privatekey when explicitly set 2012-07-23 19:28:59 -07:00
Adrian Cole
32da070317 revised tests that AdminAccess change recently broke 2012-07-23 19:28:58 -07:00
Adrian Cole
5bd9e3ad9f Issue 1028:vCloud Director 1.5: require x-vcloud-authorization header on vcloud api 2012-07-23 19:28:58 -07:00
Adrian Cole
6d9d638a1f Merge pull request #746 from dkoper/master
adding SYSTEM location scope required for FGCP
2012-07-23 19:19:50 -07:00
Dies Koper
966f1fc459 Add SYSTEM scope from DMTF CIMI. FGCP provider needs it. 2012-07-24 11:39:54 +10:00
Adrian Cole
2ef7f2bf1b Merge pull request #745 from vijaykiran/issue-1020
Issue-1020 Add full name option for AdminUser and UserAdd
2012-07-23 16:10:46 -07:00
Adrian Cole
9eaf7acd5c Merge pull request #743 from andrewgaul/transient-strategy-override
Add missing @Override in TransientStorageStrategy
2012-07-23 15:09:36 -07:00
vijaykiran
7227d70c4e Issue-1020 Add full name option for AdminUser and UserAdd 2012-07-23 23:42:31 +02:00
Andrew Gaul
6b8a2a73d4 Add missing @Override in TransientStorageStrategy 2012-07-23 13:31:21 -07:00
Adrian Cole
6016272486 Merge pull request #742 from andrewgaul/event-bus-singleton
Ensure that EventBus is a singleton
2012-07-23 12:18:58 -07:00
Adrian Cole
86b07ed768 format and imports 2012-07-23 11:43:37 -07:00
Andrew Gaul
8524dd3a67 Ensure that EventBus is a singleton 2012-07-23 11:02:55 -07:00
Adrian Cole
8402446365 Merge pull request #741 from andrewgaul/local-async-blobstore
Introduce LocalAsyncBlobStore
2012-07-23 10:25:44 -07:00
Andrew Gaul
562f8277d3 Introduce LocalAsyncBlobStore
This commit unifies the filesystem and transient blobstores.
2012-07-23 09:20:41 -07:00
Adrian Cole
5101cd0a76 Merge pull request #740 from andrewgaul/local-blobstore-misc
Miscellaneous local blobstore cleanups
2012-07-23 09:01:41 -07:00
Andrew Gaul
756e46333f Miscellaneous local blobstore cleanups
There are no more functional differences between the filesystem and
transient blobstores.  This is the last commit before introducing a
unified LocalAsyncBlobStore class.
2012-07-23 08:06:36 -07:00
Adrian Cole
b890765e9e Merge pull request #738 from andrewgaul/local-blobstore-move-helper-method
Move helper method to TransientStorageStrategy
2012-07-23 07:37:30 -07:00
Adrian Cole
d5f9bb3172 Merge pull request #739 from andrewgaul/prefer-valueof
Prefer valueOf over explicit object creation
2012-07-22 22:00:09 -07:00
Andrew Gaul
985cccff9a Prefer valueOf over explicit object creation
This allows use of cached values.  Patched with:

find -name \*.java | xargs sed -i 's/new Boolean(false)/Boolean.FALSE/g'
find -name \*.java | xargs sed -i 's/new Boolean(true)/Boolean.TRUE/g'
find -name \*.java | xargs sed -i 's/new Boolean(/Boolean.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Integer(/Integer.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Long(/Long.valueOf(/g'
2012-07-22 21:01:46 -07:00
Andrew Gaul
22da88d2ae Move helper method to TransientStorageStrategy
Also move etag generation since we cannot reuse Payloads in the
general case.
2012-07-22 20:02:59 -07:00
Adrian Cole
7a13dffeed Merge pull request #737 from andrewgaul/mutable-blob-metadata-copy
Move copy(MutableBlobMetadata) to BlobStoreUtils
2012-07-22 18:20:43 -07:00
Andrew Gaul
0bc5c69a4f Move copy(MutableBlobMetadata) to BlobStoreUtils 2012-07-22 17:37:18 -07:00
Adrian Cole
b517bc79c7 Merge pull request #736 from abayer/master
Allow negative cpuUsed values for Cloudstack virtual machines
2012-07-22 14:38:30 -07:00
Andrew Bayer
d585ace712 Cloudstack VirtualMachines can have negative cpuUsed values for some reason 2012-07-22 12:23:22 -07:00
Adrian Cole
4c31fb65f1 Merge pull request #735 from dralves/nodepool
issue 558 - corrected final bug nodepool is working
2012-07-20 16:11:14 -07:00
David Ribeiro Alves
b4c6d01eba removed dead code 2012-07-20 22:24:45 +01:00
David Ribeiro Alves
b45fad87d8 corrected destroyNodes bug 2012-07-20 22:23:16 +01:00
Andrew Phillips
3654527302 Fixed compilation failures caused by 70fa74df1a6 2012-07-19 16:00:14 -04:00
Adrian Cole
682f047bad Merge pull request #732 from andrewgaul/local-blobstore-constructors
Shuffle blobstore parameters to match superclass
2012-07-19 12:14:08 -07:00
Adrian Cole
0fb6b12c56 Merge pull request #733 from andrewgaul/remove-encode-string
Remove encodeString() and encodeString(String)
2012-07-19 12:11:00 -07:00
Andrew Gaul
27e61f73e9 Remove encodeString() and encodeString(String)
These are not used in jclouds and callers should use
String.getBytes(Charset) directly, preferably with Guava Charsets
constants.
2012-07-19 10:55:23 -07:00
Andrew Gaul
870ed0cdb3 Shuffle blobstore parameters to match superclass
Also remove unused injected parameter.
2012-07-19 07:17:02 -07:00
Adrian Cole
c4dde78b0c Merge pull request #725 from dralves/nodepool
issue 558 - nodepool
2012-07-19 04:38:59 -07:00
Adrian Cole
70fa74df1a Merge pull request #731 from andrewgaul/input-supplier
Prefer InputSupplier helpers
2012-07-19 04:34:25 -07:00
Adrian Cole
aec16c184a Merge pull request #730 from andrewgaul/local-storage-strategy-injection
Inject TransientStorageStrategy
2012-07-19 04:33:53 -07:00
Andrew Gaul
a40983a39d Prefer InputSupplier helpers
These ensure that inputs are closed properly.

Updated with: find -name \*.java | xargs sed -i
's/toStringAndClose(\(.*\)\.getInput())/toString(\1)/'
2012-07-18 17:42:48 -07:00
Andrew Gaul
a2d5a48f3f Inject TransientStorageStrategy
Remove some unneeded checkNotNull as Guice does not inject null
parameters.
2012-07-18 16:02:07 -07:00
Adrian Cole
4ac8770e66 Merge pull request #727 from jclouds/fix-issues-building-on-win
Fix issues building on Windows
2012-07-18 15:29:48 -07:00
Adrian Cole
6cb318ece8 Merge pull request #728 from andrewgaul/local-storage-strategy-odds-and-ends
Tie up odds and ends from LocalStorageStrategy
2012-07-18 15:28:24 -07:00
Adrian Cole
da86d52c65 Merge pull request #729 from andrewgaul/readme
Improve README blurb
2012-07-18 15:27:51 -07:00
Andrew Gaul
cd1de16668 Improve README blurb
Make first sentence more direct, correct grammar errors, and
alphabetize providers.
2012-07-18 14:50:05 -07:00
Andrew Gaul
8a9265f015 Tie up odds and ends from LocalStorageStrategy
Use LocalStorageStrategy instead of TransientStorageStrategy and
handle IOExceptions.  Aso use dummy location in filesystem blobstore.
2012-07-18 09:45:23 -07:00
Andrew Phillips
575b0a4559 Using the 'maxmemory' option rather than the more generic 'additionalJOption' for the Javadoc plugin to allow for easier overriding 2012-07-18 09:51:08 -04:00
Andrew Phillips
75ce908c13 Made joyent-api tests compatible with Windows 2012-07-18 09:51:03 -04:00
Andrew Phillips
f3419e90c9 Made virtualbox tests compatible with Windows 2012-07-18 09:51:01 -04:00
Andrew Phillips
16314f906c Made scriptbuilder tests compatible with Windows 2012-07-18 09:50:59 -04:00
David Ribeiro Alves
0949d52224 added admin access property to all unit tests as hudson requires it (no pk) 2012-07-18 11:36:57 +01:00