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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9f78e8d2fc
Issue 96: removed redundant factories and modified utilities and functions to use XML parsers directly
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1915 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-09-24 22:42:58 +00:00
adrian.f.cole
e3672b6a59
Issue 73: Revised and renamed key value store to BlobStore with common Map implementations; refactored implementations and test drivers to utilize new blobstore
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1910 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-09-24 00:28:01 +00:00
adrian.f.cole
30d1000165
added signature to AWS error so that we can compare the value we send with that returned from aws
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1839 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-08-09 22:23:52 +00:00
adrian.f.cole
e9aee711d3
Issue 76: restructured to jaxrs annotations and created new ones where functionality was lacking. added resteasy client apis to our repository, as there is no dep-free dist available from source. introduced TransformingHttpCommandExecutorService, which processes http independently of extracting results.
...
This uses an ExecutorService. In google app engine, there is now a WithinThreadExecutorService which is automatically selected via CloudContext as per the annotation SingleThreaded. All command classes have been converted to annotation definitions in S3Connection.
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1608 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-07-11 22:36:51 +00:00
adrian.f.cole
564573a0ad
new beta
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1504 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-30 17:53:59 +00:00
adrian.f.cole
2639bedc8e
[maven-release-plugin] prepare release 1.0-beta-2
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1502 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-30 17:17:16 +00:00
adrian.f.cole
917dae7c21
Issue 64: started logging integration tests
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1480 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-28 16:48:39 +00:00
adrian.f.cole
81ee88335e
Issue 69: ensured redirect handlers copy the content stream before closing it, as this data is needed for error parsing
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1465 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-26 17:41:39 +00:00
adrian.f.cole
d91f069761
corrected toString
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1426 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-12 16:21:35 +00:00
adrian.f.cole
6e56a0fd22
added request details to default toString
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1081 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-06-07 06:51:42 +00:00
jamurty
4403887200
Fixed HttpRequest to work with non-ascii object names. Also added string encode/decode methods to the core Utils, please use this instead of the dreaded String#getBytes
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@878 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-29 22:49:12 +00:00
adrian.f.cole
4adf4e635f
Issue 29: create separate codegen module
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@866 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-28 23:51:07 +00:00
adrian.f.cole
0f346ca1c2
new license header
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@864 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-28 21:10:33 +00:00
jamurty
b43e65dc5b
Completed basic templating implementation based on FreeMarker. The CodeGenerator now generates simple Java code files to represent the objects output by the parse_ec2.pl script.
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@861 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-27 05:11:34 +00:00
jamurty
93504ae9b6
Added the (very early) beginnings of a Java-based code generator. Currenly only parses JSON document produced by the perl API docs scraper and produces a Java object graph.
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@857 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-26 20:50:59 +00:00
adrian.f.cole
8cc04bc588
Issue 35: moved more common logic one layer up
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@844 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-24 19:54:30 +00:00
adrian.f.cole
4eced672f1
Issue 35: moved content, but also renamed options to parameters, as it makes more sense and reformatted some code
...
git-svn-id: http://jclouds.googlecode.com/svn/trunk@843 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-05-23 15:01:36 +00:00