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

430 Commits

Author SHA1 Message Date
Andrew Bayer 23e43b2c8d JCLOUDS-381. Allow explicit naming of nodes via TemplateOptions. 2013-11-21 10:15:25 -08:00
Andrew Bayer 2077da2879 JCLOUDS-361. Add support for filtering Describe* methods in EC2 2013-11-14 11:53:31 -08:00
jolly 6e7c2c7e88 add g2.2xlarge EC2 instance size (JCLOUDS-364) 2013-11-06 12:24:06 -08:00
Andrew Gaul 6c5effcdb1 Address error-prone empty statement warnings 2013-11-05 16:22:44 -08:00
Andrew Phillips e2f67a7567 Removing debugging System.err calls mistakenly included in ecc918b4 2013-11-01 16:33:36 -04:00
Andrew Gaul f1fc63ab76 Add whitespace around keywords and braces 2013-09-30 09:39:29 -07:00
Andrew Bayer 0aa19a0cee Fix aws-ec2 live tests 
Involves some non-trivial reworking of EC2 security group
translation/binding, but it was necessary.

Still problems with a number of tests:
- org.jclouds.aws.ec2.compute.AWSEC2TemplateBuilderLiveTest#testTemplateBuilderWithLessRegions
- org.jclouds.ec2.compute.EC2TemplateBuilderLiveTest#testTemplateBuilderCanUseImageIdWithoutFetchingAllImages

Those seem to be failing because there's caching going on that they're
not expecting, but I could be wrong.

Also failing:
- org.jclouds.aws.ec2.features.PlacementGroupApiLiveTest in general
- org.jclouds.aws.ec2.features.SpotInstanceApiLiveTest - a couple tests
 2013-09-30 09:33:57 -07:00
Andrew Bayer 962f98969f Fix EC2 live tests 
This removes
org.jclouds.ec2.compute.functions.PasswordCredentialsFromWindowsInstanceLiveTest
due to there not being an easily detectable valid AMI for it to run,
and low interest in actually running it in the first place.
 2013-09-30 09:33:56 -07:00
Andrew Bayer 7290cc8ea6 JCLOUDS-303. unhook ApiMetadata type hierarchy from ec2 2013-09-27 15:58:25 -07:00
Andrew Bayer eabdfe2d92 JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based on JCLOUDS-242 fix. 2013-08-18 13:53:15 -04:00
Andrew Bayer f7dd08a2a5 JCLOUDS-242. Fix security group creation on aws-ec2 
Contributed by Richard Downer.
 2013-08-14 11:07:59 -07:00
Andrew Bayer 82fe701c77 JCLOUDS-221. Add availabilityZone to spot price history. 2013-08-01 17:56:16 -07:00
Ignasi Barrera bbfec4a990 JCLOUDS-160: Support tags in EC2 images 
Based on the work made by Brock Noland
 2013-07-06 10:08:10 +02:00
Andrew Bayer 5f3b8d3fa7 JCLOUDS-150 - Removal of async from AWS - specifically EC2 
...and EC2-related elsewhere. Also moved *Client -> *Api, and moved
everything from .../services to .../features, and threw in a bunch of
Optionals to fit the EC2Api approach.

And a very big tip of the hat to nacx for figuring out the generics
stuff my brain just could not handle. =)
 2013-07-01 12:12:26 -07:00
Andrew Bayer 5f524ee6c9 JCLOUDS-101 - Add SecurityGroupExtension for compute 
- Adds the SecurityGroupExtension to compute, with tests and stub
support.
- Gets everything else to actually build against this.
- Unifies on compute's IpPermission/IpProtocol, eliminating EC2's.
- Converters from EC2/Nova/CloudStack SecurityGroup (and rules, for
the latter two) to the compute SecurityGroup (and rules, etc).
- EC2SecurityGroupExtension and tests.
- AWSEC2SecurityGroupExtension and tests - depends on JCLOUDS-99.
 2013-06-26 14:59:01 -07:00
Andrew Bayer 82f25150b9 JCLOUDS-99. Enable use of Iterable<IpPermission> for aws-ec2 
- Added AWSEC2CreateSecurityGroupIfNeeded, using
AWSSecurityGroupClient's ability to call
authorizeSecurityGroupInRegion with Iterable<IpPermission>

