Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,882 Commits 22 Branches 130 Tags 97 MiB
Commit Graph

518 Commits

Author SHA1 Message Date
Alex Yarmula 9eb73a8544 Merge branch 'master' of github.com:jclouds/jclouds 2010-04-06 11:01:07 -07:00
Alex Yarmula 63c5f8b85c Merge branch 'master' of github.com:jclouds/jclouds 2010-04-06 09:45:49 -07:00
Chas Emerick c352f408a2 fix ec2 to work with canonical AMIs 2010-04-06 08:24:55 -04:00
Adrian Cole 736e85da6b fixed ec2 to work with alestic amis 2010-04-05 20:06:57 -07:00
Alex Yarmula 2ccbc8e40a resize-ebs is moved to clouddemo repository 2010-04-05 15:21:25 -07:00
Adrian Cole 190c768d02 Issue 221: made sure default template always works on all cloud providers 2010-04-04 22:57:03 -07:00
Adrian Cole 4ee4bb8764 Issue 210: ec2 content length header was bad. corrected and also updated default appengine test app to allow more time to startup 2010-04-04 19:48:02 -07:00
Adrian Cole 68080daee3 Issue 211:update to latest appengine sdk 1.3.2 2010-03-31 19:04:37 -07:00
Adrian Cole ebcaae325f Issue 215: removed RuntimeDelegate.setInstance and turned to dependency injection for UriBuilder 2010-03-22 22:33:26 -07:00
Adrian Cole 614cbb24c6 Issue 207: increased ferocity of tests to do concurrent 5MB downloads w/checksum on both http and blobstore level. 2010-03-21 16:48:16 -07:00
Adrian Cole 38b2bef023 Issue 211: added gae, but waiting for service to go live 2010-03-20 16:22:17 -07:00
Adrian Cole 72da36bf33 switched aws demo to use s3 and ec2 2010-03-20 12:40:52 -07:00
Andrew Phillips 83d0b24e53 Line endings. 2010-03-19 12:11:31 +01:00
Andrew Phillips 3b9e961268 Merge remote branch 'origin' 2010-03-19 11:33:57 +01:00
Andrew Phillips 64b68d73db Housekeeping: renamed all .svnignore files to .gitignore, and some line endings. 2010-03-19 11:30:13 +01:00
Andrew Phillips 43788298f8 Merge branch 'master' of C:\Users\aphillips\Workspaces\Personal\jclouds 2010-03-19 09:03:35 +01:00
Andrew Phillips 550384bd22 Line ending changes and POM formatting. 2010-03-19 09:02:17 +01:00
Adrian Cole 92cc6d6a21 Refactored AMI parsing 2010-03-18 18:29:39 -07:00
Adrian Cole b47c6114c0 alestic changed naming convention to not include manifest.xml 2010-03-17 21:32:14 -07:00
Alex Yarmula e1903f9473 Merge branch 'issue174' 2010-03-16 20:34:29 -07:00
Alex Yarmula f959db6546 fixed the aws tests 2010-03-16 17:03:08 -07:00
Alex Yarmula b9a5dc0d0b fix for multiple security groups in ec2 2010-03-16 16:56:09 -07:00
Alex Yarmula a7d73a2d64 fix for multiple security groups in ec2 2010-03-16 16:55:19 -07:00
Adrian Cole dc512e8bae Issue 202: withDetails support for BlobStore.list(String,ListContainerOptions) 2010-03-14 23:34:47 -07:00
Adrian Cole e04784373e Issue 154: added Transient blobstore 2010-03-09 09:17:33 -08:00
Adrian Cole b190651247 refactored configuration module so that Issue 201 could occur. linked context with objects created from it 2010-03-09 00:10:27 -08:00
Adrian Cole 8ad3955e36 example of testing request signing 2010-02-25 13:32:34 -08:00
Alex Yarmula d71b439981 Changed the instance Size to support floating-point type of # of cores (ex, 6.5 cores). Propogated the change to template builder and related ComputeService usages. 2010-02-23 13:24:57 -08:00
Alex Yarmula c0b5d832b5 added support for m2.xlarge instance type in ec2. added tests in EC2ComputeServiceTest 2010-02-23 11:54:46 -08:00
Adrian Cole f2fb83abaf Merge branch 'master' of git@github.com:jclouds/jclouds 
* 'master' of git@github.com:jclouds/jclouds:
  Changed the way device name is passed
 2010-02-21 10:58:36 -08:00
