Changeset 451

Timestamp:

06/08/13 23:04:07 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Reorganizing for builds.

Mixing server and client doesn't play nice with builds. I'm going to
seperate them even more, so they don't share a Dojo version.

Location:

Dev/trunk/src

Files:

• index.html (modified) (1 diff)
• package.json (modified) (2 diffs)
• qed (deleted)
• qed-client/model/schema.js (modified) (1 diff)
• qed-client/package.json (modified) (1 diff)
• qed-client/qed-client.profile.js (added)
• qed-client/qed.profile.js (deleted)
• qed-server/config/couchdb/config/check.js (modified) (1 diff)
• qed-server/package.json (modified) (1 diff)
• qed-server/server.js (modified) (1 diff)
• response.html (modified) (1 diff)
• server.js (deleted)

Dev/trunk/src/index.html

@@ -17 +17 @@
                     { name: "dijit", location: "dijit" },
                     { name: "dojox", location: "dojox" },
-                    { name: "qed", location: "qed" },
                     { name: "qed-client", location: "qed-client" }
                 ],

Dev/trunk/src/package.json

@@ -1 +1 @@
 {
-  "name": "qed-application",
+  "name": "qed-full",
   "version": "0.0.1",
-  "description": "QED Application",
-  "dependencies": {
-    "simple-http-proxy": "~0.5.2",
-    "express": "~3.2.3"
-  },
+  "description": "QED Full",
   "devDependencies": {
     "grunt": "~0.4.0",
@@ -12 +8 @@
     "grunt-contrib-jshint": "~0.2.0",
     "grunt-htmlhint": "~0.4.0"
-  },
-  "dojoBuild": "qed.profile.js"
+  }
 }

Dev/trunk/src/qed-client/model/schema.js

@@ -122 +122 @@
         startDate:datetime(optional()),
         endDate:datetime(optional()),
-        mode:{type:'string',enum:['open','closed'],optional:true},
+        mode:{type:'string','enum':['open','closed'],optional:true},
         metadata:string(optional())
     });

Dev/trunk/src/qed-client/package.json

@@ -7 +7 @@
     "dijit": "~1.8.0",
     "dojox": "~1.8.0"
-  }
+  },
+  "dojoBuild": "qed-client.profile.js"
 }

Dev/trunk/src/qed-server/config/couchdb/config/check.js

@@ -3 +3 @@
      'dojo/_base/lang',
      'dojox/json/schema',
-     'qed/lib/async',
+     'qed-client/lib/async',
      './util/db',
-     'qed/model/schema'
+     'qed-client/model/schema'
 ],function(array,lang,jsonSchema,async,db,schema){
 

Dev/trunk/src/qed-server/package.json

@@ -4 +4 @@
   "description": "QED Server",
   "dependencies": {
-    "dojo": "~1.8.0",
-    "dojox": "~1.8.0"
-  }
+    "simple-http-proxy": "~0.5.2",
+    "express": "~3.2.3",
+    "underscore": "~1.4.4"
+  },
+  "dojoBuild": "qed-server.profile.js"
 }

Dev/trunk/src/qed-server/server.js

@@ -1 @@
-define([
-    "dojo/_base/array",
-    "dojo/node!express",
-    "dojo/node!fs",
-    "dojo/node!https",
-    "dojo/node!path",
-    "dojo/node!simple-http-proxy"
-], function(array, express, fs, https, path, proxy) {
+var express = require("express");
+var fs = require("fs");
+var https = require("https");
+var path = require("path");
+var proxy = require("simple-http-proxy");
+var _ = require("underscore");
 
-    function staticFile(request, response) {
-        response.sendfile(__dirname+request.path);
-    }
+function staticFile(request, response) {
+    response.sendfile(__dirname+request.path);
+}
 
-    var __dirname = path.resolve('.');
-    
-    var httpsOptions = {
-        key: fs.readFileSync('qed-server.key'),
-        cert: fs.readFileSync('qed-server.pem')
-    };
-    
-    var app = express();
-    app.use(express.logger());
-    app.use(express.compress());
-    app.use(express.favicon());
-    app.get('/', function(request, response){
-        response.sendfile(__dirname+'/index.html');
-    });
-    app.get('/*.html', staticFile);
-    array.forEach(['/dojo', '/dijit', '/dojox', '/qed', '/qed-client'], function(dir){
-        app.use(dir, express.static(__dirname+dir));
-    });
-    app.use('/data/couch', proxy('http://localhost:5984/qed'));
+var __dirname = path.resolve('..');
 
-    var server = https.createServer(httpsOptions, app).listen(8443);
-    
-    console.log("Listening on https://localhost:8443/");
+var httpsOptions = {
+    key: fs.readFileSync(__dirname+'/qed-server.key'),
+    cert: fs.readFileSync(__dirname+'/qed-server.pem')
+};
+
+var app = express();
+app.use(express.logger());
+app.use(express.compress());
+app.use(express.favicon());
+app.get('/', function(request, response){
+    response.sendfile(__dirname+'/index.html');
 });
+app.get('/*.html', staticFile);
+_.foreach(['/dojo', '/dijit', '/dojox', '/qed', '/qed-client'], function(dir){
+    app.use(dir, express['static'](__dirname+dir));
+});
+app.use('/data/couch', proxy('http://localhost:5984/qed'));
+
+var server = https.createServer(httpsOptions, app).listen(8443);
+
+console.log("Listening on https://localhost:8443/");

Dev/trunk/src/response.html

@@ -17 +17 @@
                     { name: "dijit", location: "dijit" },
                     { name: "dojox", location: "dojox" },
-                    { name: "qed", location: "qed" },
                     { name: "qed-client", location: "qed-client" }
                 ],