work in progres:serving multiple clients

README.txt

-Follow the instructions: TODO

app.js

@@ -36,7 +36,7 @@ app.set('view engine', '.hbs');
 let clientCounter = 0;
 
 	//TODO add spinner for telling user to wait until initialization is done
-	initGitRepos.initialize(downloadFiles);
+	//initGitRepos.initialize(downloadFiles);
 	//routes
 	app.get('/', function(req, res){
 
@@ -48,6 +48,8 @@ let clientCounter = 0;
 		const checkedFiles = Object.keys(req.body);
 
 		if(typeof checkedFiles !== 'undefined' && checkedFiles.length > 0){
+          clientCounter= clientCounter + 1;
+    console.log('clientCounter after increment:', clientCounter);
 			res.render('download', {checkedFiles: checkedFiles, downloadFiles: downloadNames});
 		}
 		else {
@@ -64,8 +66,7 @@ let clientCounter = 0;
 		const promiseArray = []
 		const checkedFiles = req.query.checkedFiles.split(',');
 
-		clientCounter= clientCounter + 1;
-		console.log('clientCounter after increment:', clientCounter);
+
 		if (clientCounter > 5){
 			res.render('tooManyClients');
 		}else{
@@ -190,4 +191,4 @@ function createZip(zip){
 
 
 	app.listen(3000);
-	console.log("Downloader started on port 3000.");
\ No newline at end of file
+	console.log("Downloader started on port 3000.");

backendFunctions.js

@@ -106,7 +106,7 @@ function backendInstallAddons(checkedFiles,downloadFiles,clientName){
 function backendBuild(clientName, fileName){
 	
 	return new Promise((resolve,reject)=>{
-		exec('cd '+ clientName + '/' + fileName + ' && mvn compile war:war ', (error,stdout,stderr)=> {
+		exec('cd '+ clientName + '/' + fileName + ' && mvn compile war:war', (error,stdout,stderr)=> {
 			if (error) {
 				console.log('backendBuild:', error);
 				reject(error);
@@ -115,7 +115,7 @@ function backendBuild(clientName, fileName){
 
 			console.log(stdout);
 			console.log(stderr);
-			resolve({zipFileName:'backend.war', path:'explorviz-ui-backend/target/explorviz-ui-backend-1.0-SNAPSHOT.war'});
+			resolve({zipFileName:'backend.war', path: clientName + '/explorviz-ui-backend/target/explorviz-ui-backend-1.0-SNAPSHOT.war'});
 
 
 		})

clientFolder.js

@@ -16,7 +16,7 @@ function makeClientFolder(clientName){
 
 
 function removeClientFolder(clientName){
-	exec('rm -rf ' + clientName, (error, stdout,stderr)=>{
+	exec('rm -rf ' + clientName + '/', (error, stdout,stderr)=>{
 
 		if (error) {
 			console.log('error in rmdir:', error);

frontendFunctions.js

@@ -6,7 +6,7 @@
 function prepareClientFolder(clientName, fileName){
 return new Promise((resolve,reject)=>{
 
-exec('cp -R ' + fileName + ' ' + clientName + '/',(error,stdout,stderr)=>{
+exec('cp -R ' + fileName + '/ ' + clientName + '/',(error,stdout,stderr)=>{
 
 		if (error) {
 				reject(error);
@@ -109,7 +109,7 @@ exec('cp -R ' + fileName + ' ' + clientName + '/',(error,stdout,stderr)=>{
 				console.log(stdout);
 				console.log(stderr);
 
-				resolve({zipFileName:'frontend', path:'./explorviz-ui-frontend/dist/'});
+				resolve({zipFileName:'frontend', path: clientName + '/explorviz-ui-frontend/dist/'});
 			});
 
 

package.json

@@ -16,6 +16,7 @@
     "fs": "0.0.1-security",
     "fs-readdir": "0.0.3",
     "jszip": "^3.1.3",
+    "maven": "^4.2.0",
     "path": "^0.12.7",
     "spinkit": "^1.2.5"
   },