- Added a utility method,
ComputeServiceUtils.getPortRangesInList(int... ports), to get pairs of
start/end ports covering all ranges in a list of ports. Used above.
 2013-06-19 14:07:18 -07:00
Andrew Gaul 1a6be0eb67 Do not repeat array type in initializers 2013-06-18 21:02:50 -07:00
adriancole ed2f18a1af JCLOUDS-31. updated to ASF headers via mvn com.mycila.maven-license-plugin:maven-license-plugin:format 2013-05-16 21:30:37 -07:00
adriancole fa10fc4838 JCLOUDS-31. remove malformed, duplicate, or unnecessary headers 2013-05-16 21:30:32 -07:00
Andrew Bayer 446ac67884 JCLOUDS-30. Switch to 2 space indents for POM files. 2013-05-13 12:04:43 -07:00
Andrew Bayer 259b04ff1c JCLOUDS-16. Switch groupId to org.apache.jclouds, change parent POM, remove old distributionManagement content, add ASF repos. 2013-05-13 12:04:42 -07:00
Andrew Gaul 04fad88fd3 Remove duplicate Utils getters 
Rename callers as required.
 2013-04-12 16:24:37 -07:00
adriancole 053197fe61 deprecated all top-level Async apis and clients 2013-04-09 10:18:31 -07:00
adriancole 36dd831b84 moved all code off use of RestContext except CloudStackContext, which will use it until 1.7 2013-04-09 09:23:31 -07:00
Andrew Bayer c566418d87 Adding listNodesByIds across the board. 
Adding to both ListNodesStrategy and ComputeServiceAdapter. When
possible, does a query explicitly for the specified IDs. When not,
falls back on either listDetailsOnNodesMatching (for ListNodesStrategy
implementations and in BaseComputeService) or filters listNodes output
itself (in ComputeServiceAdapter).
 2013-04-08 17:21:01 -07:00
Andrew Gaul 371db8d18f Address Xlint warnings 2013-03-13 22:23:19 -07:00
Adrian Cole fb69ae0fa9 bump master to 1.7.0-SNAPSHOT 2013-03-08 23:02:40 -08:00
adriancole 83a31e7692 unhook labs dependency from aws-ec2; to be re-enabled when issue #1400 is complete 2013-03-08 19:30:41 -08:00
adriancole c31145e42e [maven-release-plugin] prepare for next development iteration 2013-03-04 06:13:59 -08:00
adriancole 0eb3ee8091 [maven-release-plugin] prepare release jclouds-1.6.0-alpha.4 2013-03-04 06:13:57 -08:00
Adrian Cole 1fbc47bd77 added iam instance profile args to aws-ec2 2013-02-25 17:35:02 -08:00
Adrian Cole ac7a4b5354 unhooked version dependency from ec2 async tests 2013-02-25 17:04:32 -08:00
Andrew Gaul ff42fdfa13 Address FindBugs warnings 2013-02-24 20:17:50 -08:00
Adrian Cole 7e270c5ddb various cleanups to get ec2 subnet api up to latest 2013-02-24 14:40:31 -08:00
adriancole 89fda8ee28 [maven-release-plugin] prepare for next development iteration 2013-02-04 17:30:46 -08:00
adriancole 2b0ad28f26 [maven-release-plugin] prepare release jclouds-1.6.0-alpha.2 2013-02-04 17:30:44 -08:00
adriancole 267069755e [maven-release-plugin] prepare for next development iteration 2013-02-02 08:41:53 -08:00
adriancole 7c924b312f [maven-release-plugin] prepare release jclouds-1.6.0-alpha.1 2013-02-02 08:41:51 -08:00
Adrian Cole 5aa41d07aa Merge pull request #1261 from jclouds/aws-action-names 
changed aws apis to use Action key for config instead of more verbose iam names
 2013-01-29 05:53:06 -08:00
