From 06ecdb8d7ac22bff2e1249b9afb6d66ee94a2e49 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Sun, 25 Jul 2010 17:42:39 -0700
Subject: [PATCH] Issue 191: added ohai for java

---
 chef/pom.xml                                  |   2 +-
 .../org/jclouds/chef/ChefAsyncClient.java     |   2 +-
 .../java/org/jclouds/chef/ChefClient.java     |   4 +-
 .../chef/config/BaseChefRestClientModule.java |  29 +----
 .../jclouds/chef/config/ChefParserModule.java |   5 +-
 .../chef/config/ChefRestClientModule.java     |   4 +-
 .../chef/functions/ParseKeySetFromJson.java   |   4 +-
 .../handlers/ChefClientErrorRetryHandler.java |   2 +-
 .../chef/handlers/ChefErrorHandler.java       |   2 +-
 .../jclouds/chef/reference/ChefConstants.java |   4 +-
 chef/src/main/java/org/jclouds/ohai/JMX.java  |  62 +++++++++++
 .../java/org/jclouds/ohai/UpdateNode.java     |  65 +++++++++++
 .../jclouds/ohai/WhiteListCompliantJVM.java   | 103 ++++++++++++++++++
 .../jclouds/ohai/config/BaseOhaiModule.java   |  89 +++++++++++++++
 .../org/jclouds/ohai/config/OhaiModule.java   |  54 +++++++++
 .../config/WhiteListCompliantOhaiModule.java  |  28 +++++
 .../ohai/functions/ByteArrayToMacAddress.java |  65 +++++++++++
 .../org/jclouds/chef/ChefAsyncClientTest.java |  42 +++----
 .../chef/ProvidersInPropertiesTest.java       |   2 +-
 .../BindHexEncodedMD5sToJsonPayloadTest.java  |  12 +-
 .../functions/ParseClientFromJsonTest.java    |   5 +-
 .../ParseCookbookVersionFromJsonTest.java     |  21 ++--
 .../ParseDataBagItemFromJsonTest.java         |   4 +-
 .../chef/functions/ParseKeyFromJsonTest.java  |  25 +++--
 .../functions/ParseKeySetFromJsonTest.java    |   5 +-
 .../chef/functions/ParseNodeFromJsonTest.java |  11 +-
 .../ParseOrganizationFromJsonTest.java        |   5 +-
 .../functions/ParseSandboxFromJsonTest.java   |  32 ++----
 .../ParseUploadSandboxFromJsonTest.java       |  34 ++----
 .../chef/functions/ParseUserFromJsonTest.java |  13 +--
 .../test/java/org/jclouds/ohai/JMXTest.java   |  74 +++++++++++++
 .../java/org/jclouds/ohai/UpdateNodeTest.java |  76 +++++++++++++
 .../ohai/WhiteListCompliantJVMTest.java       |  82 ++++++++++++++
 .../functions/ByteArrayToMacAddressTest.java  |  58 ++++++++++
 chef/src/test/resources/log4j.xml             |   2 +-
 35 files changed, 872 insertions(+), 155 deletions(-)
 create mode 100644 chef/src/main/java/org/jclouds/ohai/JMX.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/UpdateNode.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/WhiteListCompliantJVM.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/config/BaseOhaiModule.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/config/WhiteListCompliantOhaiModule.java
 create mode 100644 chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java
 create mode 100644 chef/src/test/java/org/jclouds/ohai/JMXTest.java
 create mode 100644 chef/src/test/java/org/jclouds/ohai/UpdateNodeTest.java
 create mode 100644 chef/src/test/java/org/jclouds/ohai/WhiteListCompliantJVMTest.java
 create mode 100644 chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java

diff --git a/chef/pom.xml b/chef/pom.xml
index 628b0ad566..1d18f86898 100644
--- a/chef/pom.xml
+++ b/chef/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	<!--
-		$HeadURL$ $Revision$ $Date$ Copyright (C) 2009 Cloud Conscious, LLC
+		$HeadURL$ $Revision$ $Date$ Copyright (C) 2010 Cloud Conscious, LLC
 		<info@cloudconscious.com>
 
 		====================================================================
