Fixed some issues with Module 6

Author: bobgarner

EntityCompiler/Module6/README.md

@@ -51,12 +51,12 @@ The `path` is either an absolute path or a relative path. If you specify a relat
 
 For a git repository on **Github**, there are more parameters you need to set:
 
-|Parameter|Description|
-| -------	| ---------	|
-| `organization`|The name of the github organization owning the repository.|
-| `name`| The name of the repository.	| 
-| `path`| An optional path inside the git repository where you would like this repository declaration to be rooted.	| 
-| `tag`|An optional tag from which to pull the files from the git repository. This is how you can implement revision control.|
+|Parameter| Description                                                                                                                                                                                                      |
+| -------	|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `organization`| The name of the github organization owning the repository.                                                                                                                                                       |
+| `name`| The name of the repository.	                                                                                                                                                                                     | 
+| `path`| An optional path inside the git repository where you would like this repository declaration to be rooted.	                                                                                                       | 
+| `tag`| An optional tag from which to pull the files from the git repository. This is how you can implement revision control. It can also be a branch name which would allow you to control a release of files with git. |
 
 For example:
 
@@ -172,7 +172,7 @@ This specialized domain definition assumes you import the original domain defini
 
 Here we will use the same github repository that manages this tutorial from which to import model elements.
 
-We will start with the solution of Module 5 Session 3 and transform it to use repositories and imports. The `repo` folder is already populated with the files you will need to import.
+We will start with the solution of Module 4 Session 3 and transform it to use repositories and imports. The `repo` folder is already populated with the files you will need to import.
 
 #### Step 1
 
@@ -185,14 +185,12 @@ Inside the `space Space {}` block we'll first define a repository for importing
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/entities"
-        tag "e1.0.0"
+        path "Module6/Session3/repo/entities"
+        tag "main"
     }
 ```
 
-Notice the `path` takes us not just to the `repo` folder but also to the `entities` subfolder inside it.
-
-> Instead of prefixing our tag with a `v` for version, we will use `e` for entity (version). This way we can have tags for entity versions independent of the other model elements.
+Notice the `path` takes us not just to the `repo` folder but also to the `entities` subfolder inside it. Also note we use the tag "main" so that we are always pulling from the official released version of these files.
 
 Now we want to import the files. Each module was placed into its own `.edl` file so we will import three files as follows:
 
@@ -231,15 +229,13 @@ The parts that we deleted will instead be imported. Edit `Spaces.edl` again and
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/domains"
-        tag "d1.0.0"
+        path "Module6/Session2/repo/domains"
+        tag "main"
     }
 ```
 
 This time we are pointing to the `domains` subfolder of the `repo` folder.
 
-> Again, note that our `tag` starts with a `d` for domain (version).
-
 Each of the domains have been placed into their own files so we will import each one as follows:
 
 ```
@@ -256,14 +252,12 @@ Since we will be importing all of what is contained in the `Units.edl` file you
         organization "entityc"
         name "ec-tutorials"
         path "Module7/Session2/repo/standards"
-        tag "s1.0.0"
+        tag "main"
     }
 ```
 
 Again, it points to a `standards` subfolder of the `repo` folder. This repository can be used for more than units, it can also be used to store language definitions.
 
-> Again, note that our `tag` starts with a `s` for standards (version).
-
 Below this we can import the units as follows:
 
 ```
@@ -284,7 +278,7 @@ Now its time to run:
 ./run.sh
 ```
 
-The output should be identical to that of Module 5 Session 3.
+The output should be identical to that of Module 4 Session 3.
 
 #### Step 5
 
