@@ -112,13 +112,7 @@ func RunCreate(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *C

 			return cmdutil.AddSourceToErr("creating", info.Source, err)

 		}

-		// Serialize the object with the annotation applied.

-		data, err := info.Mapping.Codec.Encode(info.Object)

-		if err != nil {

-			return cmdutil.AddSourceToErr("creating", info.Source, err)

-		}

-

-		obj, err := resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, data)

+		obj, err := resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, info.Object)

 		if err != nil {

 			return cmdutil.AddSourceToErr("creating", info.Source, err)

 		}

@@ -206,11 +206,7 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str

 	}

 	// Serialize the object with the annotation applied.

-	data, err := info.Mapping.Codec.Encode(object)

-	if err != nil {

-		return err

-	}

-	object, err = resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, data)

+	object, err = resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, object)

 	if err != nil {

 		return err

 	}

@@ -134,12 +134,7 @@ func RunReplace(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []st

 		}

 		// Serialize the object with the annotation applied.

-		data, err := info.Mapping.Codec.Encode(info.Object)

-		if err != nil {

-			return cmdutil.AddSourceToErr("replacing", info.Source, err)

-		}

-

-		obj, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, data)

+		obj, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, info.Object)

 		if err != nil {

 			return cmdutil.AddSourceToErr("replacing", info.Source, err)

 		}

@@ -226,13 +221,7 @@ func forceReplace(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []

 			return err

 		}

-		// Serialize the object with the annotation applied.

-		data, err := info.Mapping.Codec.Encode(info.Object)

-		if err != nil {

-			return err

-		}

-

-		obj, err := resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, data)

+		obj, err := resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, info.Object)

 		if err != nil {

 			return err

 		}

@@ -194,13 +194,7 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob

 			return err

 		}

-		// Serialize the object with the annotation applied.

-		data, err := mapping.Codec.Encode(info.Object)

-		if err != nil {

-			return err

-		}

-

-		obj, err = resource.NewHelper(client, mapping).Create(namespace, false, data)

+		obj, err = resource.NewHelper(client, mapping).Create(namespace, false, info.Object)

 		if err != nil {

 			return err

 		}

@@ -414,12 +414,7 @@ func UpdateObject(info *resource.Info, updateFn func(runtime.Object) error) (run

 		return nil, err

 	}

-	data, err := helper.Codec.Encode(info.Object)

-	if err != nil {

-		return nil, err

-	}

-

