diff --git a/README.md b/README.md index b51a80c..c78ea24 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,25 @@ Generic OAuth interface ======================= + +mvn install + +mvn compile + +mvn package + +// download all dependency in out/maven/dependency +mvn dependency:copy-dependencies + +java -cp out/maven/scenarium-oauth-0.1.0.jar io.scenarium.oauth.WebLauncher + + +// create a single package jar +mvn clean compile assembly:single + + + +java -cp out/maven/scenarium-oauth-0.1.0-jar-with-dependencies.jar io.scenarium.oauth.WebLauncher + + + diff --git a/pom.xml b/pom.xml index d673614..0ed639e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - scenarium-store - scenarium-store - 0.0.1-SNAPSHOT + scenarium + scenarium-oauth + 0.1.0 2.1 2.27 @@ -120,6 +120,19 @@ maven-surefire-plugin 3.0.0-M5 + + maven-assembly-plugin + + + + fully.qualified.MainClass + + + + jar-with-dependencies + + + + diff --git a/release/Dockerfile b/release/Dockerfile new file mode 100644 index 0000000..4f78a1a --- /dev/null +++ b/release/Dockerfile @@ -0,0 +1,22 @@ +FROM archlinux:latest + +# update system +RUN pacman -Syu --noconfirm && pacman-db-upgrade +#install jdk-openjdk java-openjfx +RUN pacman -S --noconfirm jdk-openjdk java-openjfx +# clean all the caches +RUN pacman -Scc --noconfirm + +ENV LANG=C.UTF-8 +ENV JAVA_HOME=/usr/lib/jvm/java-14-openjdk +ENV JAVAFX_HOME=$JAVA_HOME +ENV PATH=/usr/lib/jvm/java-14-openjdk/bin/:$PATH +#ENV JAVA_VERSION=14.0.2 + + +RUN mkdir /application/ +ADD scenarium-oauth.jar /application/ +WORKDIR /application/ + +CMD ["java", "-cp", "/application/scenarium-oauth.jar", "io.scenarium.oauth.WebLauncher"] + diff --git a/release/docker-compose.yaml b/release/docker-compose.yaml new file mode 100644 index 0000000..1495e18 --- /dev/null +++ b/release/docker-compose.yaml @@ -0,0 +1,10 @@ +version: '3' +services: + Oauth_service: + build: . + restart: always + image: io.scenarium/oauth + container_name: io.scenarium.oauth + ports: + - 17080:17080 + diff --git a/release/scenarium-oauth.jar b/release/scenarium-oauth.jar new file mode 100644 index 0000000..b015fbb Binary files /dev/null and b/release/scenarium-oauth.jar differ diff --git a/src/io/scenarium/oauth/ConfigVariable.java b/src/io/scenarium/oauth/ConfigVariable.java new file mode 100644 index 0000000..1834f9b --- /dev/null +++ b/src/io/scenarium/oauth/ConfigVariable.java @@ -0,0 +1,24 @@ +package io.scenarium.oauth; + +public class ConfigVariable { + + public static String getDBHost() { + return System.getProperty("io.scenarium.web.oauth.db.host", "localhost"); + } + + public static String getDBPort() { + return System.getProperty("io.scenarium.web.oauth.db.port", "15306"); + } + + public static String getDBLogin() { + return System.getProperty("io.scenarium.web.oauth.db.login", "root"); + } + + public static String getDBPassword() { + return System.getProperty("io.scenarium.web.oauth.db.port", "klkhj456gkgtkhjgvkujfhjgkjhgsdfhb3467465fgdhdesfgh"); + } + + public static String getDBName() { + return System.getProperty("io.scenarium.web.oauth.db.name", "oauth"); + } +} diff --git a/src/io/scenarium/oauth/WebLauncher.java b/src/io/scenarium/oauth/WebLauncher.java index 3710615..ad6f263 100755 --- a/src/io/scenarium/oauth/WebLauncher.java +++ b/src/io/scenarium/oauth/WebLauncher.java @@ -30,6 +30,11 @@ public class WebLauncher { rc.registerClasses(UserResource.class); rc.property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, Level.WARNING.getName()); + dbConfig = new DBConfig(ConfigVariable.getDBHost(), + Integer.parseInt(ConfigVariable.getDBPort()), + ConfigVariable.getDBLogin(), + ConfigVariable.getDBPassword(), + ConfigVariable.getDBName()); dbConfig = new DBConfig("localhost", 15306, "root",