You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/11/23 23:11:07 UTC
[02/11] jclouds-chef git commit: Removed all code after promoting,
to avoid confusion
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/env_cookbooks.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/env_cookbooks.json b/core/src/test/resources/env_cookbooks.json
deleted file mode 100644
index ee7114f..0000000
--- a/core/src/test/resources/env_cookbooks.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "apache2" => {
- "url" => "http://localhost:4000/cookbooks/apache2",
- "versions" => [
- {"url" => "http://localhost:4000/cookbooks/apache2/5.1.0",
- "version" => "5.1.0"},
- {"url" => "http://localhost:4000/cookbooks/apache2/4.2.0",
- "version" => "4.2.0"}
- ]
- },
- "nginx" => {
- "url" => "http://localhost:4000/cookbooks/nginx",
- "versions" => [
- {"url" => "http://localhost:4000/cookbooks/nginx/1.0.0",
- "version" => "1.0.0"},
- {"url" => "http://localhost:4000/cookbooks/nginx/0.3.0",
- "version" => "0.3.0"}
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/environment_recipes.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/environment_recipes.json b/core/src/test/resources/environment_recipes.json
deleted file mode 100644
index cca3a11..0000000
--- a/core/src/test/resources/environment_recipes.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- "ant",
- "apache2",
- "apache2::mod_auth_openid"
-]
-
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/logback.xml b/core/src/test/resources/logback.xml
deleted file mode 100644
index f9c023f..0000000
--- a/core/src/test/resources/logback.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/mysql-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/mysql-cookbook.json b/core/src/test/resources/mysql-cookbook.json
deleted file mode 100644
index b0450ae..0000000
--- a/core/src/test/resources/mysql-cookbook.json
+++ /dev/null
@@ -1,268 +0,0 @@
-{ "attributes" : [ { "checksum" : "548fa4bc548b8b59ac98fffee8e81f4a",
- "name" : "server.rb",
- "path" : "attributes/server.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-548fa4bc548b8b59ac98fffee8e81f4a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=MsgggSKS0T1q1Lc72nJpHORBQX0%3D"
- } ],
- "chef_type" : "cookbook_version",
- "cookbook_name" : "mysql",
- "definitions" : [ ],
- "files" : [ ],
- "json_class" : "Chef::CookbookVersion",
- "libraries" : [ { "checksum" : "b2eb0760c07734be9c637dcffc86175a",
- "name" : "database.rb",
- "path" : "libraries/database.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b2eb0760c07734be9c637dcffc86175a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=CvVbxzrA%2Fuxc59ZjLR5BsMozfxk%3D"
- } ],
- "metadata" : { "attributes" : { "mysql/bind_address" : { "calculated" : false,
- "choice" : [ ],
- "default" : "ipaddress",
- "description" : "Address that mysqld should listen on",
- "display_name" : "MySQL Bind Address",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/datadir" : { "calculated" : false,
- "choice" : [ ],
- "default" : "/var/lib/mysql",
- "description" : "Location of mysql databases",
- "display_name" : "MySQL Data Directory",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/ec2_path" : { "calculated" : false,
- "choice" : [ ],
- "default" : "/mnt/mysql",
- "description" : "Location of mysql directory on EC2 instance EBS volumes",
- "display_name" : "MySQL EC2 Path",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/server_root_password" : { "calculated" : false,
- "choice" : [ ],
- "default" : "randomly generated",
- "description" : "Randomly generated password for the mysqld root user",
- "display_name" : "MySQL Server Root Password",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable" : { "calculated" : false,
- "choice" : [ ],
- "description" : "Hash of MySQL tunable attributes",
- "display_name" : "MySQL Tunables",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "hash"
- },
- "mysql/tunable/back_log" : { "calculated" : false,
- "choice" : [ ],
- "default" : "128",
- "display_name" : "MySQL Tunable Back Log",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/key_buffer" : { "calculated" : false,
- "choice" : [ ],
- "default" : "250M",
- "display_name" : "MySQL Tuntable Key Buffer",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/max_connections" : { "calculated" : false,
- "choice" : [ ],
- "default" : "800",
- "display_name" : "MySQL Tunable Max Connections",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/max_heap_table_size" : { "calculated" : false,
- "choice" : [ ],
- "default" : "32M",
- "display_name" : "MySQL Tunable Max Heap Table Size",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/net_read_timeout" : { "calculated" : false,
- "choice" : [ ],
- "default" : "30",
- "display_name" : "MySQL Tunable Net Read Timeout",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/net_write_timeout" : { "calculated" : false,
- "choice" : [ ],
- "default" : "30",
- "display_name" : "MySQL Tunable Net Write Timeout",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/table_cache" : { "calculated" : false,
- "choice" : [ ],
- "default" : "128",
- "display_name" : "MySQL Tunable Table Cache",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- },
- "mysql/tunable/wait_timeout" : { "calculated" : false,
- "choice" : [ ],
- "default" : "180",
- "display_name" : "MySQL Tunable Wait Timeout",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- }
- },
- "conflicting" : { },
- "dependencies" : { "openssl" : "" },
- "description" : "Installs and configures mysql for client or server",
- "groupings" : { },
- "license" : "Apache 2.0",
- "long_description" : "= DESCRIPTION:\n\nInstalls and configures MySQL client or server.\n\n= REQUIREMENTS:\n\n== Platform:\n\nBest tested on Ubuntu 9.04,9.10. On EC2, requires platform that supports -o bind option for the 'mount' command.\n\n== Cookbooks:\n\nRequires Opscode's openssl cookbook for secure password generation.\n\n= ATTRIBUTES: \n\n* mysql[:server_root_password] - Set the server's root password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_repl_password] - Set the replication user 'repl' password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_debian_password] - Set the debian-sys-maint user password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:bind_address] - Listen address for MySQLd, default is node's ipaddress.\n* mysql[:datadir] - Location for mysql data directory, default is \"/var/lib/mysql\"
\n* mysql[:ec2_path] - location of mysql datadir on EC2 nodes, default \"/mnt/mysql\" \n\nPerformance tuning attributes, each corresponds to the same-named parameter in my.cnf; default values listed\n\n* mysql[:tunable][:key_buffer] = \"250M\"\n* mysql[:tunable][:max_connections] = \"800\" \n* mysql[:tunable][:wait_timeout] = \"180\" \n* mysql[:tunable][:net_write_timeout] = \"30\" \n* mysql[:tunable][:net_write_timeout] = \"30\" \n* mysql[:tunable][:back_log] = \"128\" \n* mysql[:tunable][:table_cache] = \"128\" \n* mysql[:tunable][:max_heap_table_size] = \"32M\" \n\n= USAGE:\n\nOn client nodes,\n\n include_recipe \"mysql::client\"\n \nAs the common use case is on systems with Ruby, we also install the MySQL RubyGem. Because we may want to be able to use the gem within another Chef recipe, we make sure the mysql development package and gem are installed first. The key is this:\n\n r = package ... do\n action :nothing\n end\n \n r.
run_action(:install)\n \nThis creates a resource object for the package and does the installation before other recipes are parsed. You'll need to have the C compiler and such (ie, build-essential on Ubuntu) before running the recipes, but we already do that when installing Chef :-). If you want to be able to access a MySQL database via Ruby within another recipe, you could do so, like so:\n\n Gem.clear_paths # needed for Chef to find the gem...\n require 'mysql' # requires the mysql gem\n\n execute \"create #{node[:railsapp][:db][:database]} database\" do\n command \"/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:railsapp][:db][:database]}\"\n not_if do\n m = Mysql.new(\"localhost\", \"root\", @node[:mysql][:server_root_password])\n m.list_dbs.include?(@node[:railsapp][:db][:database])\n end\n end\n\nOn server nodes, \n\n include_recipe \"mysql::server\"\n \nOn Debian/Ubuntu this will preseed the MySQL package with the r
andomly generated root password. You can of course change the password afterward, but this makes sure that there's a good password set. You can view it in the node data in the Chef Server webui. Sets a new password for debian-sys-maint user as well.\n\nAlso sets up 'repl' user grants for replication slaves.\n\nOn EC2 nodes,\n\n include_recipe \"mysql::server_ec2\"\n \nWhen the ec2_path doesn't exist we look for a mounted filesystem (eg, EBS) and move the datadir there.\n\nThe client recipe is already included by server and 'default' recipes.\n\n= LICENSE and AUTHOR:\n \nAuthor:: Joshua Timberman (<jo...@opscode.com>)\nAuthor:: AJ Christensen (<aj...@opscode.com>)\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing
, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
- "maintainer" : "Opscode, Inc.",
- "maintainer_email" : "cookbooks@opscode.com",
- "name" : "mysql",
- "platforms" : { "debian" : "",
- "ubuntu" : ""
- },
- "providing" : { },
- "recipes" : { "mysql::client" : "Installs packages required for mysql clients using run_action magic",
- "mysql::server" : "Installs packages required for mysql servers w/o manual intervention",
- "mysql::server_ec2" : "Performs EC2-specific mountpoint manipulation"
- },
- "recommendations" : { },
- "replacing" : { },
- "suggestions" : { },
- "version" : "0.21.2"
- },
- "name" : "mysql-0.21.2",
- "providers" : [ { "checksum" : "b994881a2aba60e32c4b6408ffba993d",
- "name" : "database.rb",
- "path" : "providers/database.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b994881a2aba60e32c4b6408ffba993d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2XMRbryCmEqirCWLCvrXoenYubw%3D"
- } ],
- "recipes" : [ { "checksum" : "f51bd8122b7dccc9f4656319fef3252a",
- "name" : "server_ec2.rb",
- "path" : "recipes/server_ec2.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-f51bd8122b7dccc9f4656319fef3252a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=BUR2mosCvmoOKq4Mkh3JUG0MY38%3D"
- },
- { "checksum" : "80daa897597560372d017c58c4df0e3c",
- "name" : "server.rb",
- "path" : "recipes/server.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-80daa897597560372d017c58c4df0e3c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=bU3j9Nw%2BnuIroXKrlJZe7tjaugA%3D"
- },
- { "checksum" : "bd3ba2d05dea6a8cf0dc2a45f540cc32",
- "name" : "default.rb",
- "path" : "recipes/default.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-bd3ba2d05dea6a8cf0dc2a45f540cc32?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=7haumT5EtEM2h8l32efqV%2Fik%2BdY%3D"
- },
- { "checksum" : "a1d679c7480267cd9b69e3194c7e45ab",
- "name" : "client.rb",
- "path" : "recipes/client.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-a1d679c7480267cd9b69e3194c7e45ab?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=ZhfTiwv1aXC7HZMnW8A7i4vkMCM%3D"
- }
- ],
- "resources" : [ { "checksum" : "8aa8e2cafe54c2932c7aa65d62ec2695",
- "name" : "database.rb",
- "path" : "resources/database.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-8aa8e2cafe54c2932c7aa65d62ec2695?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=6URS94f1HpRibHC%2FhBkr7Eg3dVA%3D"
- } ],
- "root_files" : [ { "checksum" : "e9278fc99fd668bdce33d72dc71fade9",
- "name" : "README.rdoc",
- "path" : "README.rdoc",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e9278fc99fd668bdce33d72dc71fade9?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=KPgAGqShEO5SGzz8oRdwIInPUOc%3D"
- },
- { "checksum" : "8d2f9635f4817ff905a4124e09ec6c59",
- "name" : "metadata.rb",
- "path" : "metadata.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-8d2f9635f4817ff905a4124e09ec6c59?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=fPF2iY7tNrq%2FuNrCjRLImP9vRbA%3D"
- },
- { "checksum" : "e6804b8f3e6dfdbbece9d319537ffea1",
- "name" : "metadata.json",
- "path" : "metadata.json",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e6804b8f3e6dfdbbece9d319537ffea1?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=EVsALLreeAA41%2BiPAfPt%2FxFEIYI%3D"
- }
- ],
- "templates" : [ { "checksum" : "689c1b6fbb242b6c508384e56646341d",
- "name" : "my.cnf.erb",
- "path" : "templates/ubuntu-9.10/my.cnf.erb",
- "specificity" : "ubuntu-9.10",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D"
- },
- { "checksum" : "16b036a0bb31957a77e9b825cf616cc5",
- "name" : "mysql-server.seed.erb",
- "path" : "templates/default/mysql-server.seed.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-16b036a0bb31957a77e9b825cf616cc5?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=50bRvt6GQqFEcfYtaIsq1d4a4c8%3D"
- },
- { "checksum" : "932b51ddddcbd24ee10a76ecae33b8ba",
- "name" : "grants.sql.erb",
- "path" : "templates/default/grants.sql.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-932b51ddddcbd24ee10a76ecae33b8ba?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=RHR0obLFcsN1M9tL28IH4Tcur5g%3D"
- },
- { "checksum" : "7746560b37ac8d4a0cf68befbecbd8a3",
- "name" : "my.cnf.erb",
- "path" : "templates/default/my.cnf.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-7746560b37ac8d4a0cf68befbecbd8a3?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=W7Nqkvhw2TBrlDvcM2rlA4Oj5%2Bk%3D"
- },
- { "checksum" : "63bd67fae6d297e8f658e9c0ad01a411",
- "name" : "my.cnf.erb",
- "path" : "templates/centos/my.cnf.erb",
- "specificity" : "centos",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D"
- },
- { "checksum" : "689c1b6fbb242b6c508384e56646341d",
- "name" : "my.cnf.erb",
- "path" : "templates/ubuntu-10.04/my.cnf.erb",
- "specificity" : "ubuntu-10.04",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D"
- },
- { "checksum" : "63bd67fae6d297e8f658e9c0ad01a411",
- "name" : "my.cnf.erb",
- "path" : "templates/redhat/my.cnf.erb",
- "specificity" : "redhat",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D"
- },
- { "checksum" : "d2244150a145b3f658cd37c13269fafc",
- "name" : "port_mysql.erb",
- "path" : "templates/default/port_mysql.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d2244150a145b3f658cd37c13269fafc?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=23iHcjwpNOvlNf%2BlrKcV2pkU7uo%3D"
- },
- { "checksum" : "2e08553db526f5f80c28b343f6a616cb",
- "name" : "debian.cnf.erb",
- "path" : "templates/default/debian.cnf.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2e08553db526f5f80c28b343f6a616cb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=VdcFYxnLUkj1tS3k8DovrzZEA7E%3D"
- },
- { "checksum" : "1e5068eec65b51f5a327580fb0af4677",
- "name" : "my.cnf.erb",
- "path" : "templates/ubuntu-8.04/my.cnf.erb",
- "specificity" : "ubuntu-8.04",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-1e5068eec65b51f5a327580fb0af4677?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=D5lPeu1UQvA9pEXZm5nVOwj3WIo%3D"
- }
- ],
- "version" : "0.21.2"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/node.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/node.json b/core/src/test/resources/node.json
deleted file mode 100644
index c8ddaef..0000000
--- a/core/src/test/resources/node.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{ "automatic" : { },
- "chef_environment" : "prod",
- "chef_type" : "node",
- "default" : { },
- "json_class" : "Chef::Node",
- "name" : "adrian-jcloudstest",
- "normal" : { "tomcat6" : { "ssl_port" : 8433 } },
- "override" : { },
- "run_list" : [ "recipe[java]" ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/nodes_list.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/nodes_list.json b/core/src/test/resources/nodes_list.json
deleted file mode 100644
index 92ef95a..0000000
--- a/core/src/test/resources/nodes_list.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "blah": "https://api.opscode.com/org/directory/nodes/blah",
- "boxer": "https://api.opscode.com/org/directory/nodes/boxer",
- "blarrrrgh": "https://api.opscode.com/org/directory/nodes/blarrrrgh"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/privkey.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/privkey.txt b/core/src/test/resources/privkey.txt
deleted file mode 100644
index 43be3f7..0000000
--- a/core/src/test/resources/privkey.txt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA0ueqo76MXuP6XqZBILFziH/9AI7C6PaN5W0dSvkr9yInyGHS
-z/IR1+4tqvP2qlfKVKI4CP6BFH251Ft9qMUBuAsnlAVQ1z0exDtIFFOyQCdR7iXm
-jBIWMSS4buBwRQXwDK7id1OxtU23qVJv+xwEV0IzaaSJmaGLIbvRBD+qatfUuQJB
-MU/04DdJIwvLtZBYdC2219m5dUBQaa4bimL+YN9EcsDzD9h9UxQo5ReK7b3cNMzJ
-BKJWLzFBcJuePMzAnLFktr/RufX4wpXe6XJxoVPaHo72GorLkwnQ0HYMTY8rehT4
-mDi1FI969LHCFFaFHSAaRnwdXaQkJmSfcxzCYQIDAQABAoIBAQCW3I4sKN5B9jOe
-xq/pkeWBq4OvhW8Ys1yW0zFT8t6nHbB1XrwscQygd8gE9BPqj3e0iIEqtdphbPmj
-VHqTYbC0FI6QDClifV7noTwTBjeIOlgZ0NSUN0/WgVzIOxUz2mZ2vBZUovKILPqG
-TOi7J7RXMoySMdcXpP1f+PgvYNcnKsT72UcWaSXEV8/zo+Zm/qdGPVWwJonri5Mp
-DVm5EQSENBiRyt028rU6ElXORNmoQpVjDVqZ1gipzXkifdjGyENw2rt4V/iKYD7V
-5iqXOsvP6Cemf4gbrjunAgDG08S00kiUgvVWcdXW+dlsR2nCvH4DOEe3AYYh/aH8
-DxEE7FbtAoGBAPcNO8fJ56mNw0ow4Qg38C+Zss/afhBOCfX4O/SZKv/roRn5+gRM
-KRJYSVXNnsjPI1plzqR4OCyOrjAhtuvL4a0DinDzf1+fiztyNohwYsW1vYmqn3ti
-EN0GhSgE7ppZjqvLQ3f3LUTxynhA0U+k9wflb4irIlViTUlCsOPkrNJDAoGBANqL
-Q+vvuGSsmRLU/Cenjy+Mjj6+QENg51dz34o8JKuVKIPKU8pNnyeLa5fat0qD2MHm
-OB9opeQOcw0dStodxr6DB3wi83bpjeU6BWUGITNiWEaZEBrQ0aiqNJJKrrHm8fAZ
-9o4l4oHc4hI0kYVYYDuxtKuVJrzZiEapTwoOcYiLAoGBAI/EWbeIHZIj9zOjgjEA
-LHvm25HtulLOtyk2jd1njQhlHNk7CW2azIPqcLLH99EwCYi/miNH+pijZ2aHGCXb
-/bZrSxM0ADmrZKDxdB6uGCyp+GS2sBxjEyEsfCyvwhJ8b3Q100tqwiNO+d5FCglp
-HICx2dgUjuRVUliBwOK93nx1AoGAUI8RhIEjOYkeDAESyhNMBr0LGjnLOosX+/as
-qiotYkpjWuFULbibOFp+WMW41vDvD9qrSXir3fstkeIAW5KqVkO6mJnRoT3Knnra
-zjiKOITCAZQeiaP8BO5o3pxE9TMqb9VCO3ffnPstIoTaN4syPg7tiGo8k1SklVeH
-2S8lzq0CgYAKG2fljIYWQvGH628rp4ZcXS4hWmYohOxsnl1YrszbJ+hzR+IQOhGl
-YlkUQYXhy9JixmUUKtH+NXkKX7Lyc8XYw5ETr7JBT3ifs+G7HruDjVG78EJVojbd
-8uLA+DdQm5mg4vd1GTiSK65q/3EeoBlUaVor3HhLFki+i9qpT8CBsg==
------END RSA PRIVATE KEY-----
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/pubkey.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/pubkey.txt b/core/src/test/resources/pubkey.txt
deleted file mode 100644
index 886a471..0000000
--- a/core/src/test/resources/pubkey.txt
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ueqo76MXuP6XqZBILFz
-iH/9AI7C6PaN5W0dSvkr9yInyGHSz/IR1+4tqvP2qlfKVKI4CP6BFH251Ft9qMUB
-uAsnlAVQ1z0exDtIFFOyQCdR7iXmjBIWMSS4buBwRQXwDK7id1OxtU23qVJv+xwE
-V0IzaaSJmaGLIbvRBD+qatfUuQJBMU/04DdJIwvLtZBYdC2219m5dUBQaa4bimL+
-YN9EcsDzD9h9UxQo5ReK7b3cNMzJBKJWLzFBcJuePMzAnLFktr/RufX4wpXe6XJx
-oVPaHo72GorLkwnQ0HYMTY8rehT4mDi1FI969LHCFFaFHSAaRnwdXaQkJmSfcxzC
-YQIDAQAB
------END PUBLIC KEY-----
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/roles_list.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/roles_list.json b/core/src/test/resources/roles_list.json
deleted file mode 100644
index 1f75bc1..0000000
--- a/core/src/test/resources/roles_list.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "webserver": "http://localhost:4000/roles/webserver",
- "smtpserver": "http://localhost:4000/roles/smtpserver"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/sandbox.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sandbox.json b/core/src/test/resources/sandbox.json
deleted file mode 100644
index 640f2a1..0000000
--- a/core/src/test/resources/sandbox.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "_rev": "1-8c27b0ea4c2b7aaedbb44cfbdfcc11b2",
- "json_class": "Chef::Sandbox",
- "is_completed": false,
- "create_time": "2010-07-07T03:36:00+00:00",
- "chef_type": "sandbox",
- "checksums": [],
- "name": "f9d6d9b72bae465890aae87969f98a9c",
- "guid": "f9d6d9b72bae465890aae87969f98a9c"
- }
-
-
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/search_role.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/search_role.json b/core/src/test/resources/search_role.json
deleted file mode 100644
index 5e51663..0000000
--- a/core/src/test/resources/search_role.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "total": 1,
- "start": 0,
- "rows": [
- {
- "name": "webserver",
- "description": "The base role for systems that serve HTTP traffic",
- "json_class": "Chef::Role",
- "default_attributes": {
- "apache2": {
- "listen_ports": [
- "80",
- "443"
- ]
- }
- },
- "override_attributes": {
- "apache2": {
- "max_children": "50"
- }
- },
- "chef_type": "role",
- "run_list": [],
- "env_run_lists": {
- "prod": [
- "recipe[apache2]"
- ],
- "staging": [
- "recipe[apache2::staging]"
- ]
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/search_role_empty.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/search_role_empty.json b/core/src/test/resources/search_role_empty.json
deleted file mode 100644
index ab859ca..0000000
--- a/core/src/test/resources/search_role_empty.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "total": 0,
- "start": 0,
- "rows": []
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/tomcat-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/tomcat-cookbook.json b/core/src/test/resources/tomcat-cookbook.json
deleted file mode 100644
index 992f401..0000000
--- a/core/src/test/resources/tomcat-cookbook.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{ "attributes" : [ { "checksum" : "6e3fd0d16a87a55c569da108194ecb29",
- "name" : "tomcat6.rb",
- "path" : "attributes/tomcat6.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-6e3fd0d16a87a55c569da108194ecb29?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zvYjsgUXIC7Xj3MT8Wd93esDGJM%3D"
- } ],
- "chef_type" : "cookbook_version",
- "cookbook_name" : "tomcat6",
- "definitions" : [ ],
- "files" : [ { "checksum" : "18e534a72652f3d53b197ca4e5027009",
- "name" : "org.apache.tomcat.tomcat6.plist",
- "path" : "files/default/org.apache.tomcat.tomcat6.plist",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-18e534a72652f3d53b197ca4e5027009?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=M3fBL4t7uuYVXVah2PyZ8eL1QCc%3D"
- },
- { "checksum" : "6a35ce92050296862ea63b784529d2e0",
- "name" : "logging.properties",
- "path" : "files/default/logging.properties",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-6a35ce92050296862ea63b784529d2e0?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=vRlKoye2%2Fwz8mdQI%2F3Ht916sllE%3D"
- }
- ],
- "json_class" : "Chef::CookbookVersion",
- "libraries" : [ { "checksum" : "2b6f7847142bb36823c570899669c54b",
- "name" : "tomcat_manager.rb",
- "path" : "libraries/tomcat_manager.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2b6f7847142bb36823c570899669c54b?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zxIoUKcGYWo9ir6qf1tTy3wvKZ4%3D"
- },
- { "checksum" : "24db7b7dd6f04f8da5fa2b282910ac08",
- "name" : "tomcat.rb",
- "path" : "libraries/tomcat.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-24db7b7dd6f04f8da5fa2b282910ac08?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=c4Gbn5kX0ZaPbWvk5LAcR77sITg%3D"
- }
- ],
- "metadata" : { "attributes" : { "tomcat6/with_native" : { "calculated" : false,
- "choice" : [ ],
- "default" : "false",
- "description" : "works for centos, install tomcat-native libraries",
- "display_name" : "Tomcat native support",
- "recipes" : [ ],
- "required" : "optional",
- "type" : "string"
- } },
- "conflicting" : { },
- "dependencies" : { },
- "description" : "Installs and configures all aspects of tomcat6 using custom local installation",
- "groupings" : { },
- "license" : "Apache 2.0",
- "long_description" : "= DESCRIPTION:\n\nInstalls Tomcat6\n\n= REQUIREMENTS:\n\n== Platform and Application Environment:\n\nTested on Centos 5.2 8.10. May work on other platforms, esp Redhat.\nNeeds Java at least Java 5\n\n== Cookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* java\n\n= ATTRIBUTES: \n\n= USAGE:\n\n\n= LICENSE and AUTHOR:\n \nAuthor:: Edmund Haselwanter (<ed...@haselwanter.com>)\nCopyright:: 2009, Edmund Haselwanter\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimit
ations under the License.\n",
- "maintainer" : "Opscode, Inc.",
- "maintainer_email" : "cookbooks@opscode.com",
- "name" : "tomcat6",
- "platforms" : { "centos" : "",
- "debian" : "",
- "redhat" : "",
- "ubuntu" : ""
- },
- "providing" : { },
- "recipes" : { "tomcat6" : "Main Tomcat 6 configuration" },
- "recommendations" : { },
- "replacing" : { },
- "suggestions" : { },
- "version" : "0.1.0"
- },
- "name" : "tomcat6-0.1.0",
- "providers" : [ ],
- "recipes" : [ { "checksum" : "d45661e4b50f9677de7b8684af26ff9d",
- "name" : "default.rb",
- "path" : "recipes/default.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d45661e4b50f9677de7b8684af26ff9d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=r3CvyVe7dcOzB%2F0fNAun5ldGwr8%3D"
- } ],
- "resources" : [ ],
- "root_files" : [ { "checksum" : "14f6977f68c3674484e8289e361fb5a4",
- "name" : "README.rdoc",
- "path" : "README.rdoc",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-14f6977f68c3674484e8289e361fb5a4?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=VNZxN%2B7CxO7ZbDHJOS%2FaTtpkPaE%3D"
- },
- { "checksum" : "abc416ffba9ea64ca71635191cb87af6",
- "name" : "metadata.rb",
- "path" : "metadata.rb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-abc416ffba9ea64ca71635191cb87af6?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=pemynt9Q1F%2BxlS26kLaz%2F4NDGO4%3D"
- },
- { "checksum" : "dd8473a8a7f2b446250ecdefb1882a5e",
- "name" : "metadata.json",
- "path" : "metadata.json",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-dd8473a8a7f2b446250ecdefb1882a5e?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=sHpayqP%2Fe4Luv20EMa3q%2FaMN4ms%3D"
- }
- ],
- "templates" : [ { "checksum" : "107263b81e4700cf0adad7af2a133bbd",
- "name" : "tomcat-users.xml.erb",
- "path" : "templates/default/tomcat-users.xml.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-107263b81e4700cf0adad7af2a133bbd?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=QC7MNIauR2ox5MVlohf2i73uM1s%3D"
- },
- { "checksum" : "fa4432b353fa57b9da26a4bff44285f2",
- "name" : "sv-tomcat6-run.erb",
- "path" : "templates/default/sv-tomcat6-run.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-fa4432b353fa57b9da26a4bff44285f2?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=q2rDeJFeh4oyhfv9ExMifGB0wxo%3D"
- },
- { "checksum" : "33fd6f63133e7ebe28bc62e58773c408",
- "name" : "manager.xml.erb",
- "path" : "templates/default/manager.xml.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-33fd6f63133e7ebe28bc62e58773c408?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=rIijEhwLPf5PWTJOg%2BElbOquPBM%3D"
- },
- { "checksum" : "09f2bf988663175cd1b7973198dfb5eb",
- "name" : "sv-tomcat6-log-run.erb",
- "path" : "templates/default/sv-tomcat6-log-run.erb",
- "specificity" : "default",
- "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-09f2bf988663175cd1b7973198dfb5eb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=UnfNDP4pDzPM3PoLcLWyTnTa%2FKI%3D"
- }
- ],
- "version" : "0.1.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/core/src/test/resources/upload-site.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/upload-site.json b/core/src/test/resources/upload-site.json
deleted file mode 100644
index 58bf165..0000000
--- a/core/src/test/resources/upload-site.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "uri": "https://api.opscode.com/organizations/jclouds/sandboxes/d454f71e2a5f400c808d0c5d04c2c88c",
- "checksums": {
- "0c5ecd7788cf4f6c7de2a57193897a6c": {
- "url": "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/sandbox-d454f71e2a5f400c808d0c5d04c2c88c/checksum-0c5ecd7788cf4f6c7de2a57193897a6c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277344702&Signature=FtKyqvYEjhhEKmRY%2B0M8aGPMM7g%3D",
- "needs_upload": true
- }, "0189e76ccc476701d6b374e5a1a27347": {
- "needs_upload": false
- }, "1dda05ed139664f1f89b9dec482b77c0": {
- "needs_upload": false
- }
- }, "sandbox_id": "d454f71e2a5f400c808d0c5d04c2c88c"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/enterprise/pom.xml b/enterprise/pom.xml
deleted file mode 100644
index 1d608ad..0000000
--- a/enterprise/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-project</artifactId>
- <version>1.8.2-SNAPSHOT</version>
- <relativePath>../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>enterprisechef</artifactId>
- <name>Apache jclouds Chef :: Enterprise</name>
- <description>jclouds components to access Enterprise Chef</description>
-
- <properties>
- <test.enterprisechef.org>YOUR_ORG</test.enterprisechef.org>
- <test.enterprisechef.endpoint>https://api.opscode.com/organizations/${test.enterprisechef.org}</test.enterprisechef.endpoint>
- <test.enterprisechef.api-version />
- <test.enterprisechef.build-version />
- <test.enterprisechef.identity>YOUR_USER</test.enterprisechef.identity>
- <test.enterprisechef.credential>${user.home}/.chef/${test.enterprisechef.org}/${test.enterprisechef.identity}.pem</test.enterprisechef.credential>
- <jclouds.osgi.export>org.jclouds.enterprisechef*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.enterprisechef.org>${test.enterprisechef.org}</test.enterprisechef.org>
- <test.enterprisechef.endpoint>${test.enterprisechef.endpoint}</test.enterprisechef.endpoint>
- <test.enterprisechef.api-version>${test.enterprisechef.api-version}</test.enterprisechef.api-version>
- <test.enterprisechef.build-version>${test.enterprisechef.build-version}</test.enterprisechef.build-version>
- <test.enterprisechef.identity>${test.enterprisechef.identity}</test.enterprisechef.identity>
- <test.enterprisechef.credential>${test.enterprisechef.credential}</test.enterprisechef.credential>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
deleted file mode 100644
index 8f1a0ed..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Constants;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.chef.ChefApi;
-import org.jclouds.chef.filters.SignedHeaderAuth;
-import org.jclouds.chef.functions.ParseKeySetFromJson;
-import org.jclouds.enterprisechef.binders.BindGroupToUpdateRequestJsonPayload;
-import org.jclouds.enterprisechef.binders.GroupName;
-import org.jclouds.enterprisechef.domain.Group;
-import org.jclouds.enterprisechef.domain.User;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.Headers;
-import org.jclouds.rest.annotations.ParamParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.WrapWith;
-
-/**
- * Provides synchronous access to the Enterprise Chef Api.
- */
-@RequestFilters(SignedHeaderAuth.class)
-@Consumes(MediaType.APPLICATION_JSON)
-@Headers(keys = "X-Chef-Version", values = "{" + Constants.PROPERTY_API_VERSION + "}")
-public interface EnterpriseChefApi extends ChefApi
-{
- /**
- * Retrieves an existing user.
- *
- * @param name The name of the user to get.
- * @return The details of the user or <code>null</code> if not found.
- */
- @Named("user:get")
- @GET
- @Path("/users/{name}")
- @Fallback(NullOnNotFoundOr404.class)
- User getUser(@PathParam("name") String name);
-
- /**
- * List all existing groups.
- *
- * @return The list of groups.
- */
- @Named("group:list")
- @GET
- @Path("/groups")
- @ResponseParser(ParseKeySetFromJson.class)
- Set<String> listGroups();
-
- /**
- * Retrieves an existing group.
- *
- * @param name The name of the group to get.
- * @return The details of the group or <code>null</code> if not found.
- */
- @Named("group:get")
- @GET
- @Path("/groups/{name}")
- @Fallback(NullOnNotFoundOr404.class)
- Group getGroup(@PathParam("name") String name);
-
- /**
- * Creates a new group.
- *
- * @param name The name of the group to create.
- */
- @Named("group:create")
- @POST
- @Path("/groups")
- void createGroup(@WrapWith("groupname") String name);
-
- /**
- * Updates a group.
- * <p>
- * This method can be used to add actors (clients, groups) to the group.
- *
- * @param group The group with the updated information.
- */
- @Named("group:update")
- @PUT
- @Path("/groups/{name}")
- void updateGroup(
- @PathParam("name") @ParamParser(GroupName.class) @BinderParam(BindGroupToUpdateRequestJsonPayload.class) Group group);
-
- /**
- * Deletes a group.
- *
- * @param name The name of the group to delete.
- */
- @Named("group:delete")
- @DELETE
- @Path("/groups/{name}")
- void deleteGroup(@PathParam("name") String name);
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java
deleted file mode 100644
index fdccf46..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.chef.ChefApiMetadata;
-import org.jclouds.chef.ChefContext;
-import org.jclouds.chef.config.ChefBootstrapModule;
-import org.jclouds.chef.config.ChefParserModule;
-import org.jclouds.enterprisechef.config.EnterpriseChefHttpApiModule;
-import org.jclouds.ohai.config.JMXOhaiModule;
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for the Enterprise Chef api.
- */
-public class EnterpriseChefApiMetadata extends BaseHttpApiMetadata<EnterpriseChefApi> {
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public EnterpriseChefApiMetadata() {
- this(new Builder());
- }
-
- protected EnterpriseChefApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- return ChefApiMetadata.defaultProperties();
- }
-
- public static class Builder extends BaseHttpApiMetadata.Builder<EnterpriseChefApi, Builder> {
-
- protected Builder() {
- id("enterprisechef")
- .name("Enterprise Chef Api")
- .identityName("User")
- .credentialName("Certificate")
- .version(ChefApiMetadata.DEFAULT_API_VERSION)
- .documentation(URI.create("http://www.opscode.com/support"))
- .defaultEndpoint("https://api.opscode.com")
- .view(ChefContext.class)
- .defaultProperties(EnterpriseChefApiMetadata.defaultProperties())
- .defaultModules(
- ImmutableSet.<Class<? extends Module>> of(EnterpriseChefHttpApiModule.class,
- ChefParserModule.class, ChefBootstrapModule.class, JMXOhaiModule.class));
- }
-
- @Override
- public EnterpriseChefApiMetadata build() {
- return new EnterpriseChefApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
deleted file mode 100644
index 336ea7a..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for Enterprise Chef
- */
-public class EnterpriseChefProviderMetadata extends BaseProviderMetadata
-{
-
- public static Builder builder()
- {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder()
- {
- return builder().fromProviderMetadata(this);
- }
-
- public EnterpriseChefProviderMetadata()
- {
- super(builder());
- }
-
- public EnterpriseChefProviderMetadata(Builder builder)
- {
- super(builder);
- }
-
- public static Properties defaultProperties()
- {
- Properties properties = new Properties();
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder
- {
-
- protected Builder()
- {
- id("enterprisechef") //
- .name("OpsCode Enterprise Chef") //
- .endpoint("https://api.opscode.com") //
- .homepage(URI.create("https://manage.opscode.com")) //
- .console(URI.create("https://manage.opscode.com")) //
- .apiMetadata(new EnterpriseChefApiMetadata()) //
- .defaultProperties(EnterpriseChefProviderMetadata.defaultProperties());
- }
-
- @Override
- public EnterpriseChefProviderMetadata build()
- {
- return new EnterpriseChefProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(ProviderMetadata in)
- {
- super.fromProviderMetadata(in);
- return this;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayload.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayload.java b/enterprise/src/main/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayload.java
deleted file mode 100644
index 2573b9d..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayload.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.enterprisechef.domain.Group;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.Json;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-/**
- * Binds a group to the payload expected for the Put method in the Enterprise Chef
- * Api.
- */
-@Singleton
-public class BindGroupToUpdateRequestJsonPayload extends BindToJsonPayload {
-
- @Inject
- public BindGroupToUpdateRequestJsonPayload(Json jsonBinder) {
- super(jsonBinder);
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object payload) {
- checkArgument(checkNotNull(payload, "payload") instanceof Group, "this binder is only valid for Group objects");
- GroupUpdateRequest updateGroup = new GroupUpdateRequest((Group) payload);
- return super.bindToRequest(request, updateGroup);
- }
-
- @SuppressWarnings("unused")
- private static class GroupUpdateRequest {
- private String name;
- private String groupname;
- private String orgname;
- private ActorConfiguration actors;
-
- public GroupUpdateRequest(Group group) {
- this.name = group.getName();
- this.groupname = group.getGroupname();
- this.orgname = group.getOrgname();
- this.actors = new ActorConfiguration(group);
- }
- }
-
- @SuppressWarnings("unused")
- private static class ActorConfiguration {
- private Set<String> clients;
- private Set<String> groups;
- private Set<String> users;
-
- public ActorConfiguration(Group group) {
- this.clients = group.getClients();
- this.groups = group.getGroups();
- this.users = group.getUsers();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/binders/GroupName.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/binders/GroupName.java b/enterprise/src/main/java/org/jclouds/enterprisechef/binders/GroupName.java
deleted file mode 100644
index 12286a6..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/binders/GroupName.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Singleton;
-
-import org.jclouds.enterprisechef.domain.Group;
-
-import com.google.common.base.Function;
-
-/**
- * Gets the name of a group.
- */
-@Singleton
-public class GroupName implements Function<Object, String> {
-
- @Override
- public String apply(Object from) {
- return ((Group) checkNotNull(from, "from")).getGroupname();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/config/EnterpriseChefHttpApiModule.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/config/EnterpriseChefHttpApiModule.java b/enterprise/src/main/java/org/jclouds/enterprisechef/config/EnterpriseChefHttpApiModule.java
deleted file mode 100644
index ed0a49f..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/config/EnterpriseChefHttpApiModule.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef.config;
-
-import org.jclouds.chef.ChefApi;
-import org.jclouds.chef.config.BaseChefHttpApiModule;
-import org.jclouds.enterprisechef.EnterpriseChefApi;
-import org.jclouds.rest.ConfiguresHttpApi;
-
-/**
- * Configures the Enterprise Chef connection.
- */
-@ConfiguresHttpApi
-public class EnterpriseChefHttpApiModule extends BaseChefHttpApiModule<EnterpriseChefApi> {
-
- @Override
- protected void configure() {
- super.configure();
- bind(ChefApi.class).to(EnterpriseChefApi.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
deleted file mode 100644
index 8535ca2..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef.domain;
-
-import static org.jclouds.chef.util.CollectionUtils.copyOfOrEmpty;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Group object.
- */
-public class Group {
- public static Builder builder(String groupname) {
- return new Builder(groupname);
- }
-
- public static class Builder {
- private String name;
- private String groupname;
- private String orgname;
- private ImmutableSet.Builder<String> actors = ImmutableSet.builder();
- private ImmutableSet.Builder<String> clients = ImmutableSet.builder();
- private ImmutableSet.Builder<String> groups = ImmutableSet.builder();
- private ImmutableSet.Builder<String> users = ImmutableSet.builder();
-
- public Builder(String groupname) {
- this.groupname = groupname;
- }
-
- public Builder name(String name) {
- this.name = checkNotNull(name, "name");
- return this;
- }
-
- public Builder groupname(String groupname) {
- this.groupname = checkNotNull(groupname, "groupname");
- return this;
- }
-
- public Builder orgname(String orgname) {
- this.orgname = checkNotNull(orgname, "orgname");
- return this;
- }
-
- public Builder actor(String actor) {
- this.actors.add(checkNotNull(actor, "actor"));
- return this;
- }
-
- public Builder actors(Iterable<String> actors) {
- this.actors.addAll(checkNotNull(actors, "actors"));
- return this;
- }
-
- public Builder client(String client) {
- this.clients.add(checkNotNull(client, "client"));
- return this;
- }
-
- public Builder clients(Iterable<String> clients) {
- this.clients.addAll(checkNotNull(clients, "clients"));
- return this;
- }
-
- public Builder group(String group) {
- this.groups.add(checkNotNull(group, "group"));
- return this;
- }
-
- public Builder groups(Iterable<String> groups) {
- this.groups.addAll(checkNotNull(groups, "groups"));
- return this;
- }
-
- public Builder user(String user) {
- this.users.add(checkNotNull(user, "user"));
- return this;
- }
-
- public Builder users(Iterable<String> users) {
- this.users.addAll(checkNotNull(users, "users"));
- return this;
- }
-
- public Group build() {
- return new Group(name, checkNotNull(groupname, "groupname"), orgname, actors.build(), clients.build(),
- groups.build(), users.build());
- }
- }
-
- private final String name;
- private final String groupname;
- private final String orgname;
- private final Set<String> actors;
- private final Set<String> clients;
- private final Set<String> groups;
- private final Set<String> users;
-
- @ConstructorProperties({ "name", "groupname", "orgname", "actors", "clients", "groups", "users" })
- public Group(String name, String groupname, String orgname, @Nullable Set<String> actors,
- @Nullable Set<String> clients, @Nullable Set<String> groups, @Nullable Set<String> users) {
- this.name = name;
- this.groupname = groupname;
- this.orgname = orgname;
- this.actors = copyOfOrEmpty(actors);
- this.clients = copyOfOrEmpty(clients);
- this.groups = copyOfOrEmpty(groups);
- this.users = copyOfOrEmpty(users);
- }
-
- public String getName() {
- return name;
- }
-
- public String getGroupname() {
- return groupname;
- }
-
- public String getOrgname() {
- return orgname;
- }
-
- public Set<String> getActors() {
- return actors;
- }
-
- public Set<String> getClients() {
- return clients;
- }
-
- public Set<String> getGroups() {
- return groups;
- }
-
- public Set<String> getUsers() {
- return users;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (groupname == null ? 0 : groupname.hashCode());
- result = prime * result + (name == null ? 0 : name.hashCode());
- result = prime * result + (orgname == null ? 0 : orgname.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- Group other = (Group) obj;
- if (groupname == null) {
- if (other.groupname != null) {
- return false;
- }
- } else if (!groupname.equals(other.groupname)) {
- return false;
- }
- if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
- return false;
- }
- if (orgname == null) {
- if (other.orgname != null) {
- return false;
- }
- } else if (!orgname.equals(other.orgname)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "Group [name=" + name + ", groupname=" + groupname + ", orgname=" + orgname + ", actors=" + actors
- + ", clients=" + clients + ", groups=" + groups + ", users=" + users + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
deleted file mode 100644
index da4e9e5..0000000
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.security.PublicKey;
-
-import com.google.gson.annotations.SerializedName;
-
-/**
- * User object.
- */
-public class User {
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private String username;
- private String firstName;
- private String middleName;
- private String lastName;
- private String displayName;
- private String email;
- private PublicKey publicKey;
-
- public Builder username(String username) {
- this.username = checkNotNull(username, "username");
- return this;
- }
-
- public Builder firstName(String firstName) {
- this.firstName = checkNotNull(firstName, "firstName");
- return this;
- }
-
- public Builder middleName(String middleName) {
- this.middleName = checkNotNull(middleName, "middleName");
- return this;
- }
-
- public Builder lastName(String lastName) {
- this.lastName = checkNotNull(lastName, "lastName");
- return this;
- }
-
- public Builder displayName(String displayName) {
- this.displayName = checkNotNull(displayName, "displayName");
- return this;
- }
-
- public Builder email(String email) {
- this.email = checkNotNull(email, "email");
- return this;
- }
-
- public Builder publicKey(PublicKey publicKey) {
- this.publicKey = checkNotNull(publicKey, "publicKey");
- return this;
- }
-
- public User build() {
- return new User(username, firstName, middleName, lastName, displayName, email, publicKey);
- }
- }
-
- private final String username;
- @SerializedName("first_name")
- private final String firstName;
- @SerializedName("middle_name")
- private final String middleName;
- @SerializedName("last_name")
- private final String lastName;
- @SerializedName("display_name")
- private final String displayName;
- private final String email;
- @SerializedName("public_key")
- private final PublicKey publicKey;
-
- @ConstructorProperties({ "username", "first_name", "middle_name", "last_name", "display_name", "email", "public_key" })
- protected User(String username, String firstName, String middleName, String lastName, String displayName,
- String email, PublicKey publicKey) {
- this.username = username;
- this.firstName = firstName;
- this.middleName = middleName;
- this.lastName = lastName;
- this.displayName = displayName;
- this.email = email;
- this.publicKey = publicKey;
- }
-
- public String getUsername() {
- return username;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public String getMiddleName() {
- return middleName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public String getEmail() {
- return email;
- }
-
- public PublicKey getPublicKey() {
- return publicKey;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (displayName == null ? 0 : displayName.hashCode());
- result = prime * result + (email == null ? 0 : email.hashCode());
- result = prime * result + (firstName == null ? 0 : firstName.hashCode());
- result = prime * result + (lastName == null ? 0 : lastName.hashCode());
- result = prime * result + (middleName == null ? 0 : middleName.hashCode());
- result = prime * result + (publicKey == null ? 0 : publicKey.hashCode());
- result = prime * result + (username == null ? 0 : username.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- User other = (User) obj;
- if (displayName == null) {
- if (other.displayName != null) {
- return false;
- }
- } else if (!displayName.equals(other.displayName)) {
- return false;
- }
- if (email == null) {
- if (other.email != null) {
- return false;
- }
- } else if (!email.equals(other.email)) {
- return false;
- }
- if (firstName == null) {
- if (other.firstName != null) {
- return false;
- }
- } else if (!firstName.equals(other.firstName)) {
- return false;
- }
- if (lastName == null) {
- if (other.lastName != null) {
- return false;
- }
- } else if (!lastName.equals(other.lastName)) {
- return false;
- }
- if (middleName == null) {
- if (other.middleName != null) {
- return false;
- }
- } else if (!middleName.equals(other.middleName)) {
- return false;
- }
- if (publicKey == null) {
- if (other.publicKey != null) {
- return false;
- }
- } else if (!publicKey.equals(other.publicKey)) {
- return false;
- }
- if (username == null) {
- if (other.username != null) {
- return false;
- }
- } else if (!username.equals(other.username)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "User [username=" + username + ", firstName=" + firstName + ", middleName=" + middleName + ", lastName="
- + lastName + ", displayName=" + displayName + ", email=" + email + ", publicKey=" + publicKey + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/enterprise/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/enterprise/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 7861cbb..0000000
--- a/enterprise/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.enterprisechef.EnterpriseChefProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java
----------------------------------------------------------------------
diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java
deleted file mode 100644
index 7ca79f7..0000000
--- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.enterprisechef;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.chef.BaseChefApiExpectTest;
-import org.jclouds.chef.ChefApiMetadata;
-import org.jclouds.date.TimeStamp;
-import org.jclouds.enterprisechef.config.EnterpriseChefHttpApiModule;
-import org.jclouds.enterprisechef.domain.Group;
-import org.jclouds.enterprisechef.domain.User;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.inject.Module;
-
-/**
- * Expect tests for the {@link EnterpriseChefApi} class.
- */
-@Test(groups = "unit", testName = "EnterpriseChefApiExpectTest")
-public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<EnterpriseChefApi> {
- public EnterpriseChefApiExpectTest() {
- provider = "enterprisechef";
- }
-
- public void testGetUserReturns2xx() {
- EnterpriseChefApi api = requestSendsResponse(
- signed(HttpRequest.builder() //
- .method("GET") //
- .endpoint("https://api.opscode.com/users/nacx") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON).build()), //
- HttpResponse.builder().statusCode(200)
- .payload(payloadFromResourceWithContentType("/user.json", MediaType.APPLICATION_JSON)) //
- .build());
-
- User user = api.getUser("nacx");
- assertEquals(user.getUsername(), "nacx");
- assertEquals(user.getDisplayName(), "Ignasi Barrera");
- }
-
- public void testGetUserReturns404() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("GET") //
- .endpoint("https://api.opscode.com/users/foo") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .build()), //
- HttpResponse.builder().statusCode(404).build());
-
- assertNull(api.getUser("foo"));
- }
-
- public void testListGroups() {
- EnterpriseChefApi api = requestSendsResponse(
- signed(HttpRequest.builder() //
- .method("GET") //
- .endpoint("https://api.opscode.com/groups") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON).build()), //
- HttpResponse.builder().statusCode(200)
- .payload(payloadFromResourceWithContentType("/groups.json", MediaType.APPLICATION_JSON)) //
- .build());
-
- Set<String> groups = api.listGroups();
- assertEquals(groups.size(), 5);
- assertTrue(groups.contains("admins"));
- }
-
- public void testGetGroupReturns2xx() {
- EnterpriseChefApi api = requestSendsResponse(
- signed(HttpRequest.builder() //
- .method("GET") //
- .endpoint("https://api.opscode.com/groups/admins") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON).build()), //
- HttpResponse.builder().statusCode(200)
- .payload(payloadFromResourceWithContentType("/group.json", MediaType.APPLICATION_JSON)) //
- .build());
-
- Group group = api.getGroup("admins");
- assertEquals(group.getName(), "admins");
- assertEquals(group.getGroupname(), "admins");
- }
-
- public void testGetGroupReturns404() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("GET") //
- .endpoint("https://api.opscode.com/groups/foo") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .build()), //
- HttpResponse.builder().statusCode(404).build());
-
- assertNull(api.getGroup("foo"));
- }
-
- public void testCreateGroupReturns2xx() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("POST") //
- .endpoint("https://api.opscode.com/groups") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .payload(payloadFromStringWithContentType("{\"groupname\":\"foo\"}", MediaType.APPLICATION_JSON)) //
- .build()), //
- HttpResponse.builder().statusCode(201).build());
-
- api.createGroup("foo");
- }
-
- public void testDeleteGroupReturns2xx() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("DELETE") //
- .endpoint("https://api.opscode.com/groups/foo") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .build()), //
- HttpResponse.builder().statusCode(200).build());
-
- api.deleteGroup("foo");
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testDeleteGroupFailsOn404() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("DELETE") //
- .endpoint("https://api.opscode.com/groups/foo") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .build()), //
- HttpResponse.builder().statusCode(404).build());
-
- api.deleteGroup("foo");
- }
-
- public void testUpdateGroupReturns2xx() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("PUT") //
- .endpoint("https://api.opscode.com/groups/admins") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .payload(payloadFromResourceWithContentType("/group-update.json", MediaType.APPLICATION_JSON)) //
- .build()), //
- HttpResponse.builder().statusCode(200).build());
-
- Group group = Group.builder("admins").client("abiquo").group("admins").user("nacx").build();
- api.updateGroup(group);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testUpdateGroupFailsOn404() {
- EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() //
- .method("PUT") //
- .endpoint("https://api.opscode.com/groups/admins") //
- .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) //
- .addHeader("Accept", MediaType.APPLICATION_JSON) //
- .payload(payloadFromResourceWithContentType("/group-update.json", MediaType.APPLICATION_JSON)) //
- .build()), //
- HttpResponse.builder().statusCode(404).build());
-
- Group group = Group.builder("admins").client("abiquo").group("admins").user("nacx").build();
- api.updateGroup(group);
- }
-
- @Override
- protected Module createModule() {
- return new TestEnterpriseChefHttpApiModule();
- }
-
- @ConfiguresHttpApi
- static class TestEnterpriseChefHttpApiModule extends EnterpriseChefHttpApiModule {
- @Override
- protected String provideTimeStamp(@TimeStamp Supplier<String> cache) {
- return "timestamp";
- }
- }
-
- @Override
- protected ProviderMetadata createProviderMetadata() {
- return new EnterpriseChefProviderMetadata();
- }
-
-}