add support for short-form Controller specification
diff --git a/xos/onboard/exampleservice/exampleservice-onboard.yaml b/xos/onboard/exampleservice/exampleservice-onboard.yaml
index 25f2a31..67413d0 100644
--- a/xos/onboard/exampleservice/exampleservice-onboard.yaml
+++ b/xos/onboard/exampleservice/exampleservice-onboard.yaml
@@ -11,36 +11,9 @@
       type: tosca.nodes.ServiceController
       properties:
           base_url: file:/opt/xos/onboard/exampleservice/
-
-    exampleservice_models:
-      type: tosca.nodes.ServiceControllerResource
-      properties:
-          kind: models
-          format: python
-          url: models.py
-      requirements:
-          - controller:
-              node: exampleservice
-              relationship: tosca.relationships.UsedByController
-
-    exampleservice_admin:
-      type: tosca.nodes.ServiceControllerResource
-      properties:
-          kind: admin
-          format: python
-          url: admin.py
-      requirements:
-          - controller:
-              node: exampleservice
-              relationship: tosca.relationships.UsedByController
-
-    exampleservice_synchronizer:
-      type: tosca.nodes.ServiceControllerResource
-      properties:
-          kind: synchronizer
-          format: manifest
-          url: synchronizer/manifest
-      requirements:
-          - controller:
-              node: exampleservice
-              relationship: tosca.relationships.UsedByController
+          # The following will concatenate with base_url automatically, if
+          # base_url is non-null.
+          models: models.py
+          admin: admin.py
+          synchronizer: manifest
+          tosca_custom_types: exampleservice.yaml