Adrian Cole a72efaea6d Issue 177: support scheme-only redirects 2010-02-21 10:43:00 -08:00
Alex Yarmula db31695940 Changed the way device name is passed 2010-02-20 15:55:03 -08:00
Alex Yarmula 55c8ce03ad Improved #equals for RunningInstance.EbsBlockDevice 
Added the header to BlockDeviceMapping
 2010-02-20 12:54:07 -08:00
Alex Yarmula a607d3573f Removed the class that's no longer used 2010-02-20 12:43:32 -08:00
Alex Yarmula 7133a0b2ad Fixed wrong dependency 2010-02-20 12:35:05 -08:00
Alex Yarmula 0097a2ded6 Replaced string representation of BlockDeviceMapping with the class for Instance(Async)Client#setBlockDeviceMappingForInstanceInRegion, getBlockDeviceMappingForInstanceInRegion 
Fixed the tests and some logic for BlockDeviceMapping. NOTE: Now it receives and returns instances of RunningInstance.EbsBlockDevice
 2010-02-20 12:23:16 -08:00
Alex Yarmula cec1a92bb4 Added root volume deletion after the test ends 2010-02-19 12:33:07 -08:00
Alex Yarmula 6786db2738 code refactoring for the test 2010-02-19 10:47:52 -08:00
Alex Yarmula 14d9862853 Added a new live test (InstanceVolumeManagerLiveTest.java). 
Changed the snapshot taking behavior: snapshot is deleted when it's no longer needed.
Exposed some of the object on InstanceVolumeManager for tests
 2010-02-18 16:56:36 -08:00
Alex Yarmula 1b09ebb041 Cleaned up SshExecutor 2010-02-17 10:51:32 -08:00
Alex Yarmula 543af26e92 Added SocketOpen retryable predicate for connecting to ssh 
Some refactoring, including use of guava's checkState and more precise method parameters
 2010-02-17 10:40:35 -08:00
Alex Yarmula a46542ee91 removed incorrect path to key 2010-02-17 00:51:14 -08:00
Alex Yarmula 4d8050105a added new demos in .pom 
added proper headers
 2010-02-17 00:48:21 -08:00
Alex Yarmula f83dce9469 added aws demo that resizes volume size for EBS-backed instances 
it includes main classes and Java launcher in /resize-ebs-java,
as well as JRuby launcher for the same Java classes
 2010-02-17 00:31:36 -08:00