diff --git a/chef/src/main/java/org/jclouds/chef/ChefAsyncClient.java b/chef/src/main/java/org/jclouds/chef/ChefAsyncClient.java
index b86fb89ebd..7596e8452e 100644
--- a/chef/src/main/java/org/jclouds/chef/ChefAsyncClient.java
+++ b/chef/src/main/java/org/jclouds/chef/ChefAsyncClient.java
@@ -78,7 +78,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 @Headers(keys = "X-Chef-Version", values = ChefAsyncClient.VERSION)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface ChefAsyncClient {
-   public static final String VERSION = "0.9.6";
+   public static final String VERSION = "0.9.8";
 
    /**
     * @see ChefClient#getUploadSandboxForChecksums
diff --git a/chef/src/main/java/org/jclouds/chef/ChefClient.java b/chef/src/main/java/org/jclouds/chef/ChefClient.java
index 58db1eb5af..cae3352bd1 100644
--- a/chef/src/main/java/org/jclouds/chef/ChefClient.java
+++ b/chef/src/main/java/org/jclouds/chef/ChefClient.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  */
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java b/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java
index 2ffd825c7a..74b75c5f9b 100644
--- a/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java
+++ b/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,29 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-/**
- *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * 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.chef.config;
 
 import static org.jclouds.Constants.PROPERTY_CREDENTIAL;
@@ -64,8 +41,6 @@ import org.jclouds.http.RequiresHttp;
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
-import org.jclouds.http.functions.config.ParserModule.DateAdapter;
-import org.jclouds.http.functions.config.ParserModule.Iso8601DateAdapter;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.config.RestClientModule;
 
@@ -130,7 +105,7 @@ public class BaseChefRestClientModule<S, A> extends RestClientModule<S, A> {
 
    @Override
    protected void configure() {
-      bind(DateAdapter.class).to(Iso8601DateAdapter.class);
+      install(new ChefParserModule());
       super.configure();
    }
 
diff --git a/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java b/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java
index 441be75cc6..85bcf983c7 100644
--- a/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java
+++ b/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +26,8 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.chef.domain.DataBagItem;
+import org.jclouds.json.config.GsonModule.DateAdapter;
+import org.jclouds.json.config.GsonModule.Iso8601DateAdapter;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonDeserializationContext;
@@ -79,5 +81,6 @@ public class ChefParserModule extends AbstractModule {
 
    @Override
    protected void configure() {
+      bind(DateAdapter.class).to(Iso8601DateAdapter.class);
    }
 }
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/chef/config/ChefRestClientModule.java b/chef/src/main/java/org/jclouds/chef/config/ChefRestClientModule.java
index f162f0489c..f06a12b68c 100644
--- a/chef/src/main/java/org/jclouds/chef/config/ChefRestClientModule.java
+++ b/chef/src/main/java/org/jclouds/chef/config/ChefRestClientModule.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  */
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java b/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java
index b3e212ccc6..736178557a 100644
--- a/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java
+++ b/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  */
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/chef/src/main/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandler.java b/chef/src/main/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandler.java
index 62093e0bf6..b4b6967fc0 100644
--- a/chef/src/main/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandler.java
+++ b/chef/src/main/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandler.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java b/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java
index ea6f0d6cf1..cb93645c2a 100644
--- a/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java
+++ b/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/chef/src/main/java/org/jclouds/chef/reference/ChefConstants.java b/chef/src/main/java/org/jclouds/chef/reference/ChefConstants.java
index 629672479d..b73c436a38 100644
--- a/chef/src/main/java/org/jclouds/chef/reference/ChefConstants.java
+++ b/chef/src/main/java/org/jclouds/chef/reference/ChefConstants.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  */
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/chef/src/main/java/org/jclouds/ohai/JMX.java b/chef/src/main/java/org/jclouds/ohai/JMX.java
new file mode 100644
index 0000000000..a7d650d3b1
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/JMX.java
@@ -0,0 +1,62 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.lang.management.RuntimeMXBean;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+import org.jclouds.domain.JsonBall;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.Maps;
+
+/**
+ * 
+ * Gathers Ohai data from the JVM.
+ * 
+ * @author Adrian Cole
+ */
+@Singleton
+public class JMX implements Supplier<Map<String, JsonBall>> {
+
+   @Resource
+   protected Logger logger = Logger.NULL;
+   private final Provider<RuntimeMXBean> runtimeSupplier;
+
+   @Inject
+   public JMX(Provider<RuntimeMXBean> runtimeSupplier) {
+      this.runtimeSupplier = checkNotNull(runtimeSupplier, "runtimeSupplier");
+   }
+
+   public Map<String, JsonBall> get() {
+      RuntimeMXBean runtime = runtimeSupplier.get();
+      Map<String, JsonBall> automatic = Maps.newLinkedHashMap();
+      long uptimeInSeconds = runtime.getUptime() / 1000;
+      automatic.put("uptime_seconds", new JsonBall(uptimeInSeconds));
+      return automatic;
+   }
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/UpdateNode.java b/chef/src/main/java/org/jclouds/ohai/UpdateNode.java
new file mode 100644
index 0000000000..2119c3a3f7
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/UpdateNode.java
@@ -0,0 +1,65 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.jclouds.chef.ChefClient;
+import org.jclouds.chef.domain.Node;
+import org.jclouds.domain.JsonBall;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Supplier;
+
+/**
+ * 
+ * Updates node with new automatic attributes.
+ * 
+ * @author Adrian Cole
+ */
+@Singleton
+public class UpdateNode {
+
+   @Resource
+   protected Logger logger = Logger.NULL;
+
+   private final ChefClient chef;
+   private final Supplier<Map<String, JsonBall>> automaticSupplier;
+
+   @Inject
+   public UpdateNode(ChefClient chef, @Named("automatic") Supplier<Map<String, JsonBall>> automaticSupplier) {
+      this.chef = checkNotNull(chef, "chef");
+      this.automaticSupplier = checkNotNull(automaticSupplier, "automaticSupplier");
+   }
+
+   public void updateNode(String nodeName) {
+      logger.info("updating node %s", nodeName);
+      Node node = chef.getNode(nodeName);
+      node.getAutomatic().putAll(automaticSupplier.get());
+      chef.updateNode(node);
+      logger.debug("done updating node %s", nodeName);
+   }
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/WhiteListCompliantJVM.java b/chef/src/main/java/org/jclouds/ohai/WhiteListCompliantJVM.java
new file mode 100644
index 0000000000..bd5bfad08a
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/WhiteListCompliantJVM.java
@@ -0,0 +1,103 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+import org.jclouds.domain.JsonBall;
+import org.jclouds.json.Json;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Function;
+import com.google.common.base.Supplier;
+import com.google.inject.internal.Maps;
+
+/**
+ * 
+ * Gathers Ohai data from the JVM. Note that this is intended to be Google App
+ * Engine compatible, so please do not access the network, JMX, or other classes
+ * not on the whitelist.
+ * 
+ * @author Adrian Cole
+ */
+@Singleton
+public class WhiteListCompliantJVM implements Supplier<Map<String, JsonBall>> {
+
+   @Resource
+   protected Logger logger = Logger.NULL;
+
+   private final Function<byte[], String> byteArrayToMacAddress;
+   private final NetworkInterface defaultNetworkInterface;
+   private final Json json;
+   private final Provider<Long> nanoTimeProvider;
+   private final Provider<Properties> systemPropertiesProvider;
+
+   @Inject
+   public WhiteListCompliantJVM(Json json, Function<byte[], String> byteArrayToMacAddress,
+         @Named("nanoTime") Provider<Long> nanoTimeProvider,
+         @Named("systemProperties") Provider<Properties> systemPropertiesProvider,
+         NetworkInterface defaultNetworkInterface) {
+      this.json = checkNotNull(json, "json");
+      this.byteArrayToMacAddress = checkNotNull(byteArrayToMacAddress, "byteArrayToMacAddress");
+      this.nanoTimeProvider = checkNotNull(nanoTimeProvider, "nanoTimeProvider");
+      this.systemPropertiesProvider = checkNotNull(systemPropertiesProvider, "systemPropertiesProvider");
+      this.defaultNetworkInterface = checkNotNull(defaultNetworkInterface, "defaultNetworkInterface");
+   }
+
+   public Map<String, JsonBall> get() {
+      Map<String, JsonBall> returnVal = Maps.newLinkedHashMap();
+      Properties systemProperties = systemPropertiesProvider.get();
+      String now = nanoTimeProvider.get() + "";
+      StringBuilder nowBuilder = new StringBuilder(now).insert(now.length() - 6, '.');
+      while (nowBuilder.lastIndexOf("0") != -1 && nowBuilder.lastIndexOf("0") == nowBuilder.length() - 1)
+         nowBuilder.deleteCharAt(nowBuilder.length() - 1);
+      now = nowBuilder.toString();
+
+      returnVal.put("ohai_time", new JsonBall(now));
+      returnVal.put("java", new JsonBall(json.toJson(systemProperties)));
+
+      try {
+         String mac = byteArrayToMacAddress.apply(defaultNetworkInterface.getHardwareAddress());
+         returnVal.put("macaddress", new JsonBall(mac));
+      } catch (SocketException e) {
+         logger.warn(e, "could not read address from %s", defaultNetworkInterface.getDisplayName());
+      }
+
+      String platform = systemProperties.getProperty("os.name");
+      platform = platform.replaceAll("[ -]", "").toLowerCase();
+
+      returnVal.put("platform", new JsonBall(platform));
+      returnVal.put("platform_version", new JsonBall(systemProperties.getProperty("os.version")));
+
+      returnVal.put("ohai_time", new JsonBall(now));
+      returnVal.put("current_user", new JsonBall(systemProperties.getProperty("user.name")));
+      return returnVal;
+   }
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/config/BaseOhaiModule.java b/chef/src/main/java/org/jclouds/ohai/config/BaseOhaiModule.java
new file mode 100644
index 0000000000..b34786b5df
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/config/BaseOhaiModule.java
@@ -0,0 +1,89 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai.config;
+
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.jclouds.domain.JsonBall;
+import org.jclouds.ohai.WhiteListCompliantJVM;
+import org.jclouds.ohai.functions.ByteArrayToMacAddress;
+import org.jclouds.util.Utils;
+
+import com.google.common.base.Function;
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.AbstractModule;
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.TypeLiteral;
+
+/**
+ * Wires the components needed to parse ohai data from a JVM
+ * 
+ * @author Adrian Cole
+ */
+public class BaseOhaiModule extends AbstractModule {
+
+   @Override
+   protected void configure() {
+      bind(new TypeLiteral<Function<byte[], String>>() {
+      }).to(new TypeLiteral<ByteArrayToMacAddress>() {
+      });
+   }
+
+   @Named("nanoTime")
+   @Provides
+   protected Long nanoTime() {
+      return System.nanoTime();
+   }
+
+   @Named("systemProperties")
+   @Provides
+   protected Properties systemProperties() {
+      return System.getProperties();
+   }
+
+   @Named("automatic")
+   @Provides
+   @Singleton
+   Supplier<Map<String, JsonBall>> automaticSupplier(
+         @Named("automatic") Iterable<Supplier<Map<String, JsonBall>>> suppliers) {
+      return Utils.composeMapSupplier(suppliers);
+   }
+
+   @Named("automatic")
+   @Singleton
+   @Provides
+   Iterable<Supplier<Map<String, JsonBall>>> suppliers(Injector injector) {
+      return ImmutableList.<Supplier<Map<String, JsonBall>>> of(injector.getInstance(WhiteListCompliantJVM.class));
+   }
+
+   @Provides
+   @Singleton
+   protected NetworkInterface provideDefaultNetworkInterface() throws SocketException {
+      return NetworkInterface.getNetworkInterfaces().nextElement();
+   }
+
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java b/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java
new file mode 100644
index 0000000000..22f3a6062e
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java
@@ -0,0 +1,54 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai.config;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.Map;
+
+import javax.inject.Singleton;
+
+import org.jclouds.domain.JsonBall;
+import org.jclouds.ohai.JMX;
+import org.jclouds.ohai.WhiteListCompliantJVM;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+
+/**
+ * Wires the components needed to parse ohai data from a JVM
+ * 
+ * @author Adrian Cole
+ */
+public class OhaiModule extends BaseOhaiModule {
+
+   @Provides
+   @Singleton
+   protected RuntimeMXBean provideRuntimeMXBean() {
+      return ManagementFactory.getRuntimeMXBean();
+   }
+
+   @Override
+   Iterable<Supplier<Map<String, JsonBall>>> suppliers(Injector injector) {
+      return ImmutableList.<Supplier<Map<String, JsonBall>>> of(injector.getInstance(WhiteListCompliantJVM.class),
+            injector.getInstance(JMX.class));
+   }
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/config/WhiteListCompliantOhaiModule.java b/chef/src/main/java/org/jclouds/ohai/config/WhiteListCompliantOhaiModule.java
new file mode 100644
index 0000000000..a61f3859a1
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/config/WhiteListCompliantOhaiModule.java
@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai.config;
+
+/**
+ * Wires the components needed to parse ohai data without violating the GAE JVM
+ * 
+ * @author Adrian Cole
+ */
+public class WhiteListCompliantOhaiModule extends BaseOhaiModule {
+
+}
\ No newline at end of file
diff --git a/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java b/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java
new file mode 100644
index 0000000000..a7ddf8e9fb
--- /dev/null
+++ b/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java
@@ -0,0 +1,65 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ohai.functions;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Iterables.transform;
+import static com.google.common.collect.Lists.partition;
+import static com.google.common.primitives.Bytes.asList;
+import static com.google.common.primitives.Bytes.toArray;
+
+import java.net.NetworkInterface;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jclouds.encryption.EncryptionService;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+
+/**
+ * 
+ * Creates a string in the form: {@code 00:26:bb:09:e6:c4 }
+ * 
+ * @author Adrian Cole
+ */
+@Singleton
+public class ByteArrayToMacAddress implements Function<byte[], String> {
+   private final EncryptionService encryptionService;
+
+   @Inject
+   ByteArrayToMacAddress(EncryptionService encryptionService, NetworkInterface networkInterface) {
+      this.encryptionService = checkNotNull(encryptionService, "encryptionService");
+   }
+
+   @Override
+   public String apply(byte[] from) {
+      return Joiner.on(':').join(transform(partition(asList(from), 1), new Function<List<Byte>, String>() {
+
+         @Override
+         public String apply(List<Byte> from) {
+            return encryptionService.hex(toArray(from));
+         }
+
+      }));
+   }
+
+}
\ No newline at end of file
diff --git a/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java b/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
index c24e3c153b..9d3d1f5feb 100644
--- a/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
+++ b/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
@@ -76,7 +76,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             "0189e76ccc476701d6b374e5a1a27347", true);
       assertRequestLineEquals(httpRequest,
             "PUT http://localhost:4000/sandboxes/0189e76ccc476701d6b374e5a1a27347 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, "{\"is_completed\":\"true\"}", "application/json", false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -95,7 +95,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             .fromHex("0c5ecd7788cf4f6c7de2a57193897a6c")), Bytes.asList(encryptionService
             .fromHex("1dda05ed139664f1f89b9dec482b77c0"))));
       assertRequestLineEquals(httpRequest, "POST http://localhost:4000/sandboxes HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"checksums\":{\"0189e76ccc476701d6b374e5a1a27347\":null,\"0c5ecd7788cf4f6c7de2a57193897a6c\":null,\"1dda05ed139664f1f89b9dec482b77c0\":null}}",
@@ -113,7 +113,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("getCookbook", String.class, String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "cookbook", "1.0.0");
       assertRequestLineEquals(httpRequest, "GET http://localhost:4000/cookbooks/cookbook/1.0.0 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -128,7 +128,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("deleteCookbook", String.class, String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "cookbook", "1.0.0");
       assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/cookbooks/cookbook/1.0.0 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -146,7 +146,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             new CookbookVersion("cookbook", "1.0.1"));
 
       assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/cookbooks/cookbook/1.0.1 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"name\":\"cookbook-1.0.1\",\"definitions\":[],\"attributes\":[],\"files\":[],\"metadata\":{\"suggestions\":{},\"dependencies\":{},\"conflicting\":{},\"providing\":{},\"platforms\":{},\"recipes\":{},\"replacing\":{},\"groupings\":{},\"attributes\":{},\"recommendations\":{}},\"providers\":[],\"cookbook_name\":\"cookbook\",\"resources\":[],\"templates\":[],\"libraries\":[],\"version\":\"1.0.1\",\"recipes\":[],\"root_files\":[],\"json_class\":\"Chef::CookbookVersion\",\"chef_type\":\"cookbook_version\"}",
@@ -164,7 +164,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest, "GET http://localhost:4000/cookbooks HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeySetFromJson.class);
@@ -179,7 +179,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("clientExists", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "client");
       assertRequestLineEquals(httpRequest, "HEAD http://localhost:4000/clients/client HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ReturnTrueIf2xx.class);
@@ -194,7 +194,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("deleteClient", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "client");
       assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/clients/client HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -210,7 +210,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "client");
 
       assertRequestLineEquals(httpRequest, "POST http://localhost:4000/clients HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, "{\"clientname\":\"client\"}", "application/json", false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeyFromJson.class);
@@ -226,7 +226,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest, "GET http://localhost:4000/clients HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeySetFromJson.class);
@@ -241,7 +241,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("generateKeyForClient", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "client");
       assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/clients/client HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, "{\"clientname\":\"client\", \"private_key\": true}", "application/json", false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeyFromJson.class);
@@ -256,7 +256,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("nodeExists", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "node");
       assertRequestLineEquals(httpRequest, "HEAD http://localhost:4000/nodes/node HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ReturnTrueIf2xx.class);
@@ -271,7 +271,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("deleteNode", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "node");
       assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/nodes/node HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -288,7 +288,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             ImmutableSet.of("recipe[java]")));
 
       assertRequestLineEquals(httpRequest, "POST http://localhost:4000/nodes HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"name\":\"testnode\",\"normal\":{},\"override\":{},\"default\":{},\"automatic\":{},\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Node\",\"chef_type\":\"node\"}",
@@ -308,7 +308,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             ImmutableSet.of("recipe[java]")));
 
       assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/nodes/testnode HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"name\":\"testnode\",\"normal\":{},\"override\":{},\"default\":{},\"automatic\":{},\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Node\",\"chef_type\":\"node\"}",
@@ -327,7 +327,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest, "GET http://localhost:4000/nodes HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeySetFromJson.class);
@@ -342,7 +342,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("roleExists", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "role");
       assertRequestLineEquals(httpRequest, "HEAD http://localhost:4000/roles/role HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ReturnTrueIf2xx.class);
@@ -357,7 +357,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       Method method = ChefAsyncClient.class.getMethod("deleteRole", String.class);
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method, "role");
       assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/roles/role HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
@@ -374,7 +374,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             ImmutableSet.of("recipe[java]")));
 
       assertRequestLineEquals(httpRequest, "POST http://localhost:4000/roles HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"name\":\"testrole\",\"override_attributes\":{},\"default_attributes\":{},\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Role\",\"chef_type\":\"role\"}",
@@ -394,7 +394,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             ImmutableSet.of("recipe[java]")));
 
       assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/roles/testrole HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(
             httpRequest,
             "{\"name\":\"testrole\",\"override_attributes\":{},\"default_attributes\":{},\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Role\",\"chef_type\":\"role\"}",
@@ -413,7 +413,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
       GeneratedHttpRequest<ChefAsyncClient> httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest, "GET http://localhost:4000/roles HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.6\n");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: 0.9.8\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ParseKeySetFromJson.class);