adriancole b3c3cb0a88 issue #1184 changed aws apis to use Action key for config instead of more verbose iam names 2013-01-29 04:45:42 -08:00
adriancole a51e6a8323 issue #1089 removed default timeout values so that those not using async will have simpler debugging 2013-01-29 04:19:00 -08:00
adriancole 085a1ef2b8 merged STS and aws-common, so that all aws apis can test support of temporary credentials 2013-01-22 12:27:44 -08:00
Andrew Gaul af963df92d Use Map.entrySet where possible 
Improves run-time efficiency and addresses FindBugs warnings.
 2013-01-21 23:59:42 -08:00
Adrian Cole 37e587ee51 changes related to centralizing construction of invokables 2013-01-19 17:17:30 -08:00
Adrian Cole 4980367991 centralize TypeToken creation 2013-01-19 11:31:55 -08:00
adriancole dc4ca1efbd removed deprecated methods which were easy to do 2013-01-19 08:32:45 -08:00
adriancole b3901deeb9 rewrote aws config to use standard op names 2013-01-16 10:54:17 -08:00
Adrian Cole f18d3b433f Merge pull request #1177 from jclouds/retryablepredicate-highlander 
There can be only one retryable predicate; use Predicates2.retry
 2013-01-13 22:07:42 -08:00
