Tampon

.gitignore

@@ -20,8 +20,11 @@ src/main/javascript/client/SXP*
 /logs/
 /simpleDb/
 src/main/js/SXP-linux-x64/
+src/main/js/SXP-darwin-x64/
 src/main/js/node_modules/
 certConfig.conf
 keystore.jks
 .cache*
 derby.log
+SXP.iml
+/.idea/

.gitlab-ci.yml

@@ -51,7 +51,10 @@ tests:
   except:
     - master
 
-
+ deploy:
+   stage: deploy
+   script:
+     - ./deploy
 #selenium:
 #  stage: test
 #  image: selenium/standalone-firefox

build.gradle

@@ -10,23 +10,23 @@ jacoco {
 
 //Adding Google java format and sonar pluggins for jdk >= 8
 buildscript {
-  repositories {
-	maven {
-      url "https://plugins.gradle.org/m2/"
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        //classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.3.2"
+        if (JavaVersion.current() >= JavaVersion.VERSION_1_8) {
+            classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.1"
+        }
+        classpath "com.netflix.nebula:nebula-ospackage-plugin:3.+"
     }
-  }
-  dependencies {
-    //classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.3.2"
-     if(JavaVersion.current()>= JavaVersion.VERSION_1_8){
-    	classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.1"
-	}
-	classpath "com.netflix.nebula:nebula-ospackage-plugin:3.+"
-  }
 }
 
 //apply plugin: "com.github.sherter.google-java-format"
-if(JavaVersion.current()>= JavaVersion.VERSION_1_8){
-	apply plugin: "org.sonarqube"
+if (JavaVersion.current() >= JavaVersion.VERSION_1_8) {
+    apply plugin: "org.sonarqube"
 }
 
 
@@ -37,15 +37,17 @@ targetCompatibility = 1.7
 repositories {
     mavenCentral()
     maven {
+
     	url 'http://www.janus-project.org/maven'
         url uri('libs')
+
     }
 }
 jar {
-	manifest {
-		attributes 'Implementation-Title': 'SXP network',
-				   'Implementation-Version': 1.0
-	}
+    manifest {
+        attributes 'Implementation-Title': 'SXP network',
+                'Implementation-Version': 1.0
+    }
 }
 
 sourceSets.main.resources.srcDirs += ["src/main/resources"]
@@ -57,15 +59,15 @@ configurations {
 }
 
 //Define selenium sources and resources
-sourceSets {	
-	selenium {
+sourceSets {
+    selenium {
         java {
             compileClasspath += main.output + test.output
             runtimeClasspath += main.output + test.output
             srcDir file('src/selenium/java')
         }
         resources.srcDir file('src/selenium/resources')
-    }    
+    }
 }
 
 //selenium task
@@ -75,28 +77,28 @@ task selenium(type: Test) {
     testClassesDir = sourceSets.selenium.output.classesDir
     classpath = sourceSets.selenium.runtimeClasspath
     outputs.upToDateWhen { false }
-   // jvmArgs ""
+    // jvmArgs ""
 }
 
-test{
- //exclude 'model/syncManager/**'
- //exclude 'controller/**'
- //exclude 'crypt/**'
- //exclude 'model/entity/**'
- //exclude 'model/validator/**'
- //exclude 'network/**'
- //exclude 'protocol/**'
- //exclude 'rest/**'
- //exclude 'util/**'
- 
-   testLogging {
-       showStandardStreams = false
-       showExceptions = false
-       showStackTraces = false
-   }
- 
- 
- if (System.getProperty('DEBUG', 'false') == 'true') {
+test {
+    //exclude 'model/syncManager/**'
+    //exclude 'controller/**'
+    //exclude 'crypt/**'
+    //exclude 'model/entity/**'
+    //exclude 'model/validator/**'
+    //exclude 'network/**'
+    //exclude 'protocol/**'
+    //exclude 'rest/**'
+    //exclude 'util/**'
+
+    testLogging {
+        showStandardStreams = false
+        showExceptions = false
+        showStackTraces = false
+    }
+
+
+    if (System.getProperty('DEBUG', 'false') == 'true') {
         jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006'
     }
 }
@@ -130,52 +132,53 @@ tasks.withType(Test) {
 }
 
 dependencies {
-	
-	compile 'org.hibernate:hibernate-validator:5.2.4.Final'
-	
-	compile 'org.apache.logging.log4j:log4j-api:2.1'
-  	compile 'org.apache.logging.log4j:log4j-core:2.1'
-  	compile 'org.apache.logging.log4j:log4j-1.2-api:2.1'
-  	compile 'org.apache.logging.log4j:log4j-web:2.5'
-  	
-   	compile 'org.eclipse.jetty:jetty-server:9.2+'
-	compile 'org.eclipse.jetty:jetty-servlet:9.2+'
-  	compile 'org.eclipse.jetty:jetty-webapp:9.3+'
+
+    compile 'org.hibernate:hibernate-validator:5.2.4.Final'
+
+    compile 'org.apache.logging.log4j:log4j-api:2.1'
+    compile 'org.apache.logging.log4j:log4j-core:2.1'
+    compile 'org.apache.logging.log4j:log4j-1.2-api:2.1'
+    compile 'org.apache.logging.log4j:log4j-web:2.5'
+
+    compile 'org.eclipse.jetty:jetty-server:9.2+'
+    compile 'org.eclipse.jetty:jetty-servlet:9.2+'
+    compile 'org.eclipse.jetty:jetty-webapp:9.3+'
     compile 'org.eclipse.jetty:jetty-util:9.2+'
-  	//compile 'org.eclipse.jetty:apache-jsp:9.2+'
-  	//compile 'org.eclipse.jetty:apache-jstl:9.2+'
-
-	compile 'org.apache.commons:commons-collections4:4.0'
-
-	compile 'org.glassfish.jersey.core:jersey-server:2.7'
-	compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.7'
-	compile 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.7'
-	compile 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.7'
-	compile 'org.glassfish.jersey.media:jersey-media-moxy:2.7'
-	compile 'javax:javaee-api:7.0'
-	compile 'org.apache.derby:derby:10.12.1.1'
-	compile 'org.eclipse.persistence:eclipselink:2.6.3-M1'
-	compile 'org.eclipse.persistence:javax.persistence:2.1.1'
-	compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3'
-	compile fileTree(dir: './libs', include: '*.jar')
-	compile ('com.kenai.jxse:jxse:2.7')
-        {
-                // org.jboss.netty has moved to io.netty
-		exclude group: 'org.jboss.netty', module: 'httptunnel'
-	}
-	compile 'org.jdom:jdom2:2.0.6'
-	compile 'com.google.guava:guava:19.0'
-	compile 'org.shredzone.acme4j:acme4j-utils:0.8'
-	compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3'
-
-	compile 'org.hibernate:hibernate-validator:5.3.3.Final'
-	compile 'javax.el:javax.el-api:2.2.4'
-	compile 'org.glassfish.web:javax.el:2.2.4'
-
-
-	testCompile 'org.apache.commons:commons-lang3:3.1'
-	testCompile fileTree(dir: './libs', include: 'loremipsum-1.0.jar')
-	testCompile group: 'junit', name: 'junit', version: '4.+'
+    //compile 'org.eclipse.jetty:apache-jsp:9.2+'
+    //compile 'org.eclipse.jetty:apache-jstl:9.2+'
+
+    compile 'org.apache.commons:commons-collections4:4.0'
+
+    compile 'org.glassfish.jersey.core:jersey-server:2.7'
+    compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.7'
+    compile 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.7'
+    compile 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.7'
+    compile 'org.glassfish.jersey.media:jersey-media-moxy:2.7'
+    compile 'javax:javaee-api:7.0'
+    compile 'org.apache.derby:derby:10.12.1.1'
+    compile 'org.eclipse.persistence:eclipselink:2.6.3-M1'
+    compile 'org.eclipse.persistence:javax.persistence:2.1.1'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3'
+    compile 'io.netty:netty-all:4.0.24.Final'
+    compile('com.kenai.jxse:jxse:2.7') {
+        exclude group: 'org.jboss.netty', module: 'httptunnel'
+
+    }
+    compile 'org.jdom:jdom2:2.0.6'
+    compile fileTree(dir: './libs', include: '*.jar')
+    compile 'com.google.guava:guava:19.0'
+    compile 'org.shredzone.acme4j:acme4j-utils:0.8'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3'
+
+    compile 'org.hibernate:hibernate-validator:5.3.3.Final'
+    compile 'javax.el:javax.el-api:2.2.4'
+    compile 'org.glassfish.web:javax.el:2.2.4'
+
+
+    testCompile 'org.apache.commons:commons-lang3:3.1'
+    testCompile fileTree(dir: './libs', include: 'loremipsum-1.0.jar')
+    testCompile group: 'junit', name: 'junit', version: '4.+'
+
     testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.16.0'
     testCompile group: 'org.json', name: 'json', version: '20160810'
     seleniumCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.0.1'
@@ -184,20 +187,19 @@ dependencies {
 configurations.all {
     exclude group: "log4j", module: "log4j"
 }
-
 [compileJava, compileTestJava]*.options.collect {options -> 
 options.encoding = 'UTF-8'} 
 
 eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
+    classpath {
+        downloadSources = true
+        downloadJavadoc = true
+    }
 }
 
 //Copy dependencies in the libs directory
 task libs(type: Sync) {
-	from configurations.compile
+    from configurations.compile
     //from configurations.runtime
     from configurations.testCompile
     from configurations.seleniumCompile

docs/_layouts/default.html

@@ -1,63 +1,73 @@
 <!DOCTYPE html>
-<html lang="{{ site.lang | default: "en-US" }}">
+<html lang="{{ site.lang | default: " en-US" }}">
 
-  <head>
+<head>
     <meta charset='utf-8'>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="viewport" content="width=device-width,maximum-scale=2">
-    <meta name="description" content="{{ site.title | default: site.github.repository_name }} : {{ site.description | default: site.github.project_tagline }}">
+    <meta name="description"
+          content="{{ site.title | default: site.github.repository_name }} : {{ site.description | default: site.github.project_tagline }}">
 
-    <link rel="stylesheet" type="text/css" media="screen" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+    <link rel="stylesheet" type="text/css" media="screen"
+          href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
 
     <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    securely exchange anything, anywhere, with anyone.
-    <!-- HEADER -->
-    <div id="header_wrap" class="outer">
-        <header class="inner">
-          <a id="forkme_banner" href="{{ site.github.repository_url }}">View on GitHub</a>
-
-          <!-- <h1 id="project_title">{{ site.title | default: site.github.repository_name }}</h1> -->
-          <a href="https://pja35.github.io/SXP/wiki/"><img src="/SXP/images/sxp.svg" height=108px width=622px /></a>
-          <h2 id="project_tagline">{{ site.description | default: site.github.project_tagline }}</h2>
-
-          {% if site.show_downloads %}
-            <section id="downloads">
-              <a class="zip_download_link" href="{{ site.github.zip_url }}">Download this project as a .zip file</a>
-              <a class="tar_download_link" href="{{ site.github.tar_url }}">Download this project as a tar.gz file</a>
-            </section>
-          {% endif %}
-        </header>
-    </div>
-
-    <!-- MAIN CONTENT -->
-    <div id="main_content_wrap" class="outer">
-      <section id="main_content" class="inner">
+</head>
+
+<body>
+securely exchange anything, anywhere, with anyone.
+<!-- HEADER -->
+<div id="header_wrap" class="outer">
+    <header class="inner">
+        <a id="forkme_banner" href="{{ site.github.repository_url }}">View on GitHub</a>
+
+        <!-- <h1 id="project_title">{{ site.title | default: site.github.repository_name }}</h1> -->
+        <a href="https://pja35.github.io/SXP/wiki/"><img src="/SXP/images/sxp.svg" height=108px width=622px/></a>
+        <h2 id="project_tagline">{{ site.description | default: site.github.project_tagline }}</h2>
+
+        {% if site.show_downloads %}
+        <section id="downloads">
+            <a class="zip_download_link" href="{{ site.github.zip_url }}">Download this project as a .zip file</a>
+            <a class="tar_download_link" href="{{ site.github.tar_url }}">Download this project as a tar.gz file</a>
+        </section>
+        {% endif %}
+    </header>
+</div>
+
+<!-- MAIN CONTENT -->
+<div id="main_content_wrap" class="outer">
+    <section id="main_content" class="inner">
         {{ content }}
-      </section>
-    </div>
+    </section>
+</div>
 
-    <!-- FOOTER  -->
-    <div id="footer_wrap" class="outer">
-      <footer class="inner">
+<!-- FOOTER  -->
+<div id="footer_wrap" class="outer">
+    <footer class="inner">
         {% if site.github.is_project_page %}
-        <p class="copyright">{{ site.title | default: site.github.repository_name }} maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
+        <p class="copyright">{{ site.title | default: site.github.repository_name }} maintained by <a
+                href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
         {% endif %}
         <p>Published with <a href="https://pages.github.com">GitHub Pages</a></p>
-      </footer>
-    </div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', '{{ site.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-      </script>
-    {% endif %}
-  </body>
+    </footer>
+</div>
+
+{% if site.google_analytics %}
+<script type="text/javascript">
+    (function (i, s, o, g, r, a, m) {
+        i['GoogleAnalyticsObject'] = r;
+        i[r] = i[r] || function () {
+            (i[r].q = i[r].q || []).push(arguments)
+        }, i[r].l = 1 * new Date();
+        a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0];
+        a.async = 1;
+        a.src = g;
+        m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+    ga('create', '{{ site.google_analytics }}', 'auto');
+    ga('send', 'pageview');
+</script>
+{% endif %}
+</body>
 </html>