diff --git a/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java b/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java
index 48776a93e9..e803aa1296 100644
--- a/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java
+++ b/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java b/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
index f138ac6948..5d3bd29d75 100644
--- a/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
+++ b/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
@@ -30,9 +30,10 @@ import java.net.URI;
 
 import javax.ws.rs.HttpMethod;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.config.ParserModule;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -45,7 +46,7 @@ import com.google.inject.Injector;
 @Test(groups = "unit", testName = "chef.BindHexEncodedMD5sToJsonPayloadTest")
 public class BindHexEncodedMD5sToJsonPayloadTest {
 
-   Injector injector = Guice.createInjector(new ParserModule());
+   Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
    BindChecksumsToJsonPayload binder = injector.getInstance(BindChecksumsToJsonPayload.class);
 
    @Test(expectedExceptions = IllegalArgumentException.class)
@@ -57,10 +58,9 @@ public class BindHexEncodedMD5sToJsonPayloadTest {
    @Test(enabled = false)
    public void testCorrect() {
       HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost"));
-      binder.bindToRequest(request, ImmutableSet.of(injector.getInstance(EncryptionService.class)
-               .fromHex("abddef"), injector.getInstance(EncryptionService.class).fromHex("1234")));
-      assertEquals(request.getPayload().getRawContent(),
-               "{\"checksums\":{\"abddef\":null,\"1234\":null}}");
+      binder.bindToRequest(request, ImmutableSet.of(injector.getInstance(EncryptionService.class).fromHex("abddef"),
+            injector.getInstance(EncryptionService.class).fromHex("1234")));
+      assertEquals(request.getPayload().getRawContent(), "{\"checksums\":{\"abddef\":null,\"1234\":null}}");
    }
 
    @Test(expectedExceptions = { NullPointerException.class, IllegalStateException.class })
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
index 6adba3f567..426318695a 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
@@ -5,10 +5,11 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.Client;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -29,7 +30,7 @@ public class ParseClientFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<Client>>() {
       }));
    }
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
index 7fcb1d9ed2..790fd80d49 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.Set;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.Attribute;
 import org.jclouds.chef.domain.CookbookVersion;
 import org.jclouds.chef.domain.Metadata;