Adrian Cole 3ac6f475e7 unwound dependencies relating to ssh keys and crypt 2013-01-13 20:53:59 -08:00
Adrian Cole a49a060152 There can be only one retryable predicate; use Predicates2.retry decorator 2013-01-13 20:30:34 -08:00
Adrian Cole 3962b30808 updated to use standard guava Futures and ListenableFuture 2013-01-13 09:31:10 -08:00
Adrian Cole 45bb35971e replaced usage of checkNotEmpty with checkNotNull(emptyToNull 2013-01-12 15:20:11 -08:00
Adrian Cole d57197c103 cleaned up code references detected as unnecessary by UEC plugin 2013-01-12 12:31:00 -08:00
adriancole f8f99b41b1 verify http://code.google.com/p/jclouds/issues/detail?id=406 2013-01-11 10:08:12 -08:00
adriancole 3701e27e86 fix issue #1149: subnet id for spot instances 2013-01-10 13:51:05 -08:00
adriancole 9d75aa353d refactored ec2 tests so that they can be used in aws-ec2 2013-01-10 13:38:58 -08:00
adriancole 992e9ebbcf change cacheloader that can return nulls to return optional so to avoid cacheload exceptions 2013-01-10 13:20:27 -08:00
Adrian Cole 47c215c63c removed custom guava code for scoped binding and type params 2013-01-08 22:48:10 -08:00
Adrian Cole 2480481835 dependent changes on tests and internal classes 2013-01-08 00:32:45 -08:00
Adrian Cole 3089111621 refactored internal code and tests to use FunctionalReflection 2013-01-07 00:36:31 -08:00
Adrian Cole 74c633f90a moved all providers and test cases from j.l.r.Method -> Invokable 2013-01-05 18:51:38 -08:00
Adrian Cole 36123a6068 deterministic creation of requests based on arg order 2013-01-04 12:44:26 -08:00
Adrian Cole 75c54e5595 fixed missing m3.m3_2xlarge 2013-01-02 06:53:33 -08:00
Adrian Cole aaf41575d8 missing timeout on describeinstances 2013-01-01 22:16:47 -08:00
Adrian Cole b582d4a4a8 added recent aws instance types 2013-01-01 22:15:59 -08:00
Adrian Cole 4874f1c3c6 updated to latest aws linux ami 2013-01-01 22:14:46 -08:00
Adrian Cole bd4f5cfba2 moved off deprecated TagClient -> TagApi; refactored tagging to occur at end of run 2013-01-01 19:19:33 -08:00
Adrian Cole 6e554298ab ensure extra metadata from provider doesn't trip metadata tests 2013-01-01 17:18:55 -08:00
Adrian Cole 9745e9dc2f fixed covariance and warnings on ApiMetadata subclasses 2012-12-31 19:40:49 -08:00
Adrian Cole c39503b682 TimeoutException is controllable via upping timeout properties; don't add more retry loops and stacktraces 2012-12-31 17:09:27 -08:00
Adrian Cole bb953c981e fix issue #1101: Move to Guava 14 BaseEncoding and Hashing 2012-12-31 14:48:31 -08:00
Adrian Cole cddd35bc51 removed unnecessary generic types and made RestAnnotationProcessor immutable 2012-12-30 23:18:59 -08:00
Adrian Cole 13d8b9c402 replaced @Timeout w/explicit properties 2012-12-30 12:31:43 -08:00
Adrian Cole 9b1872c6ff removed custom code that duplicates functionality of guava fallbacks 2012-12-27 16:54:31 -08:00
Adrian Cole 20c3426fc8 replaced jersey w/Uris & UriTemplates; removed complexity in url encoding and edge cases like matrix params 2012-12-24 14:32:59 -08:00
Adrian Cole 847b1c7352 Merge pull request #1090 from jclouds/no-matrix 
removed explicit matrix param support as their use is edge case in rest
 2012-12-23 09:28:45 -08:00
Adrian Cole 3be1089538 removed explicit matrix param support as their use is edge case in rest 2012-12-22 17:45:31 -08:00
Adrian Cole 98a36eb3f6 added named annotations corresponding to IAM actions 2012-12-21 12:15:21 -08:00
Adrian Cole e66219c16e normalized to CryptoStreams 2012-11-30 17:33:53 -08:00
Adrian Cole 878ec1bcab undid Serializable and added checkstyle InterfaceIsType:allowMarkerInterfaces=false 2012-11-18 09:23:44 -08:00
Adrian Cole db786f3b20 Issue 1123: add new Asia Pacific (Sydney) Region [ap-southeast-2] 2012-11-13 08:46:01 -08:00
Adrian Cole 5ebc72efd4 updated aws template test 2012-11-13 08:43:20 -08:00
Adrian Cole 55c3f587f4 Issue 1110: replace TagClient with TagApi in aws-ec2 2012-11-12 18:30:30 -08:00
Andrew Gaul d7380114a6 Enforce use of Atomics.newReference via Checkstyle 
Avoids duplicating types.
 2012-11-12 11:56:48 -08:00
Andrew Gaul 3ad36d25d5 Enforce no unnecessary parentheses via Checkstyle 2012-11-10 13:22:12 -08:00
Aled Sage 43d6155341 Set EC2 windows-template image id for testing 
- Identify the windows-template AMI using id rather than name-matching
 2012-11-04 22:29:52 +00:00
Andrew Gaul 0761874578 Prefer Assert.fail over assert 
The former cannot be disabled.
 2012-11-03 14:51:52 -07:00
Andrew Gaul 08b9982384 Enforce modifier order via Checkstyle 
Also fix violations, via:

find -name \*.java | xargs sed -i 's/final static/static final/'
find -name \*.java | xargs sed -i 's/static private/private static/'
find -name \*.java | xargs sed -i 's/static abstract/abstract static/'
 2012-11-01 20:01:30 -07:00
Andrew Gaul 35ce78f15a Correct typos 2012-11-01 13:25:44 -07:00
Andrew Gaul 93d69ece2b Enforce newline at end of file via Checkstyle 
Also address all warnings, via:

find -name \*.java | while read i; do if [ x`tail -c 1 $i` != x"" ]; then echo >> $i; fi; done
 2012-10-29 22:12:44 -07:00
Andrew Gaul 709ca69a2d Enforce that all imports are used via Checkstyle 
Also remove all unused imports, via:

mvn checkstyle:checkstyle -Dcheckstyle.output.file=/dev/stdout -Dcheckstyle.output.format=plain | tac | awk -v FS=: '/warning/{print "sed -i " $2 "d " $1}' | while read i; do $i; done
 2012-10-29 17:11:08 -07:00
Andrew Gaul 28d7a6f143 Prefer immutable over empty collections 
The former does not create an object when calling iterator(), as
discussed here:

https://groups.google.com/d/msg/jclouds-dev/l7BviKDXreA/mP6Ow_RYxIgJ
 2012-10-20 15:35:29 -07:00
Adrian Cole 14ad17108f Issue 671: NPE on aws-ec2 w/vpc security groups 2012-10-08 15:39:51 -04:00
Adrian Cole 28d766b9df bumped to 1.6.0-SNAPSHOT 2012-09-17 01:43:52 -07:00
Adrian Cole d766f8d4e3 stable ec2 2012-09-16 22:37:13 -07:00
Adrian Cole 6f5ebf3e90 Issue 1085:deprecate getRegion from EC2 domain objects 2012-09-16 12:55:48 -07:00
Adrian Cole b951276ec3 cleaned up aws apis 2012-09-15 23:47:44 -07:00
Adrian Cole 0b31622267 cleaned ec2 instance type 2012-09-15 14:05:24 -07:00
vijaykiran 7a81769e1c Issue-1051 overrideLoginUser not working 2012-08-03 01:14:09 +02:00
Adrian Cole b5558a25e9 test expectations 2012-07-30 12:31:16 -07:00
Adrian Cole 0424274259 Issue 1049:support aws-ec2 cluster compute instances in eu-west-1 2012-07-30 12:31:15 -07:00
Adrian Cole 53fe278f03 added windows password parsing to ec2 2012-07-30 12:31:11 -07:00
Andrew Gaul 8ed0e28e68 Spelling corrections 2012-07-26 22:39:35 -07:00
Adrian Cole 1b0d6e027a prettier toString on ec2 2012-07-26 10:07:14 -07:00
Adrian Cole 5d6e005e8b Issue 1030:defaults not picking up on compute.templateOptions() 2012-07-25 00:33:39 -07:00
vijaykiran de3db2103d issue-1026 Support for aws-ec2 hi1.4x instance 2012-07-25 00:26:21 +02: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 Donald Kennedy 4463b52051 Added optional timeout to EC2 listNodes strategy and made awaitCompletion update latch in finally block 2012-07-16 16:58:37 +01:00
Adrian Cole 180265fe49 Issue 1022:Move naming convention to Api from Client or Services:: glesys jenkins openstack-* opsource-servers savvis-symphonyvpdc cloudwatch cloudidentity rackspace-cloudidentity aws-cloudwatch rackspace-cloudservers-us hpcloud-compute rackspace-cloudservers-us trystack-nova 2012-07-15 15:00:42 -07:00
Adrian Cole 05fd64af44 cleaned up http builders and expect tests 2012-07-15 01:50:38 -07:00
Adrian Cole e9bfb9d1a2 Issue 1007: changed ec2 date parsing logic to use DateCodec and isolated hacks to eucalyptus and openstack-nova-ec2 respectively 2012-07-06 22:54:45 -07:00
Adrian Cole e35005d45c updated amazon templates 2012-07-03 22:14:06 -07:00
Adrian Cole d29fbba783 Issue 980: timestamp on ec2 requests are in the future 2012-06-15 23:35:17 -04:00
Adrian Cole d980b4fd42 changed test poms to use provider.template and provider.ec2-template accordingly 2012-06-15 23:35:10 -04:00
Adrian Cole 8a34254c8e in CloudBridge terminatedInstances go away quickly unveiling the need to address instanceId not found 2012-06-15 23:31:33 -04:00
Adrian Cole bcd3d50ad6 Issue 956:add getImage by id to ComputeService 2012-06-04 16:54:49 -07:00
Adrian Cole ef31f5114d added rawState to RunningInstance 2012-06-04 16:54:30 -07:00
Adrian Cole 92d1f1b471 moved to explicitly adding clojure projects 2012-06-03 17:28:56 -07:00
Ioannis Canellos b078adc3ce Removed fragments and dynamic imports. Added centralized control of the maven-bundle-plugin. 2012-06-03 19:41:54 +03:00
Adrian Cole 96773b8a1b Issue 952:add status field to image 2012-05-30 21:22:10 -07:00
Adrian Cole 07c2c24721 Issue 949:Introduce: ComputeMetadataIncludingStatus; Deprecate NodeState -> NodeMetadata.Status 2012-05-29 20:41:10 -07:00
Adrian Cole 67d8f9a0f4 image extension related classes under extensions package 2012-05-21 12:39:32 -06:00
Adrian Cole 5c647df129 Issue 938:TemplateBuilderSpec 2012-05-21 02:45:25 -06:00
Adrian Cole a91a23f745 aws-ec2 works with tags now 2012-05-18 19:57:29 -07:00
Adrian Cole b4f01eda7b Issue 445: moved incidental test into its own class until we can convert it to an expect test 2012-05-18 17:50:38 -07:00
Adrian Cole a53cece32d Issue 445: moved incidental test into its own class until we can convert it to an expect test 2012-05-18 17:49:59 -07:00
Adrian Cole 5bd59d50cd fixed test configuration 2012-05-10 19:29:19 -07:00
Adrian Cole 59f2b6d171 Merge pull request #625 from aledsage/Issue-888-GroupNamingConvention 
Issue 888 group naming convention
 2012-05-10 16:45:39 -07:00
Adrian Cole a6cc00e078 Merge pull request #603 from dralves/image-extension-all 
image extension working on hpcloud, virtualbox and aws-ec2, cloudservers...
 2012-05-10 16:43:27 -07:00
Aled Sage 94ac48070d Issue 888: use GroupNamingConvention for keyName/securityGroup; don't include region in name 2012-05-10 16:47:37 +01:00
Aled Sage 8631b90c32 Fix aws-ec2 template live tests: update OS versions 2012-05-10 16:45:54 +01:00
David Ribeiro Alves 5a8f0c1743 added image extension state checker to aws-ec2 module 2012-05-10 08:48:40 +01:00
Adrian Cole acf1bc2d22 updated template expectations 2012-05-09 18:20:42 -07:00
Adam Lowe 850cdc2fc8 Moving EncodedRSAPublicKeyToBase64 (and corresponding unit test) up into EC2 so both openstack-nova-ec2 and aws-ec2 can share the same class 2012-05-03 12:31:39 +01:00
David Ribeiro Alves 082158ac3f image extension working on hpcloud, virtualbox and aws-ec2, cloudservers implemented but has issues 2012-05-03 03:55:40 +01:00
Richard Downer 18a65bf1a7 Move WindowsClientLiveTest from ec2 to aws-ec2 as it depends on AWS's published AMIs and naming conventions 2012-04-25 20:18:13 +03:00
Richard Downer 1a77b194e5 EC2 Windows AMIs have a separate owner (which changed recently) - add this owner ID to the default set. Update WindowsClientLiveTest to use the default set and verify it passes. 2012-04-25 19:42:35 +03:00
Adrian Cole df7d2acbb4 wrapper -> view 2012-04-23 19:14:36 -07:00
Adrian Cole 886d2cafb9 created base Context class with ProviderMetadata and Identity 2012-04-23 16:16:51 -07:00
Adrian Cole f1010e13a4 fixed aws-ec2 image parsing 2012-04-21 10:59:01 -07:00
Adrian Cole dab1dd69fc fix covariance/assignability in RestContext<? extends Client> subclasses 2012-04-18 15:05:39 -07:00
Adrian Cole 2f9b1738a0 Merge pull request #572 from dralves/image-extension 
implemented image extension
 2012-04-18 07:37:02 -07:00
Adrian Cole 5ea29cbbb7 Merge pull request #560 from danikov/covariant-future-iterables 
covariant compatible version of futureIterables
 2012-04-18 07:35:23 -07:00
danikov fff1c7dc2d make FutureIterables covariant compatible + update tests 2012-04-18 13:06:54 +01:00
David Ribeiro Alves 05212b75fa implemented image extension 2012-04-18 09:37:44 +01:00
Adrian Cole 0b59dea073 removed ContextBuilder subclasses; added unwrap; undid generic params 2012-04-16 00:44:20 -07:00
Adrian Cole 3b2e6ea796 fix cloudwatch 2012-04-13 10:48:38 -06:00
Adrian Cole 23cb01f977 refactor PropertiesBuilder and related types into ApiMetadata and ProviderMetadata, and update all usage 2012-04-11 19:47:09 -06:00
Andrew Gaul b47860afc1 Use inference to elide duplicated type parameters 
Found with:
grep 'Builder.*<.*>.*Immutable.*<.*>.*builder();'
 2012-04-08 22:32:04 -07:00
Adrian Cole 00c7179f72 moved cacheloaders to the correct package 2012-04-05 17:42:06 -07:00