Alex Yarmula 3e8381e3f3 Added an overloaded version of 'createVolumeFromSnapshotInAvailabilityZone' to support specific size for a volume 2010-02-16 10:37:18 -08:00
Adrian Cole c8f5d36c14 changed apache hc to not be automatically included in the enterprise distribution, as untuned it is much slower than default 2010-02-10 12:22:37 -08:00
Adrian Cole df86359e65 Issue 156: refactored compute api classes and added reboot support 2010-02-08 22:09:07 -08:00
Adrian Cole 52e40c4651 normalized usage of null across compute apis, removed loop of recreating nodes, extracted BaseComputeService class 2010-02-08 01:32:53 -08:00
Adrian Cole 7228d2ea04 Issue 107: added proxy support, timeout parameters, and refactored ssl module 2010-02-05 23:16:34 -08:00
Adrian Cole 4582c57c72 fixed version numbers to SNAPSHOT 2010-02-04 21:30:22 -08:00
adrian.f.cole 2ed029764f beta-3 release 
git-svn-id: http://jclouds.googlecode.com/svn/branches/1.0-beta-3@3054 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-02-02 11:34:05 +00:00
adrian.f.cole 7120f6e536 corrected CNFE, as it should have been a subclass of ResourceNotFoundException; stabalized the directory support for rackspace and atmos 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2753 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-02-02 04:07:49 +00:00
adrian.f.cole a268309c94 overhauled the blobstore api to work with pseudo directories and continuable lists. fixed connection errors in http executor. changed to return null on resource not found 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2745 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-02-01 10:09:45 +00:00
adrian.f.cole 2b3d2b0c48 fix bugs found by pvdyck blind usage of content on HEAD requests and throwing away data on generation of uri 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2738 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-29 23:39:47 +00:00
adrian.f.cole 24f1836f7a Issue 130 added rsa key options to compute api 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2734 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-29 07:01:20 +00:00
adrian.f.cole 99dd7c1638 Issue 130: clarified method names 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2731 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-28 08:21:10 +00:00
adrian.f.cole 3521c47029 Issue 130: added location and made compute service set-based 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2730 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-28 05:21:11 +00:00
adrian.f.cole 70aa7e4ef3 Issue 73, 130, 150: overhauled context builders, blobstore javadocs, setup http connection limiter, and otherwise readied the code for consumption 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2729 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-25 09:41:37 +00:00
adrian.f.cole 9d305c95a9 Issue 130: added rimu and vanilla vcloud, hardened state changes to delete with status checks, added example build.properties to ant samples 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2727 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-23 03:22:28 +00:00
adrian.f.cole aa41f4512b Issue 130: added rackspace and cleaned up builder concepts 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2721 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-22 20:39:23 +00:00
adrian.f.cole 28aadccb49 Issue 130: fleshed out compute abstraction and hardened TemplateBuilder design 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2718 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-22 09:35:39 +00:00
adrian.f.cole a17da70588 support null; add AuthorizationException 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2717 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-22 00:30:07 +00:00
adrian.f.cole cb906ded3c Issue 130: added options to runNode like openPorts and runScript; added ability to specify alternate endpoint in *ContextBuilderFactory; updated ant tasks to use new node features; Issue 112: normalized vcloud clients 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2712 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-21 06:22:42 +00:00
sharedocs1@gmail.com e486147c01 Updated license headers (no code changes). 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2703 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-20 11:52:59 +00:00
adrian.f.cole 2e213ae223 Issue 130: properly modeled node and templates 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2702 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-20 11:34:24 +00:00
adrian.f.cole 9b39988ad7 Issue 130, Issue 73: separated out provider context from abstraction. accessible via getProviderSpecificContext 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2684 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-20 00:32:04 +00:00
adrian.f.cole e38f58902c Added more images to ec2 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2673 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-19 11:18:41 +00:00
adrian.f.cole 35b2043e95 new GoogleAppEngineConfigurationModule 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2672 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-19 07:06:34 +00:00
adrian.f.cole 969bb8ea38 Issue 144: Temporary hack until http://code.google.com/p/guava-libraries/issues/detail?id=317 is fixed. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2670 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-19 02:23:30 +00:00
adrian.f.cole f9fec120a7 Issue 130: separated out compute api 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2668 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-18 22:56:58 +00:00
adrian.f.cole 27de8ac105 Issue 148 Issue 9 cleanup javadoc, removed use of string.replaceAll 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2664 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-18 20:28:37 +00:00
adrian.f.cole 2776d12093 corrected ssl errors in blobstore and normalized context factories 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2663 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-16 17:35:59 +00:00
adrian.f.cole d8e6c0e248 Issue 130, Issue 29: normalize location, called Region in amazon speak, restructured domain model across compute and blobstore 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2658 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-15 23:13:35 +00:00
adrian.f.cole 63073ae3f4 formatting 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2655 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-14 20:40:39 +00:00
sharedocs1@gmail.com ffbc1bb004 The usual svn:ignore stuff 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2653 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-14 13:50:00 +00:00
adrian.f.cole 2d19e33828 changed factories to not use varargs as it makes scripting ugly. also added NONE options for the same reason. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2645 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-13 06:34:35 +00:00
adrian.f.cole 6ff6abd36c Issue 129 Issue 130: changed naming convention per libcloud; added context object 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2644 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-13 01:19:42 +00:00
adrian.f.cole e3c6b0e4e1 fastest ec2 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2642 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-12 03:14:05 +00:00
adrian.f.cole b29521ef41 Issue 147: performace improvements to SQS 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2641 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-12 02:18:23 +00:00
adrian.f.cole 5b1a2da6a1 Issue 129: cargo integration and ant task consolidation 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2636 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-11 13:38:07 +00:00
adrian.f.cole befd1f0a4e Issue 130: corrected type where UMBUNTU should have been UBUNTU, started integrating cargo 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2630 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-11 05:57:07 +00:00
adrian.f.cole 340d58e030 added jdk to computeservice 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2629 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-11 03:00:42 +00:00
adrian.f.cole 646cad3202 adjusted timeouts and corrected invalid ami id 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2628 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-11 02:06:54 +00:00
adrian.f.cole 05a7f5233b Issue 146: initial support for amazon SQS 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2627 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-11 00:08:04 +00:00
adrian.f.cole 83a2d54e3e Issue 144: convert to ListenableFutures 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2625 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-10 06:25:44 +00:00
adrian.f.cole e69831b1a9 Issue 144: replaced exception handling with guava's Throwables methods 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2624 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-10 05:07:42 +00:00
adrian.f.cole 1284fd67fa Issue 144: replaced FutureFunctionCallable, FutureFunctionWrapper, RunnableFutureTask with Futures.compose and Futures.chain 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2617 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-07 01:46:43 +00:00
adrian.f.cole 6a5a4df606 Issue 144: replace WithinThreadExecutorService with com.google.common.util.concurrent.Executors.sameThreadExecutor 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2616 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-06 22:21:24 +00:00
adrian.f.cole 2d3c1b6019 made name a mandatory parameter of newBlob 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2612 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-06 17:54:41 +00:00
adrian.f.cole 183342d7f0 broke the build 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2611 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-06 16:41:01 +00:00
adrian.f.cole aab7fd12dc s3: fixed ssl error on bucket not found 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2609 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-06 03:43:25 +00:00
sharedocs1@gmail.com 63c4712517 Corrected JavaDoc tag. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2579 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 21:56:30 +00:00
sharedocs1@gmail.com 26fe6beb3e Removed some unnecessary <type>jar</type> and <scope>compile</scope> entries (these are the defaults). 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2578 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 19:12:11 +00:00
sharedocs1@gmail.com 9a936f2a52 Replaced local values of appengine.home with a placeholder. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2577 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 19:09:05 +00:00
sharedocs1@gmail.com 71ddcd5c87 Formatting. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2571 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 18:43:17 +00:00
sharedocs1@gmail.com 4b8c5d9b50 Added svn:ignore 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2568 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 13:44:25 +00:00
sharedocs1@gmail.com 6c8aad4549 Updated svn:ignore 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2567 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 13:44:01 +00:00
adrian.f.cole 26b2e20640 new demo javaoverssh 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2566 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 03:29:50 +00:00
adrian.f.cole edc6ccc503 opened port 8080 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2565 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-02 00:38:14 +00:00
adrian.f.cole bdbb6d0ec9 corrected license of pom.xml files 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2564 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-01 17:56:29 +00:00
adrian.f.cole 7e34f51cc4 Issue 29: completed instance commands 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2561 3d8758e0-26b5-11de-8745-db77d3ebf521
 2010-01-01 01:38:23 +00:00