@@ -13,15 +14,15 @@ import org.jclouds.chef.domain.Resource;
 import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
 import org.jclouds.util.Utils;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.gson.Gson;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -37,10 +38,12 @@ public class ParseCookbookVersionFromJsonTest {
 
    private ParseJson<CookbookVersion> handler;
    private Injector injector;
+   private Json json;
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      injector = Guice.createInjector(new ParserModule());
+      injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
+      json = injector.getInstance(Json.class);
       handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<CookbookVersion>>() {
       }));
    }
@@ -50,8 +53,8 @@ public class ParseCookbookVersionFromJsonTest {
       CookbookVersion cookbook = handler.apply(new HttpResponse(200, "ok", Payloads
             .newPayload(ParseCookbookVersionFromJsonTest.class.getResourceAsStream("/brew-cookbook.json"))));
 
-      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils
-            .toInputStream(new Gson().toJson(cookbook))))));
+      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils.toInputStream(json
+            .toJson(cookbook))))));
    }
 
    @Test(enabled = false)
@@ -59,8 +62,8 @@ public class ParseCookbookVersionFromJsonTest {
       CookbookVersion cookbook = handler.apply(new HttpResponse(200, "ok", Payloads
             .newPayload(ParseCookbookVersionFromJsonTest.class.getResourceAsStream("/tomcat-cookbook.json"))));
 
-      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils
-            .toInputStream(new Gson().toJson(cookbook))))));
+      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils.toInputStream(json
+            .toJson(cookbook))))));
    }
 
    @Test(enabled = false)
