Fixed version number.

README.md

@@ -53,8 +53,7 @@ You can copy the [built-in](https://github.com/yahoo/mojito-cli-create/tree/mast
 
 If a file in the archetype source ends with `.hb` then the contents of the file will have key/value replacement done for the following:
 
-* `{{port}}` -> default port number 8666 or the value passed by option `--port`
-* `{{name}}` -> the name passed as the last command line argument that is not a flag or option, like `--port`. The
+* `{{name}}` -> the name passed as the last command line argument that is not a flag or option. The
   name is lowercased and used for the module name of mojit code.
 * `{{class}}` -> is the sname as `{{name}}` except the value is not lowercased. The value is used for the class name
   of mojit code.

archetypes/app/default/app.js.hb

@@ -0,0 +1,37 @@
+/*jslint nomen:true, node:true*/
+
+var express = require('express'),
+    libmojito = require('mojito'),
+    app;
+
+app = express();
+
+// Set the port to listen on.
+app.set('port', process.env.PORT || {{port}});
+
+// Create a new Mojito instance and attach it to `app`.
+// Options can be passed to `extend`.
+libmojito.extend(app, {
+    context: {
+        environment: "development"
+    }
+});
+
+// Load the built-in middleware or any middleware
+// configuration specified in application.json
+app.use(libmojito.middleware());
+
+
+
+// Load routes configuration from routes.json
+app.mojito.attachRoutes();
+
+// Allow anonymyous mojit instances w/ actions to be dispatched
+app.get('/:mojit/:action', libmojito.dispatch("{mojit}.{action}"));
+
+app.listen(app.get('port'), function () {
+    console.log('Server listening on port ' + app.get('port') + ' ' +
+                   'in ' + app.get('env') + ' mode');
+});
+
+

archetypes/app/default/application.json.hb

@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "appPort": "{{port}}",
         "specs": {}
     },
     {

archetypes/app/default/package.json.hb

@@ -5,9 +5,11 @@
     "author": "",
     "contributors": [],
     "dependencies": {
-        "mojito": ">0.6"
+        "express": "3.x",
+        "mojito": "~0.9"
     },
     "engines": {
-        "node": ">0.8"
-    }
+        "node": ">=0.8"
+    },
+    "main": "./app.js"
 }

archetypes/app/full/app.js.hb

@@ -0,0 +1,35 @@
+/*jslint nomen:true, node:true*/
+
+var express = require('express'),
+    libmojito = require('mojito'),
+    app;
+
+app = express();
+
+// Set the port to listen on.
+app.set('port', process.env.PORT || {{port}});
+
+// Create a new Mojito instance and attach it to `app`.
+// Options can be passed to `extend`.
+libmojito.extend(app, {
+    context: {
+        environment: "development"
+    }
+});
+
+// Load the built-in middleware or any middleware
+// configuration specified in application.json
+app.use(libmojito.middleware());
+
+// Load routes configuration from routes.json
+app.mojito.attachRoutes();
+
+// Allow anonymyous mojit instances w/ actions to be dispatched
+app.get('/:mojit/:action', libmojito.dispatch("{mojit}.{action}"));
+
+app.listen(app.get('port'), function () {
+    console.log('Server listening on port ' + app.get('port') + ' ' +
+                   'in ' + app.get('env') + ' mode');
+});
+
+

archetypes/app/full/application.json.hb

@@ -2,7 +2,6 @@
     {
         "settings": [ "master" ],
 
-        "appPort": "{{port}}",
         "cacheViewTemplates": true,
         "staticHandling": {
             "appName": "app",

archetypes/app/full/package.json.hb

@@ -5,9 +5,11 @@
     "author": "",
     "contributors": [],
     "dependencies": {
-        "mojito": ">0.6"
+        "express": "3.x",
+        "mojito": "~0.9"
     },
     "engines": {
-        "node": ">0.8"
-    }
+        "node": ">=0.8"
+    },
+    "main": "./app.js"
 }

archetypes/app/simple/app.js.hb

@@ -0,0 +1,35 @@
+/*jslint nomen:true, node:true*/
+
+var express = require('express'),
+    libmojito = require('mojito'),
+    app;
+
+app = express();
+
+// Set the port to listen on.
+app.set('port', process.env.PORT || {{port}});
+
+// Create a new Mojito instance and attach it to `app`.
+// Options can be passed to `extend`.
+libmojito.extend(app, {
+    context: {
+        environment: "development"
+    }
+});
+
+// Load the built-in middleware or any middleware
+// configuration specified in application.json
+app.use(libmojito.middleware());
+
+// Load routes configuration from routes.json
+app.mojito.attachRoutes();
+
+// Allow anonymyous mojit instances w/ actions to be dispatched
+app.get('/:mojit/:action', libmojito.dispatch("{mojit}.{action}"));
+
+app.listen(app.get('port'), function () {
+    console.log('Server listening on port ' + app.get('port') + ' ' +
+                   'in ' + app.get('env') + ' mode');
+});
+
+

