Changed directory structure

This commit is contained in:
2022-02-13 17:15:44 +01:00
parent 11f932dd47
commit 915d4668ba
45 changed files with 102 additions and 11 deletions

@ -11,34 +11,74 @@ steps:
pull: never
commands:
- artifact-dl-java maven/org.json:json:20211205
- artifact-dl-java omz/org.omegazero.common:common:latest
- artifact-dl-java omz/org.omegazero.common:omz-common:latest
- name: prepare-source
image: omz-ci-tools
pull: never
commands:
- setversion src/org/omegazero/net/common/NetCommon.java
- mkdir build
- setversion net-common/main/java/org/omegazero/net/common/NetCommon.java
- name: build
- name: build-common
# use ECJ because of bug in default JDK 8 compiler (JDK-8139836)
# use older version of ECJ with JDK 8 because of method signature changes in ByteBuffer in newer versions
image: openjdk-ecj:4.14
pull: never
commands:
- mkdir bin
- ecj -verbose -d bin -cp json-20211205.jar:common-latest.jar -8 src
- jar cf build.jar -C bin .
- mkdir -p build/common/bin
- ecj -verbose -d build/common/bin -cp json-20211205.jar:omz-common-latest.jar -8 net-common/main/java
- jar cf build-common.jar -C build/common/bin .
depends_on:
- prepare-dependencies
- prepare-source
- name: build-client
image: openjdk-ecj:4.14
pull: never
commands:
- mkdir -p build/client/bin
- ecj -verbose -d build/client/bin -cp json-20211205.jar:omz-common-latest.jar:build-common.jar -8 net-client/main/java
- jar cf build-client.jar -C build/client/bin .
depends_on:
- prepare-dependencies
- prepare-source
- build-common
- name: build-server
image: openjdk-ecj:4.14
pull: never
commands:
- mkdir -p build/server/bin
- ecj -verbose -d build/server/bin -cp json-20211205.jar:omz-common-latest.jar:build-common.jar -8 net-server/main/java
- jar cf build-server.jar -C build/server/bin .
depends_on:
- prepare-dependencies
- prepare-source
- build-common
- name: build-all
image: openjdk-ecj:4.14
pull: never
commands:
- mkdir -p build/all/bin
- cp -r build/common/bin/* build/client/bin/* build/server/bin/* build/all/bin
- jar cf build-all.jar -C build/all/bin .
depends_on:
- build-common
- build-client
- build-server
- name: publish
image: omz-ci-tools
pull: never
commands:
- artifact-push-java build.jar omz/org.omegazero.net:netlib
- artifact-push-java build-all.jar omz/org.omegazero.net:omz-netlib
- artifact-push-java build-common.jar omz/org.omegazero.net:omz-netlib-common
- artifact-push-java build-client.jar omz/org.omegazero.net:omz-netlib-client
- artifact-push-java build-server.jar omz/org.omegazero.net:omz-netlib-server
depends_on:
- build
- build-all
environment:
OMZ_ARTIFACT_PUSH_TOKEN:
from_secret: artifact_push_token

@ -2,13 +2,19 @@
"generator": "javadoc",
"targetName": "omz-net-lib",
"generatorOptions": {
"src": ["src"],
"src": [
"net-common/main/java",
"net-client/main/java",
"net-server/main/java"
],
"packages": ["org"],
"windowtitle": "omegazero Java Network Library",
"doctitle": "omegazero Java Network Library documentation",
"header": "omz net lib",
"groups": {
"Networking Packages": "org.omegazero.net.*"
"Lib: common": "org.omegazero.net.common:org.omegazero.net.socket:org.omegazero.net.socket.*:org.omegazero.net.util",
"Lib: client": "org.omegazero.net.client:org.omegazero.net.client.*",
"Lib: server": "org.omegazero.net.server:org.omegazero.net.server.*"
},
"links": [
"https://docs.oracle.com/javase/8/docs/api/",
@ -17,7 +23,7 @@
],
"dependencies": [
"maven/org.json:json:20211205",
"omz/org.omegazero.common:common:latest"
"omz/org.omegazero.common:omz-common:latest"
]
}
}

@ -4,3 +4,9 @@
[![Documentation Build Status](https://docs.omegazero.org/ci/gen/badge.php?owner=omegazero&repo=omz-net-lib)](https://docs.omegazero.org/ci/#/repos/omegazero/omz-net-lib)
[![Release](https://api.omegazero.org/v1/git/getrepobadge?author=omegazero&repository=omz-net-lib&metric=release&color=09b&width=100)](https://git.omegazero.org/omegazero/omz-net-lib/releases)
Prebuilt full JARs: <https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib>
Javadoc: <https://docs.omegazero.org/javadoc/omz-net-lib/>
**Important:** All parts of this library require [omz-java-lib](https://git.omegazero.org/omegazero/omz-java-lib).

5
net-client/README.md Normal file

@ -0,0 +1,5 @@
## omz-net-lib/client
Contains client manager implementations.
Prebuilt JARs: <https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib-client>. Requires [common](https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib-common).

@ -0,0 +1,4 @@
/**
* Provides client manager implementations.
*/
package org.omegazero.net.client;

@ -0,0 +1,4 @@
/**
* Provides classes for passing client socket creation parameters.
*/
package org.omegazero.net.client.params;

5
net-common/README.md Normal file

@ -0,0 +1,5 @@
## omz-net-lib/common
Contains the base classes of *omz-net-lib*. These include utility classes and socket implementations.
Prebuilt JARs: <https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib-common>.

@ -0,0 +1,4 @@
/**
* Contains base classes of the networking library.
*/
package org.omegazero.net.common;

@ -0,0 +1,4 @@
/**
* Provides classes representing network sockets.
*/
package org.omegazero.net.socket;

@ -0,0 +1,4 @@
/**
* Contains miscellaneous utility classes for networking and security.
*/
package org.omegazero.net.util;

5
net-server/README.md Normal file

@ -0,0 +1,5 @@
## omz-net-lib/server
Contains server implementations and management.
Prebuilt JARs: <https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib-server>. Requires [common](https://drone.omegazero.org/build-artifacts/java/org.omegazero.net:omz-netlib-common).

@ -0,0 +1,4 @@
/**
* Provides server implementations.
*/
package org.omegazero.net.server;