adrian.f.cole 9d1ef9bdf5 Issue 29: changed userData to automatically encode data 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2560 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 18:26:55 +00:00
adrian.f.cole 3f7058454c Issue 29: changed userData to automatically encode data 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2559 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 18:08:30 +00:00
adrian.f.cole 32ab37d3d7 Fixed license error caught by libcloud: jclouds isn't licensed to Apache, it just uses that license. thanks guys 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2558 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 17:36:46 +00:00
adrian.f.cole 6fc03a9b01 Issue 29: added DescribeInstanceAttribute functions 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2557 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 06:53:32 +00:00
adrian.f.cole 093d1ce393 Issue 29: example of how to create/destroy a lamp server 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2556 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 03:14:13 +00:00
adrian.f.cole f27950205a Issue 29: alestic run support 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2555 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-31 02:35:23 +00:00
adrian.f.cole 1e0e63ddd2 Issue 23: added bucket logging 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2548 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-30 21:58:15 +00:00
adrian.f.cole bfd9fa8d53 Issue 22: request payment 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2544 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-30 20:04:14 +00:00
adrian.f.cole dff7756acb Issue 23, 142: added bucket location and northern california region 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2543 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-30 18:50:33 +00:00
adrian.f.cole 0f71237ba8 Issue 29: broke some tests 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2541 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-30 06:03:57 +00:00
adrian.f.cole 18201f319f Issue 29: added support for elastic block store ami 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2540 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-30 05:43:44 +00:00
sharedocs1@gmail.com a3c86c926a Replaced the DTD in web.xml with the XSD header and added svn:ignore info 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2534 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-29 23:36:11 +00:00
adrian.f.cole 0f158c95f2 Issue 29: completed EBS support 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2533 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-29 05:26:12 +00:00
adrian.f.cole 719aa3483b Issue 29: added attach/detach 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2532 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-28 23:17:00 +00:00
adrian.f.cole c5d67c7cb3 Issue 29: added parsers for Volumes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2530 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-28 21:16:05 +00:00
adrian.f.cole 0a31da0d1a Issue 29: added initial support for EBS 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2528 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-28 05:49:53 +00:00
adrian.f.cole 1c8b5cce44 Issue 29, Issue 76: allowed for null parameters; converted existing ec2 methods to employ Region as a required argument 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2527 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-28 04:51:10 +00:00
adrian.f.cole e7c6cbf492 Issue 29, Issue 76: added new annotation @EndpointParam, added support for Availability Zones and Regions 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2526 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-28 01:41:31 +00:00
adrian.f.cole 5613f7662c Issue 29: added monitoring services 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2525 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-27 07:40:02 +00:00
adrian.f.cole 57aea2d47b Issue 29: brought Image Services in line with 11/30/2009 release 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2524 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-27 06:04:20 +00:00
adrian.f.cole d60951fcf1 Issue 29: options for create image 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2523 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-26 18:02:18 +00:00
adrian.f.cole 36662a2dc8 Issue 29: added create image 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2521 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-25 00:36:42 +00:00
adrian.f.cole 9acd434114 Issue 29: moved ec2 functions into separate modules 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2518 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-24 22:12:17 +00:00
sharedocs1@gmail.com caaf950fc1 Rewritten the distribution generation to a) use descriptors from a shared dependency b) correctly package transitive dependencies and c) correctly JarJar these dependencies 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2517 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-24 19:50:37 +00:00
sharedocs1@gmail.com 3e5c6aff2d Last tweaks (for the moment) to the Maven assembly. See http://code.google.com/p/jclouds/issues/detail?id=127 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2480 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-20 14:39:29 +00:00
sharedocs1@gmail.com 0b449924b3 Last tweaks (for the moment) to the Maven assembly. See http://code.google.com/p/jclouds/issues/detail?id=127 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2479 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-20 14:38:06 +00:00
adrian.f.cole 410b5f76e3 Issue 136: updated to 1.3.0 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2469 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-18 17:21:23 +00:00
adrian.f.cole 6bd1663f3d Issue 130: fixed npe when there is no ip address 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2465 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-18 08:36:16 +00:00
adrian.f.cole ce1b6dea27 Issue 130: added server state 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2462 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-18 07:44:52 +00:00
adrian.f.cole 8116d47b67 Removed dependency of apache commons-io as it overlaps with guava. note guava will include google collections soon 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2457 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-17 20:10:58 +00:00
sharedocs1@gmail.com e5d745049f Made the JetS3t dependency 'provided' as it is assumed that the user will already have JetS3t in his/her project's classpath 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2453 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-17 15:22:19 +00:00
sharedocs1@gmail.com b3907f7f88 Added skeleton READMEs for projects. See http://code.google.com/p/jclouds/issues/detail?id=127 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2452 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-17 15:17:52 +00:00
adrian.f.cole 0dc9f42502 Issue 129, Issue 130: added ec2 to abstraction and ant tool 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2446 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-16 08:24:25 +00:00
adrian.f.cole 107ef1c040 raised default timeout of get/put commands in blobstores 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2435 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-15 05:58:53 +00:00
adrian.f.cole 6e74a573df fixed demo 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2426 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-15 00:50:29 +00:00
adrian.f.cole 8be956c42c Issue 128: updated snapshot for vfs 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2414 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-14 00:09:18 +00:00
adrian.f.cole 8023ccefff updated perftest to use joda/bouncycastle 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2412 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-13 21:42:07 +00:00
adrian.f.cole 4a22f808d1 Issue 134: switch to typed payloads for http requests and blob types 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2410 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-13 20:46:48 +00:00
adrian.f.cole 74be2180d3 Issue 131: reorganized package structure 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2409 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-13 06:42:22 +00:00
adrian.f.cole 1eb4619faa Issue 131: extract out bouncycastle 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2408 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-13 05:16:26 +00:00
adrian.f.cole 507794042e Issue 131: move joda to extension 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2407 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-13 02:24:30 +00:00
adrian.f.cole a900e05a1f Issue 131: modularized out blobstore 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2405 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-12 23:28:02 +00:00
sharedocs1@gmail.com 573d654d7d Cleaned up POMs (removed unnecessary <packaging>jar</packaging> and moved a few things around) 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2398 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-11 16:36:56 +00:00
adrian.f.cole 6aeb907620 Issue 129: only use uri to get abstract services. credentials are embedded in the uri, urlencoded as necessary 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2387 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-09 01:56:27 +00:00
adrian.f.cole 9e340f286e Issue 128: added initial vfs module and fixed dependent bugs 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2374 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-12-07 07:09:57 +00:00
adrian.f.cole 0b94f0ef12 added path to redirect options 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2315 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-23 08:09:59 +00:00
adrian.f.cole a35a0f84ab updated to latest guice 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2300 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-17 21:20:38 +00:00
adrian.f.cole bc238bc507 Issue 121: converted all modules to sync/asyc 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2293 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-15 23:16:38 +00:00
adrian.f.cole 2285f36bd3 Issue 29: better state testing 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2291 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-15 01:49:23 +00:00
adrian.f.cole 3aa7e73351 Issue 112: added support for most Terremark Internet Services Functions 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2287 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-14 00:57:17 +00:00
sharedocs1@gmail.com 5e6ef2d068 Adding svn:ignore part 2. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2280 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 23:25:47 +00:00
sharedocs1@gmail.com 1e7b64c323 Cosmetic project name changes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2277 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 23:04:15 +00:00
sharedocs1@gmail.com 01577cd717 Cosmetic project name changes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2276 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 23:03:53 +00:00
sharedocs1@gmail.com f2b8b4cd9f Cosmetic project name changes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2275 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 23:03:29 +00:00
sharedocs1@gmail.com 3bf6762de9 Changed some (out-of-date?) project names. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2274 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 23:00:50 +00:00
sharedocs1@gmail.com 8a7f1e42e0 Adding svn:ignore part 1. 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2273 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 22:55:18 +00:00
adrian.f.cole 633a38b502 Issue 119: fixed encoding in unit tests 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2270 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 18:51:17 +00:00
adrian.f.cole ba60357f21 Issue 29: elastic ip support 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2269 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 18:49:38 +00:00
adrian.f.cole 7dca745375 Issue 29: started on image attributes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2258 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-12 06:22:44 +00:00
adrian.f.cole 5fd7d87447 Issue 116: rolled up atmos 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2253 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-11 08:10:52 +00:00
adrian.f.cole 474936d711 Issue 116: consolidated azure modules 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2251 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-11 07:38:47 +00:00
adrian.f.cole 13be94e72b Issue 61: removed sun cloud support 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2250 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-11 07:14:47 +00:00
adrian.f.cole 10fe315b7d Issue 116: consolidated blobstore into core 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2249 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-11 07:10:33 +00:00
adrian.f.cole 59cd117fdf fixed unit tests 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2238 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-09 06:13:41 +00:00
adrian.f.cole 78d72fae49 Issue 29: supports basic operations 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2236 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-09 03:39:28 +00:00
adrian.f.cole 870becd3f1 Issue 116: rolled s3 into aws 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2235 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-09 03:35:53 +00:00
adrian.f.cole b14210bf92 changed name of blobstore module 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2060 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-06 22:52:52 +00:00
adrian.f.cole 946128b97d fixed demo 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2049 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-06 20:43:54 +00:00
adrian.f.cole a2b17d5718 unit test failures 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2042 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-04 00:59:13 +00:00
adrian.f.cole 830d90874d Issue 73: updated to allow container listings to have pagination 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2037 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-11-02 09:13:40 +00:00
adrian.f.cole 3d030cfac0 removed mapmaker expiration as it is incompatible with google appengine. replaced with ExpirableSupplier 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2032 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-31 09:07:57 +00:00
adrian.f.cole af2fa174d1 made google sample work across clouds 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2031 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-31 09:05:19 +00:00
adrian.f.cole 16e3526430 tuned performance tests 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2014 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-31 00:47:16 +00:00
adrian.f.cole f285e85ae7 removed bad xstream dependency 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2012 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-31 00:40:19 +00:00
adrian.f.cole 92b7a3ea89 Issue 73: support recursive listing on stubs 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2010 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-30 20:48:47 +00:00
adrian.f.cole aa6bb89d75 Issue 113: signature logger 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2008 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-30 20:46:58 +00:00
adrian.f.cole 243ec0d2aa Issue 113: centralized loggers and switched to logger: jclouds.signature not jclouds.signature.wire 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2007 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-30 16:52:04 +00:00
adrian.f.cole 5b95c35ca7 Issue 113: signature logger 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2006 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-30 16:19:35 +00:00
adrian.f.cole 050f6e9a82 Issue 74, Issue 76, Issue 101: revamped blobstore and rest subsystems; Issue 10: removed assisted inject 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2001 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-29 20:17:42 +00:00
adrian.f.cole ee6ffff298 Issue 73: normalizing names of objects; break metadata into interfaces so that they can be implemented differently 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1986 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-19 01:14:25 +00:00
adrian.f.cole e939114702 tuned timestamp logic 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1982 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-14 04:59:51 +00:00
adrian.f.cole 33d11fe07f Issue 73: changed eTag to String, as at least two clouds don't have parsable etags; changed user metadata to Map from Multimap as there are no dupes 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1973 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-12 06:10:15 +00:00
adrian.f.cole 04f70ce8f7 disabled wire logging 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1972 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-12 06:06:28 +00:00
adrian.f.cole 9c3dcdf495 Issue 76: Reverted decision to rename binders to decorators. binders are not decorators, as they do not enclose objects and add behavior 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1970 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-11 23:22:49 +00:00
adrian.f.cole 06c63e6284 Issue 74: changed scope for performance tests 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1969 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-11 18:38:02 +00:00
adrian.f.cole 50fc3cb913 Issue 74: refactored logging including addition of new trace and header logs. These remove the need for separate json and xml debugging, as it is seen in wire logs 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1968 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-10 21:55:18 +00:00
adrian.f.cole 5b7878b0ea Issue 76: added support for @Produces and @Consumes, replaced @EntityBinder with @DecoratorParam so that we can manipulate more things then just entities; organized rest module 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1952 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-10 00:18:34 +00:00
adrian.f.cole b3a9e76d21 added timeout parameter for builders 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1951 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-08 18:38:36 +00:00
adrian.f.cole 557d28783f Issue 109, Issue 73: more work on compatibility layer; expose vendor interface as getApi(); more Strategies 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1946 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-05 16:27:48 +00:00
adrian.f.cole f78670f871 Issue 108 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1943 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-04 00:25:12 +00:00
adrian.f.cole a1ca5773c7 Issue 108: changed from List to SortedSet 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1941 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-10-03 19:53:27 +00:00
adrian.f.cole 502dc92836 Issue 103, Issue 73: cleaned up injection and portability layer, removing need for most internal classes and facilitating shared testing stubs across providers 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1940 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-30 21:17:07 +00:00
adrian.f.cole c2b62a0a03 simplified example as it was too complicated 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1938 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-30 21:10:01 +00:00
adrian.f.cole 2de58bb5b9 Issue 102: refactor to use RestContext instead of httpresponse.request 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1935 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-27 19:28:37 +00:00
adrian.f.cole bb50a7364f Issue 99: organize binders 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1924 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-25 05:33:03 +00:00
adrian.f.cole 58b075562f Issue 95: multiple endpoints per interface 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1922 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-25 04:02:38 +00:00
adrian.f.cole 66c1b593b9 Issue 95: factories that support alternate endpoints 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1921 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-25 00:38:40 +00:00
adrian.f.cole 95409990b1 Issue 95: created qualifier annotations for endpoints and removed host/port logic 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1917 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-24 22:49:43 +00:00
adrian.f.cole 6b0f7e289a light work on ec2 
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1916 3d8758e0-26b5-11de-8745-db77d3ebf521
 2009-09-24 22:48:30 +00:00