@@ -422,15 +416,3 @@ It's time to run:
 ```
 
 The output should look the same as the previous session (with the repository tags being the same).
-
-#### Step 5
-
-As in the last session, lets change the tag in our repository definition to use upgraded templates. Edit `Space.edl` and for `TemplatesRepository` change its `tag` to `t1.1.0`.
-
-Run the compiler again:
-
-```
-./run.sh
-```
-
-The difference in the template code is just minor, the output should basically have the same information but slight changes in the formatting.

EntityCompiler/Module6/Session2/solution/ec/Space.edl

@@ -4,8 +4,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/entities"
-        tag "e1.0.0" // "e1.1.0" // "e1.2.0"
+        path "EntityCompiler/Module6/Session2/repo/entities"
+        tag "main"
     }
 
     import Graphics, Accessories, User from EntityRepository
@@ -14,8 +14,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/domains"
-        tag "d1.0.0" // "d1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/domains"
+        tag "main"
     }
 
     import Database, Model, DTO, API from DomainRepository
@@ -24,8 +24,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/standards"
-        tag "s1.0.0" // "s1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/standards"
+        tag "main"
     }
 
     import Units from StandardsRepository

EntityCompiler/Module6/Session3/ec/Space.edl

@@ -4,8 +4,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/entities"
-        tag "e1.0.0" // "e1.1.0" // "e1.2.0"
+        path "EntityCompiler/Module6/Session2/repo/entities"
+        tag "main"
     }
 
     import Graphics, Accessories, User from EntityRepository
@@ -14,8 +14,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/domains"
-        tag "d1.0.0" // "d1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/domains"
+        tag "main"
     }
 
     import Database, Model, DTO, API from DomainRepository
@@ -24,8 +24,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/standards"
-        tag "s1.0.0" // "s1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/standards"
+        tag "main"
     }
 
     import Units from StandardsRepository

EntityCompiler/Module6/Session3/repo/templates/APITemplate.eml

@@ -1,13 +1,11 @@
 $[domain APICode]
 $[log]
-===========
-    API
-===========
+=========== API ===========
     $[foreach entity in space.entities]
         $[if entity.isSecondary]$[continue]$[/if]
 
 API Class> ${entity|domain|name}
-Get ${entity.name|title} List> GET /api/${entity|domain:APIPath|name}
-Returns objects of class> ${entity|domain:DTO|name}
+Get ${entity.name|title} List: GET /api/${entity|domain:APIPath|name}
+Returns objects of class ${entity|domain:DTO|name}
     $[/foreach]
 $[/log]

EntityCompiler/Module6/Session3/repo/templates/DatabaseTemplate.eml

@@ -1,16 +1,14 @@
 $[domain Database]
 $[log]
-===========
- DATABASE
-===========
+=========== DATABASE ===========
     $[foreach entity in space.entities]
 
-Table> ${entity|domain|name}
+Table: ${entity|domain|name}
         $[if entity.hasPrimaryKey]
-    PK>     ${entity.primaryKeyAttribute|domain|name}
+    PK:     ${entity.primaryKeyAttribute|domain|name}
         $[/if]
         $[foreach attribute in (entity|domain).attributes]
-    Column> ${attribute|name}
+    Column: ${attribute|name}
         $[/foreach]
     $[/foreach]
 $[/log]

EntityCompiler/Module6/Session3/repo/templates/data/DTOTemplate.eml

@@ -1,16 +1,14 @@
 $[domain DTO]
 $[log]
-===========
-    DTO
-===========
+=========== DTO ===========
     $[foreach entity in space.entities]
 
-Class> ${entity|domain|fullname}
+Class: ${entity|domain|fullname}
         $[if entity.hasPrimaryKey]
-    PK>     ${entity.primaryKeyAttribute|domain|name}
+    PK:     ${entity.primaryKeyAttribute|domain|name}
         $[/if]
         $[foreach attribute in (entity|domain).attributes]
-    Member> ${attribute|name}
+    Member: ${attribute|name}
         $[/foreach]
     $[/foreach]
 $[/log]

EntityCompiler/Module6/Session3/repo/templates/data/ModelTemplate.eml

@@ -1,30 +1,28 @@
 $[domain Model]
 $[log]
-===========
-   MODEL
-===========
+=========== MODEL ===========
     $[foreach module in space.modules]
 
-MODULE> ${module|domain|name}
+MODULE: ${module|domain|name}
         $[foreach typedef in module.typedefs]
 
-  Typedef> ${typedef|domain|name}
+  Typedef: ${typedef|domain|name}
         $[/foreach]
         $[foreach enum in module.enums]
 
-  Enum> ${enum|domain|name}
+  Enum: ${enum|domain|name}
             $[foreach item in enum.items]
     ${item.value}) ${item|domain|name}
             $[/foreach]
         $[/foreach]
         $[foreach entity in module.entities]
 
-  Class> ${entity|domain|fullname:("::")}
+  Class: ${entity|domain|fullname:("::")}
             $[if entity.hasPrimaryKey]
-      PK>     ${entity.primaryKeyAttribute|domain|name}
+      PK:     ${entity.primaryKeyAttribute|domain|name}
             $[/if]
             $[foreach attribute in entity.attributes]
-      Member> ${attribute|domain|name}
+      Member: ${attribute|domain|name}
             $[/foreach]
         $[/foreach]
     $[/foreach]

EntityCompiler/Module6/Session3/solution/ec/Configuration.edl

@@ -3,8 +3,8 @@ configuration Tutorial
     templates {
         import from TemplatesRepository
         template DatabaseTemplate {}
-        template DTOTemplate in "data/DTOTemplate" {}
-        template ModelTemplate in "data/ModelTemplate" {}
+        template DTOTemplate in "data" {}
+        template ModelTemplate in "data" {}
         template APITemplate {}
     }
 }

EntityCompiler/Module6/Session3/solution/ec/Space.edl

@@ -4,8 +4,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/entities"
-        tag "e1.0.0" // "e1.1.0" // "e1.2.0"
+        path "EntityCompiler/Module6/Session2/repo/entities"
+        tag "main"
     }
 
     import Graphics, Accessories, User from EntityRepository
@@ -14,8 +14,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/domains"
-        tag "d1.0.0" // "d1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/domains"
+        tag "main"
     }
 
     import Database, Model, DTO, API from DomainRepository
@@ -24,8 +24,8 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session2/repo/standards"
-        tag "s1.0.0" // "s1.1.0"
+        path "EntityCompiler/Module6/Session2/repo/standards"
+        tag "main"
     }
 
     import Units from StandardsRepository
@@ -34,7 +34,7 @@ space Space
         type github
         organization "entityc"
         name "ec-tutorials"
-        path "Module7/Session3/repo/templates"
-        tag "t1.0.0" // "t1.1.0"
+        path "EntityCompiler/Module6/Session3/repo/templates"
+        tag "main"
     }
 }