From e9c205c763dd3230a8723e4985c1d3232ac74e52 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Tue, 21 Jun 2011 11:07:58 -0600
Subject: [PATCH] verification server now conforms to new file organization
---
verifier/{server => }/app.js | 13 ++++++++++---
verifier/{server => lib}/httputils.js | 0
verifier/{server => lib}/idassertion.js | 0
verifier/{server => lib}/jwt.js | 0
verifier/{server => lib}/make_assertion.js | 0
verifier/{server => lib}/rsa.js | 0
verifier/{server => lib}/test_verification.js | 0
verifier/{server/standalone.js => run.js} | 4 +++-
8 files changed, 13 insertions(+), 4 deletions(-)
rename verifier/{server => }/app.js (87%)
rename verifier/{server => lib}/httputils.js (100%)
rename verifier/{server => lib}/idassertion.js (100%)
rename verifier/{server => lib}/jwt.js (100%)
rename verifier/{server => lib}/make_assertion.js (100%)
rename verifier/{server => lib}/rsa.js (100%)
rename verifier/{server => lib}/test_verification.js (100%)
rename verifier/{server/standalone.js => run.js} (82%)
mode change 100644 => 100755
diff --git a/verifier/server/app.js b/verifier/app.js
similarity index 87%
rename from verifier/server/app.js
rename to verifier/app.js
index 3f1463d73..48c7e4e0f 100644
--- a/verifier/server/app.js
+++ b/verifier/app.js
@@ -1,8 +1,13 @@
const path = require('path'),
url = require('url'),
- httputils = require('./httputils.js'),
- idassertion = require('./idassertion.js'),
- jwt = require('./jwt.js');
+ fs = require('fs'),
+ httputils = require('./lib/httputils.js'),
+ idassertion = require('./lib/idassertion.js'),
+ jwt = require('./lib/jwt.js');
+
+// create the var directory if it doesn't exist
+var VAR_DIR = path.join(__dirname, "var");
+try { fs.mkdirSync(VAR_DIR, 0755); } catch(e) { }
function handler(req, resp, serveFile) {
// dispatch!
@@ -68,6 +73,8 @@ function handler(req, resp, serveFile) {
}
};
+exports.varDir = VAR_DIR;
+
exports.setup = function(app) {
app.use(handler);
};
diff --git a/verifier/server/httputils.js b/verifier/lib/httputils.js
similarity index 100%
rename from verifier/server/httputils.js
rename to verifier/lib/httputils.js
diff --git a/verifier/server/idassertion.js b/verifier/lib/idassertion.js
similarity index 100%
rename from verifier/server/idassertion.js
rename to verifier/lib/idassertion.js
diff --git a/verifier/server/jwt.js b/verifier/lib/jwt.js
similarity index 100%
rename from verifier/server/jwt.js
rename to verifier/lib/jwt.js
diff --git a/verifier/server/make_assertion.js b/verifier/lib/make_assertion.js
similarity index 100%
rename from verifier/server/make_assertion.js
rename to verifier/lib/make_assertion.js
diff --git a/verifier/server/rsa.js b/verifier/lib/rsa.js
similarity index 100%
rename from verifier/server/rsa.js
rename to verifier/lib/rsa.js
diff --git a/verifier/server/test_verification.js b/verifier/lib/test_verification.js
similarity index 100%
rename from verifier/server/test_verification.js
rename to verifier/lib/test_verification.js
diff --git a/verifier/server/standalone.js b/verifier/run.js
old mode 100644
new mode 100755
similarity index 82%
rename from verifier/server/standalone.js
rename to verifier/run.js
index 3aebe1479..34adb7f8e
--- a/verifier/server/standalone.js
+++ b/verifier/run.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
var sys = require("sys"),
path = require("path"),
fs = require("fs"),
@@ -9,7 +11,7 @@ var PRIMARY_PORT = 62800;
var handler = require("./app.js");
var app = express.createServer().use(express.logger({
- stream: fs.createWriteStream(path.join(__dirname, "server.log"))
+ stream: fs.createWriteStream(path.join(handler.varDir, "server.log"))
}));
// let the specific server interact directly with the express server to register their middleware
--
GitLab