@@ -68,8 +71,8 @@ public class ParseCookbookVersionFromJsonTest {
       CookbookVersion cookbook = handler.apply(new HttpResponse(200, "ok", Payloads
             .newPayload(ParseCookbookVersionFromJsonTest.class.getResourceAsStream("/mysql-cookbook.json"))));
 
-      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils
-            .toInputStream(new Gson().toJson(cookbook))))));
+      assertEquals(cookbook, handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils.toInputStream(json
+            .toJson(cookbook))))));
    }
 
    @Test(enabled = false)
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
index aa8b808f53..fcc2c495cb 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
@@ -8,8 +8,8 @@ import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.DataBagItem;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -29,7 +29,7 @@ public class ParseDataBagItemFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule(), new ChefParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<DataBagItem>>() {
       }));
       mapper = injector.getInstance(Gson.class);
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseKeyFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseKeyFromJsonTest.java
index 0dfeeb2a1a..fd688edb0a 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseKeyFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseKeyFromJsonTest.java
@@ -4,9 +4,10 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.jclouds.util.Utils;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -26,25 +27,25 @@ public class ParseKeyFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(ParseKeyFromJson.class);
    }
 
    public void testRegex() {
       assertEquals(
-               handler
-                        .apply(new HttpResponse(
-                                 200,
-                                 "ok",
-                                 Payloads
-                                          .newPayload(Utils
-                                                   .toInputStream("{\n\"uri\": \"https://api.opscode.com/users/bobo\", \"private_key\": \"RSA_PRIVATE_KEY\",}")))),
-               "RSA_PRIVATE_KEY");
+            handler
+                  .apply(new HttpResponse(
+                        200,
+                        "ok",
+                        Payloads
+                              .newPayload(Utils
+                                    .toInputStream("{\n\"uri\": \"https://api.opscode.com/users/bobo\", \"private_key\": \"RSA_PRIVATE_KEY\",}")))),
+            "RSA_PRIVATE_KEY");
    }
 
    public void test2() {
-      String key = handler.apply(new HttpResponse(200, "ok", Payloads
-               .newPayload(ParseKeyFromJsonTest.class.getResourceAsStream("/newclient.txt"))));
+      String key = handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(ParseKeyFromJsonTest.class
+            .getResourceAsStream("/newclient.txt"))));
       assert key.startsWith("-----BEGIN RSA PRIVATE KEY-----\n");
    }
 }
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
index 590b563a6f..a1577d0734 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
@@ -4,9 +4,10 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -26,7 +27,7 @@ public class ParseKeySetFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(ParseKeySetFromJson.class);
    }
 
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
index 42b06a186e..48d0033307 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
@@ -5,12 +5,13 @@ import static org.testng.Assert.assertEquals;
 import java.io.IOException;
 import java.util.Collections;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.Node;
 import org.jclouds.domain.JsonBall;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -32,16 +33,16 @@ public class ParseNodeFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<Node>>() {
       }));
    }
 
    public void test() {
 
-      Node node = new Node("adrian-jcloudstest", ImmutableMap.<String, JsonBall> of("tomcat6",new JsonBall("{\"ssl_port\":8433}")), ImmutableMap
-            .<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(),
-            Collections.singleton("recipe[java]"));
+      Node node = new Node("adrian-jcloudstest", ImmutableMap.<String, JsonBall> of("tomcat6", new JsonBall(
+            "{\"ssl_port\":8433}")), ImmutableMap.<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(),
+            ImmutableMap.<String, JsonBall> of(), Collections.singleton("recipe[java]"));
 
       assertEquals(handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(ParseCookbookVersionFromJsonTest.class
             .getResourceAsStream("/node.json")))), node);
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseOrganizationFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseOrganizationFromJsonTest.java
index e81cbeedec..8d59dbb737 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseOrganizationFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseOrganizationFromJsonTest.java
@@ -22,11 +22,12 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.Organization;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -47,7 +48,7 @@ public class ParseOrganizationFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
       handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<Organization>>() {
       }));
    }
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
index 964eaf7ed4..6f218d4c30 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
@@ -4,19 +4,17 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.Sandbox;
 import org.jclouds.date.DateService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