archetypes/app/simple/application.json.hb

@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "appPort": "{{port}}",
         "specs": {}
     },
     {

archetypes/app/simple/package.json.hb

@@ -5,9 +5,11 @@
     "author": "",
     "contributors": [],
     "dependencies": {
-        "mojito": ">0.6"
+        "express": "3.x",
+        "mojito": "~0.9"
     },
     "engines": {
-        "node": ">0.8"
-    }
+        "node": ">=0.8"
+    },
+    "main": "./app.js"
 }

archetypes/app/yahoo/app.js.hb

@@ -0,0 +1,34 @@
+/*jslint nomen:true, node:true*/
+
+var express = require('express'),
+    libmojito = require('mojito'),
+    app;
+
+app = express();
+
+// Set the port to listen on.
+app.set('port', process.env.PORT || {{port}});
+
+// Create a new Mojito instance and attach it to `app`.
+// Options can be passed to `extend`.
+libmojito.extend(app, {
+    context: {
+        environment: "development"
+    }
+});
+
+// Load the built-in middleware or any middleware
+// configuration specified in application.json
+app.use(libmojito.middleware());
+
+// Load routes configuration from routes.json
+app.mojito.attachRoutes();
+
+app.listen(app.get('port'), function () {
+    console.log('Server listening on port ' + app.get('port') + ' ' +
+                   'in ' + app.get('env') + ' mode');
+});
+
+module.exports = app;
+
+

archetypes/app/yahoo/application.json.hb

@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "appPort": "{{port}}",
         "specs": {}
     },
     {

archetypes/app/yahoo/index.js

@@ -0,0 +1,14 @@
+
+/*jslint nomen:true, node:true*/
+
+var http = require('http'),
+    app = require('./app');
+
+/**
+ * @token given by manhattan and used to emit that the app is ready
+ */
+module.exports = function(config, token) {
+    // send the application to Manhattan along with the token
+    process.emit("application-ready", token, http.createServer(app));
+};
+

archetypes/app/yahoo/package.json.hb

@@ -13,9 +13,11 @@
           }
     ],
     "dependencies": {
-        "mojito": ">0.6"
+        "express": "3.x",
+        "mojito": "~0.9"
     },
     "engines": {
-        "node": ">0.8"
-    }
+        "node": ">=0.8"
+    },
+    "main": "./app.js"
 }

archetypes/demo/quickstartguide/app.js

@@ -0,0 +1,34 @@
+/*jslint nomen:true, node:true*/
+
+var express = require('express'),
+    libmojito = require('mojito'),
+    app;
+
+app = express();
+
+// Set the port to listen on.
+app.set('port', process.env.PORT || 8666);
+
+// Create a new Mojito instance and attach it to `app`.
+// Options can be passed to `extend`.
+libmojito.extend(app, {
+    context: {
+        environment: "development"
+    }
+});
+
+// Load the built-in middleware or any middleware
+// configuration specified in application.json
+app.use(libmojito.middleware());
+
+// Load routes configuration from routes.json
+app.mojito.attachRoutes();
+
+app.listen(app.get('port'), function () {
+    console.log('Server listening on port ' + app.get('port') + ' ' +
+                   'in ' + app.get('env') + ' mode');
+});
+
+module.exports = app;
+
+

archetypes/demo/quickstartguide/index.js

@@ -14,13 +14,11 @@ http://devel.corp.yahoo.com/cocktails/mojito/manhattan_reqs_mojito_startup.html#
 
 process.chdir(__dirname);
 
-/*
-* Create the MojitoServer instance we'll interact with. Options can be passed
-* using an object with the desired key/value pairs.
-*/
-var Mojito = require('mojito');
-var app = Mojito.createServer();
+var http = require('http'),
+    app = require('./app');
 
 module.exports = function(config, token) {
-    process.emit('application-ready', token, app.getHttpServer());
+    process.emit('application-ready', token, http.createServer(app));
 };
+
+

archetypes/demo/quickstartguide/package.json

@@ -33,6 +33,6 @@
     },
     "dependencies": {
         "node-markdown": "*",
-        "mojito": "*"
+        "mojito": "~0.9"
     }
 }