[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libeufin] branch master updated: init nexus
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [libeufin] branch master updated: init nexus |
|
Date: |
Tue, 08 Oct 2019 12:28:07 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository libeufin.
The following commit(s) were added to refs/heads/master by this push:
new 323e087 init nexus
323e087 is described below
commit 323e08712336ae3b7ef01fc5c5f813cb8182ab50
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Oct 8 12:27:55 2019 +0200
init nexus
---
.idea/modules.xml | 8 ---
build.gradle | 81 ++++++++++------------
nexus/build.gradle | 22 ++++++
nexus/src/main/kotlin/Main.kt | 60 ++++++++++++++++
sandbox/build.gradle | 19 +++++
.../tech/libeufin/messages/HEVRequestDataType.java | 0
.../libeufin/messages/HEVResponseDataType.java | 0
.../java/tech/libeufin/messages/ObjectFactory.java | 0
.../libeufin/messages/SystemReturnCodeType.java | 0
.../src}/main/kotlin/tech/libeufin/DB.kt | 2 +-
.../src}/main/kotlin/tech/libeufin/GetLogger.kt | 2 +-
.../src}/main/kotlin/tech/libeufin/HEVResponse.kt | 2 +-
.../src}/main/kotlin/tech/libeufin/JSON.kt | 2 +-
.../src}/main/kotlin/tech/libeufin/Main.kt | 2 +-
.../kotlin/tech/libeufin/ProtocolAndVersion.kt | 2 +-
.../src}/main/kotlin/tech/libeufin/XML.kt | 2 +-
{src => sandbox/src}/main/python/libeufin-cli | 0
{src => sandbox/src}/main/resources/ebics_H004.xsd | 0
{src => sandbox/src}/main/resources/ebics_hev.xsd | 0
.../main/resources/ebics_keymgmt_request_H004.xsd | 0
.../main/resources/ebics_keymgmt_response_H004.xsd | 0
.../src}/main/resources/ebics_orders_H004.xsd | 0
.../src}/main/resources/ebics_request_H004.xsd | 0
.../src}/main/resources/ebics_response_H004.xsd | 0
.../src}/main/resources/ebics_signature_S002.xsd | 0
.../src}/main/resources/ebics_signatures.xsd | 0
.../src}/main/resources/ebics_types_H004.xsd | 0
.../src}/main/resources/xmldsig-core-schema.xsd | 0
{src => sandbox/src}/test/kotlin/XmlTest.kt | 0
.../HEVresponse-from-official-documentation.xml | 0
{src => sandbox/src}/test/resources/ebics_hev.xml | 0
.../test/resources/ebics_ini_request_sample.xml | 0
.../src}/test/resources/hev_resp3.0.xml | 0
.../src}/test/resources/hev_resp_libeufin.xml | 0
settings.gradle | 4 +-
35 files changed, 146 insertions(+), 62 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 7eca8b7..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/modules/libeufin.iml"
filepath="$PROJECT_DIR$/.idea/modules/libeufin.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 06b813f..9d2da2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,59 +1,48 @@
plugins {
- id 'java'
- id 'application'
- id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+ id "org.jetbrains.kotlin.jvm" version "1.3.50"
}
-version '1.0-SNAPSHOT'
+allprojects {
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-repositories {
- mavenCentral()
- jcenter()
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- implementation "io.ktor:ktor-gson:1.1.5"
- // compile group: 'io.ktor', name: 'ktor-gson', version: '0.9.0'
- compile "org.jetbrains.exposed:exposed:0.17.3"
- compile "io.ktor:ktor-server-netty:1.2.4"
- compile "ch.qos.logback:logback-classic:1.2.3"
- compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
- compile('javax.xml.bind:jaxb-api:2.3.0')
- compile('javax.activation:activation:1.1')
- compile('org.glassfish.jaxb:jaxb-runtime:2.3.0')
- testCompile group: 'junit', name: 'junit', version: '4.12'
-}
-
-compileKotlin {
- kotlinOptions {
- jvmTarget = "1.8"
- }
-}
-compileTestKotlin {
- kotlinOptions {
- jvmTarget = "1.8"
+ repositories {
+ mavenCentral()
+ jcenter()
}
}
-application {
- mainClassName = "tech.libeufin.MainKt"
-}
+subprojects {
-jar {
- manifest {
- attributes "Main-Class": "tech.libeufin.MainKt"
+ version '1.0-SNAPSHOT'
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ compileKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
}
- from {
- configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+ compileTestKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
}
-}
-test {
- useJUnit()
-}
+ apply plugin : "application"
+ apply plugin : "java"
+
+ dependencies {
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+ implementation "io.ktor:ktor-gson:1.1.5"
+ compile group: 'io.ktor', name: 'ktor-gson', version: '0.9.0'
+ compile "org.jetbrains.exposed:exposed:0.17.3"
+ compile "io.ktor:ktor-server-netty:1.2.4"
+ compile "ch.qos.logback:logback-classic:1.2.3"
+ compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+ compile "javax.xml.bind:jaxb-api:2.3.0"
+ compile "javax.activation:activation:1.1"
+ compile "org.glassfish.jaxb:jaxb-runtime:2.3.0"
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+ }
+
+}
\ No newline at end of file
diff --git a/nexus/build.gradle b/nexus/build.gradle
new file mode 100644
index 0000000..d8464b6
--- /dev/null
+++ b/nexus/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+ id "org.jetbrains.kotlin.jvm"
+}
+
+application {
+ mainClassName = "tech.libeufin.nexus.MainKt"
+}
+
+dependencies {
+ implementation project(":sandbox")
+}
+
+jar {
+ manifest {
+ attributes "Main-Class": "tech.libeufin.nexus.MainKt"
+
+ }
+
+ from {
+ configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+ }
+}
\ No newline at end of file
diff --git a/nexus/src/main/kotlin/Main.kt b/nexus/src/main/kotlin/Main.kt
new file mode 100644
index 0000000..11b5bbe
--- /dev/null
+++ b/nexus/src/main/kotlin/Main.kt
@@ -0,0 +1,60 @@
+/*
+ * This file is part of LibEuFin.
+ * Copyright (C) 2019 Stanisci and Dold.
+
+ * LibEuFin is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3, or
+ * (at your option) any later version.
+
+ * LibEuFin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
+ * Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public
+ * License along with LibEuFin; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+package tech.libeufin.nexus
+
+import io.ktor.application.call
+import io.ktor.application.install
+import io.ktor.features.CallLogging
+import io.ktor.features.ContentNegotiation
+import io.ktor.gson.gson
+import io.ktor.response.respondText
+import io.ktor.routing.get
+import io.ktor.routing.post
+import io.ktor.routing.routing
+import io.ktor.server.engine.embeddedServer
+import io.ktor.server.netty.Netty
+import java.text.DateFormat
+
+fun main() {
+ val server = embeddedServer(Netty, port = 5001) {
+
+ install(CallLogging)
+ install(ContentNegotiation) {
+ gson {
+ setDateFormat(DateFormat.LONG)
+ setPrettyPrinting()
+ }
+ }
+
+ routing {
+ get("/") {
+ call.respondText("Hello by Nexus!\n")
+ return@get
+ }
+
+ post("/nexus") {
+ call.respondText("Not implemented!\n")
+ return@post
+ }
+
+ }
+ }
+ server.start(wait = true)
+}
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
new file mode 100644
index 0000000..26dbd19
--- /dev/null
+++ b/sandbox/build.gradle
@@ -0,0 +1,19 @@
+plugins {
+ // FIXME: must go into the global file.
+ id "org.jetbrains.kotlin.jvm"
+}
+
+application {
+ mainClassName = "tech.libeufin.sandbox.MainKt"
+}
+
+jar {
+ manifest {
+ attributes "Main-Class": "tech.libeufin.sandbox.MainKt"
+
+ }
+
+ from {
+ configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/tech/libeufin/messages/HEVRequestDataType.java
b/sandbox/src/main/java/tech/libeufin/messages/HEVRequestDataType.java
similarity index 100%
rename from src/main/java/tech/libeufin/messages/HEVRequestDataType.java
rename to sandbox/src/main/java/tech/libeufin/messages/HEVRequestDataType.java
diff --git a/src/main/java/tech/libeufin/messages/HEVResponseDataType.java
b/sandbox/src/main/java/tech/libeufin/messages/HEVResponseDataType.java
similarity index 100%
rename from src/main/java/tech/libeufin/messages/HEVResponseDataType.java
rename to sandbox/src/main/java/tech/libeufin/messages/HEVResponseDataType.java
diff --git a/src/main/java/tech/libeufin/messages/ObjectFactory.java
b/sandbox/src/main/java/tech/libeufin/messages/ObjectFactory.java
similarity index 100%
rename from src/main/java/tech/libeufin/messages/ObjectFactory.java
rename to sandbox/src/main/java/tech/libeufin/messages/ObjectFactory.java
diff --git a/src/main/java/tech/libeufin/messages/SystemReturnCodeType.java
b/sandbox/src/main/java/tech/libeufin/messages/SystemReturnCodeType.java
similarity index 100%
rename from src/main/java/tech/libeufin/messages/SystemReturnCodeType.java
rename to sandbox/src/main/java/tech/libeufin/messages/SystemReturnCodeType.java
diff --git a/src/main/kotlin/tech/libeufin/DB.kt
b/sandbox/src/main/kotlin/tech/libeufin/DB.kt
similarity index 99%
rename from src/main/kotlin/tech/libeufin/DB.kt
rename to sandbox/src/main/kotlin/tech/libeufin/DB.kt
index f477b10..f1e24a7 100644
--- a/src/main/kotlin/tech/libeufin/DB.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/DB.kt
@@ -1,4 +1,4 @@
-package tech.libeufin
+package tech.libeufin.sandbox
import org.jetbrains.exposed.dao.*
import org.jetbrains.exposed.sql.*
diff --git a/src/main/kotlin/tech/libeufin/GetLogger.kt
b/sandbox/src/main/kotlin/tech/libeufin/GetLogger.kt
similarity index 96%
rename from src/main/kotlin/tech/libeufin/GetLogger.kt
rename to sandbox/src/main/kotlin/tech/libeufin/GetLogger.kt
index be03ba3..83f2c50 100644
--- a/src/main/kotlin/tech/libeufin/GetLogger.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/GetLogger.kt
@@ -1,4 +1,4 @@
-package tech.libeufin;
+package tech.libeufin.sandbox
import ch.qos.logback.classic.Level
import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/tech/libeufin/HEVResponse.kt
b/sandbox/src/main/kotlin/tech/libeufin/HEVResponse.kt
similarity index 97%
rename from src/main/kotlin/tech/libeufin/HEVResponse.kt
rename to sandbox/src/main/kotlin/tech/libeufin/HEVResponse.kt
index 97370d3..cd9f782 100644
--- a/src/main/kotlin/tech/libeufin/HEVResponse.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/HEVResponse.kt
@@ -1,4 +1,4 @@
-package tech.libeufin
+package tech.libeufin.sandbox
import tech.libeufin.messages.HEVResponseDataType
import tech.libeufin.messages.ObjectFactory
diff --git a/src/main/kotlin/tech/libeufin/JSON.kt
b/sandbox/src/main/kotlin/tech/libeufin/JSON.kt
similarity index 97%
rename from src/main/kotlin/tech/libeufin/JSON.kt
rename to sandbox/src/main/kotlin/tech/libeufin/JSON.kt
index b20951a..ac78da6 100644
--- a/src/main/kotlin/tech/libeufin/JSON.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/JSON.kt
@@ -1,4 +1,4 @@
-package tech.libeufin
+package tech.libeufin.sandbox
/**
* Error message.
diff --git a/src/main/kotlin/tech/libeufin/Main.kt
b/sandbox/src/main/kotlin/tech/libeufin/Main.kt
similarity index 99%
rename from src/main/kotlin/tech/libeufin/Main.kt
rename to sandbox/src/main/kotlin/tech/libeufin/Main.kt
index 7e2bf3d..b2ad70e 100644
--- a/src/main/kotlin/tech/libeufin/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/Main.kt
@@ -17,7 +17,7 @@
* <http://www.gnu.org/licenses/>
*/
-package tech.libeufin
+package tech.libeufin.sandbox
import io.ktor.application.call
import io.ktor.application.install
diff --git a/src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
b/sandbox/src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
similarity index 79%
rename from src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
rename to sandbox/src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
index 54bd465..e69f08b 100644
--- a/src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/ProtocolAndVersion.kt
@@ -1,4 +1,4 @@
-package tech.libeufin
+package tech.libeufin.sandbox
class ProtocolAndVersion(protocol: String, version: String) {
val protocol = protocol
diff --git a/src/main/kotlin/tech/libeufin/XML.kt
b/sandbox/src/main/kotlin/tech/libeufin/XML.kt
similarity index 99%
rename from src/main/kotlin/tech/libeufin/XML.kt
rename to sandbox/src/main/kotlin/tech/libeufin/XML.kt
index 4cd4836..f7cc319 100644
--- a/src/main/kotlin/tech/libeufin/XML.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/XML.kt
@@ -17,7 +17,7 @@
* <http://www.gnu.org/licenses/>
*/
-package tech.libeufin
+package tech.libeufin.sandbox
import com.sun.org.apache.xerces.internal.dom.DOMInputImpl
import org.w3c.dom.Document
diff --git a/src/main/python/libeufin-cli b/sandbox/src/main/python/libeufin-cli
similarity index 100%
rename from src/main/python/libeufin-cli
rename to sandbox/src/main/python/libeufin-cli
diff --git a/src/main/resources/ebics_H004.xsd
b/sandbox/src/main/resources/ebics_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_H004.xsd
rename to sandbox/src/main/resources/ebics_H004.xsd
diff --git a/src/main/resources/ebics_hev.xsd
b/sandbox/src/main/resources/ebics_hev.xsd
similarity index 100%
rename from src/main/resources/ebics_hev.xsd
rename to sandbox/src/main/resources/ebics_hev.xsd
diff --git a/src/main/resources/ebics_keymgmt_request_H004.xsd
b/sandbox/src/main/resources/ebics_keymgmt_request_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_keymgmt_request_H004.xsd
rename to sandbox/src/main/resources/ebics_keymgmt_request_H004.xsd
diff --git a/src/main/resources/ebics_keymgmt_response_H004.xsd
b/sandbox/src/main/resources/ebics_keymgmt_response_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_keymgmt_response_H004.xsd
rename to sandbox/src/main/resources/ebics_keymgmt_response_H004.xsd
diff --git a/src/main/resources/ebics_orders_H004.xsd
b/sandbox/src/main/resources/ebics_orders_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_orders_H004.xsd
rename to sandbox/src/main/resources/ebics_orders_H004.xsd
diff --git a/src/main/resources/ebics_request_H004.xsd
b/sandbox/src/main/resources/ebics_request_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_request_H004.xsd
rename to sandbox/src/main/resources/ebics_request_H004.xsd
diff --git a/src/main/resources/ebics_response_H004.xsd
b/sandbox/src/main/resources/ebics_response_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_response_H004.xsd
rename to sandbox/src/main/resources/ebics_response_H004.xsd
diff --git a/src/main/resources/ebics_signature_S002.xsd
b/sandbox/src/main/resources/ebics_signature_S002.xsd
similarity index 100%
rename from src/main/resources/ebics_signature_S002.xsd
rename to sandbox/src/main/resources/ebics_signature_S002.xsd
diff --git a/src/main/resources/ebics_signatures.xsd
b/sandbox/src/main/resources/ebics_signatures.xsd
similarity index 100%
rename from src/main/resources/ebics_signatures.xsd
rename to sandbox/src/main/resources/ebics_signatures.xsd
diff --git a/src/main/resources/ebics_types_H004.xsd
b/sandbox/src/main/resources/ebics_types_H004.xsd
similarity index 100%
rename from src/main/resources/ebics_types_H004.xsd
rename to sandbox/src/main/resources/ebics_types_H004.xsd
diff --git a/src/main/resources/xmldsig-core-schema.xsd
b/sandbox/src/main/resources/xmldsig-core-schema.xsd
similarity index 100%
rename from src/main/resources/xmldsig-core-schema.xsd
rename to sandbox/src/main/resources/xmldsig-core-schema.xsd
diff --git a/src/test/kotlin/XmlTest.kt b/sandbox/src/test/kotlin/XmlTest.kt
similarity index 100%
rename from src/test/kotlin/XmlTest.kt
rename to sandbox/src/test/kotlin/XmlTest.kt
diff --git a/src/test/resources/HEVresponse-from-official-documentation.xml
b/sandbox/src/test/resources/HEVresponse-from-official-documentation.xml
similarity index 100%
rename from src/test/resources/HEVresponse-from-official-documentation.xml
rename to sandbox/src/test/resources/HEVresponse-from-official-documentation.xml
diff --git a/src/test/resources/ebics_hev.xml
b/sandbox/src/test/resources/ebics_hev.xml
similarity index 100%
rename from src/test/resources/ebics_hev.xml
rename to sandbox/src/test/resources/ebics_hev.xml
diff --git a/src/test/resources/ebics_ini_request_sample.xml
b/sandbox/src/test/resources/ebics_ini_request_sample.xml
similarity index 100%
rename from src/test/resources/ebics_ini_request_sample.xml
rename to sandbox/src/test/resources/ebics_ini_request_sample.xml
diff --git a/src/test/resources/hev_resp3.0.xml
b/sandbox/src/test/resources/hev_resp3.0.xml
similarity index 100%
rename from src/test/resources/hev_resp3.0.xml
rename to sandbox/src/test/resources/hev_resp3.0.xml
diff --git a/src/test/resources/hev_resp_libeufin.xml
b/sandbox/src/test/resources/hev_resp_libeufin.xml
similarity index 100%
rename from src/test/resources/hev_resp_libeufin.xml
rename to sandbox/src/test/resources/hev_resp_libeufin.xml
diff --git a/settings.gradle b/settings.gradle
index ce38a7d..dcf5bb7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,4 @@
-rootProject.name = 'sandbox'
+rootProject.name = 'libeufin'
+include("sandbox")
+include("nexus")
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libeufin] branch master updated: init nexus,
gnunet <=