-import org.jclouds.http.functions.config.ParserModule.DateAdapter;
-import org.jclouds.http.functions.config.ParserModule.Iso8601DateAdapter;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -35,28 +33,16 @@ public class ParseSandboxFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule(),
-            new AbstractModule() {
-
-               @Override
-               protected void configure() {
-                  bind(DateAdapter.class).to(Iso8601DateAdapter.class);
-               }
-
-            });
-      handler = injector.getInstance(Key
-            .get(new TypeLiteral<ParseJson<Sandbox>>() {
-            }));
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
+      handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<Sandbox>>() {
+      }));
       dateService = injector.getInstance(DateService.class);
    }
 
    public void test() {
-      assertEquals(handler.apply(new HttpResponse(200, "ok", Payloads
-            .newPayload(ParseSandboxFromJsonTest.class
-                  .getResourceAsStream("/sandbox.json")))), new Sandbox(
-            "1-8c27b0ea4c2b7aaedbb44cfbdfcc11b2", false, dateService
-                  .iso8601SecondsDateParse("2010-07-07T03:36:00+00:00"),
-            ImmutableSet.<String> of(), "f9d6d9b72bae465890aae87969f98a9c",
-            "f9d6d9b72bae465890aae87969f98a9c"));
+      assertEquals(handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(ParseSandboxFromJsonTest.class
+            .getResourceAsStream("/sandbox.json")))), new Sandbox("1-8c27b0ea4c2b7aaedbb44cfbdfcc11b2", false,
+            dateService.iso8601SecondsDateParse("2010-07-07T03:36:00+00:00"), ImmutableSet.<String> of(),
+            "f9d6d9b72bae465890aae87969f98a9c", "f9d6d9b72bae465890aae87969f98a9c"));
    }
 }
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
index 046b9ebae0..12d706389e 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
@@ -6,13 +6,14 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.ChecksumStatus;
 import org.jclouds.chef.domain.UploadSandbox;
 import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -36,39 +37,28 @@ public class ParseUploadSandboxFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      injector = Guice.createInjector(new ParserModule());
