From edfa62efb21b128dce6de134a3fb0d85f77bd2b8 Mon Sep 17 00:00:00 2001 From: www-data Date: Tue, 2 Dec 2014 11:34:39 +0100 Subject: [PATCH] Shuffling. --- Server/JOURNAL => JOURNAL | 0 Server/webApp/.prova.php.swp | Bin 12288 -> 0 bytes Server/webApp/esercizi/aalbero.xml | 16 ---- Server/webApp/esercizi/demorgan.xml | 27 ------- Server/webApp/esercizi/demorgan2.xml | 27 ------- Server/webApp/esercizi/risolvibile.xml | 35 --------- Server/webApp/esercizi/tautologia.xml | 15 ---- Server/webApp/esercizi/test.xml | 12 --- Server/webApp/index.html | 17 ----- Server/webApp/index.html~ | 17 ----- Server/webApp/login.css | 16 ---- Server/webApp/login.js | 65 ---------------- Server/webApp/login.js~ | 66 ---------------- Server/webApp/login.php | 41 ---------- Server/webApp/login.php~ | 42 ---------- Server/webApp/logout.js | 18 ----- Server/webApp/logout.php | 7 -- Server/webApp/main.php | 41 ---------- Server/webApp/printEs.php | 13 ---- Server/webApp/prova.html~ | 12 --- Server/webApp/prova.js | 72 ------------------ Server/webApp/prova.pho | 0 Server/webApp/prova.pho~ | 0 Server/webApp/prova.php | 39 ---------- Server/webApp/prova.php~ | 44 ----------- Server/webApp/prova.txt | 2 - Server/webApp/prova.txt~ | 0 Server/webApp/serverRequest.php | 54 ------------- Server/webApp/upload.php | 53 ------------- Server/webApp/upload.php~ | 33 -------- Server/webApp/util.php | 41 ---------- Server/webApp/xmlPharse.php | 11 --- Server/logintesi.sql => logintesi.sql | 0 .../server => server}/tesi/.idea/compiler.xml | 0 .../.idea/copyright/profiles_settings.xml | 0 .../tesi/.idea/description.html | 0 .../tesi/.idea/encodings.xml | 0 {Server/server => server}/tesi/.idea/misc.xml | 0 .../server => server}/tesi/.idea/modules.xml | 0 .../tesi/.idea/project-template.xml | 0 .../tesi/.idea/scopes/scope_settings.xml | 0 .../tesi/.idea/uiDesigner.xml | 0 {Server/server => server}/tesi/.idea/vcs.xml | 0 .../tesi/.idea/workspace.xml | 0 .../tesi/com/company/DirectoryWatcher.class | Bin .../tesi/com/company/EmailSender.class | Bin .../tesi/com/company/EsNameParser.class | Bin .../out/production/tesi/com/company/MD5.class | Bin .../tesi/com/company/dbConnect.class | Bin .../production/tesi/com/company/esercizi.xml | 0 .../production/tesi/com/company/global.class | Bin .../tesi/com/company/guestServer.class | Bin .../tesi/com/company/httpget$MyHandler.class | Bin .../production/tesi/com/company/httpget.class | Bin .../production/tesi/com/company/keystore.bks | Bin .../production/tesi/com/company/keystore.crt | Bin .../production/tesi/com/company/keystore.jks | Bin .../tesi/com/company/personalServer.class | Bin .../tesi/com/company/suString.class | Bin .../tesi/com/company/superServer.class | Bin .../tesi/com/company/xmlOperation.class | Bin .../testi/com/company/DeleteFileExample.class | Bin .../testi/com/company/EmailSender.class | Bin .../testi/com/company/EsNameParser.class | Bin .../testi/com/company/dbConnect.class | Bin .../production/testi/com/company/esercizi.xml | 0 .../testi/com/company/guestServer.class | Bin .../testi/com/company/httpget$MyHandler.class | Bin .../testi/com/company/httpget.class | Bin .../production/testi/com/company/keystore.bks | Bin .../production/testi/com/company/keystore.crt | Bin .../production/testi/com/company/keystore.jks | Bin .../testi/com/company/personalServer.class | Bin .../testi/com/company/suString.class | Bin .../testi/com/company/superServer.class | Bin .../src/com/company/DeleteFileExample.class | Bin .../src/com/company/DirectoryWatcher.class | Bin .../src/com/company/DirectoryWhatcer.java | 0 .../tesi/src/com/company/EmailSender.class | Bin .../tesi/src/com/company/EmailSender.java | 0 .../tesi/src/com/company/EsNameParser.class | Bin .../tesi/src/com/company/EsNameParser.java | 0 .../tesi/src/com/company/MD5.class | Bin .../tesi/src/com/company/MD5.java | 0 .../tesi/src/com/company/Makefile | 0 .../tesi/src/com/company/dbConnect.class | Bin .../tesi/src/com/company/dbConnect.java | 0 .../tesi/src/com/company/esercizi.xml | 0 .../tesi/src/com/company/esercizi.xml~ | 0 .../tesi/src/com/company/global.class | Bin .../tesi/src/com/company/global.java | 0 .../tesi/src/com/company/guestServer.class | Bin .../tesi/src/com/company/guestServer.java | 0 .../src/com/company/httpget$MyHandler.class | Bin .../tesi/src/com/company/httpget.class | Bin .../tesi/src/com/company/httpget.java | 0 .../tesi/src/com/company/keystore.bks | Bin .../tesi/src/com/company/keystore.crt | Bin .../tesi/src/com/company/keystore.jks | Bin .../tesi/src/com/company/personalServer.class | Bin .../tesi/src/com/company/personalServer.java | 0 .../tesi/src/com/company/suString.class | Bin .../tesi/src/com/company/suString.java | 0 .../tesi/src/com/company/superServer.class | Bin .../tesi/src/com/company/superServer.java | 0 .../tesi/src/com/company/testEsname.class | Bin .../tesi/src/com/company/xmlOperation.class | Bin .../tesi/src/com/company/xmlOperation.java | 0 {Server/server => server}/tesi/src/go.sh | 0 {Server/server => server}/tesi/tesi.iml | 0 110 files changed, 836 deletions(-) rename Server/JOURNAL => JOURNAL (100%) delete mode 100644 Server/webApp/.prova.php.swp delete mode 100644 Server/webApp/esercizi/aalbero.xml delete mode 100644 Server/webApp/esercizi/demorgan.xml delete mode 100644 Server/webApp/esercizi/demorgan2.xml delete mode 100644 Server/webApp/esercizi/risolvibile.xml delete mode 100644 Server/webApp/esercizi/tautologia.xml delete mode 100644 Server/webApp/esercizi/test.xml delete mode 100755 Server/webApp/index.html delete mode 100755 Server/webApp/index.html~ delete mode 100755 Server/webApp/login.css delete mode 100755 Server/webApp/login.js delete mode 100755 Server/webApp/login.js~ delete mode 100755 Server/webApp/login.php delete mode 100755 Server/webApp/login.php~ delete mode 100755 Server/webApp/logout.js delete mode 100755 Server/webApp/logout.php delete mode 100755 Server/webApp/main.php delete mode 100755 Server/webApp/printEs.php delete mode 100755 Server/webApp/prova.html~ delete mode 100755 Server/webApp/prova.js delete mode 100755 Server/webApp/prova.pho delete mode 100755 Server/webApp/prova.pho~ delete mode 100755 Server/webApp/prova.php delete mode 100755 Server/webApp/prova.php~ delete mode 100755 Server/webApp/prova.txt delete mode 100755 Server/webApp/prova.txt~ delete mode 100755 Server/webApp/serverRequest.php delete mode 100755 Server/webApp/upload.php delete mode 100755 Server/webApp/upload.php~ delete mode 100755 Server/webApp/util.php delete mode 100755 Server/webApp/xmlPharse.php rename Server/logintesi.sql => logintesi.sql (100%) rename {Server/server => server}/tesi/.idea/compiler.xml (100%) rename {Server/server => server}/tesi/.idea/copyright/profiles_settings.xml (100%) rename {Server/server => server}/tesi/.idea/description.html (100%) rename {Server/server => server}/tesi/.idea/encodings.xml (100%) rename {Server/server => server}/tesi/.idea/misc.xml (100%) rename {Server/server => server}/tesi/.idea/modules.xml (100%) rename {Server/server => server}/tesi/.idea/project-template.xml (100%) rename {Server/server => server}/tesi/.idea/scopes/scope_settings.xml (100%) rename {Server/server => server}/tesi/.idea/uiDesigner.xml (100%) rename {Server/server => server}/tesi/.idea/vcs.xml (100%) rename {Server/server => server}/tesi/.idea/workspace.xml (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/DirectoryWatcher.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/EmailSender.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/EsNameParser.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/MD5.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/dbConnect.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/esercizi.xml (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/global.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/guestServer.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/httpget$MyHandler.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/httpget.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/keystore.bks (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/keystore.crt (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/keystore.jks (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/personalServer.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/suString.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/superServer.class (100%) rename {Server/server => server}/tesi/out/production/tesi/com/company/xmlOperation.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/DeleteFileExample.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/EmailSender.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/EsNameParser.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/dbConnect.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/esercizi.xml (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/guestServer.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/httpget$MyHandler.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/httpget.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/keystore.bks (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/keystore.crt (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/keystore.jks (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/personalServer.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/suString.class (100%) rename {Server/server => server}/tesi/out/production/testi/com/company/superServer.class (100%) rename {Server/server => server}/tesi/src/com/company/DeleteFileExample.class (100%) rename {Server/server => server}/tesi/src/com/company/DirectoryWatcher.class (100%) rename {Server/server => server}/tesi/src/com/company/DirectoryWhatcer.java (100%) rename {Server/server => server}/tesi/src/com/company/EmailSender.class (100%) rename {Server/server => server}/tesi/src/com/company/EmailSender.java (100%) rename {Server/server => server}/tesi/src/com/company/EsNameParser.class (100%) rename {Server/server => server}/tesi/src/com/company/EsNameParser.java (100%) rename {Server/server => server}/tesi/src/com/company/MD5.class (100%) rename {Server/server => server}/tesi/src/com/company/MD5.java (100%) rename {Server/server => server}/tesi/src/com/company/Makefile (100%) rename {Server/server => server}/tesi/src/com/company/dbConnect.class (100%) rename {Server/server => server}/tesi/src/com/company/dbConnect.java (100%) rename {Server/server => server}/tesi/src/com/company/esercizi.xml (100%) rename {Server/server => server}/tesi/src/com/company/esercizi.xml~ (100%) rename {Server/server => server}/tesi/src/com/company/global.class (100%) rename {Server/server => server}/tesi/src/com/company/global.java (100%) rename {Server/server => server}/tesi/src/com/company/guestServer.class (100%) rename {Server/server => server}/tesi/src/com/company/guestServer.java (100%) rename {Server/server => server}/tesi/src/com/company/httpget$MyHandler.class (100%) rename {Server/server => server}/tesi/src/com/company/httpget.class (100%) rename {Server/server => server}/tesi/src/com/company/httpget.java (100%) rename {Server/server => server}/tesi/src/com/company/keystore.bks (100%) rename {Server/server => server}/tesi/src/com/company/keystore.crt (100%) rename {Server/server => server}/tesi/src/com/company/keystore.jks (100%) rename {Server/server => server}/tesi/src/com/company/personalServer.class (100%) rename {Server/server => server}/tesi/src/com/company/personalServer.java (100%) rename {Server/server => server}/tesi/src/com/company/suString.class (100%) rename {Server/server => server}/tesi/src/com/company/suString.java (100%) rename {Server/server => server}/tesi/src/com/company/superServer.class (100%) rename {Server/server => server}/tesi/src/com/company/superServer.java (100%) rename {Server/server => server}/tesi/src/com/company/testEsname.class (100%) rename {Server/server => server}/tesi/src/com/company/xmlOperation.class (100%) rename {Server/server => server}/tesi/src/com/company/xmlOperation.java (100%) rename {Server/server => server}/tesi/src/go.sh (100%) rename {Server/server => server}/tesi/tesi.iml (100%) diff --git a/Server/JOURNAL b/JOURNAL similarity index 100% rename from Server/JOURNAL rename to JOURNAL diff --git a/Server/webApp/.prova.php.swp b/Server/webApp/.prova.php.swp deleted file mode 100644 index 48d1c1c43ad2807ddf1c1bc4fcb50b6f74056bc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&ubGw6vwB6heBILk6xZ@zy#84>JKVtT18qK&{k|JLMdUAed#XU>@2g}#H|#) z2znG0QBVE}{t=>ogNSGU1HqGTHrs8gh6+6?Z{W+Y*?HghozG4VA=|3ntKWv%$|XVL zq!3SEJB_>LvUoNtgjOmxA0IYk8?_h6!C2Q5pGY4_?@5nI4bpW|jWk92J}JaU(p%DV(md%K_4rJBM|wkg zMKXOOk|yzB0!)AjFaajO1egF5U;<3wzaua|C&sbuD!>QWE?V>k@O0bv0J_o(%=^HW zS+Fa{fd);3wbrWAIw?c!qDJV;2xI`LwbHO1`bs)punCFU*3j{MtXNmGdO$xyc$nKX zTufJhRe_d_Fpym=LZP`>zqPQsZkghST1y?Rjdjc1wl+!?u)w9BEyN(}hfdza>p-!q zde|H!L8obKiX%Lhl}{=5j(7BSEX#45{? z?q;yr6zU$RoJ9&NQ1QXsCUaqscV!D|HK?Y|spU-<+gqmb{%z_TVQhL$SC}gw?p`04lY;CI2h4D2D9StbEGBG*C?HYj-MCBQ69qF zYYsju{{B>k!TiBRj2FDF+{8t5ev%NO2B9<$t)mW@mG9hWEY+76SDFj=8w<;;^_Ark v0UHK5W3Goz1zGJ~I-Z81V>|MIWv6z?$W+$A!U%QS+wpAreq5V3@816e^LRwI diff --git a/Server/webApp/esercizi/aalbero.xml b/Server/webApp/esercizi/aalbero.xml deleted file mode 100644 index 8591816..0000000 --- a/Server/webApp/esercizi/aalbero.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - a - b - - - c - d - - - - diff --git a/Server/webApp/esercizi/demorgan.xml b/Server/webApp/esercizi/demorgan.xml deleted file mode 100644 index 1445f1f..0000000 --- a/Server/webApp/esercizi/demorgan.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - A - B - - - - - A - - - B - - - - - - - 13 - 60 - 5 - - diff --git a/Server/webApp/esercizi/demorgan2.xml b/Server/webApp/esercizi/demorgan2.xml deleted file mode 100644 index 1445f1f..0000000 --- a/Server/webApp/esercizi/demorgan2.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - A - B - - - - - A - - - B - - - - - - - 13 - 60 - 5 - - diff --git a/Server/webApp/esercizi/risolvibile.xml b/Server/webApp/esercizi/risolvibile.xml deleted file mode 100644 index ee115e9..0000000 --- a/Server/webApp/esercizi/risolvibile.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - A - - B - - - R - - - - A - B - - - R - - - - - A - - - - - B - - - 13 - 60 - 5 - - diff --git a/Server/webApp/esercizi/tautologia.xml b/Server/webApp/esercizi/tautologia.xml deleted file mode 100644 index 4c8d1c3..0000000 --- a/Server/webApp/esercizi/tautologia.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - A - A - - - - 13 - 60 - 5 - - diff --git a/Server/webApp/esercizi/test.xml b/Server/webApp/esercizi/test.xml deleted file mode 100644 index 4a1e680..0000000 --- a/Server/webApp/esercizi/test.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - top - - - - - - - diff --git a/Server/webApp/index.html b/Server/webApp/index.html deleted file mode 100755 index 62e3446..0000000 --- a/Server/webApp/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - -

Benvenuto nella pagina di amministazione

-
- - - -
- - diff --git a/Server/webApp/index.html~ b/Server/webApp/index.html~ deleted file mode 100755 index e566e53..0000000 --- a/Server/webApp/index.html~ +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - -

Benvenuto nella pagina di amministazione

-
- - - -
- - \ No newline at end of file diff --git a/Server/webApp/login.css b/Server/webApp/login.css deleted file mode 100755 index dc4f5da..0000000 --- a/Server/webApp/login.css +++ /dev/null @@ -1,16 +0,0 @@ -#login -{ - width:100%; - display:inline-block; - text-align:center; -} -#esTable -{ - display:block; - float:left; -} -#tabella -{ - display:block; - float:left; -} diff --git a/Server/webApp/login.js b/Server/webApp/login.js deleted file mode 100755 index e9afdc4..0000000 --- a/Server/webApp/login.js +++ /dev/null @@ -1,65 +0,0 @@ -function change() -{ -/*Quando viene chiamata, modifica il campo "location" di document*/ -/*effettuando un redirect sulla pagina main.php*/ -document.location.href="./main.php"; -} - - - - -function login() -{ - var jsonlogin=new Object(); - jsonlogin.username=$('#username').val(); //recupero i dati di login dai rispettivi campi dell'HTML - jsonlogin.password=$('#password').val(); - var sendstr = JSON.stringify(jsonlogin); //creo il JSON di invio al server - $.ajax - ({ - type: 'POST', - url: 'login.php', - async: false, - contentType: 'application/json; charset=utf-8', - dataType: 'json', - data: sendstr, - success: function(response) - { //in caso di successo della richiesta viene eseguita questa funzione - if (response['result']=="login effettuato con successo") - //cioè se il server ha ritornato che l'utente è stato trovato con successo - change(); - else - $("#errlogin").fadeIn(); - setTimeout(function(){$("#errlogin").fadeOut()}, 2000); - - } - }); -} - - - - - -$(document).ready -( - function () - { - $("#errlogin").hide(); //nasconde i div di errore del login - //funzione che effettua login se bottone viene cliccato - $("#loginForm").click - ( - function() - { - login(); - } - ); - //funzione che effettua login se tasto "INVIO" viene cliccato - $("#password").keyup( - function(invio) - { - if(invio.keyCode == 13) { - login(); - } - - }); - } -); diff --git a/Server/webApp/login.js~ b/Server/webApp/login.js~ deleted file mode 100755 index 5866524..0000000 --- a/Server/webApp/login.js~ +++ /dev/null @@ -1,66 +0,0 @@ -function change() -{ -/*Quando viene chiamata, modifica il campo "location" di document*/ -/*effettuando un redirect sulla pagina main.php*/ -document.location.href="./prova.html"; -} - - - - -function login() -{ - var jsonlogin=new Object(); - jsonlogin.username=$('#username').val(); //recupero i dati di login dai rispettivi campi dell'HTML - jsonlogin.password=$('#password').val(); - window.alert($('#username').val()+$('#password').val()); - var sendstr = JSON.stringify(jsonlogin); //creo il JSON di invio al server - $.ajax - ({ - type: 'POST', - url: 'login.php', - async: false, - contentType: 'application/json; charset=utf-8', - dataType: 'json', - data: sendstr, - success: function(response) - { //in caso di successo della richiesta viene eseguita questa funzione - if (response['result']=="login effettuato con successo") - //cioè se il server ha ritornato che l'utente è stato trovato con successo - change(); - else - $("#errlogin").fadeIn(); - setTimeout(function(){$("#errlogin").fadeOut()}, 2000); - - } - }); -} - - - - - -$(document).ready -( - function () - { - $("#errlogin").hide(); //nasconde i div di errore del login - //funzione che effettua login se bottone viene cliccato - $("#loginForm").click - ( - function() - { - login(); - } - ); - //funzione che effettua login se tasto "INVIO" viene cliccato - $("#password").keyup( - function(invio) - { - if(invio.keyCode == 13) { - login(); - } - - }); - } -); diff --git a/Server/webApp/login.php b/Server/webApp/login.php deleted file mode 100755 index 4053a81..0000000 --- a/Server/webApp/login.php +++ /dev/null @@ -1,41 +0,0 @@ -"errore nella connessione al database"); - $ris=json_encode($arr); - echo $ris; - die; - } - else - { - $str="SELECT * FROM admin WHERE username='".$result->username."' AND password='".$result->password."';"; - $exists= mysqli_query($con,$str); - if (!($exists)) - { - $arr=array('result'=>"errore nella ricerca all'interno del database"); - $ris=json_encode($arr); - echo $ris; - die; - } - $res=mysqli_num_rows($exists); - if ($res==1) - { - $ID=mysqli_fetch_array($exists); - $_SESSION["username"]=$result->username; - $arr = array('result'=>"login effettuato con successo"); - $ris=json_encode($arr); - echo $ris; - } - else - { - $arr= array('result'=>"Utente non trovato"); - $ris=json_encode($arr); - echo $ris; - } - } - mysqli_close($con) -?> diff --git a/Server/webApp/login.php~ b/Server/webApp/login.php~ deleted file mode 100755 index 5206e97..0000000 --- a/Server/webApp/login.php~ +++ /dev/null @@ -1,42 +0,0 @@ -"errore nella connessione al database"); - $ris=json_encode($arr); - echo $ris; - die; - } - else - { - $str="SELECT * FROM admin WHERE username='danilo.berardinelli' AND password='123stella';"; - $exists= mysqli_query($con,$str); - if (!($exists)) - { - $arr=array('result'=>"errore nella ricerca all'interno del database"); - $ris=json_encode($arr); - echo $ris; - die; - } - $res=mysqli_num_rows($exists); - if ($res==1) - { - $ID=mysqli_fetch_array($exists); - $_SESSION["username"]=$result->username; - $arr = array('result'=>"login effettuato con successo"); - $ris=json_encode($arr); - echo $ris; - } - else - { - $arr= array('result'=>"Utente non trovato"); - $ris=json_encode($arr); - echo $ris; - } - - } - mysqli_close($con) -?> diff --git a/Server/webApp/logout.js b/Server/webApp/logout.js deleted file mode 100755 index 9817f6a..0000000 --- a/Server/webApp/logout.js +++ /dev/null @@ -1,18 +0,0 @@ -function change() -{ - document.location.href="index.html"; -} -function logout() -{ - $.ajax({ - type: 'POST', - url: 'logout.php', - async: false - }).success - ( - function(response) - { - change(); - } - ); -} diff --git a/Server/webApp/logout.php b/Server/webApp/logout.php deleted file mode 100755 index 7060d00..0000000 --- a/Server/webApp/logout.php +++ /dev/null @@ -1,7 +0,0 @@ -"logout effettuato con successo"); - $ris=json_encode($arr); - echo $ris; -?> diff --git a/Server/webApp/main.php b/Server/webApp/main.php deleted file mode 100755 index 2866325..0000000 --- a/Server/webApp/main.php +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - -
- Select file to upload: - - -
-
-
- - - - -
Lista Esercizi
- - - - - - - - - diff --git a/Server/webApp/printEs.php b/Server/webApp/printEs.php deleted file mode 100755 index 6c4b6e8..0000000 --- a/Server/webApp/printEs.php +++ /dev/null @@ -1,13 +0,0 @@ -"; - - while (false !== ($file = readdir($handle))) { - if($file!="." && $file!="..") - echo "$file
"; - } - - closedir($handle); - } -?> diff --git a/Server/webApp/prova.html~ b/Server/webApp/prova.html~ deleted file mode 100755 index 0e3d827..0000000 --- a/Server/webApp/prova.html~ +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Server/webApp/prova.js b/Server/webApp/prova.js deleted file mode 100755 index 62d03ef..0000000 --- a/Server/webApp/prova.js +++ /dev/null @@ -1,72 +0,0 @@ -function update(event) -{ - var str; - if (event==null) - str='all'; - else{ - var object=event.target; - str=object.getAttribute("esercizio"); - } - var query="./serverRequest.php"; - var request=new Object(); - request.name=str; - var sendstr=JSON.stringify(request); - $.ajax({ - url:query, - type:"POST", - async: "true", - dataType: "json", - data:sendstr, - contentType: "application/json; charset=utf-8", - success:function(val) - { - $("#tabella").empty(); - $("#tabella").append(""); - $.each(val.esercizi, function(i, item) { - var id="es"+i; - for(j=0;j').attr('id',id_i)); - id_i="#"+id_i; - $(id_i).append($('"); - $.each(val.esercizi, function(i, item) { - var id="ex"+i; - $("#esTable").append($('').attr('id',id)); - $("#ex"+i).append($('
Nome EsercizioStudenteclick
Nome EsercizioStudenteClick').text(item.esercizio)); - $(id_i).append($('').text(item.risultati[j].utente)); - $(id_i).append($('').text(item.risultati[j].click)); - $(id_i).append($('').attr('risultato',item.risultati[j].click)); - } - }); - }, - }); -} - -function esList() -{ - var query="./xmlPharse.php"; - $.ajax({ - url:query, - type:"GET", - async: "true", - dataType: "json", - accepts: {json:"application/json"}, - success:function(val) - { - $("#esTable").empty(); - $("#esTable").append("
Nome Esercizio
').text(item)); - $("#ex"+i).append($('').attr('esercizio',item)); - $("#ex"+i).append($('').attr('esercizio',item)); - }); - $("#esTable").append(''); - $(".seleziona").click(function(event){update(event);}); - }, - }); -} - -$(document).ready(function(){ - esList(); - update(); - $(".seleziona").click(function(event){update(event);}); -}); diff --git a/Server/webApp/prova.pho b/Server/webApp/prova.pho deleted file mode 100755 index e69de29..0000000 diff --git a/Server/webApp/prova.pho~ b/Server/webApp/prova.pho~ deleted file mode 100755 index e69de29..0000000 diff --git a/Server/webApp/prova.php b/Server/webApp/prova.php deleted file mode 100755 index 6284333..0000000 --- a/Server/webApp/prova.php +++ /dev/null @@ -1,39 +0,0 @@ - 500000) { - echo "Sorry, your file is too large."; - $uploadOk = 0; - } - // Check if $uploadOk is set to 0 by an error - if ($uploadOk == 0) { - echo "Sorry, your file was not uploaded."; - // if everything is ok, try to upload file - } else { - if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) { - echo "The file ". basename( $_FILES["fileToUpload"]["name"]). " has been uploaded."; - } else { - echo "Sorry, there was an error uploading your file."; - } - } - echo exec("php-cli main.php"); -?> - - - - - -
- Select file to upload: - - -
- diff --git a/Server/webApp/prova.php~ b/Server/webApp/prova.php~ deleted file mode 100755 index 0f7fcaa..0000000 --- a/Server/webApp/prova.php~ +++ /dev/null @@ -1,44 +0,0 @@ - 500000) { - echo "Sorry, your file is too large."; - $uploadOk = 0; - } - // Allow certain file formats - /*if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg" - && $imageFileType != "gif" ) { - echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed."; - $uploadOk = 0; - }*/ - // Check if $uploadOk is set to 0 by an error - if ($uploadOk == 0) { - echo "Sorry, your file was not uploaded."; - // if everything is ok, try to upload file - } else { - if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) { - echo "The file ". basename( $_FILES["fileToUpload"]["name"]). " has been uploaded."; - } else { - echo "Sorry, there was an error uploading your file."; - } - } -?> diff --git a/Server/webApp/prova.txt b/Server/webApp/prova.txt deleted file mode 100755 index 28c1837..0000000 --- a/Server/webApp/prova.txt +++ /dev/null @@ -1,2 +0,0 @@ -mi sei riuscito a scaricare - diff --git a/Server/webApp/prova.txt~ b/Server/webApp/prova.txt~ deleted file mode 100755 index e69de29..0000000 diff --git a/Server/webApp/serverRequest.php b/Server/webApp/serverRequest.php deleted file mode 100755 index 9140fd7..0000000 --- a/Server/webApp/serverRequest.php +++ /dev/null @@ -1,54 +0,0 @@ -"errore nella connessione al database"); - $ris=json_encode($arr); - echo $ris; - die; - } - if($result->name=='all') - $str="SELECT * FROM esercizi;"; - else - $str="SELECT * FROM esercizi WHERE esercizio='".$result->name."' ORDER BY esercizio;"; - $str=mysqli_query($con,$str); - if (!$str) - { - $arr= array('result'=>"nessun elemento presente"); - $ris=json_encode($arr); - echo $ris; - die; - } - $esercizi; - $risp=mysqli_fetch_array($str); - $risultati; - $esercizio['esercizio']=$risp['esercizio']; - do - { - if($esercizio['esercizio']==$risp['esercizio']) - { - //aggiungo utenti e click ell'es corrente - $risultati[]=array('id'=>$risp['id'],'utente'=>$risp['utente'],'click'=>$risp['click']); - } - else - { - //reimposto i campi per un nuovo esercizio - $esercizio['risultati']=$risultati; - $esercizi[]=$esercizio; - unset($esercizio); - unset($risultati); - $esercizio['esercizio']=$risp['esercizio']; - $risultati[]=array('id'=>$risp['id'],'utente'=>$risp['utente'],'click'=>$risp['click']); - } - }while($risp=mysqli_fetch_array($str)); - $esercizio['risultati']=$risultati; - $esercizi[]=$esercizio; - $ex=array('esercizi'=>$esercizi); - unset($esercizio); - unset($risultati); - $return_json=__json_encode($ex); - echo $return_json; -?> diff --git a/Server/webApp/upload.php b/Server/webApp/upload.php deleted file mode 100755 index 67c3a7a..0000000 --- a/Server/webApp/upload.php +++ /dev/null @@ -1,53 +0,0 @@ - 500000) { - echo "Sorry, your file is too large."; - $uploadOk = 0; - } - // Allow certain file formats - /*if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg" - && $imageFileType != "gif" ) { - echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed."; - $uploadOk = 0; - }*/ - // Check if $uploadOk is set to 0 by an error - if ($uploadOk == 0) { - echo "Sorry, your file was not uploaded."; - // if everything is ok, try to upload file - } else { - if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) { - echo "The file ". basename( $_FILES["fileToUpload"]["name"]). " has been uploaded."; - } else { - echo "Sorry, there was an error uploading your file."; - } - } -?> - - - - - -
- -
- diff --git a/Server/webApp/upload.php~ b/Server/webApp/upload.php~ deleted file mode 100755 index 9cf7a77..0000000 --- a/Server/webApp/upload.php~ +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/Server/webApp/util.php b/Server/webApp/util.php deleted file mode 100755 index 0c7fbec..0000000 --- a/Server/webApp/util.php +++ /dev/null @@ -1,41 +0,0 @@ - $value ) { - $items [] = __json_encode ( "$key" ) . ':' . __json_encode ( $value ); - } - $json = '{' . implode ( ',', $items ) . '}'; - } - } elseif (is_string ( $data )) { - $json = '"' . addcslashes ( $data, '\\"' ) . '"'; - } else { - // int, floats, bools, null - $json = strtolower ( var_export ( $data, true ) ); - } - return $json; -} - -function GET_check() -{ -if (!isset($_GET['scope']) or !isset($_GET['type']) or !($_GET['lat']) or !isset($_GET['lng']) or !isset($_GET['radius']) or !isset($_GET['timemin']) or !isset($_GET['timemax']) or !isset($_GET['status'])) - return false; -else return true; -} -function POST_check($params) -{ -if (!$params->type or !$params->lat or !$params->lng) return false; -else return true; -} - -function NOTIFY_check($params) -{ -if (!$params->event_id or !$params->lat or !$params->lng or !$params->status) return false; -else return true; -} -?> diff --git a/Server/webApp/xmlPharse.php b/Server/webApp/xmlPharse.php deleted file mode 100755 index a2090df..0000000 --- a/Server/webApp/xmlPharse.php +++ /dev/null @@ -1,11 +0,0 @@ -esercizio as $esercizio) - { - $esercizi['esercizi'][]="$esercizio"; - } - $return_json=__json_encode($esercizi); - echo $return_json; -?> diff --git a/Server/logintesi.sql b/logintesi.sql similarity index 100% rename from Server/logintesi.sql rename to logintesi.sql diff --git a/Server/server/tesi/.idea/compiler.xml b/server/tesi/.idea/compiler.xml similarity index 100% rename from Server/server/tesi/.idea/compiler.xml rename to server/tesi/.idea/compiler.xml diff --git a/Server/server/tesi/.idea/copyright/profiles_settings.xml b/server/tesi/.idea/copyright/profiles_settings.xml similarity index 100% rename from Server/server/tesi/.idea/copyright/profiles_settings.xml rename to server/tesi/.idea/copyright/profiles_settings.xml diff --git a/Server/server/tesi/.idea/description.html b/server/tesi/.idea/description.html similarity index 100% rename from Server/server/tesi/.idea/description.html rename to server/tesi/.idea/description.html diff --git a/Server/server/tesi/.idea/encodings.xml b/server/tesi/.idea/encodings.xml similarity index 100% rename from Server/server/tesi/.idea/encodings.xml rename to server/tesi/.idea/encodings.xml diff --git a/Server/server/tesi/.idea/misc.xml b/server/tesi/.idea/misc.xml similarity index 100% rename from Server/server/tesi/.idea/misc.xml rename to server/tesi/.idea/misc.xml diff --git a/Server/server/tesi/.idea/modules.xml b/server/tesi/.idea/modules.xml similarity index 100% rename from Server/server/tesi/.idea/modules.xml rename to server/tesi/.idea/modules.xml diff --git a/Server/server/tesi/.idea/project-template.xml b/server/tesi/.idea/project-template.xml similarity index 100% rename from Server/server/tesi/.idea/project-template.xml rename to server/tesi/.idea/project-template.xml diff --git a/Server/server/tesi/.idea/scopes/scope_settings.xml b/server/tesi/.idea/scopes/scope_settings.xml similarity index 100% rename from Server/server/tesi/.idea/scopes/scope_settings.xml rename to server/tesi/.idea/scopes/scope_settings.xml diff --git a/Server/server/tesi/.idea/uiDesigner.xml b/server/tesi/.idea/uiDesigner.xml similarity index 100% rename from Server/server/tesi/.idea/uiDesigner.xml rename to server/tesi/.idea/uiDesigner.xml diff --git a/Server/server/tesi/.idea/vcs.xml b/server/tesi/.idea/vcs.xml similarity index 100% rename from Server/server/tesi/.idea/vcs.xml rename to server/tesi/.idea/vcs.xml diff --git a/Server/server/tesi/.idea/workspace.xml b/server/tesi/.idea/workspace.xml similarity index 100% rename from Server/server/tesi/.idea/workspace.xml rename to server/tesi/.idea/workspace.xml diff --git a/Server/server/tesi/out/production/tesi/com/company/DirectoryWatcher.class b/server/tesi/out/production/tesi/com/company/DirectoryWatcher.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/DirectoryWatcher.class rename to server/tesi/out/production/tesi/com/company/DirectoryWatcher.class diff --git a/Server/server/tesi/out/production/tesi/com/company/EmailSender.class b/server/tesi/out/production/tesi/com/company/EmailSender.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/EmailSender.class rename to server/tesi/out/production/tesi/com/company/EmailSender.class diff --git a/Server/server/tesi/out/production/tesi/com/company/EsNameParser.class b/server/tesi/out/production/tesi/com/company/EsNameParser.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/EsNameParser.class rename to server/tesi/out/production/tesi/com/company/EsNameParser.class diff --git a/Server/server/tesi/out/production/tesi/com/company/MD5.class b/server/tesi/out/production/tesi/com/company/MD5.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/MD5.class rename to server/tesi/out/production/tesi/com/company/MD5.class diff --git a/Server/server/tesi/out/production/tesi/com/company/dbConnect.class b/server/tesi/out/production/tesi/com/company/dbConnect.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/dbConnect.class rename to server/tesi/out/production/tesi/com/company/dbConnect.class diff --git a/Server/server/tesi/out/production/tesi/com/company/esercizi.xml b/server/tesi/out/production/tesi/com/company/esercizi.xml similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/esercizi.xml rename to server/tesi/out/production/tesi/com/company/esercizi.xml diff --git a/Server/server/tesi/out/production/tesi/com/company/global.class b/server/tesi/out/production/tesi/com/company/global.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/global.class rename to server/tesi/out/production/tesi/com/company/global.class diff --git a/Server/server/tesi/out/production/tesi/com/company/guestServer.class b/server/tesi/out/production/tesi/com/company/guestServer.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/guestServer.class rename to server/tesi/out/production/tesi/com/company/guestServer.class diff --git a/Server/server/tesi/out/production/tesi/com/company/httpget$MyHandler.class b/server/tesi/out/production/tesi/com/company/httpget$MyHandler.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/httpget$MyHandler.class rename to server/tesi/out/production/tesi/com/company/httpget$MyHandler.class diff --git a/Server/server/tesi/out/production/tesi/com/company/httpget.class b/server/tesi/out/production/tesi/com/company/httpget.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/httpget.class rename to server/tesi/out/production/tesi/com/company/httpget.class diff --git a/Server/server/tesi/out/production/tesi/com/company/keystore.bks b/server/tesi/out/production/tesi/com/company/keystore.bks similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/keystore.bks rename to server/tesi/out/production/tesi/com/company/keystore.bks diff --git a/Server/server/tesi/out/production/tesi/com/company/keystore.crt b/server/tesi/out/production/tesi/com/company/keystore.crt similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/keystore.crt rename to server/tesi/out/production/tesi/com/company/keystore.crt diff --git a/Server/server/tesi/out/production/tesi/com/company/keystore.jks b/server/tesi/out/production/tesi/com/company/keystore.jks similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/keystore.jks rename to server/tesi/out/production/tesi/com/company/keystore.jks diff --git a/Server/server/tesi/out/production/tesi/com/company/personalServer.class b/server/tesi/out/production/tesi/com/company/personalServer.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/personalServer.class rename to server/tesi/out/production/tesi/com/company/personalServer.class diff --git a/Server/server/tesi/out/production/tesi/com/company/suString.class b/server/tesi/out/production/tesi/com/company/suString.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/suString.class rename to server/tesi/out/production/tesi/com/company/suString.class diff --git a/Server/server/tesi/out/production/tesi/com/company/superServer.class b/server/tesi/out/production/tesi/com/company/superServer.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/superServer.class rename to server/tesi/out/production/tesi/com/company/superServer.class diff --git a/Server/server/tesi/out/production/tesi/com/company/xmlOperation.class b/server/tesi/out/production/tesi/com/company/xmlOperation.class similarity index 100% rename from Server/server/tesi/out/production/tesi/com/company/xmlOperation.class rename to server/tesi/out/production/tesi/com/company/xmlOperation.class diff --git a/Server/server/tesi/out/production/testi/com/company/DeleteFileExample.class b/server/tesi/out/production/testi/com/company/DeleteFileExample.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/DeleteFileExample.class rename to server/tesi/out/production/testi/com/company/DeleteFileExample.class diff --git a/Server/server/tesi/out/production/testi/com/company/EmailSender.class b/server/tesi/out/production/testi/com/company/EmailSender.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/EmailSender.class rename to server/tesi/out/production/testi/com/company/EmailSender.class diff --git a/Server/server/tesi/out/production/testi/com/company/EsNameParser.class b/server/tesi/out/production/testi/com/company/EsNameParser.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/EsNameParser.class rename to server/tesi/out/production/testi/com/company/EsNameParser.class diff --git a/Server/server/tesi/out/production/testi/com/company/dbConnect.class b/server/tesi/out/production/testi/com/company/dbConnect.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/dbConnect.class rename to server/tesi/out/production/testi/com/company/dbConnect.class diff --git a/Server/server/tesi/out/production/testi/com/company/esercizi.xml b/server/tesi/out/production/testi/com/company/esercizi.xml similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/esercizi.xml rename to server/tesi/out/production/testi/com/company/esercizi.xml diff --git a/Server/server/tesi/out/production/testi/com/company/guestServer.class b/server/tesi/out/production/testi/com/company/guestServer.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/guestServer.class rename to server/tesi/out/production/testi/com/company/guestServer.class diff --git a/Server/server/tesi/out/production/testi/com/company/httpget$MyHandler.class b/server/tesi/out/production/testi/com/company/httpget$MyHandler.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/httpget$MyHandler.class rename to server/tesi/out/production/testi/com/company/httpget$MyHandler.class diff --git a/Server/server/tesi/out/production/testi/com/company/httpget.class b/server/tesi/out/production/testi/com/company/httpget.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/httpget.class rename to server/tesi/out/production/testi/com/company/httpget.class diff --git a/Server/server/tesi/out/production/testi/com/company/keystore.bks b/server/tesi/out/production/testi/com/company/keystore.bks similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/keystore.bks rename to server/tesi/out/production/testi/com/company/keystore.bks diff --git a/Server/server/tesi/out/production/testi/com/company/keystore.crt b/server/tesi/out/production/testi/com/company/keystore.crt similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/keystore.crt rename to server/tesi/out/production/testi/com/company/keystore.crt diff --git a/Server/server/tesi/out/production/testi/com/company/keystore.jks b/server/tesi/out/production/testi/com/company/keystore.jks similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/keystore.jks rename to server/tesi/out/production/testi/com/company/keystore.jks diff --git a/Server/server/tesi/out/production/testi/com/company/personalServer.class b/server/tesi/out/production/testi/com/company/personalServer.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/personalServer.class rename to server/tesi/out/production/testi/com/company/personalServer.class diff --git a/Server/server/tesi/out/production/testi/com/company/suString.class b/server/tesi/out/production/testi/com/company/suString.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/suString.class rename to server/tesi/out/production/testi/com/company/suString.class diff --git a/Server/server/tesi/out/production/testi/com/company/superServer.class b/server/tesi/out/production/testi/com/company/superServer.class similarity index 100% rename from Server/server/tesi/out/production/testi/com/company/superServer.class rename to server/tesi/out/production/testi/com/company/superServer.class diff --git a/Server/server/tesi/src/com/company/DeleteFileExample.class b/server/tesi/src/com/company/DeleteFileExample.class similarity index 100% rename from Server/server/tesi/src/com/company/DeleteFileExample.class rename to server/tesi/src/com/company/DeleteFileExample.class diff --git a/Server/server/tesi/src/com/company/DirectoryWatcher.class b/server/tesi/src/com/company/DirectoryWatcher.class similarity index 100% rename from Server/server/tesi/src/com/company/DirectoryWatcher.class rename to server/tesi/src/com/company/DirectoryWatcher.class diff --git a/Server/server/tesi/src/com/company/DirectoryWhatcer.java b/server/tesi/src/com/company/DirectoryWhatcer.java similarity index 100% rename from Server/server/tesi/src/com/company/DirectoryWhatcer.java rename to server/tesi/src/com/company/DirectoryWhatcer.java diff --git a/Server/server/tesi/src/com/company/EmailSender.class b/server/tesi/src/com/company/EmailSender.class similarity index 100% rename from Server/server/tesi/src/com/company/EmailSender.class rename to server/tesi/src/com/company/EmailSender.class diff --git a/Server/server/tesi/src/com/company/EmailSender.java b/server/tesi/src/com/company/EmailSender.java similarity index 100% rename from Server/server/tesi/src/com/company/EmailSender.java rename to server/tesi/src/com/company/EmailSender.java diff --git a/Server/server/tesi/src/com/company/EsNameParser.class b/server/tesi/src/com/company/EsNameParser.class similarity index 100% rename from Server/server/tesi/src/com/company/EsNameParser.class rename to server/tesi/src/com/company/EsNameParser.class diff --git a/Server/server/tesi/src/com/company/EsNameParser.java b/server/tesi/src/com/company/EsNameParser.java similarity index 100% rename from Server/server/tesi/src/com/company/EsNameParser.java rename to server/tesi/src/com/company/EsNameParser.java diff --git a/Server/server/tesi/src/com/company/MD5.class b/server/tesi/src/com/company/MD5.class similarity index 100% rename from Server/server/tesi/src/com/company/MD5.class rename to server/tesi/src/com/company/MD5.class diff --git a/Server/server/tesi/src/com/company/MD5.java b/server/tesi/src/com/company/MD5.java similarity index 100% rename from Server/server/tesi/src/com/company/MD5.java rename to server/tesi/src/com/company/MD5.java diff --git a/Server/server/tesi/src/com/company/Makefile b/server/tesi/src/com/company/Makefile similarity index 100% rename from Server/server/tesi/src/com/company/Makefile rename to server/tesi/src/com/company/Makefile diff --git a/Server/server/tesi/src/com/company/dbConnect.class b/server/tesi/src/com/company/dbConnect.class similarity index 100% rename from Server/server/tesi/src/com/company/dbConnect.class rename to server/tesi/src/com/company/dbConnect.class diff --git a/Server/server/tesi/src/com/company/dbConnect.java b/server/tesi/src/com/company/dbConnect.java similarity index 100% rename from Server/server/tesi/src/com/company/dbConnect.java rename to server/tesi/src/com/company/dbConnect.java diff --git a/Server/server/tesi/src/com/company/esercizi.xml b/server/tesi/src/com/company/esercizi.xml similarity index 100% rename from Server/server/tesi/src/com/company/esercizi.xml rename to server/tesi/src/com/company/esercizi.xml diff --git a/Server/server/tesi/src/com/company/esercizi.xml~ b/server/tesi/src/com/company/esercizi.xml~ similarity index 100% rename from Server/server/tesi/src/com/company/esercizi.xml~ rename to server/tesi/src/com/company/esercizi.xml~ diff --git a/Server/server/tesi/src/com/company/global.class b/server/tesi/src/com/company/global.class similarity index 100% rename from Server/server/tesi/src/com/company/global.class rename to server/tesi/src/com/company/global.class diff --git a/Server/server/tesi/src/com/company/global.java b/server/tesi/src/com/company/global.java similarity index 100% rename from Server/server/tesi/src/com/company/global.java rename to server/tesi/src/com/company/global.java diff --git a/Server/server/tesi/src/com/company/guestServer.class b/server/tesi/src/com/company/guestServer.class similarity index 100% rename from Server/server/tesi/src/com/company/guestServer.class rename to server/tesi/src/com/company/guestServer.class diff --git a/Server/server/tesi/src/com/company/guestServer.java b/server/tesi/src/com/company/guestServer.java similarity index 100% rename from Server/server/tesi/src/com/company/guestServer.java rename to server/tesi/src/com/company/guestServer.java diff --git a/Server/server/tesi/src/com/company/httpget$MyHandler.class b/server/tesi/src/com/company/httpget$MyHandler.class similarity index 100% rename from Server/server/tesi/src/com/company/httpget$MyHandler.class rename to server/tesi/src/com/company/httpget$MyHandler.class diff --git a/Server/server/tesi/src/com/company/httpget.class b/server/tesi/src/com/company/httpget.class similarity index 100% rename from Server/server/tesi/src/com/company/httpget.class rename to server/tesi/src/com/company/httpget.class diff --git a/Server/server/tesi/src/com/company/httpget.java b/server/tesi/src/com/company/httpget.java similarity index 100% rename from Server/server/tesi/src/com/company/httpget.java rename to server/tesi/src/com/company/httpget.java diff --git a/Server/server/tesi/src/com/company/keystore.bks b/server/tesi/src/com/company/keystore.bks similarity index 100% rename from Server/server/tesi/src/com/company/keystore.bks rename to server/tesi/src/com/company/keystore.bks diff --git a/Server/server/tesi/src/com/company/keystore.crt b/server/tesi/src/com/company/keystore.crt similarity index 100% rename from Server/server/tesi/src/com/company/keystore.crt rename to server/tesi/src/com/company/keystore.crt diff --git a/Server/server/tesi/src/com/company/keystore.jks b/server/tesi/src/com/company/keystore.jks similarity index 100% rename from Server/server/tesi/src/com/company/keystore.jks rename to server/tesi/src/com/company/keystore.jks diff --git a/Server/server/tesi/src/com/company/personalServer.class b/server/tesi/src/com/company/personalServer.class similarity index 100% rename from Server/server/tesi/src/com/company/personalServer.class rename to server/tesi/src/com/company/personalServer.class diff --git a/Server/server/tesi/src/com/company/personalServer.java b/server/tesi/src/com/company/personalServer.java similarity index 100% rename from Server/server/tesi/src/com/company/personalServer.java rename to server/tesi/src/com/company/personalServer.java diff --git a/Server/server/tesi/src/com/company/suString.class b/server/tesi/src/com/company/suString.class similarity index 100% rename from Server/server/tesi/src/com/company/suString.class rename to server/tesi/src/com/company/suString.class diff --git a/Server/server/tesi/src/com/company/suString.java b/server/tesi/src/com/company/suString.java similarity index 100% rename from Server/server/tesi/src/com/company/suString.java rename to server/tesi/src/com/company/suString.java diff --git a/Server/server/tesi/src/com/company/superServer.class b/server/tesi/src/com/company/superServer.class similarity index 100% rename from Server/server/tesi/src/com/company/superServer.class rename to server/tesi/src/com/company/superServer.class diff --git a/Server/server/tesi/src/com/company/superServer.java b/server/tesi/src/com/company/superServer.java similarity index 100% rename from Server/server/tesi/src/com/company/superServer.java rename to server/tesi/src/com/company/superServer.java diff --git a/Server/server/tesi/src/com/company/testEsname.class b/server/tesi/src/com/company/testEsname.class similarity index 100% rename from Server/server/tesi/src/com/company/testEsname.class rename to server/tesi/src/com/company/testEsname.class diff --git a/Server/server/tesi/src/com/company/xmlOperation.class b/server/tesi/src/com/company/xmlOperation.class similarity index 100% rename from Server/server/tesi/src/com/company/xmlOperation.class rename to server/tesi/src/com/company/xmlOperation.class diff --git a/Server/server/tesi/src/com/company/xmlOperation.java b/server/tesi/src/com/company/xmlOperation.java similarity index 100% rename from Server/server/tesi/src/com/company/xmlOperation.java rename to server/tesi/src/com/company/xmlOperation.java diff --git a/Server/server/tesi/src/go.sh b/server/tesi/src/go.sh similarity index 100% rename from Server/server/tesi/src/go.sh rename to server/tesi/src/go.sh diff --git a/Server/server/tesi/tesi.iml b/server/tesi/tesi.iml similarity index 100% rename from Server/server/tesi/tesi.iml rename to server/tesi/tesi.iml -- 2.39.2