svn commit: r1213356 - in /incubator/ambari/trunk/controller/src/main: java/org/apache/ambari/datastore/StaticDataStore.java resources/org/apache/ambari/stacks/puppet1-0.xml

[om...@apache.org]

Author: omalley
Date: Mon Dec 12 18:39:29 2011
New Revision: 1213356

URL: http://svn.apache.org/viewvc?rev=1213356&view=rev
Log:
AMBARI-153. Fix the loading puppet stack from json.

Removed:
    incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml
Modified:
    incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java

Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java?rev=1213356&r1=1213355&r2=1213356&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java Mon Dec 12 18:39:29 2011
@@ -34,6 +34,7 @@ import org.apache.ambari.common.rest.ent
 
 import com.google.inject.Singleton;
 import com.sun.jersey.api.json.JSONJAXBContext;
+import com.sun.jersey.api.json.JSONUnmarshaller;
 
 /**
  * A data store that uses in-memory maps and some preset values for testing.
@@ -51,13 +52,13 @@ class StaticDataStore implements DataSto
       new TreeMap<String, ClusterState>();
 
   private static final JAXBContext jaxbContext;
-  private static final JAXBContext jsonContext;
+  private static final JSONJAXBContext jsonContext;
   static {
     try {
       jaxbContext = JAXBContext.
           newInstance("org.apache.ambari.common.rest.entities");
-      jsonContext = JSONJAXBContext.newInstance
-          ("org.apache.ambari.common.rest.entities");
+      jsonContext = 
+          new JSONJAXBContext("org.apache.ambari.common.rest.entities");
     } catch (JAXBException e) {
       throw new RuntimeException("Can't create jaxb context", e);
     }
@@ -68,7 +69,7 @@ class StaticDataStore implements DataSto
                  "hadoop-security");
     addStackFile("org/apache/ambari/stacks/cluster123-0.xml", "cluster123");
     addStackFile("org/apache/ambari/stacks/cluster124-0.xml", "cluster124");
-    addStackJsonFile("org/apache/ambari/stacks/puppet1-0.xml", "puppet1");
+    addStackJsonFile("org/apache/ambari/stacks/puppet1-0.json", "puppet1");
     addClusterFile("org/apache/ambari/clusters/cluster123.xml", "cluster123");
   }
 
@@ -94,8 +95,8 @@ class StaticDataStore implements DataSto
       throw new IllegalArgumentException("Can't find resource for " + filename);
     }
     try {
-      Unmarshaller um = jsonContext.createUnmarshaller();
-      Stack stack = (Stack) um.unmarshal(in);
+      JSONUnmarshaller um = jsonContext.createJSONUnmarshaller();
+      Stack stack = um.unmarshalFromJSON(in, Stack.class);
       storeStack(stackName, stack);
     } catch (JAXBException je) {
       throw new IOException("Can't parse " + filename, je);