-      handler = injector.getInstance(Key
-            .get(new TypeLiteral<ParseJson<UploadSandbox>>() {
-            }));
+      injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
+      handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<UploadSandbox>>() {
+      }));
    }
 
    public void test() {
-      EncryptionService encryptionService = injector
-            .getInstance(EncryptionService.class);
+      EncryptionService encryptionService = injector.getInstance(EncryptionService.class);
       assertEquals(
-            handler.apply(new HttpResponse(200, "ok", Payloads
-                  .newPayload(ParseUploadSandboxFromJsonTest.class
-                        .getResourceAsStream("/upload-site.json")))),
+            handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(ParseUploadSandboxFromJsonTest.class
+                  .getResourceAsStream("/upload-site.json")))),
             new UploadSandbox(
                   URI
                         .create("https://api.opscode.com/organizations/jclouds/sandboxes/d454f71e2a5f400c808d0c5d04c2c88c"),
                   ImmutableMap
                         .<List<Byte>, ChecksumStatus> of(
-                              Bytes
-                                    .asList(encryptionService
-                                          .fromHex("0c5ecd7788cf4f6c7de2a57193897a6c")),
+                              Bytes.asList(encryptionService.fromHex("0c5ecd7788cf4f6c7de2a57193897a6c")),
                               new ChecksumStatus(
                                     URI
                                           .create("https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/sandbox-d454f71e2a5f400c808d0c5d04c2c88c/checksum-0c5ecd7788cf4f6c7de2a57193897a6c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277344702&Signature=FtKyqvYEjhhEKmRY%2B0M8aGPMM7g%3D"),
-                                    true),
-                              Bytes
-                                    .asList(encryptionService
-                                          .fromHex("0189e76ccc476701d6b374e5a1a27347")),
-                              new ChecksumStatus(),
-                              Bytes
-                                    .asList(encryptionService
-                                          .fromHex("1dda05ed139664f1f89b9dec482b77c0")),
-                              new ChecksumStatus()),
+                                    true), Bytes.asList(encryptionService.fromHex("0189e76ccc476701d6b374e5a1a27347")),
+                              new ChecksumStatus(), Bytes.asList(encryptionService
+                                    .fromHex("1dda05ed139664f1f89b9dec482b77c0")), new ChecksumStatus()),
                   "d454f71e2a5f400c808d0c5d04c2c88c"));
    }
 }
diff --git a/chef/src/test/java/org/jclouds/chef/functions/ParseUserFromJsonTest.java b/chef/src/test/java/org/jclouds/chef/functions/ParseUserFromJsonTest.java
index 6d48bb1257..cc892348b5 100644
--- a/chef/src/test/java/org/jclouds/chef/functions/ParseUserFromJsonTest.java
+++ b/chef/src/test/java/org/jclouds/chef/functions/ParseUserFromJsonTest.java
@@ -4,11 +4,12 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
+import org.jclouds.chef.config.ChefParserModule;
 import org.jclouds.chef.domain.User;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
-import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.config.GsonModule;
 import org.jclouds.util.Utils;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -30,10 +31,9 @@ public class ParseUserFromJsonTest {
 
    @BeforeTest
    protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new ParserModule());
-      handler = injector.getInstance(Key
-            .get(new TypeLiteral<ParseJson<User>>() {
-            }));
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule());
+      handler = injector.getInstance(Key.get(new TypeLiteral<ParseJson<User>>() {
+      }));
    }
 
    public void test() {
@@ -47,7 +47,6 @@ public class ParseUserFromJsonTest {
 
       String toParse = "{\n\"username\": \"bobo\",\n\"first_name\": \"Bobo\",\n\"middle_name\": \"Tiberion\",\n\"last_name\": \"Clown\",\n\"display_name\": \"Bobo T. Clown\",\n\"email\": \"bobo@clownco.com\" \n}";
 
-      assertEquals(handler.apply(new HttpResponse(200, "ok", Payloads
-            .newPayload(Utils.toInputStream(toParse)))), user);
+      assertEquals(handler.apply(new HttpResponse(200, "ok", Payloads.newPayload(Utils.toInputStream(toParse)))), user);
    }
 }