-	if _, err := helper.Replace(info.Namespace, info.Name, true, data); err != nil {

+	if _, err := helper.Replace(info.Namespace, info.Name, true, info.Object); err != nil {

 		return nil, err

 	}

@@ -99,37 +99,26 @@ func (m *Helper) Delete(namespace, name string) error {

 		Error()

 }

-func (m *Helper) Create(namespace string, modify bool, data []byte) (runtime.Object, error) {

+func (m *Helper) Create(namespace string, modify bool, obj runtime.Object) (runtime.Object, error) {

 	if modify {

-		obj, err := m.Codec.Decode(data)

-		if err != nil {

-			// We don't know how to check a version on this object, but create it anyway

-			return m.createResource(m.RESTClient, m.Resource, namespace, data)

-		}

-

 		// Attempt to version the object based on client logic.

 		version, err := m.Versioner.ResourceVersion(obj)

 		if err != nil {

 			// We don't know how to clear the version on this object, so send it to the server as is

-			return m.createResource(m.RESTClient, m.Resource, namespace, data)

+			return m.createResource(m.RESTClient, m.Resource, namespace, obj)

 		}

 		if version != "" {

 			if err := m.Versioner.SetResourceVersion(obj, ""); err != nil {

 				return nil, err

 			}

-			newData, err := m.Codec.Encode(obj)

-			if err != nil {

-				return nil, err

-			}

-			data = newData

 		}

 	}

-	return m.createResource(m.RESTClient, m.Resource, namespace, data)

+	return m.createResource(m.RESTClient, m.Resource, namespace, obj)

 }

-func (m *Helper) createResource(c RESTClient, resource, namespace string, data []byte) (runtime.Object, error) {

-	return c.Post().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Body(data).Do().Get()

+func (m *Helper) createResource(c RESTClient, resource, namespace string, obj runtime.Object) (runtime.Object, error) {

+	return c.Post().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Body(obj).Do().Get()

 }

 func (m *Helper) Patch(namespace, name string, pt api.PatchType, data []byte) (runtime.Object, error) {

 	return m.RESTClient.Patch(pt).

@@ -141,27 +130,21 @@ func (m *Helper) Patch(namespace, name string, pt api.PatchType, data []byte) (r

 		Get()

 }

-func (m *Helper) Replace(namespace, name string, overwrite bool, data []byte) (runtime.Object, error) {

+func (m *Helper) Replace(namespace, name string, overwrite bool, obj runtime.Object) (runtime.Object, error) {

 	c := m.RESTClient

-	obj, err := m.Codec.Decode(data)

-	if err != nil {

-		// We don't know how to handle this object, but replace it anyway

-		return m.replaceResource(c, m.Resource, namespace, name, data)

-	}

-

 	// Attempt to version the object based on client logic.

 	version, err := m.Versioner.ResourceVersion(obj)

 	if err != nil {

 		// We don't know how to version this object, so send it to the server as is

-		return m.replaceResource(c, m.Resource, namespace, name, data)

+		return m.replaceResource(c, m.Resource, namespace, name, obj)

 	}

 	if version == "" && overwrite {

 		// Retrieve the current version of the object to overwrite the server object

 		serverObj, err := c.Get().Namespace(namespace).Resource(m.Resource).Name(name).Do().Get()

 		if err != nil {

 			// The object does not exist, but we want it to be created

-			return m.replaceResource(c, m.Resource, namespace, name, data)

+			return m.replaceResource(c, m.Resource, namespace, name, obj)

 		}

 		serverVersion, err := m.Versioner.ResourceVersion(serverObj)

 		if err != nil {

@@ -170,16 +153,11 @@ func (m *Helper) Replace(namespace, name string, overwrite bool, data []byte) (r

 		if err := m.Versioner.SetResourceVersion(obj, serverVersion); err != nil {

 			return nil, err

 		}

-		newData, err := m.Codec.Encode(obj)

-		if err != nil {

-			return nil, err

-		}

-		data = newData

 	}

-	return m.replaceResource(c, m.Resource, namespace, name, data)

+	return m.replaceResource(c, m.Resource, namespace, name, obj)

 }

-func (m *Helper) replaceResource(c RESTClient, resource, namespace, name string, data []byte) (runtime.Object, error) {

-	return c.Put().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Name(name).Body(data).Do().Get()

+func (m *Helper) replaceResource(c RESTClient, resource, namespace, name string, obj runtime.Object) (runtime.Object, error) {

+	return c.Put().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Name(name).Body(obj).Do().Get()

 }

@@ -170,7 +170,10 @@ func TestHelperCreate(t *testing.T) {

 		},

 		{

 			Modify: true,

-			Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},

+			Object: &api.Pod{

+				ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"},

+				Spec:       apitesting.DeepEqualSafePodSpec(),

+			},

 			ExpectObject: &api.Pod{

 				ObjectMeta: api.ObjectMeta{Name: "foo"},

 				Spec:       apitesting.DeepEqualSafePodSpec(),

@@ -194,11 +197,7 @@ func TestHelperCreate(t *testing.T) {

 			Versioner:       testapi.Default.MetadataAccessor(),

 			NamespaceScoped: true,

 		}

-		data := []byte{}

-		if test.Object != nil {

-			data = []byte(runtime.EncodeOrDie(testapi.Default.Codec(), test.Object))

-		}

-		_, err := modifier.Create("bar", test.Modify, data)

+		_, err := modifier.Create("bar", test.Modify, test.Object)

 		if (err != nil) != test.Err {

 			t.Errorf("%d: unexpected error: %t %v", i, test.Err, err)

 		}

@@ -218,7 +217,7 @@ func TestHelperCreate(t *testing.T) {

 			expect = []byte(runtime.EncodeOrDie(testapi.Default.Codec(), test.ExpectObject))

 		}

 		if !reflect.DeepEqual(expect, body) {

-			t.Errorf("%d: unexpected body: %s", i, string(body))

+			t.Errorf("%d: unexpected body: %s (expected %s)", i, string(body), string(expect))

 		}

 	}

@@ -413,7 +412,10 @@ func TestHelperReplace(t *testing.T) {

 			Req: expectPut,

 		},

 		{

-			Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},

+			Object: &api.Pod{

+				ObjectMeta: api.ObjectMeta{Name: "foo"},

+				Spec:       apitesting.DeepEqualSafePodSpec(),

+			},

 			ExpectObject: &api.Pod{

 				ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"},

 				Spec:       apitesting.DeepEqualSafePodSpec(),

@@ -449,11 +451,7 @@ func TestHelperReplace(t *testing.T) {

 			Versioner:       testapi.Default.MetadataAccessor(),

 			NamespaceScoped: true,

 		}

-		data := []byte{}

-		if test.Object != nil {

-			data = []byte(runtime.EncodeOrDie(testapi.Default.Codec(), test.Object))

-		}

-		_, err := modifier.Replace("bar", "foo", test.Overwrite, data)

+		_, err := modifier.Replace("bar", "foo", test.Overwrite, test.Object)

 		if (err != nil) != test.Err {

 			t.Errorf("%d: unexpected error: %t %v", i, test.Err, err)

 		}

@@ -97,14 +97,16 @@ func TestExampleObjectSchemas(t *testing.T) {

 			"ldapserver-service":             &kapi.Service{},

 		},

 		"../test/integration/fixtures": {

-			"test-deployment-config":    &deployapi.DeploymentConfig{},

-			"test-image":                &imageapi.Image{},

-			"test-image-stream":         &imageapi.ImageStream{},

-			"test-image-stream-mapping": nil, // skip &imageapi.ImageStreamMapping{},

-			"test-route":                &routeapi.Route{},

-			"test-service":              &kapi.Service{},

-			"test-buildcli":             &kapi.List{},

-			"test-buildcli-beta2":       &kapi.List{},

+			// TODO fix this test to  handle json and yaml

+			"project-request-template-with-quota": nil, // skip a yaml file

+			"test-deployment-config":              &deployapi.DeploymentConfig{},

+			"test-image":                          &imageapi.Image{},

+			"test-image-stream":                   &imageapi.ImageStream{},

+			"test-image-stream-mapping":           nil, // skip &imageapi.ImageStreamMapping{},

+			"test-route":                          &routeapi.Route{},

+			"test-service":                        &kapi.Service{},

+			"test-buildcli":                       &kapi.List{},

+			"test-buildcli-beta2":                 &kapi.List{},

 		},

 		"../test/templates/fixtures": {

 			"crunchydata-pod": nil, // Explicitly fails validation, but should pass transformation

@@ -252,11 +252,7 @@ func (o *EditOptions) RunEdit() error {

 			if err != nil {

 				return err

 			}

-			data, err := info.Mapping.Codec.Encode(info.Object)

-			if err != nil {

-				return err

-			}

-			updated, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, false, data)

+			updated, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, false, info.Object)

 			if err != nil {

 				fmt.Fprintln(o.out, results.AddError(err, info))

 				return nil

@@ -415,7 +411,11 @@ func applyPatch(delta *jsonmerge.Delta, info *resource.Info, version string) err

 	if err != nil {

 		return patchError{err}

 	}

-	updated, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, false, merged)

+	mergedObj, err := info.Mapping.Codec.Decode(merged)

+	if err != nil {

+		return patchError{err}

+	}

+	updated, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, false, mergedObj)

 	if err != nil {

 		return err

 	}

@@ -290,13 +290,7 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman

 	failed := false

 	for _, info := range infos {

-		data, err := info.Mapping.Codec.Encode(info.Object)

-		if err != nil {

-			fmt.Fprintf(cmd.Out(), "Error: %v\n", err)

-			failed = true

-			continue

-		}

-		obj, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, data)

+		obj, err := resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, info.Object)

 		if err != nil {

 			handlePodUpdateError(cmd.Out(), err, "environment variables")

 			failed = true

@@ -439,17 +439,11 @@ func (v *VolumeOptions) RunVolume(args []string) error {

 	failed := false

 	for _, info := range updateInfos {

-		data, err := info.Mapping.Codec.Encode(info.Object)

-		if err != nil {

-			fmt.Fprintf(v.Err, "error: %v\n", err)

-			failed = true

-			continue

-		}

 		var obj runtime.Object

 		if len(info.ResourceVersion) == 0 {

-			obj, err = resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, false, data)

+			obj, err = resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, false, info.Object)

 		} else {

-			obj, err = resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, data)

+			obj, err = resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, true, info.Object)

 		}

 		if err != nil {

 			handlePodUpdateError(v.Err, err, "volume")

@@ -40,11 +40,7 @@ func NewPrintErrorAfter(mapper meta.RESTMapper, errs io.Writer) func(*resource.I

 }

 func encodeAndCreate(info *resource.Info, namespace string, obj runtime.Object) (runtime.Object, error) {

-	data, err := info.Mapping.Codec.Encode(obj)

-	if err != nil {

-		return nil, err

-	}

-	return resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, data)

+	return resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, obj)

 }

 // Create attempts to create each item generically, gathering all errors in the

new file mode 100644

@@ -0,0 +1,115 @@

+apiVersion: v1

+kind: Template

+metadata:

+  creationTimestamp: 2015-10-24T18:25:22Z

+  name: default-project-request

+  namespace: default

+objects:

+- apiVersion: v1

+  kind: Project

+  metadata:

+    annotations:

+      openshift.io/description: ${PROJECT_DESCRIPTION}

+      openshift.io/display-name: ${PROJECT_DISPLAYNAME}

+      extra: here

+    creationTimestamp: null

+    name: ${PROJECT_NAME}

+  spec: {}

+  status: {}

+- apiVersion: v1

+  kind: ResourceQuota

+  metadata:

+    name: ${PROJECT_NAME}-quota

+  spec:

+    hard:

+      cpu: 200m

+      memory: 512Mi

+      pods: 3

+      replicationcontrollers: 3

+      resourcequotas: 1

+      services: 3

+- apiVersion: v1

+  kind: LimitRange

+  metadata:

+    creationTimestamp: null

+    name: ${PROJECT_NAME}-limits

+  spec:

+    limits:

+    - max:

+        cpu: 500m

+        memory: 750Mi

+      min:

+        cpu: 10m

+        memory: 5Mi

+      type: Pod

+    - default:

+        cpu: 100m

+        memory: 100Mi

+      max:

+        cpu: 500m

+        memory: 750Mi

+      min:

+        cpu: 10m

+        memory: 5Mi

+      type: Container

+- apiVersion: v1

+  groupNames: []

+  kind: RoleBinding

+  metadata:

+    creationTimestamp: null

+    name: admins

+    namespace: ${PROJECT_NAME}

+  roleRef:

+    name: admin

+  subjects:

+  - kind: User

+    name: ${PROJECT_ADMIN_USER}

+  userNames:

+  - ${PROJECT_ADMIN_USER}

+- apiVersion: v1

+  groupNames:

+  - system:serviceaccounts:${PROJECT_NAME}

+  kind: RoleBinding

+  metadata:

+    creationTimestamp: null

+    name: system:image-pullers

+    namespace: ${PROJECT_NAME}

+  roleRef:

+    name: system:image-puller

+  subjects:

+  - kind: SystemGroup

+    name: system:serviceaccounts:${PROJECT_NAME}

+  userNames: []

+- apiVersion: v1

+  groupNames: []

+  kind: RoleBinding

+  metadata:

+    creationTimestamp: null

+    name: system:image-builders

+    namespace: ${PROJECT_NAME}

+  roleRef:

+    name: system:image-builder

+  subjects:

+  - kind: ServiceAccount

+    name: builder

+  userNames:

+  - system:serviceaccount:${PROJECT_NAME}:builder

+- apiVersion: v1

+  groupNames: []

+  kind: RoleBinding

+  metadata:

+    creationTimestamp: null

+    name: system:deployers

+    namespace: ${PROJECT_NAME}

+  roleRef:

+    name: system:deployer

+  subjects:

+  - kind: ServiceAccount

+    name: deployer

+  userNames:

+  - system:serviceaccount:${PROJECT_NAME}:deployer

+parameters:

+- name: PROJECT_NAME

+- name: PROJECT_DISPLAYNAME

+- name: PROJECT_DESCRIPTION

+- name: PROJECT_ADMIN_USER

\ No newline at end of file

@@ -19,7 +19,6 @@ import (

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

 	"github.com/openshift/origin/pkg/cmd/util/tokencmd"

 	projectapi "github.com/openshift/origin/pkg/project/api"

-	projectrequeststorage "github.com/openshift/origin/pkg/project/registry/projectrequest/delegated"

 	testutil "github.com/openshift/origin/test/util"

 	testserver "github.com/openshift/origin/test/util/server"

 )

@@ -132,11 +131,13 @@ func TestUnprivilegedNewProjectFromTemplate(t *testing.T) {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	template := projectrequeststorage.DefaultTemplate()

+	template, err := testutil.GetTemplateFixture("fixtures/project-request-template-with-quota.yaml")

+	if err != nil {

+		t.Fatalf("unexpected error: %v", err)

+	}

 	template.Name = templateName

 	template.Namespace = namespace

-	template.Objects[0].(*projectapi.Project).Annotations["extra"] = "here"

 	_, err = clusterAdminClient.Templates(namespace).Create(template)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -4,10 +4,13 @@ import (

 	"fmt"

 	"io/ioutil"

-	buildapi "github.com/openshift/origin/pkg/build/api"

-	imageapi "github.com/openshift/origin/pkg/image/api"

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/latest"

+	kyaml "k8s.io/kubernetes/pkg/util/yaml"

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+	imageapi "github.com/openshift/origin/pkg/image/api"

+	templateapi "github.com/openshift/origin/pkg/template/api"

 )

 // CreateSampleImageStream creates an ImageStream in given namespace

@@ -58,3 +61,19 @@ func GetSecretFixture(filename string) *kapi.Secret {

 	latest.CodecForLegacyGroup().DecodeInto(jsonData, &secret)

 	return &secret

 }

+

+func GetTemplateFixture(filename string) (*templateapi.Template, error) {

+	data, err := ioutil.ReadFile(filename)

+	if err != nil {

+		return nil, err

+	}

+	jsonData, err := kyaml.ToJSON(data)

+	if err != nil {

+		return nil, err

+	}

+	obj, err := latest.CodecForLegacyGroup().Decode(jsonData)

+	if err != nil {

+		return nil, err

+	}

+	return obj.(*templateapi.Template), nil

+}