This pull request merges the providers in the jclouds-chef repo into the main jclouds one. The providers are just copied from there without changes. The change summary is:
* Copied the jclouds-chef providers to the *apis/chef* and *providers/enterprise-chef* folders. * Changed their parent pom to *jclouds-project*, and updated the *relativePath* property accordingly. * Changed the *jclouds-project/pom.xml* to fix a conflict in the *duplicate class finder* plugin between jclouds-core test-jar and the scriptbuilder test-jar. This didn't appear before because no other project included both test jars. After this PR is merged we should edit the README of the jclouds-chef repo and make it clear it is now merged into the main one, but keep the existing repo for reference and older versions bugfixing. And as a minor note, the *compute* folder in the jclouds-chef repo has not been migrated. It contained just some example tests that integrate chef with the compute service, but the feature is already covered in the existing chef live tests. Also the tests in there are basically a copy of the contents in the *chef-basics* project in the *jclouds-examples* repo. It makes no sense to have them as tests there (they also add *jclouds-all* as a dependency, which makes no sense), so we can safely get rid of them and keep the chef examples instead. This was discussed in the dev@ mailing list, so @everett-toews Feel free to merge this PR before cutting the 1.8.0 release (and then forget about releasing the jclouds-chef repo) if you want. You can merge this Pull Request by running: git pull https://github.com/nacx/jclouds chef Or you can view, comment on it, or merge it online at: https://github.com/jclouds/jclouds/pull/458 -- Commit Summary -- * Move jclouds-chef to the main jclouds repo -- File Changes -- A apis/chef/pom.xml (131) A apis/chef/src/main/clojure/org/jclouds/chef.clj (261) A apis/chef/src/main/java/org/jclouds/chef/ChefApi.java (853) A apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java (110) A apis/chef/src/main/java/org/jclouds/chef/ChefContext.java (37) A apis/chef/src/main/java/org/jclouds/chef/ChefService.java (263) A apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java (54) A apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java (71) A apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java (35) A apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java (32) A apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java (31) A apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java (32) A apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java (32) A apis/chef/src/main/java/org/jclouds/chef/config/BaseChefHttpApiModule.java (208) A apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java (121) A apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java (28) A apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java (321) A apis/chef/src/main/java/org/jclouds/chef/config/ChefProperties.java (110) A apis/chef/src/main/java/org/jclouds/chef/config/CookbookParser.java (41) A apis/chef/src/main/java/org/jclouds/chef/config/CookbookVersionsParser.java (41) A apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java (37) A apis/chef/src/main/java/org/jclouds/chef/config/Validator.java (40) A apis/chef/src/main/java/org/jclouds/chef/domain/Attribute.java (235) A apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java (95) A apis/chef/src/main/java/org/jclouds/chef/domain/ChecksumStatus.java (102) A apis/chef/src/main/java/org/jclouds/chef/domain/Client.java (182) A apis/chef/src/main/java/org/jclouds/chef/domain/CookbookDefinition.java (217) A apis/chef/src/main/java/org/jclouds/chef/domain/CookbookVersion.java (369) A apis/chef/src/main/java/org/jclouds/chef/domain/DatabagItem.java (63) A apis/chef/src/main/java/org/jclouds/chef/domain/Environment.java (178) A apis/chef/src/main/java/org/jclouds/chef/domain/Metadata.java (447) A apis/chef/src/main/java/org/jclouds/chef/domain/Node.java (263) A apis/chef/src/main/java/org/jclouds/chef/domain/Resource.java (169) A apis/chef/src/main/java/org/jclouds/chef/domain/Role.java (205) A apis/chef/src/main/java/org/jclouds/chef/domain/Sandbox.java (195) A apis/chef/src/main/java/org/jclouds/chef/domain/SearchResult.java (46) A apis/chef/src/main/java/org/jclouds/chef/domain/UploadSandbox.java (136) A apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java (200) A apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java (61) A apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java (69) A apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java (130) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionCheckingChefVersion.java (49) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java (50) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10.java (52) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10.java (63) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsCheckingChefVersion.java (49) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java (49) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java (59) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java (55) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java (45) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java (35) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java (77) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java (35) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java (35) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java (50) A apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java (35) A apis/chef/src/main/java/org/jclouds/chef/functions/RunListForGroup.java (61) A apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java (42) A apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java (67) A apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java (81) A apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java (299) A apis/chef/src/main/java/org/jclouds/chef/internal/ChefContextImpl.java (55) A apis/chef/src/main/java/org/jclouds/chef/options/CreateClientOptions.java (64) A apis/chef/src/main/java/org/jclouds/chef/options/SearchOptions.java (95) A apis/chef/src/main/java/org/jclouds/chef/predicates/CookbookVersionPredicates.java (93) A apis/chef/src/main/java/org/jclouds/chef/strategy/CleanupStaleNodesAndClients.java (32) A apis/chef/src/main/java/org/jclouds/chef/strategy/CreateNodeAndPopulateAutomaticAttributes.java (33) A apis/chef/src/main/java/org/jclouds/chef/strategy/DeleteAllClientsInList.java (34) A apis/chef/src/main/java/org/jclouds/chef/strategy/DeleteAllNodesInList.java (31) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListClients.java (32) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java (32) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListCookbookVersionsInEnvironment.java (37) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java (31) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListNodes.java (32) A apis/chef/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java (32) A apis/chef/src/main/java/org/jclouds/chef/strategy/UpdateAutomaticAttributesOnNode.java (31) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/BaseListCookbookVersionsImpl.java (97) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/BaseListNodesImpl.java (77) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java (102) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java (83) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java (85) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java (81) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java (109) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java (60) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java (117) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java (96) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java (62) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java (62) A apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java (75) A apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java (73) A apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java (387) A apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApiMetadata.java (75) A apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java (116) A apis/chef/src/main/java/org/jclouds/chef/util/ChefUtils.java (71) A apis/chef/src/main/java/org/jclouds/chef/util/CollectionUtils.java (69) A apis/chef/src/main/java/org/jclouds/chef/util/RunListBuilder.java (83) A apis/chef/src/main/java/org/jclouds/ohai/Automatic.java (33) A apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java (48) A apis/chef/src/main/java/org/jclouds/ohai/config/ConfiguresOhai.java (28) A apis/chef/src/main/java/org/jclouds/ohai/config/JMXOhaiModule.java (48) A apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java (183) A apis/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java (51) A apis/chef/src/main/java/org/jclouds/ohai/functions/MapSetToMultimap.java (42) A apis/chef/src/main/java/org/jclouds/ohai/functions/NestSlashKeys.java (156) A apis/chef/src/main/java/org/jclouds/ohai/suppliers/UptimeSecondsSupplier.java (44) A apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata (2) A apis/chef/src/test/clojure/org/jclouds/chef_test.clj (70) A apis/chef/src/test/java/org/jclouds/chef/BaseChefApiExpectTest.java (44) A apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java (279) A apis/chef/src/test/java/org/jclouds/chef/ChefApiLiveTest.java (32) A apis/chef/src/test/java/org/jclouds/chef/ChefApiMetadataTest.java (33) A apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java (741) A apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java (70) A apis/chef/src/test/java/org/jclouds/chef/config/ChefParserModuleTest.java (93) A apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java (213) A apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java (74) A apis/chef/src/test/java/org/jclouds/chef/functions/ClientForGroupTest.java (106) A apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java (230) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java (98) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionCheckingChefVersionTest.java (62) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java (72) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java (74) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java (92) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java (129) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsCheckingChefVersionTest.java (62) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java (61) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java (68) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java (65) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBodyTest.java (42) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java (66) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java (73) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java (71) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java (62) A apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java (87) A apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java (92) A apis/chef/src/test/java/org/jclouds/chef/functions/UriForResourceTest.java (54) A apis/chef/src/test/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandlerTest.java (115) A apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java (542) A apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java (96) A apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefServiceTest.java (99) A apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java (60) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java (61) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java (62) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java (61) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java (64) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImplLiveTest.java (217) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java (82) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java (86) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java (61) A apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java (63) A apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java (47) A apis/chef/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java (69) A apis/chef/src/test/java/org/jclouds/chef/test/TransientChefApiMetadataTest.java (33) A apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java (57) A apis/chef/src/test/java/org/jclouds/chef/util/RunListBuilderTest.java (71) A apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java (82) A apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java (147) A apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java (33) A apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java (117) A apis/chef/src/test/resources/apache-chef-demo-cookbook.json (46) A apis/chef/src/test/resources/bootstrap-env.sh (56) A apis/chef/src/test/resources/bootstrap.sh (56) A apis/chef/src/test/resources/brew-cookbook.json (48) A apis/chef/src/test/resources/client.json (8) A apis/chef/src/test/resources/clients_list.json (5) A apis/chef/src/test/resources/data_list.json (4) A apis/chef/src/test/resources/env_cookbooks.json (20) A apis/chef/src/test/resources/environment_recipes.json (6) A apis/chef/src/test/resources/mysql-cookbook.json (268) A apis/chef/src/test/resources/node.json (10) A apis/chef/src/test/resources/nodes_list.json (5) A apis/chef/src/test/resources/privkey.txt (27) A apis/chef/src/test/resources/pubkey.txt (9) A apis/chef/src/test/resources/roles_list.json (4) A apis/chef/src/test/resources/sandbox.json (12) A apis/chef/src/test/resources/search_role.json (34) A apis/chef/src/test/resources/search_role_empty.json (5) A apis/chef/src/test/resources/tomcat-cookbook.json (121) A apis/chef/src/test/resources/upload-site.json (13) M apis/pom.xml (1) M project/pom.xml (2) A providers/enterprise-chef/pom.xml (110) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java (124) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java (82) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java (86) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayload.java (79) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/binders/GroupName.java (38) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/config/EnterpriseChefHttpApiModule.java (36) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/domain/Group.java (211) A providers/enterprise-chef/src/main/java/org/jclouds/enterprisechef/domain/User.java (220) A providers/enterprise-chef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata (1) A providers/enterprise-chef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java (209) A providers/enterprise-chef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java (122) A providers/enterprise-chef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java (31) A providers/enterprise-chef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java (82) A providers/enterprise-chef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java (40) A providers/enterprise-chef/src/test/resources/group-update.json (1) A providers/enterprise-chef/src/test/resources/group.json (14) A providers/enterprise-chef/src/test/resources/groups.json (7) A providers/enterprise-chef/src/test/resources/user.json (9) M providers/pom.xml (1) -- Patch Links -- https://github.com/jclouds/jclouds/pull/458.patch https://github.com/jclouds/jclouds/pull/458.diff --- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/458