diff --git a/chef/src/test/java/org/jclouds/ohai/JMXTest.java b/chef/src/test/java/org/jclouds/ohai/JMXTest.java
new file mode 100644
index 0000000000..1cef74d548
--- /dev/null
+++ b/chef/src/test/java/org/jclouds/ohai/JMXTest.java
@@ -0,0 +1,74 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ohai;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.classextension.EasyMock.replay;
+import static org.easymock.classextension.EasyMock.verify;
+import static org.testng.Assert.assertEquals;
+
+import java.lang.management.RuntimeMXBean;
+
+import org.jclouds.chef.config.ChefParserModule;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.ohai.config.OhaiModule;
+import org.testng.annotations.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Tests behavior of {@code JMX}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ohai.JMXTest")
+public class JMXTest {
+
+   @Test
+   public void test() {
+
+      final RuntimeMXBean runtime = createMock(RuntimeMXBean.class);
+
+      expect(runtime.getUptime()).andReturn(69876000l);
+
+      replay(runtime);
+
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule(), new OhaiModule() {
+         @Override
+         protected RuntimeMXBean provideRuntimeMXBean() {
+            return runtime;
+         }
+      });
+      Json json = injector.getInstance(Json.class);
+      JMX jmx = injector.getInstance(JMX.class);
+
+      assertEquals(json.toJson(jmx.get()), "{\"uptime_seconds\":69876}");
+
+      verify(runtime);
+
+   }
+}
diff --git a/chef/src/test/java/org/jclouds/ohai/UpdateNodeTest.java b/chef/src/test/java/org/jclouds/ohai/UpdateNodeTest.java
new file mode 100644
index 0000000000..6b091d8f30
--- /dev/null
+++ b/chef/src/test/java/org/jclouds/ohai/UpdateNodeTest.java
@@ -0,0 +1,76 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ohai;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.classextension.EasyMock.replay;
+import static org.easymock.classextension.EasyMock.verify;
+
+import java.util.Map;
+
+import org.jclouds.chef.ChefClient;
+import org.jclouds.chef.domain.Node;
+import org.jclouds.domain.JsonBall;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Tests behavior of {@code UpdateNode}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ohai.UpdateNodeTest")
+public class UpdateNodeTest {
+
+   @Test
+   public void test() {
+      ChefClient chef = createMock(ChefClient.class);
+
+      Map<String, JsonBall> automatic = ImmutableMap.<String, JsonBall> of();
+
+      Node node = new Node("name", ImmutableSet.<String> of());
+
+      Supplier<Map<String, JsonBall>> automaticSupplier = Suppliers.<Map<String, JsonBall>> ofInstance(automatic);
+
+      Node nodeWithAutomatic = new Node("name", ImmutableMap.<String, JsonBall> of(), ImmutableMap
+            .<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(), automatic, ImmutableSet.<String> of());
+
+      expect(chef.getNode("name")).andReturn(node);
+      node.getAutomatic().putAll(automaticSupplier.get());
+      expect(chef.updateNode(nodeWithAutomatic)).andReturn(null);
+
+      replay(chef);
+
+      UpdateNode updater = new UpdateNode(chef, automaticSupplier);
+
+      updater.updateNode("name");
+      verify(chef);
+
+   }
+}
diff --git a/chef/src/test/java/org/jclouds/ohai/WhiteListCompliantJVMTest.java b/chef/src/test/java/org/jclouds/ohai/WhiteListCompliantJVMTest.java
new file mode 100644
index 0000000000..71616d32e4
--- /dev/null
+++ b/chef/src/test/java/org/jclouds/ohai/WhiteListCompliantJVMTest.java
@@ -0,0 +1,82 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ohai;
+
+import static org.testng.Assert.assertEquals;
+
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Properties;
+
+import org.jclouds.chef.config.ChefParserModule;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.ohai.config.BaseOhaiModule;
+import org.jclouds.ohai.functions.ByteArrayToMacAddress;
+import org.testng.annotations.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Tests behavior of {@code WhiteListCompliantJVM}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ohai.WhiteListCompliantJVMTest")
+public class WhiteListCompliantJVMTest {
+
+   @Test
+   public void test() throws SocketException {
+
+      byte[] mac = NetworkInterface.getNetworkInterfaces().nextElement().getHardwareAddress();
+      final Properties sysProperties = new Properties();
+
+      sysProperties.setProperty("os.name", "Mac OS X");
+      sysProperties.setProperty("os.version", "10.3.0");
+      sysProperties.setProperty("user.name", "user");
+
+      Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule(), new BaseOhaiModule() {
+         @Override
+         protected Long nanoTime() {
+            return 1279992919325290l;
+         }
+
+         @Override
+         protected Properties systemProperties() {
+            return sysProperties;
+         }
+
+      });
+      String macString = injector.getInstance(ByteArrayToMacAddress.class).apply(mac);
+      Json json = injector.getInstance(Json.class);
+      WhiteListCompliantJVM WhiteListCompliantJVM = injector.getInstance(WhiteListCompliantJVM.class);
+
+      assertEquals(
+            json.toJson(WhiteListCompliantJVM.get()),
+            "{\"ohai_time\":1279992919.32529,\"java\":{\"user.name\":\"user\",\"os.version\":\"10.3.0\",\"os.name\":\"Mac OS X\"},\"macaddress\":\""
+                  + macString + "\",\"platform\":\"macosx\",\"platform_version\":\"10.3.0\",\"current_user\":\"user\"}");
+
+   }
+}
diff --git a/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java b/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
new file mode 100644
index 0000000000..be48d9d604
--- /dev/null
+++ b/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ohai.functions;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.jclouds.encryption.EncryptionService;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Tests behavior of {@code ByteArrayToMacAddress}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", sequential = true, testName = "ohai.ByteArrayToMacAddressTest")
+public class ByteArrayToMacAddressTest {
+
+   private ByteArrayToMacAddress converter;
+   private EncryptionService encryptionService;
+
+   @BeforeTest
+   protected void setUpInjector() throws IOException {
+      Injector injector = Guice.createInjector();
+      converter = injector.getInstance(ByteArrayToMacAddress.class);
+      encryptionService = injector.getInstance(EncryptionService.class);
+   }
+
+   public void test() {
+      assertEquals(converter.apply(encryptionService.fromHex("0026bb09e6c4")), "00:26:bb:09:e6:c4");
+   }
+}
diff --git a/chef/src/test/resources/log4j.xml b/chef/src/test/resources/log4j.xml
index 347362575f..0e4fac1d4b 100644
--- a/chef/src/test/resources/log4j.xml
+++ b/chef/src/test/resources/log4j.xml
@@ -2,7 +2,7 @@
     <!--
 
 
-        Copyright (C) 2009 Cloud Conscious, LLC.
+        Copyright (C) 2010 Cloud Conscious, LLC.
         <info@cloudconscious.com>
 
         ====================================================================