diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index fc4b68d..d198c18 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -31,7 +31,7 @@ jobs: username: woggioni password: ${{ secrets.PUBLISHER_TOKEN }} - - name: Build gbcs Docker image + name: Build rbcs Docker image uses: docker/build-push-action@v5.3.0 with: context: "docker/build/docker" @@ -39,12 +39,12 @@ jobs: push: true pull: true tags: | - gitea.woggioni.net/woggioni/gbcs:latest - gitea.woggioni.net/woggioni/gbcs:${{ steps.retrieve-version.outputs.VERSION }} + gitea.woggioni.net/woggioni/rbcs:latest + gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }} target: release - cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx + cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx - - name: Build gbcs memcache Docker image + name: Build rbcs memcache Docker image uses: docker/build-push-action@v5.3.0 with: context: "docker/build/docker" @@ -52,11 +52,11 @@ jobs: push: true pull: true tags: | - gitea.woggioni.net/woggioni/gbcs:memcache - gitea.woggioni.net/woggioni/gbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }} + gitea.woggioni.net/woggioni/rbcs:memcache + gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }} target: release-memcache - cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx - cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx + cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx + cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/rbcs:buildx - name: Publish artifacts env: PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} diff --git a/.gitignore b/.gitignore index 86dc90f..c268a30 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ # Ignore Gradle build output directory build -gbcs-cli/native-image/*.json +rbcs-cli/native-image/*.json diff --git a/build.gradle b/build.gradle index 5c4748e..5afc3b6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { subproject -> version = project.currentTag.map { it[0] }.get() } else { version = project.gitRevision.map { gitRevision -> - "${getProperty('gbcs.version')}.${gitRevision[0..10]}" + "${getProperty('rbcs.version')}.${gitRevision[0..10]}" }.get() } diff --git a/docker/Dockerfile b/docker/Dockerfile index 36b8cf4..eae7a4e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,13 +4,13 @@ USER luser WORKDIR /home/luser FROM base-release AS release -ADD gbcs-cli-envelope-*.jar gbcs.jar -ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/gbcs.jar", "server"] +ADD rbcs-cli-envelope-*.jar rbcs.jar +ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"] FROM base-release AS release-memcache -ADD --chown=luser:luser gbcs-cli-envelope-*.jar gbcs.jar +ADD --chown=luser:luser rbcs-cli-envelope-*.jar rbcs.jar RUN mkdir plugins WORKDIR /home/luser/plugins -RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/gbcs-server-memcache*.tar +RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar WORKDIR /home/luser -ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/gbcs.jar", "server"] +ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"] diff --git a/docker/build.gradle b/docker/build.gradle index d431354..826c1b9 100644 --- a/docker/build.gradle +++ b/docker/build.gradle @@ -18,8 +18,8 @@ configurations { } dependencies { - docker project(path: ':gbcs-cli', configuration: 'release') - docker project(path: ':gbcs-server-memcache', configuration: 'release') + docker project(path: ':rbcs-cli', configuration: 'release') + docker project(path: ':rbcs-server-memcache', configuration: 'release') } Provider cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {} @@ -35,21 +35,21 @@ Provider prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) { Provider dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) { group = 'docker' dependsOn prepareDockerBuild - images.add('gitea.woggioni.net/woggioni/gbcs:latest') - images.add("gitea.woggioni.net/woggioni/gbcs:${version}") + images.add('gitea.woggioni.net/woggioni/rbcs:latest') + images.add("gitea.woggioni.net/woggioni/rbcs:${version}") } Provider dockerTag = tasks.register('dockerTagImage', DockerTagImage) { group = 'docker' - repository = 'gitea.woggioni.net/woggioni/gbcs' - imageId = 'gitea.woggioni.net/woggioni/gbcs:latest' + repository = 'gitea.woggioni.net/woggioni/rbcs' + imageId = 'gitea.woggioni.net/woggioni/rbcs:latest' tag = version } Provider dockerTagMemcache = tasks.register('dockerTagMemcacheImage', DockerTagImage) { group = 'docker' - repository = 'gitea.woggioni.net/woggioni/gbcs' - imageId = 'gitea.woggioni.net/woggioni/gbcs:memcache' + repository = 'gitea.woggioni.net/woggioni/rbcs' + imageId = 'gitea.woggioni.net/woggioni/rbcs:memcache' tag = "${version}-memcache" } diff --git a/gbcs-api/src/main/java/module-info.java b/gbcs-api/src/main/java/module-info.java deleted file mode 100644 index 63ae1e7..0000000 --- a/gbcs-api/src/main/java/module-info.java +++ /dev/null @@ -1,7 +0,0 @@ -module net.woggioni.gbcs.api { - requires static lombok; - requires java.xml; - requires io.netty.buffer; - exports net.woggioni.gbcs.api; - exports net.woggioni.gbcs.api.exception; -} \ No newline at end of file diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/GbcsException.java b/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/GbcsException.java deleted file mode 100644 index 66edaf9..0000000 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/GbcsException.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.woggioni.gbcs.api.exception; - -public class GbcsException extends RuntimeException { - public GbcsException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/gbcs-cli/src/main/java/module-info.java b/gbcs-cli/src/main/java/module-info.java deleted file mode 100644 index a38f913..0000000 --- a/gbcs-cli/src/main/java/module-info.java +++ /dev/null @@ -1,17 +0,0 @@ -module net.woggioni.gbcs.cli { - requires org.slf4j; - requires net.woggioni.gbcs.server; - requires info.picocli; - requires net.woggioni.gbcs.common; - requires net.woggioni.gbcs.client; - requires kotlin.stdlib; - requires net.woggioni.jwo; - requires net.woggioni.gbcs.api; - - exports net.woggioni.gbcs.cli.impl.converters to info.picocli; - opens net.woggioni.gbcs.cli.impl.commands to info.picocli; - opens net.woggioni.gbcs.cli.impl to info.picocli; - opens net.woggioni.gbcs.cli to info.picocli, net.woggioni.gbcs.common; - - exports net.woggioni.gbcs.cli; -} \ No newline at end of file diff --git a/gbcs-client/src/test/resources/net/woggioni/gbcs/client/test/gbcs-client.xml b/gbcs-client/src/test/resources/net/woggioni/gbcs/client/test/gbcs-client.xml deleted file mode 100644 index 037df85..0000000 --- a/gbcs-client/src/test/resources/net/woggioni/gbcs/client/test/gbcs-client.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/gbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider b/gbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider deleted file mode 100644 index c5aac89..0000000 --- a/gbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider +++ /dev/null @@ -1 +0,0 @@ -net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory \ No newline at end of file diff --git a/gbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider b/gbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider deleted file mode 100644 index 122761c..0000000 --- a/gbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider +++ /dev/null @@ -1 +0,0 @@ -net.woggioni.gbcs.server.memcache.MemcacheCacheProvider \ No newline at end of file diff --git a/gbcs-server/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider b/gbcs-server/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider deleted file mode 100644 index a681f5b..0000000 --- a/gbcs-server/src/main/resources/META-INF/services/net.woggioni.gbcs.api.CacheProvider +++ /dev/null @@ -1,2 +0,0 @@ -net.woggioni.gbcs.server.cache.FileSystemCacheProvider -net.woggioni.gbcs.server.cache.InMemoryCacheProvider \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b51d6b9..7164bbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.configuration-cache=false org.gradle.parallel=true org.gradle.caching=true -gbcs.version = 0.1.3 +rbcs.version = 0.1.3 lys.version = 2025.02.05 diff --git a/gbcs-api/build.gradle b/rbcs-api/build.gradle similarity index 100% rename from gbcs-api/build.gradle rename to rbcs-api/build.gradle diff --git a/rbcs-api/src/main/java/module-info.java b/rbcs-api/src/main/java/module-info.java new file mode 100644 index 0000000..65708d8 --- /dev/null +++ b/rbcs-api/src/main/java/module-info.java @@ -0,0 +1,7 @@ +module net.woggioni.rbcs.api { + requires static lombok; + requires java.xml; + requires io.netty.buffer; + exports net.woggioni.rbcs.api; + exports net.woggioni.rbcs.api.exception; +} \ No newline at end of file diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Cache.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java similarity index 77% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/Cache.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java index b9427c5..8c217a4 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Cache.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.api; +package net.woggioni.rbcs.api; import io.netty.buffer.ByteBuf; -import net.woggioni.gbcs.api.exception.ContentTooLargeException; +import net.woggioni.rbcs.api.exception.ContentTooLargeException; import java.nio.channels.ReadableByteChannel; import java.util.concurrent.CompletableFuture; diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/CacheProvider.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/CacheProvider.java similarity index 90% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/CacheProvider.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/CacheProvider.java index 45cdef4..7c23750 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/CacheProvider.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/CacheProvider.java @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.api; +package net.woggioni.rbcs.api; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java similarity index 97% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java index b09522a..080c65c 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.api; +package net.woggioni.rbcs.api; import lombok.EqualsAndHashCode; @@ -135,7 +135,7 @@ public class Configuration { } public interface Cache { - net.woggioni.gbcs.api.Cache materialize(); + net.woggioni.rbcs.api.Cache materialize(); String getNamespaceURI(); String getTypeName(); } diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Role.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Role.java similarity index 56% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/Role.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/Role.java index 6335aa5..d5a5d22 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/Role.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/Role.java @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.api; +package net.woggioni.rbcs.api; public enum Role { Reader, Writer diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/CacheException.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/CacheException.java similarity index 66% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/CacheException.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/CacheException.java index 3d9f96c..eab730d 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/CacheException.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/CacheException.java @@ -1,6 +1,6 @@ -package net.woggioni.gbcs.api.exception; +package net.woggioni.rbcs.api.exception; -public class CacheException extends GbcsException { +public class CacheException extends RbcsException { public CacheException(String message, Throwable cause) { super(message, cause); } diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ConfigurationException.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ConfigurationException.java similarity index 66% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ConfigurationException.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ConfigurationException.java index 9f722a6..f9b0ffa 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ConfigurationException.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ConfigurationException.java @@ -1,6 +1,6 @@ -package net.woggioni.gbcs.api.exception; +package net.woggioni.rbcs.api.exception; -public class ConfigurationException extends GbcsException { +public class ConfigurationException extends RbcsException { public ConfigurationException(String message, Throwable cause) { super(message, cause); } diff --git a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ContentTooLargeException.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ContentTooLargeException.java similarity index 51% rename from gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ContentTooLargeException.java rename to rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ContentTooLargeException.java index 468cc01..174781a 100644 --- a/gbcs-api/src/main/java/net/woggioni/gbcs/api/exception/ContentTooLargeException.java +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/ContentTooLargeException.java @@ -1,6 +1,6 @@ -package net.woggioni.gbcs.api.exception; +package net.woggioni.rbcs.api.exception; -public class ContentTooLargeException extends GbcsException { +public class ContentTooLargeException extends RbcsException { public ContentTooLargeException(String message, Throwable cause) { super(message, cause); } diff --git a/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/RbcsException.java b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/RbcsException.java new file mode 100644 index 0000000..294c748 --- /dev/null +++ b/rbcs-api/src/main/java/net/woggioni/rbcs/api/exception/RbcsException.java @@ -0,0 +1,7 @@ +package net.woggioni.rbcs.api.exception; + +public class RbcsException extends RuntimeException { + public RbcsException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/gbcs-cli/build.gradle b/rbcs-cli/build.gradle similarity index 87% rename from gbcs-cli/build.gradle rename to rbcs-cli/build.gradle index 6c8f61f..eecfc7f 100644 --- a/gbcs-cli/build.gradle +++ b/rbcs-cli/build.gradle @@ -17,9 +17,9 @@ import net.woggioni.gradle.graalvm.JlinkPlugin import net.woggioni.gradle.graalvm.JlinkTask Property mainModuleName = objects.property(String.class) -mainModuleName.set('net.woggioni.gbcs.cli') +mainModuleName.set('net.woggioni.rbcs.cli') Property mainClassName = objects.property(String.class) -mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli') +mainClassName.set('net.woggioni.rbcs.cli.RemoteBuildCacheServerCli') tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) { options.javaModuleMainClass = mainClassName @@ -47,8 +47,8 @@ dependencies { implementation catalog.netty.codec.http implementation catalog.picocli - implementation project(':gbcs-client') - implementation project(':gbcs-server') + implementation project(':rbcs-client') + implementation project(':rbcs-server') // runtimeOnly catalog.slf4j.jdk14 runtimeOnly catalog.logback.classic @@ -56,10 +56,10 @@ dependencies { } Provider envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) { -// systemProperties['java.util.logging.config.class'] = 'net.woggioni.gbcs.LoggingConfig' -// systemProperties['log.config.source'] = 'net/woggioni/gbcs/cli/logging.properties' -// systemProperties['java.util.logging.config.file'] = 'classpath:net/woggioni/gbcs/cli/logging.properties' - systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/gbcs/cli/logback.xml' +// systemProperties['java.util.logging.config.class'] = 'net.woggioni.rbcs.LoggingConfig' +// systemProperties['log.config.source'] = 'net/woggioni/rbcs/cli/logging.properties' +// systemProperties['java.util.logging.config.file'] = 'classpath:net/woggioni/rbcs/cli/logging.properties' + systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/rbcs/cli/logback.xml' systemProperties['io.netty.leakDetectionLevel'] = 'DISABLED' // systemProperties['org.slf4j.simpleLogger.showDateTime'] = 'true' @@ -83,7 +83,7 @@ tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) { tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) { mainClass = mainClassName - mainModule = 'net.woggioni.gbcs.cli' + mainModule = 'net.woggioni.rbcs.cli' } artifacts { diff --git a/gbcs-cli/native-image/native-image.properties b/rbcs-cli/native-image/native-image.properties similarity index 100% rename from gbcs-cli/native-image/native-image.properties rename to rbcs-cli/native-image/native-image.properties diff --git a/rbcs-cli/src/main/java/module-info.java b/rbcs-cli/src/main/java/module-info.java new file mode 100644 index 0000000..4026852 --- /dev/null +++ b/rbcs-cli/src/main/java/module-info.java @@ -0,0 +1,17 @@ +module net.woggioni.rbcs.cli { + requires org.slf4j; + requires net.woggioni.rbcs.server; + requires info.picocli; + requires net.woggioni.rbcs.common; + requires net.woggioni.rbcs.client; + requires kotlin.stdlib; + requires net.woggioni.jwo; + requires net.woggioni.rbcs.api; + + exports net.woggioni.rbcs.cli.impl.converters to info.picocli; + opens net.woggioni.rbcs.cli.impl.commands to info.picocli; + opens net.woggioni.rbcs.cli.impl to info.picocli; + opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common; + + exports net.woggioni.rbcs.cli; +} \ No newline at end of file diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt similarity index 60% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt index 46c40dd..3e5843d 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt @@ -1,43 +1,43 @@ -package net.woggioni.gbcs.cli +package net.woggioni.rbcs.cli -import net.woggioni.gbcs.cli.impl.AbstractVersionProvider -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.cli.impl.commands.BenchmarkCommand -import net.woggioni.gbcs.cli.impl.commands.ClientCommand -import net.woggioni.gbcs.cli.impl.commands.GetCommand -import net.woggioni.gbcs.cli.impl.commands.HealthCheckCommand -import net.woggioni.gbcs.cli.impl.commands.PasswordHashCommand -import net.woggioni.gbcs.cli.impl.commands.PutCommand -import net.woggioni.gbcs.cli.impl.commands.ServerCommand -import net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.cli.impl.AbstractVersionProvider +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand +import net.woggioni.rbcs.cli.impl.commands.ClientCommand +import net.woggioni.rbcs.cli.impl.commands.GetCommand +import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand +import net.woggioni.rbcs.cli.impl.commands.PasswordHashCommand +import net.woggioni.rbcs.cli.impl.commands.PutCommand +import net.woggioni.rbcs.cli.impl.commands.ServerCommand +import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory +import net.woggioni.rbcs.common.contextLogger import net.woggioni.jwo.Application import picocli.CommandLine import picocli.CommandLine.Model.CommandSpec @CommandLine.Command( - name = "gbcs", versionProvider = GradleBuildCacheServerCli.VersionProvider::class + name = "rbcs", versionProvider = RemoteBuildCacheServerCli.VersionProvider::class ) -class GradleBuildCacheServerCli : GbcsCommand() { +class RemoteBuildCacheServerCli : RbcsCommand() { class VersionProvider : AbstractVersionProvider() companion object { @JvmStatic fun main(vararg args: String) { - val currentClassLoader = GradleBuildCacheServerCli::class.java.classLoader + val currentClassLoader = RemoteBuildCacheServerCli::class.java.classLoader Thread.currentThread().contextClassLoader = currentClassLoader if(currentClassLoader.javaClass.name == "net.woggioni.envelope.loader.ModuleClassLoader") { //We're running in an envelope jar and custom URL protocols won't work - GbcsUrlStreamHandlerFactory.install() + RbcsUrlStreamHandlerFactory.install() } val log = contextLogger() - val app = Application.builder("gbcs") - .configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR") - .configurationDirectoryPropertyKey("net.woggioni.gbcs.conf.dir") + val app = Application.builder("rbcs") + .configurationDirectoryEnvVar("RBCS_CONFIGURATION_DIR") + .configurationDirectoryPropertyKey("net.woggioni.rbcs.conf.dir") .build() - val gbcsCli = GradleBuildCacheServerCli() - val commandLine = CommandLine(gbcsCli) + val rbcsCli = RemoteBuildCacheServerCli() + val commandLine = CommandLine(rbcsCli) commandLine.setExecutionExceptionHandler { ex, cl, parseResult -> log.error(ex.message, ex) CommandLine.ExitCode.SOFTWARE diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/AbstractVersionProvider.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/AbstractVersionProvider.kt similarity index 96% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/AbstractVersionProvider.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/AbstractVersionProvider.kt index 43d4c8e..21045e8 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/AbstractVersionProvider.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/AbstractVersionProvider.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.cli.impl +package net.woggioni.rbcs.cli.impl import picocli.CommandLine import java.util.jar.Attributes diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/GbcsCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt similarity index 85% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/GbcsCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt index 4ffa081..201f7af 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/GbcsCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt @@ -1,11 +1,11 @@ -package net.woggioni.gbcs.cli.impl +package net.woggioni.rbcs.cli.impl import net.woggioni.jwo.Application import picocli.CommandLine import java.nio.file.Path -abstract class GbcsCommand : Runnable { +abstract class RbcsCommand : Runnable { @CommandLine.Option(names = ["-h", "--help"], usageHelp = true) var usageHelp = false diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/BenchmarkCommand.kt similarity index 93% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/BenchmarkCommand.kt index 9809df4..fb0fa2f 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/BenchmarkCommand.kt @@ -1,10 +1,10 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GradleBuildCacheClient -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.common.error -import net.woggioni.gbcs.common.info +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.client.RemoteBuildCacheClient +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.common.error +import net.woggioni.rbcs.common.info import net.woggioni.jwo.JWO import picocli.CommandLine import java.security.SecureRandom @@ -20,7 +20,7 @@ import kotlin.random.Random description = ["Run a load test against the server"], showDefaultValues = true ) -class BenchmarkCommand : GbcsCommand() { +class BenchmarkCommand : RbcsCommand() { private val log = contextLogger() @CommandLine.Spec @@ -46,7 +46,7 @@ class BenchmarkCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GradleBuildCacheClient(profile).use { client -> + RemoteBuildCacheClient(profile).use { client -> val entryGenerator = sequence { val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong()) diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt similarity index 68% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt index 9565b75..f686534 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ClientCommand.kt @@ -1,24 +1,24 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GradleBuildCacheClient +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.client.RemoteBuildCacheClient import net.woggioni.jwo.Application import picocli.CommandLine import java.nio.file.Path @CommandLine.Command( name = "client", - description = ["GBCS client"], + description = ["RBCS client"], showDefaultValues = true ) -class ClientCommand(app : Application) : GbcsCommand() { +class ClientCommand(app : Application) : RbcsCommand() { @CommandLine.Option( names = ["-c", "--configuration"], description = ["Path to the client configuration file"], paramLabel = "CONFIGURATION_FILE" ) - private var configurationFile : Path = findConfigurationFile(app, "gbcs-client.xml") + private var configurationFile : Path = findConfigurationFile(app, "rbcs-client.xml") @CommandLine.Option( names = ["-p", "--profile"], @@ -28,8 +28,8 @@ class ClientCommand(app : Application) : GbcsCommand() { ) var profileName : String? = null - val configuration : GradleBuildCacheClient.Configuration by lazy { - GradleBuildCacheClient.Configuration.parse(configurationFile) + val configuration : RemoteBuildCacheClient.Configuration by lazy { + RemoteBuildCacheClient.Configuration.parse(configurationFile) } override fun run() { diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/GetCommand.kt similarity index 83% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/GetCommand.kt index 1f5f2a2..9c23d8e 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/GetCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/GetCommand.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GradleBuildCacheClient -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.client.RemoteBuildCacheClient +import net.woggioni.rbcs.common.contextLogger import picocli.CommandLine import java.nio.file.Files import java.nio.file.Path @@ -12,7 +12,7 @@ import java.nio.file.Path description = ["Fetch a value from the cache with the specified key"], showDefaultValues = true ) -class GetCommand : GbcsCommand() { +class GetCommand : RbcsCommand() { private val log = contextLogger() @CommandLine.Spec @@ -38,7 +38,7 @@ class GetCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GradleBuildCacheClient(profile).use { client -> + RemoteBuildCacheClient(profile).use { client -> client.get(key).thenApply { value -> value?.let { (output?.let(Files::newOutputStream) ?: System.out).use { diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/HealthCheckCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt similarity index 82% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/HealthCheckCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt index 0440f52..d14ea6a 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/HealthCheckCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/HealthCheckCommand.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.client.GradleBuildCacheClient -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.client.RemoteBuildCacheClient +import net.woggioni.rbcs.common.contextLogger import picocli.CommandLine import java.security.SecureRandom import kotlin.random.Random @@ -12,7 +12,7 @@ import kotlin.random.Random description = ["Check server health"], showDefaultValues = true ) -class HealthCheckCommand : GbcsCommand() { +class HealthCheckCommand : RbcsCommand() { private val log = contextLogger() @CommandLine.Spec @@ -24,7 +24,7 @@ class HealthCheckCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GradleBuildCacheClient(profile).use { client -> + RemoteBuildCacheClient(profile).use { client -> val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong()) val nonce = ByteArray(0xa0) random.nextBytes(nonce) diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PasswordHashCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt similarity index 77% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PasswordHashCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt index 80a47f6..c5f9ecd 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PasswordHashCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PasswordHashCommand.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.cli.impl.converters.OutputStreamConverter -import net.woggioni.gbcs.common.PasswordSecurity.hashPassword +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.cli.impl.converters.OutputStreamConverter +import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import net.woggioni.jwo.UncloseableOutputStream import picocli.CommandLine import java.io.OutputStream @@ -12,10 +12,10 @@ import java.io.PrintWriter @CommandLine.Command( name = "password", - description = ["Generate a password hash to add to GBCS configuration file"], + description = ["Generate a password hash to add to RBCS configuration file"], showDefaultValues = true ) -class PasswordHashCommand : GbcsCommand() { +class PasswordHashCommand : RbcsCommand() { @CommandLine.Option( names = ["-o", "--output-file"], description = ["Write the output to a file instead of stdout"], diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt similarity index 78% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt index c2af2d5..6f39748 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PutCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/PutCommand.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.cli.impl.converters.InputStreamConverter -import net.woggioni.gbcs.client.GradleBuildCacheClient -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.cli.impl.converters.InputStreamConverter +import net.woggioni.rbcs.client.RemoteBuildCacheClient +import net.woggioni.rbcs.common.contextLogger import picocli.CommandLine import java.io.InputStream @@ -12,7 +12,7 @@ import java.io.InputStream description = ["Add or replace a value to the cache with the specified key"], showDefaultValues = true ) -class PutCommand : GbcsCommand() { +class PutCommand : RbcsCommand() { private val log = contextLogger() @CommandLine.Spec @@ -39,7 +39,7 @@ class PutCommand : GbcsCommand() { clientCommand.configuration.profiles[profileName] ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration") } - GradleBuildCacheClient(profile).use { client -> + RemoteBuildCacheClient(profile).use { client -> value.use { client.put(key, it.readAllBytes()) }.get() diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ServerCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ServerCommand.kt similarity index 72% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ServerCommand.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ServerCommand.kt index 1f34d55..f6418da 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ServerCommand.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/commands/ServerCommand.kt @@ -1,13 +1,12 @@ -package net.woggioni.gbcs.cli.impl.commands +package net.woggioni.rbcs.cli.impl.commands -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.cli.impl.GbcsCommand -import net.woggioni.gbcs.cli.impl.converters.DurationConverter -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.common.debug -import net.woggioni.gbcs.common.info -import net.woggioni.gbcs.server.GradleBuildCacheServer -import net.woggioni.gbcs.server.GradleBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL +import net.woggioni.rbcs.cli.impl.RbcsCommand +import net.woggioni.rbcs.cli.impl.converters.DurationConverter +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.common.debug +import net.woggioni.rbcs.common.info +import net.woggioni.rbcs.server.RemoteBuildCacheServer +import net.woggioni.rbcs.server.RemoteBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL import net.woggioni.jwo.Application import net.woggioni.jwo.JWO import picocli.CommandLine @@ -18,10 +17,10 @@ import java.time.Duration @CommandLine.Command( name = "server", - description = ["GBCS server"], + description = ["RBCS server"], showDefaultValues = true ) -class ServerCommand(app : Application) : GbcsCommand() { +class ServerCommand(app : Application) : RbcsCommand() { private val log = contextLogger() @@ -50,7 +49,7 @@ class ServerCommand(app : Application) : GbcsCommand() { description = ["Read the application configuration from this file"], paramLabel = "CONFIG_FILE" ) - private var configurationFile: Path = findConfigurationFile(app, "gbcs-server.xml") + private var configurationFile: Path = findConfigurationFile(app, "rbcs-server.xml") override fun run() { if (!Files.exists(configurationFile)) { @@ -58,15 +57,15 @@ class ServerCommand(app : Application) : GbcsCommand() { createDefaultConfigurationFile(configurationFile) } - val configuration = GradleBuildCacheServer.loadConfiguration(configurationFile) + val configuration = RemoteBuildCacheServer.loadConfiguration(configurationFile) log.debug { ByteArrayOutputStream().also { - GradleBuildCacheServer.dumpConfiguration(configuration, it) + RemoteBuildCacheServer.dumpConfiguration(configuration, it) }.let { "Server configuration:\n${String(it.toByteArray())}" } } - val server = GradleBuildCacheServer(configuration) + val server = RemoteBuildCacheServer(configuration) server.run().use { server -> timeout?.let { Thread.sleep(it) diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/DurationConverter.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/DurationConverter.kt similarity index 82% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/DurationConverter.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/DurationConverter.kt index 56a9324..62229fe 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/DurationConverter.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/DurationConverter.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.cli.impl.converters +package net.woggioni.rbcs.cli.impl.converters import picocli.CommandLine import java.time.Duration diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/InputStreamConverter.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/InputStreamConverter.kt similarity index 86% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/InputStreamConverter.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/InputStreamConverter.kt index ef03c43..f31e36b 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/InputStreamConverter.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/InputStreamConverter.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.cli.impl.converters +package net.woggioni.rbcs.cli.impl.converters import picocli.CommandLine import java.io.InputStream diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/OutputStreamConverter.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/OutputStreamConverter.kt similarity index 86% rename from gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/OutputStreamConverter.kt rename to rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/OutputStreamConverter.kt index ae3fa2c..f385a51 100644 --- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/OutputStreamConverter.kt +++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/converters/OutputStreamConverter.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.cli.impl.converters +package net.woggioni.rbcs.cli.impl.converters import picocli.CommandLine import java.io.OutputStream diff --git a/gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logback.xml b/rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logback.xml similarity index 100% rename from gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logback.xml rename to rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logback.xml diff --git a/gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logging.properties b/rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logging.properties similarity index 100% rename from gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logging.properties rename to rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logging.properties diff --git a/gbcs-client/build.gradle b/rbcs-client/build.gradle similarity index 77% rename from gbcs-client/build.gradle rename to rbcs-client/build.gradle index 70e7696..e0eefe8 100644 --- a/gbcs-client/build.gradle +++ b/rbcs-client/build.gradle @@ -4,8 +4,8 @@ plugins { } dependencies { - implementation project(':gbcs-api') - implementation project(':gbcs-common') + implementation project(':rbcs-api') + implementation project(':rbcs-common') implementation catalog.picocli implementation catalog.slf4j.api implementation catalog.netty.buffer diff --git a/gbcs-client/src/main/java/module-info.java b/rbcs-client/src/main/java/module-info.java similarity index 58% rename from gbcs-client/src/main/java/module-info.java rename to rbcs-client/src/main/java/module-info.java index 0ba216d..5a90175 100644 --- a/gbcs-client/src/main/java/module-info.java +++ b/rbcs-client/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module net.woggioni.gbcs.client { +module net.woggioni.rbcs.client { requires io.netty.handler; requires io.netty.codec.http; requires io.netty.transport; @@ -6,12 +6,12 @@ module net.woggioni.gbcs.client { requires io.netty.common; requires io.netty.buffer; requires java.xml; - requires net.woggioni.gbcs.common; - requires net.woggioni.gbcs.api; + requires net.woggioni.rbcs.common; + requires net.woggioni.rbcs.api; requires io.netty.codec; requires org.slf4j; - exports net.woggioni.gbcs.client; + exports net.woggioni.rbcs.client; - opens net.woggioni.gbcs.client.schema; + opens net.woggioni.rbcs.client.schema; } \ No newline at end of file diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt similarity index 97% rename from gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt rename to rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt index 09a5165..fe3836f 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.client +package net.woggioni.rbcs.client import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBuf @@ -30,11 +30,11 @@ import io.netty.handler.ssl.SslContextBuilder import io.netty.handler.stream.ChunkedWriteHandler import io.netty.util.concurrent.Future import io.netty.util.concurrent.GenericFutureListener -import net.woggioni.gbcs.client.impl.Parser -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.common.debug -import net.woggioni.gbcs.common.trace +import net.woggioni.rbcs.client.impl.Parser +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.common.debug +import net.woggioni.rbcs.common.trace import java.net.InetSocketAddress import java.net.URI import java.nio.file.Files @@ -48,7 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger import io.netty.util.concurrent.Future as NettyFuture -class GradleBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable { +class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable { private val group: NioEventLoopGroup private var sslContext: SslContext private val log = contextLogger() diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Exception.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Exception.kt similarity index 89% rename from gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Exception.kt rename to rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Exception.kt index cd91dbc..1d888bc 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Exception.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Exception.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.client +package net.woggioni.rbcs.client import io.netty.handler.codec.http.HttpResponseStatus diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt similarity index 84% rename from gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt rename to rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt index a584c91..dcc6bee 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/impl/Parser.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.client.impl +package net.woggioni.rbcs.client.impl -import net.woggioni.gbcs.api.exception.ConfigurationException -import net.woggioni.gbcs.client.GradleBuildCacheClient -import net.woggioni.gbcs.common.Xml.Companion.asIterable -import net.woggioni.gbcs.common.Xml.Companion.renderAttribute +import net.woggioni.rbcs.api.exception.ConfigurationException +import net.woggioni.rbcs.client.RemoteBuildCacheClient +import net.woggioni.rbcs.common.Xml.Companion.asIterable +import net.woggioni.rbcs.common.Xml.Companion.renderAttribute import org.w3c.dom.Document import java.net.URI import java.nio.file.Files @@ -15,9 +15,9 @@ import java.time.Duration object Parser { - fun parse(document: Document): GradleBuildCacheClient.Configuration { + fun parse(document: Document): RemoteBuildCacheClient.Configuration { val root = document.documentElement - val profiles = mutableMapOf() + val profiles = mutableMapOf() for (child in root.asIterable()) { val tagName = child.localName @@ -27,8 +27,8 @@ object Parser { child.renderAttribute("name") ?: throw ConfigurationException("name attribute is required") val uri = child.renderAttribute("base-url")?.let(::URI) ?: throw ConfigurationException("base-url attribute is required") - var authentication: GradleBuildCacheClient.Configuration.Authentication? = null - var retryPolicy: GradleBuildCacheClient.Configuration.RetryPolicy? = null + var authentication: RemoteBuildCacheClient.Configuration.Authentication? = null + var retryPolicy: RemoteBuildCacheClient.Configuration.RetryPolicy? = null for (gchild in child.asIterable()) { when (gchild.localName) { "tls-client-auth" -> { @@ -49,7 +49,7 @@ object Parser { .toList() .toTypedArray() authentication = - GradleBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials( + RemoteBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials( key, certChain ) @@ -61,7 +61,7 @@ object Parser { val password = gchild.renderAttribute("password") ?: throw ConfigurationException("password attribute is required") authentication = - GradleBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials( + RemoteBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials( username, password ) @@ -80,7 +80,7 @@ object Parser { gchild.renderAttribute("exp") ?.let(String::toDouble) ?: 2.0f - retryPolicy = GradleBuildCacheClient.Configuration.RetryPolicy( + retryPolicy = RemoteBuildCacheClient.Configuration.RetryPolicy( maxAttempts, initialDelay.toMillis(), exp.toDouble() @@ -93,7 +93,7 @@ object Parser { ?: 50 val connectionTimeout = child.renderAttribute("connection-timeout") ?.let(Duration::parse) - profiles[name] = GradleBuildCacheClient.Configuration.Profile( + profiles[name] = RemoteBuildCacheClient.Configuration.Profile( uri, authentication, connectionTimeout, @@ -103,6 +103,6 @@ object Parser { } } } - return GradleBuildCacheClient.Configuration(profiles) + return RemoteBuildCacheClient.Configuration(profiles) } } \ No newline at end of file diff --git a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/retry.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt similarity index 98% rename from gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/retry.kt rename to rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt index 6003dda..b02ec21 100644 --- a/gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/retry.kt +++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/retry.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.client +package net.woggioni.rbcs.client import io.netty.util.concurrent.EventExecutorGroup import java.util.concurrent.CompletableFuture diff --git a/gbcs-client/src/main/resources/net/woggioni/gbcs/client/schema/gbcs-client.xsd b/rbcs-client/src/main/resources/net/woggioni/rbcs/client/schema/rbcs-client.xsd similarity index 77% rename from gbcs-client/src/main/resources/net/woggioni/gbcs/client/schema/gbcs-client.xsd rename to rbcs-client/src/main/resources/net/woggioni/rbcs/client/schema/rbcs-client.xsd index d424a6b..2fea379 100644 --- a/gbcs-client/src/main/resources/net/woggioni/gbcs/client/schema/gbcs-client.xsd +++ b/rbcs-client/src/main/resources/net/woggioni/rbcs/client/schema/rbcs-client.xsd @@ -1,25 +1,25 @@ - - + - + - - - + + + - + diff --git a/gbcs-client/src/test/kotlin/net/woggioni/gbcs/client/RetryTest.kt b/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt similarity index 98% rename from gbcs-client/src/test/kotlin/net/woggioni/gbcs/client/RetryTest.kt rename to rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt index 977cc89..760bc6d 100644 --- a/gbcs-client/src/test/kotlin/net/woggioni/gbcs/client/RetryTest.kt +++ b/rbcs-client/src/test/kotlin/net/woggioni/rbcs/client/RetryTest.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.client +package net.woggioni.rbcs.client import io.netty.util.concurrent.DefaultEventExecutorGroup import io.netty.util.concurrent.EventExecutorGroup -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.common.contextLogger import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.params.ParameterizedTest diff --git a/gbcs-client/src/test/resources/logback.xml b/rbcs-client/src/test/resources/logback.xml similarity index 100% rename from gbcs-client/src/test/resources/logback.xml rename to rbcs-client/src/test/resources/logback.xml diff --git a/rbcs-client/src/test/resources/net/woggioni/rbcs/client/test/rbcs-client.xml b/rbcs-client/src/test/resources/net/woggioni/rbcs/client/test/rbcs-client.xml new file mode 100644 index 0000000..96465ee --- /dev/null +++ b/rbcs-client/src/test/resources/net/woggioni/rbcs/client/test/rbcs-client.xml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/gbcs-common/build.gradle b/rbcs-common/build.gradle similarity index 89% rename from gbcs-common/build.gradle rename to rbcs-common/build.gradle index afa0b02..0622894 100644 --- a/gbcs-common/build.gradle +++ b/rbcs-common/build.gradle @@ -6,7 +6,7 @@ plugins { } dependencies { - implementation project(':gbcs-api') + implementation project(':rbcs-api') implementation catalog.slf4j.api implementation catalog.jwo implementation catalog.netty.buffer diff --git a/gbcs-common/src/main/java/module-info.java b/rbcs-common/src/main/java/module-info.java similarity index 65% rename from gbcs-common/src/main/java/module-info.java rename to rbcs-common/src/main/java/module-info.java index 9fb6552..c08df9d 100644 --- a/gbcs-common/src/main/java/module-info.java +++ b/rbcs-common/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module net.woggioni.gbcs.common { +module net.woggioni.rbcs.common { requires java.xml; requires java.logging; requires org.slf4j; @@ -6,6 +6,6 @@ module net.woggioni.gbcs.common { requires net.woggioni.jwo; requires io.netty.buffer; - provides java.net.spi.URLStreamHandlerProvider with net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory; - exports net.woggioni.gbcs.common; + provides java.net.spi.URLStreamHandlerProvider with net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory; + exports net.woggioni.rbcs.common; } \ No newline at end of file diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufInputStream.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt similarity index 95% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufInputStream.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt index 1538da3..8d8ea77 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufInputStream.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufInputStream.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import io.netty.buffer.ByteBuf import java.io.InputStream diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufOutputStream.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt similarity index 85% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufOutputStream.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt index 3e4d026..8cc131e 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufOutputStream.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/ByteBufOutputStream.kt @@ -1,7 +1,6 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import io.netty.buffer.ByteBuf -import java.io.InputStream import java.io.OutputStream class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() { diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Exception.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Exception.kt similarity index 87% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Exception.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Exception.kt index f02cd41..b4232da 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Exception.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Exception.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common class ResourceNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) { } diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/HostAndPort.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/HostAndPort.kt similarity index 80% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/HostAndPort.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/HostAndPort.kt index 2f97a04..59cfc47 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/HostAndPort.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/HostAndPort.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common data class HostAndPort(val host: String, val port: Int = 0) { diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Logging.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt similarity index 98% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Logging.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt index fdca60a..b17cb07 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Logging.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/PasswordSecurity.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/PasswordSecurity.kt similarity index 97% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/PasswordSecurity.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/PasswordSecurity.kt index 32921f8..ecc0810 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/PasswordSecurity.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/PasswordSecurity.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import java.security.SecureRandom import java.security.spec.KeySpec diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GBCS.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt similarity index 79% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GBCS.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt index c9e28c4..8d50375 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GBCS.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt @@ -1,15 +1,15 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import net.woggioni.jwo.JWO import java.net.URI import java.net.URL import java.security.MessageDigest -object GBCS { +object RBCS { fun String.toUrl() : URL = URL.of(URI(this), null) - const val GBCS_NAMESPACE_URI: String = "urn:net.woggioni.gbcs.server" - const val GBCS_PREFIX: String = "gbcs" + const val RBCS_NAMESPACE_URI: String = "urn:net.woggioni.rbcs.server" + const val RBCS_PREFIX: String = "rbcs" const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance" fun digest( diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GbcsUrlStreamHandlerFactory.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RbcsUrlStreamHandlerFactory.kt similarity index 92% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GbcsUrlStreamHandlerFactory.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RbcsUrlStreamHandlerFactory.kt index dae163d..71a3cd8 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GbcsUrlStreamHandlerFactory.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RbcsUrlStreamHandlerFactory.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import java.io.IOException import java.io.InputStream @@ -6,14 +6,13 @@ import java.net.URL import java.net.URLConnection import java.net.URLStreamHandler import java.net.spi.URLStreamHandlerProvider -import java.util.Optional import java.util.concurrent.atomic.AtomicBoolean import java.util.stream.Collectors -class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() { +class RbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() { - private class ClasspathHandler(private val classLoader: ClassLoader = GbcsUrlStreamHandlerFactory::class.java.classLoader) : + private class ClasspathHandler(private val classLoader: ClassLoader = RbcsUrlStreamHandlerFactory::class.java.classLoader) : URLStreamHandler() { override fun openConnection(u: URL): URLConnection? { @@ -88,12 +87,12 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() { private val installed = AtomicBoolean(false) fun install() { if (!installed.getAndSet(true)) { - URL.setURLStreamHandlerFactory(GbcsUrlStreamHandlerFactory()) + URL.setURLStreamHandlerFactory(RbcsUrlStreamHandlerFactory()) } } private val packageMap: Map> by lazy { - GbcsUrlStreamHandlerFactory::class.java.module.layer + RbcsUrlStreamHandlerFactory::class.java.module.layer .modules() .stream() .flatMap { m: Module -> diff --git a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Xml.kt b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt similarity index 99% rename from gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Xml.kt rename to rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt index 3546150..0a05122 100644 --- a/gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Xml.kt +++ b/rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Xml.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.common +package net.woggioni.rbcs.common import net.woggioni.jwo.JWO import org.slf4j.LoggerFactory diff --git a/rbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider b/rbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider new file mode 100644 index 0000000..738bdad --- /dev/null +++ b/rbcs-common/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider @@ -0,0 +1 @@ +net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory \ No newline at end of file diff --git a/gbcs-server-memcache/build.gradle b/rbcs-server-memcache/build.gradle similarity index 94% rename from gbcs-server-memcache/build.gradle rename to rbcs-server-memcache/build.gradle index fed9c28..6aaa6ed 100644 --- a/gbcs-server-memcache/build.gradle +++ b/rbcs-server-memcache/build.gradle @@ -29,8 +29,8 @@ configurations { } dependencies { - implementation project(':gbcs-common') - implementation project(':gbcs-api') + implementation project(':rbcs-common') + implementation project(':rbcs-api') implementation catalog.jwo implementation catalog.slf4j.api implementation catalog.netty.common diff --git a/gbcs-server-memcache/src/main/java/module-info.java b/rbcs-server-memcache/src/main/java/module-info.java similarity index 51% rename from gbcs-server-memcache/src/main/java/module-info.java rename to rbcs-server-memcache/src/main/java/module-info.java index 89bff29..920665a 100644 --- a/gbcs-server-memcache/src/main/java/module-info.java +++ b/rbcs-server-memcache/src/main/java/module-info.java @@ -1,8 +1,8 @@ -import net.woggioni.gbcs.api.CacheProvider; +import net.woggioni.rbcs.api.CacheProvider; -module net.woggioni.gbcs.server.memcache { - requires net.woggioni.gbcs.common; - requires net.woggioni.gbcs.api; +module net.woggioni.rbcs.server.memcache { + requires net.woggioni.rbcs.common; + requires net.woggioni.rbcs.api; requires net.woggioni.jwo; requires java.xml; requires kotlin.stdlib; @@ -13,7 +13,7 @@ module net.woggioni.gbcs.server.memcache { requires io.netty.buffer; requires org.slf4j; - provides CacheProvider with net.woggioni.gbcs.server.memcache.MemcacheCacheProvider; + provides CacheProvider with net.woggioni.rbcs.server.memcache.MemcacheCacheProvider; - opens net.woggioni.gbcs.server.memcache.schema; + opens net.woggioni.rbcs.server.memcache.schema; } \ No newline at end of file diff --git a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/Exception.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/Exception.kt similarity index 78% rename from gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/Exception.kt rename to rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/Exception.kt index a7ca669..31ca929 100644 --- a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/Exception.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/Exception.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.memcache +package net.woggioni.rbcs.server.memcache class MemcacheException(status : Short, msg : String? = null, cause : Throwable? = null) : RuntimeException(msg ?: "Memcached status $status", cause) \ No newline at end of file diff --git a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCache.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCache.kt similarity index 80% rename from gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCache.kt rename to rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCache.kt index 29627e2..8a4d1bc 100644 --- a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCache.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCache.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.server.memcache +package net.woggioni.rbcs.server.memcache import io.netty.buffer.ByteBuf -import net.woggioni.gbcs.api.Cache -import net.woggioni.gbcs.server.memcache.client.MemcacheClient +import net.woggioni.rbcs.api.Cache +import net.woggioni.rbcs.server.memcache.client.MemcacheClient import java.nio.channels.ReadableByteChannel import java.util.concurrent.CompletableFuture diff --git a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheConfiguration.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt similarity index 79% rename from gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheConfiguration.kt rename to rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt index 58fc814..67a32de 100644 --- a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheConfiguration.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheConfiguration.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.memcache +package net.woggioni.rbcs.server.memcache -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.HostAndPort +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.HostAndPort import java.time.Duration data class MemcacheCacheConfiguration( @@ -33,7 +33,7 @@ data class MemcacheCacheConfiguration( override fun materialize() = MemcacheCache(this) - override fun getNamespaceURI() = "urn:net.woggioni.gbcs.server.memcache" + override fun getNamespaceURI() = "urn:net.woggioni.rbcs.server.memcache" override fun getTypeName() = "memcacheCacheType" } diff --git a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheProvider.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt similarity index 84% rename from gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheProvider.kt rename to rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt index d15e569..40e0591 100644 --- a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/MemcacheCacheProvider.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/MemcacheCacheProvider.kt @@ -1,12 +1,12 @@ -package net.woggioni.gbcs.server.memcache +package net.woggioni.rbcs.server.memcache -import net.woggioni.gbcs.api.CacheProvider -import net.woggioni.gbcs.api.exception.ConfigurationException -import net.woggioni.gbcs.common.GBCS -import net.woggioni.gbcs.common.HostAndPort -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.common.Xml.Companion.asIterable -import net.woggioni.gbcs.common.Xml.Companion.renderAttribute +import net.woggioni.rbcs.api.CacheProvider +import net.woggioni.rbcs.api.exception.ConfigurationException +import net.woggioni.rbcs.common.RBCS +import net.woggioni.rbcs.common.HostAndPort +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.Xml.Companion.asIterable +import net.woggioni.rbcs.common.Xml.Companion.renderAttribute import org.w3c.dom.Document import org.w3c.dom.Element import java.time.Duration @@ -14,14 +14,14 @@ import java.time.temporal.ChronoUnit class MemcacheCacheProvider : CacheProvider { - override fun getXmlSchemaLocation() = "jpms://net.woggioni.gbcs.server.memcache/net/woggioni/gbcs/server/memcache/schema/gbcs-memcache.xsd" + override fun getXmlSchemaLocation() = "jpms://net.woggioni.rbcs.server.memcache/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd" override fun getXmlType() = "memcacheCacheType" - override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server.memcache" + override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server.memcache" val xmlNamespacePrefix : String - get() = "gbcs-memcache" + get() = "rbcs-memcache" override fun deserialize(el: Element): MemcacheCacheConfiguration { val servers = mutableListOf() @@ -71,7 +71,7 @@ class MemcacheCacheProvider : CacheProvider { Xml.of(doc, result) { attr("xmlns:${xmlNamespacePrefix}", xmlNamespace, namespaceURI = "http://www.w3.org/2000/xmlns/") - attr("xs:type", "${xmlNamespacePrefix}:$xmlType", GBCS.XML_SCHEMA_NAMESPACE_URI) + attr("xs:type", "${xmlNamespacePrefix}:$xmlType", RBCS.XML_SCHEMA_NAMESPACE_URI) for (server in servers) { node("server") { attr("host", server.endpoint.host) diff --git a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/client/MemcacheClient.kt b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt similarity index 95% rename from gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/client/MemcacheClient.kt rename to rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt index 62cbfad..d163388 100644 --- a/gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/client/MemcacheClient.kt +++ b/rbcs-server-memcache/src/main/kotlin/net/woggioni/rbcs/server/memcache/client/MemcacheClient.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.memcache.client +package net.woggioni.rbcs.server.memcache.client import io.netty.bootstrap.Bootstrap @@ -23,15 +23,14 @@ import io.netty.handler.codec.memcache.binary.DefaultFullBinaryMemcacheRequest import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheRequest import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheResponse import io.netty.util.concurrent.GenericFutureListener -import net.woggioni.gbcs.common.ByteBufInputStream -import net.woggioni.gbcs.common.ByteBufOutputStream -import net.woggioni.gbcs.common.GBCS.digest -import net.woggioni.gbcs.common.HostAndPort -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.server.memcache.MemcacheCacheConfiguration -import net.woggioni.gbcs.server.memcache.MemcacheException +import net.woggioni.rbcs.common.ByteBufInputStream +import net.woggioni.rbcs.common.ByteBufOutputStream +import net.woggioni.rbcs.common.RBCS.digest +import net.woggioni.rbcs.common.HostAndPort +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.server.memcache.MemcacheCacheConfiguration +import net.woggioni.rbcs.server.memcache.MemcacheException import net.woggioni.jwo.JWO -import java.io.ByteArrayOutputStream import java.net.InetSocketAddress import java.nio.channels.Channels import java.nio.channels.ReadableByteChannel diff --git a/rbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider b/rbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider new file mode 100644 index 0000000..5a04b38 --- /dev/null +++ b/rbcs-server-memcache/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider @@ -0,0 +1 @@ +net.woggioni.rbcs.server.memcache.MemcacheCacheProvider \ No newline at end of file diff --git a/gbcs-server-memcache/src/main/resources/net/woggioni/gbcs/server/memcache/schema/gbcs-memcache.xsd b/rbcs-server-memcache/src/main/resources/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd similarity index 71% rename from gbcs-server-memcache/src/main/resources/net/woggioni/gbcs/server/memcache/schema/gbcs-memcache.xsd rename to rbcs-server-memcache/src/main/resources/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd index 946a1da..ae6b557 100644 --- a/gbcs-server-memcache/src/main/resources/net/woggioni/gbcs/server/memcache/schema/gbcs-memcache.xsd +++ b/rbcs-server-memcache/src/main/resources/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd @@ -1,10 +1,10 @@ - - + @@ -15,14 +15,14 @@ - + - + - + diff --git a/gbcs-server/build.gradle b/rbcs-server/build.gradle similarity index 85% rename from gbcs-server/build.gradle rename to rbcs-server/build.gradle index 71603c1..62507bb 100644 --- a/gbcs-server/build.gradle +++ b/rbcs-server/build.gradle @@ -10,8 +10,8 @@ dependencies { implementation catalog.slf4j.api implementation catalog.netty.codec.http - api project(':gbcs-common') - api project(':gbcs-api') + api project(':rbcs-common') + api project(':rbcs-api') // runtimeOnly catalog.slf4j.jdk14 testRuntimeOnly catalog.logback.classic @@ -19,7 +19,7 @@ dependencies { testImplementation catalog.bcprov.jdk18on testImplementation catalog.bcpkix.jdk18on - testRuntimeOnly project(":gbcs-server-memcache") + testRuntimeOnly project(":rbcs-server-memcache") } test { diff --git a/gbcs-server/src/main/java/module-info.java b/rbcs-server/src/main/java/module-info.java similarity index 54% rename from gbcs-server/src/main/java/module-info.java rename to rbcs-server/src/main/java/module-info.java index 4e00a8c..5f8951a 100644 --- a/gbcs-server/src/main/java/module-info.java +++ b/rbcs-server/src/main/java/module-info.java @@ -1,8 +1,8 @@ -import net.woggioni.gbcs.api.CacheProvider; -import net.woggioni.gbcs.server.cache.FileSystemCacheProvider; -import net.woggioni.gbcs.server.cache.InMemoryCacheProvider; +import net.woggioni.rbcs.api.CacheProvider; +import net.woggioni.rbcs.server.cache.FileSystemCacheProvider; +import net.woggioni.rbcs.server.cache.InMemoryCacheProvider; -module net.woggioni.gbcs.server { +module net.woggioni.rbcs.server { requires java.sql; requires java.xml; requires java.logging; @@ -16,13 +16,13 @@ module net.woggioni.gbcs.server { requires io.netty.codec; requires org.slf4j; requires net.woggioni.jwo; - requires net.woggioni.gbcs.common; - requires net.woggioni.gbcs.api; + requires net.woggioni.rbcs.common; + requires net.woggioni.rbcs.api; - exports net.woggioni.gbcs.server; + exports net.woggioni.rbcs.server; - opens net.woggioni.gbcs.server; - opens net.woggioni.gbcs.server.schema; + opens net.woggioni.rbcs.server; + opens net.woggioni.rbcs.server.schema; uses CacheProvider; provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider; diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/Logging.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/Logging.kt similarity index 97% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/Logging.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/Logging.kt index b7b8334..31ef121 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/Logging.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/Logging.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server +package net.woggioni.rbcs.server import io.netty.channel.ChannelHandlerContext import org.slf4j.Logger diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/GradleBuildCacheServer.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt similarity index 93% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/GradleBuildCacheServer.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt index 516f2aa..345a93c 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/GradleBuildCacheServer.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server +package net.woggioni.rbcs.server import io.netty.bootstrap.ServerBootstrap import io.netty.buffer.ByteBuf @@ -30,24 +30,24 @@ import io.netty.handler.timeout.IdleStateHandler import io.netty.util.AttributeKey import io.netty.util.concurrent.DefaultEventExecutorGroup import io.netty.util.concurrent.EventExecutorGroup -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.exception.ConfigurationException -import net.woggioni.gbcs.common.GBCS.toUrl -import net.woggioni.gbcs.common.PasswordSecurity.decodePasswordHash -import net.woggioni.gbcs.common.PasswordSecurity.hashPassword -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.common.debug -import net.woggioni.gbcs.common.info -import net.woggioni.gbcs.server.auth.AbstractNettyHttpAuthenticator -import net.woggioni.gbcs.server.auth.Authorizer -import net.woggioni.gbcs.server.auth.ClientCertificateValidator -import net.woggioni.gbcs.server.auth.RoleAuthorizer -import net.woggioni.gbcs.server.configuration.Parser -import net.woggioni.gbcs.server.configuration.Serializer -import net.woggioni.gbcs.server.exception.ExceptionHandler -import net.woggioni.gbcs.server.handler.ServerHandler -import net.woggioni.gbcs.server.throttling.ThrottlingHandler +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.exception.ConfigurationException +import net.woggioni.rbcs.common.RBCS.toUrl +import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash +import net.woggioni.rbcs.common.PasswordSecurity.hashPassword +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.common.debug +import net.woggioni.rbcs.common.info +import net.woggioni.rbcs.server.auth.AbstractNettyHttpAuthenticator +import net.woggioni.rbcs.server.auth.Authorizer +import net.woggioni.rbcs.server.auth.ClientCertificateValidator +import net.woggioni.rbcs.server.auth.RoleAuthorizer +import net.woggioni.rbcs.server.configuration.Parser +import net.woggioni.rbcs.server.configuration.Serializer +import net.woggioni.rbcs.server.exception.ExceptionHandler +import net.woggioni.rbcs.server.handler.ServerHandler +import net.woggioni.rbcs.server.throttling.ThrottlingHandler import net.woggioni.jwo.JWO import net.woggioni.jwo.Tuple2 import java.io.OutputStream @@ -65,7 +65,7 @@ import java.util.regex.Pattern import javax.naming.ldap.LdapName import javax.net.ssl.SSLPeerUnverifiedException -class GradleBuildCacheServer(private val cfg: Configuration) { +class RemoteBuildCacheServer(private val cfg: Configuration) { private val log = contextLogger() companion object { @@ -73,7 +73,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) { val userAttribute: AttributeKey = AttributeKey.valueOf("user") val groupAttribute: AttributeKey> = AttributeKey.valueOf("group") - val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/gbcs/gbcs-default.xml".toUrl() } + val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/rbcs/server/rbcs-default.xml".toUrl() } private const val SSL_HANDLER_NAME = "sslHandler" fun loadConfiguration(configurationFile: Path): Configuration { @@ -393,7 +393,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) { } } log.info { - "GradleBuildCacheServer has been gracefully shut down" + "RemoteBuildCacheServer has been gracefully shut down" } } } @@ -425,7 +425,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) { val bindAddress = InetSocketAddress(cfg.host, cfg.port) val httpChannel = bootstrap.bind(bindAddress).sync() log.info { - "GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}" + "RemoteBuildCacheServer is listening on ${cfg.host}:${cfg.port}" } return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup)) } diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authenticator.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt similarity index 88% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authenticator.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt index bb9c9a3..163fd37 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authenticator.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.auth +package net.woggioni.rbcs.server.auth import io.netty.buffer.Unpooled import io.netty.channel.ChannelFutureListener @@ -11,10 +11,10 @@ import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.netty.util.ReferenceCountUtil -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Configuration.Group -import net.woggioni.gbcs.api.Role -import net.woggioni.gbcs.server.GradleBuildCacheServer +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Configuration.Group +import net.woggioni.rbcs.api.Role +import net.woggioni.rbcs.server.RemoteBuildCacheServer abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer) : ChannelInboundHandlerAdapter() { @@ -40,8 +40,8 @@ abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer override fun channelRead(ctx: ChannelHandlerContext, msg: Any) { if (msg is HttpRequest) { val result = authenticate(ctx, msg) ?: return authenticationFailure(ctx, msg) - ctx.channel().attr(GradleBuildCacheServer.userAttribute).set(result.user) - ctx.channel().attr(GradleBuildCacheServer.groupAttribute).set(result.groups) + ctx.channel().attr(RemoteBuildCacheServer.userAttribute).set(result.user) + ctx.channel().attr(RemoteBuildCacheServer.groupAttribute).set(result.groups) val roles = ( (result.user?.let { user -> diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authorizer.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authorizer.kt similarity index 66% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authorizer.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authorizer.kt index 28e64bc..1e777db 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/Authorizer.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authorizer.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.auth +package net.woggioni.rbcs.server.auth import io.netty.handler.codec.http.HttpRequest -import net.woggioni.gbcs.api.Role +import net.woggioni.rbcs.api.Role fun interface Authorizer { fun authorize(roles : Set, request: HttpRequest) : Boolean diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/ClientCertificateValidator.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/ClientCertificateValidator.kt similarity index 99% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/ClientCertificateValidator.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/ClientCertificateValidator.kt index 8689de2..fe24d17 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/ClientCertificateValidator.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/ClientCertificateValidator.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.auth +package net.woggioni.rbcs.server.auth import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelInboundHandlerAdapter diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/UserAuthorizer.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/UserAuthorizer.kt similarity index 89% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/UserAuthorizer.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/UserAuthorizer.kt index aedf65f..072dfb3 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/auth/UserAuthorizer.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/UserAuthorizer.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.server.auth +package net.woggioni.rbcs.server.auth import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpRequest -import net.woggioni.gbcs.api.Role +import net.woggioni.rbcs.api.Role class RoleAuthorizer : Authorizer { diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCache.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt similarity index 94% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCache.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt index 1b280f8..eb5b552 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCache.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt @@ -1,10 +1,10 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache import io.netty.buffer.ByteBuf -import net.woggioni.gbcs.api.Cache -import net.woggioni.gbcs.common.ByteBufInputStream -import net.woggioni.gbcs.common.GBCS.digestString -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.api.Cache +import net.woggioni.rbcs.common.ByteBufInputStream +import net.woggioni.rbcs.common.RBCS.digestString +import net.woggioni.rbcs.common.contextLogger import net.woggioni.jwo.JWO import net.woggioni.jwo.LockFile import java.nio.channels.Channels diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheConfiguration.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt similarity index 68% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheConfiguration.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt index 8d32d80..287c0b6 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheConfiguration.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheConfiguration.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.GBCS +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.RBCS import net.woggioni.jwo.Application import java.nio.file.Path import java.time.Duration @@ -14,14 +14,14 @@ data class FileSystemCacheConfiguration( val compressionLevel: Int, ) : Configuration.Cache { override fun materialize() = FileSystemCache( - root ?: Application.builder("gbcs").build().computeCacheDirectory(), + root ?: Application.builder("rbcs").build().computeCacheDirectory(), maxAge, digestAlgorithm, compressionEnabled, compressionLevel ) - override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI + override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI override fun getTypeName() = "fileSystemCacheType" } \ No newline at end of file diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheProvider.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheProvider.kt similarity index 80% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheProvider.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheProvider.kt index 55dc94c..84286f8 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/FileSystemCacheProvider.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCacheProvider.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache -import net.woggioni.gbcs.api.CacheProvider -import net.woggioni.gbcs.common.GBCS -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.common.Xml.Companion.renderAttribute +import net.woggioni.rbcs.api.CacheProvider +import net.woggioni.rbcs.common.RBCS +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.Xml.Companion.renderAttribute import org.w3c.dom.Document import org.w3c.dom.Element import java.nio.file.Path @@ -12,11 +12,11 @@ import java.util.zip.Deflater class FileSystemCacheProvider : CacheProvider { - override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/server/schema/gbcs.xsd" + override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd" override fun getXmlType() = "fileSystemCacheType" - override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server" + override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server" override fun deserialize(el: Element): FileSystemCacheConfiguration { val path = el.renderAttribute("path") @@ -44,8 +44,8 @@ class FileSystemCacheProvider : CacheProvider { override fun serialize(doc: Document, cache : FileSystemCacheConfiguration) = cache.run { val result = doc.createElement("cache") Xml.of(doc, result) { - val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI) - attr("xs:type", "${prefix}:fileSystemCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI) + val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI) + attr("xs:type", "${prefix}:fileSystemCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI) attr("path", root.toString()) attr("max-age", maxAge.toString()) digestAlgorithm?.let { digestAlgorithm -> diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCache.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt similarity index 94% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCache.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt index 1490684..ecdc7ee 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCache.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt @@ -1,11 +1,11 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache import io.netty.buffer.ByteBuf -import net.woggioni.gbcs.api.Cache -import net.woggioni.gbcs.common.ByteBufInputStream -import net.woggioni.gbcs.common.ByteBufOutputStream -import net.woggioni.gbcs.common.GBCS.digestString -import net.woggioni.gbcs.common.contextLogger +import net.woggioni.rbcs.api.Cache +import net.woggioni.rbcs.common.ByteBufInputStream +import net.woggioni.rbcs.common.ByteBufOutputStream +import net.woggioni.rbcs.common.RBCS.digestString +import net.woggioni.rbcs.common.contextLogger import net.woggioni.jwo.JWO import java.nio.channels.Channels import java.security.MessageDigest diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheConfiguration.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt similarity index 72% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheConfiguration.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt index b638206..9a8071b 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheConfiguration.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.GBCS +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.RBCS import java.time.Duration data class InMemoryCacheConfiguration( @@ -19,7 +19,7 @@ data class InMemoryCacheConfiguration( compressionLevel ) - override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI + override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI override fun getTypeName() = "inMemoryCacheType" } \ No newline at end of file diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheProvider.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt similarity index 80% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheProvider.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt index c54f82c..43112aa 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheProvider.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.server.cache +package net.woggioni.rbcs.server.cache -import net.woggioni.gbcs.api.CacheProvider -import net.woggioni.gbcs.common.GBCS -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.common.Xml.Companion.renderAttribute +import net.woggioni.rbcs.api.CacheProvider +import net.woggioni.rbcs.common.RBCS +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.common.Xml.Companion.renderAttribute import org.w3c.dom.Document import org.w3c.dom.Element import java.time.Duration @@ -11,11 +11,11 @@ import java.util.zip.Deflater class InMemoryCacheProvider : CacheProvider { - override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/server/schema/gbcs.xsd" + override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd" override fun getXmlType() = "inMemoryCacheType" - override fun getXmlNamespace() = "urn:net.woggioni.gbcs.server" + override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server" override fun deserialize(el: Element): InMemoryCacheConfiguration { val maxAge = el.renderAttribute("max-age") @@ -44,8 +44,8 @@ class InMemoryCacheProvider : CacheProvider { override fun serialize(doc: Document, cache : InMemoryCacheConfiguration) = cache.run { val result = doc.createElement("cache") Xml.of(doc, result) { - val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI) - attr("xs:type", "${prefix}:inMemoryCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI) + val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI) + attr("xs:type", "${prefix}:inMemoryCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI) attr("max-age", maxAge.toString()) attr("max-size", maxSize.toString()) digestAlgorithm?.let { digestAlgorithm -> diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/CacheSerializers.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/CacheSerializers.kt similarity index 72% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/CacheSerializers.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/CacheSerializers.kt index 4f9bed4..4efff37 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/CacheSerializers.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/CacheSerializers.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.configuration +package net.woggioni.rbcs.server.configuration -import net.woggioni.gbcs.api.CacheProvider -import net.woggioni.gbcs.api.Configuration +import net.woggioni.rbcs.api.CacheProvider +import net.woggioni.rbcs.api.Configuration import java.util.ServiceLoader object CacheSerializers { diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Parser.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Parser.kt similarity index 93% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Parser.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Parser.kt index 251d16d..04ae765 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Parser.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Parser.kt @@ -1,20 +1,20 @@ -package net.woggioni.gbcs.server.configuration +package net.woggioni.rbcs.server.configuration -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Configuration.Authentication -import net.woggioni.gbcs.api.Configuration.BasicAuthentication -import net.woggioni.gbcs.api.Configuration.Cache -import net.woggioni.gbcs.api.Configuration.ClientCertificateAuthentication -import net.woggioni.gbcs.api.Configuration.Group -import net.woggioni.gbcs.api.Configuration.KeyStore -import net.woggioni.gbcs.api.Configuration.Tls -import net.woggioni.gbcs.api.Configuration.TlsCertificateExtractor -import net.woggioni.gbcs.api.Configuration.TrustStore -import net.woggioni.gbcs.api.Configuration.User -import net.woggioni.gbcs.api.Role -import net.woggioni.gbcs.api.exception.ConfigurationException -import net.woggioni.gbcs.common.Xml.Companion.asIterable -import net.woggioni.gbcs.common.Xml.Companion.renderAttribute +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Configuration.Authentication +import net.woggioni.rbcs.api.Configuration.BasicAuthentication +import net.woggioni.rbcs.api.Configuration.Cache +import net.woggioni.rbcs.api.Configuration.ClientCertificateAuthentication +import net.woggioni.rbcs.api.Configuration.Group +import net.woggioni.rbcs.api.Configuration.KeyStore +import net.woggioni.rbcs.api.Configuration.Tls +import net.woggioni.rbcs.api.Configuration.TlsCertificateExtractor +import net.woggioni.rbcs.api.Configuration.TrustStore +import net.woggioni.rbcs.api.Configuration.User +import net.woggioni.rbcs.api.Role +import net.woggioni.rbcs.api.exception.ConfigurationException +import net.woggioni.rbcs.common.Xml.Companion.asIterable +import net.woggioni.rbcs.common.Xml.Companion.renderAttribute import org.w3c.dom.Document import org.w3c.dom.Element import org.w3c.dom.TypeInfo diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Serializer.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Serializer.kt similarity index 96% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Serializer.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Serializer.kt index f481da5..b20b7e5 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/configuration/Serializer.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/configuration/Serializer.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.server.configuration +package net.woggioni.rbcs.server.configuration -import net.woggioni.gbcs.api.CacheProvider -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.GBCS -import net.woggioni.gbcs.common.Xml +import net.woggioni.rbcs.api.CacheProvider +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.RBCS +import net.woggioni.rbcs.common.Xml import org.w3c.dom.Document object Serializer { @@ -19,10 +19,10 @@ object Serializer { val schemaLocations = CacheSerializers.index.values.asSequence().map { it.xmlNamespace to it.xmlSchemaLocation }.toMap() - return Xml.of(GBCS.GBCS_NAMESPACE_URI, GBCS.GBCS_PREFIX + ":server") { + return Xml.of(RBCS.RBCS_NAMESPACE_URI, RBCS.RBCS_PREFIX + ":server") { // attr("xmlns:xs", GradleBuildCacheServer.XML_SCHEMA_NAMESPACE_URI) val value = schemaLocations.asSequence().map { (k, v) -> "$k $v" }.joinToString(" ") - attr("xs:schemaLocation", value , namespaceURI = GBCS.XML_SCHEMA_NAMESPACE_URI) + attr("xs:schemaLocation", value , namespaceURI = RBCS.XML_SCHEMA_NAMESPACE_URI) conf.serverPath ?.takeIf(String::isNotEmpty) diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/exception/ExceptionHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt similarity index 93% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/exception/ExceptionHandler.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt index bf8e4d6..b9f1e2e 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/exception/ExceptionHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.exception +package net.woggioni.rbcs.server.exception import io.netty.buffer.Unpooled import io.netty.channel.ChannelDuplexHandler @@ -13,10 +13,10 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.netty.handler.timeout.ReadTimeoutException import io.netty.handler.timeout.WriteTimeoutException -import net.woggioni.gbcs.api.exception.CacheException -import net.woggioni.gbcs.api.exception.ContentTooLargeException -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.common.debug +import net.woggioni.rbcs.api.exception.CacheException +import net.woggioni.rbcs.api.exception.ContentTooLargeException +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.common.debug import javax.net.ssl.SSLPeerUnverifiedException @ChannelHandler.Sharable diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/handler/ServerHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt similarity index 97% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/handler/ServerHandler.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt index 41c001c..97a3aa3 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/handler/ServerHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ServerHandler.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.handler +package net.woggioni.rbcs.server.handler import io.netty.buffer.Unpooled import io.netty.channel.ChannelFutureListener @@ -16,10 +16,10 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpUtil import io.netty.handler.codec.http.LastHttpContent import io.netty.handler.stream.ChunkedNioStream -import net.woggioni.gbcs.api.Cache -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.server.debug -import net.woggioni.gbcs.server.warn +import net.woggioni.rbcs.api.Cache +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.server.debug +import net.woggioni.rbcs.server.warn import java.nio.channels.FileChannel import java.nio.file.Path diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/BucketManager.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt similarity index 97% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/BucketManager.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt index 891a229..a75524b 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/BucketManager.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/BucketManager.kt @@ -1,6 +1,6 @@ -package net.woggioni.gbcs.server.throttling +package net.woggioni.rbcs.server.throttling -import net.woggioni.gbcs.api.Configuration +import net.woggioni.rbcs.api.Configuration import net.woggioni.jwo.Bucket import java.net.InetSocketAddress import java.util.Arrays diff --git a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/ThrottlingHandler.kt b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt similarity index 91% rename from gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/ThrottlingHandler.kt rename to rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt index a44d461..09f6b85 100644 --- a/gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/throttling/ThrottlingHandler.kt +++ b/rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/throttling/ThrottlingHandler.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.throttling +package net.woggioni.rbcs.server.throttling import io.netty.channel.ChannelHandler.Sharable import io.netty.channel.ChannelHandlerContext @@ -7,9 +7,9 @@ import io.netty.handler.codec.http.DefaultFullHttpResponse import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.contextLogger -import net.woggioni.gbcs.server.GradleBuildCacheServer +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.contextLogger +import net.woggioni.rbcs.server.RemoteBuildCacheServer import net.woggioni.jwo.Bucket import net.woggioni.jwo.LongMath import java.net.InetSocketAddress @@ -40,11 +40,11 @@ class ThrottlingHandler(cfg: Configuration) : override fun channelRead(ctx: ChannelHandlerContext, msg: Any) { val buckets = mutableListOf() - val user = ctx.channel().attr(GradleBuildCacheServer.userAttribute).get() + val user = ctx.channel().attr(RemoteBuildCacheServer.userAttribute).get() if (user != null) { bucketManager.getBucketByUser(user)?.let(buckets::addAll) } - val groups = ctx.channel().attr(GradleBuildCacheServer.groupAttribute).get() ?: emptySet() + val groups = ctx.channel().attr(RemoteBuildCacheServer.groupAttribute).get() ?: emptySet() if (groups.isNotEmpty()) { groups.forEach { group -> bucketManager.getBucketByGroup(group)?.let(buckets::add) diff --git a/rbcs-server/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider b/rbcs-server/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider new file mode 100644 index 0000000..46a7419 --- /dev/null +++ b/rbcs-server/src/main/resources/META-INF/services/net.woggioni.rbcs.api.CacheProvider @@ -0,0 +1,2 @@ +net.woggioni.rbcs.server.cache.FileSystemCacheProvider +net.woggioni.rbcs.server.cache.InMemoryCacheProvider \ No newline at end of file diff --git a/gbcs-server/src/main/resources/net/woggioni/gbcs/server/gbcs-default.xml b/rbcs-server/src/main/resources/net/woggioni/rbcs/server/rbcs-default.xml similarity index 67% rename from gbcs-server/src/main/resources/net/woggioni/gbcs/server/gbcs-default.xml rename to rbcs-server/src/main/resources/net/woggioni/rbcs/server/rbcs-default.xml index ca17e90..fcd9473 100644 --- a/gbcs-server/src/main/resources/net/woggioni/gbcs/server/gbcs-default.xml +++ b/rbcs-server/src/main/resources/net/woggioni/rbcs/server/rbcs-default.xml @@ -1,8 +1,8 @@ - + xmlns:rbcs="urn:net.woggioni.rbcs.server" + xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs.xsd"> - + - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/main/resources/net/woggioni/gbcs/server/schema/gbcs.xsd b/rbcs-server/src/main/resources/net/woggioni/rbcs/server/schema/rbcs.xsd similarity index 80% rename from gbcs-server/src/main/resources/net/woggioni/gbcs/server/schema/gbcs.xsd rename to rbcs-server/src/main/resources/net/woggioni/rbcs/server/schema/rbcs.xsd index a436257..5ede3b1 100644 --- a/gbcs-server/src/main/resources/net/woggioni/gbcs/server/schema/gbcs.xsd +++ b/rbcs-server/src/main/resources/net/woggioni/rbcs/server/schema/rbcs.xsd @@ -1,28 +1,28 @@ - - + - - - - - + + + + + - + - - + + @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -74,8 +74,8 @@ - - + + @@ -86,8 +86,8 @@ - - + + @@ -99,7 +99,7 @@ - + @@ -113,13 +113,13 @@ - + - + @@ -127,28 +127,28 @@ - - + + - + - + - - - + + + @@ -171,7 +171,7 @@ - + @@ -182,8 +182,8 @@ - - + + @@ -203,7 +203,7 @@ - + diff --git a/gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/CertificateUtils.java b/rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/CertificateUtils.java similarity index 99% rename from gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/CertificateUtils.java rename to rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/CertificateUtils.java index fb6486e..09a7a93 100644 --- a/gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/CertificateUtils.java +++ b/rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/CertificateUtils.java @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.test.utils; +package net.woggioni.rbcs.server.test.utils; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.x500.X500Name; diff --git a/gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/NetworkUtils.java b/rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/NetworkUtils.java similarity index 95% rename from gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/NetworkUtils.java rename to rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/NetworkUtils.java index 132aabd..520dcb7 100644 --- a/gbcs-server/src/test/java/net/woggioni/gbcs/server/test/utils/NetworkUtils.java +++ b/rbcs-server/src/test/java/net/woggioni/rbcs/server/test/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.test.utils; +package net.woggioni.rbcs.server.test.utils; import net.woggioni.jwo.JWO; diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractBasicAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractBasicAuthServerTest.kt similarity index 88% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractBasicAuthServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractBasicAuthServerTest.kt index fbd260f..318f9e4 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractBasicAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractBasicAuthServerTest.kt @@ -1,11 +1,11 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Role -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.server.cache.FileSystemCacheConfiguration -import net.woggioni.gbcs.server.configuration.Serializer -import net.woggioni.gbcs.server.test.utils.NetworkUtils +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Role +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.server.cache.FileSystemCacheConfiguration +import net.woggioni.rbcs.server.configuration.Serializer +import net.woggioni.rbcs.server.test.utils.NetworkUtils import java.net.URI import java.net.http.HttpRequest import java.nio.charset.StandardCharsets @@ -23,7 +23,7 @@ abstract class AbstractBasicAuthServerTest : AbstractServerTest() { protected val random = Random(101325) protected val keyValuePair = newEntry(random) - protected val serverPath = "gbcs" + protected val serverPath = "rbcs" protected val readersGroup = Configuration.Group("readers", setOf(Role.Reader), null, null) protected val writersGroup = Configuration.Group("writers", setOf(Role.Writer), null, null) diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractServerTest.kt similarity index 78% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractServerTest.kt index da05365..a00cc94 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractServerTest.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.server.GradleBuildCacheServer +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.server.RemoteBuildCacheServer import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.MethodOrderer @@ -19,7 +19,7 @@ abstract class AbstractServerTest { protected lateinit var testDir : Path - private var serverHandle : GradleBuildCacheServer.ServerHandle? = null + private var serverHandle : RemoteBuildCacheServer.ServerHandle? = null @BeforeAll fun setUp0(@TempDir tmpDir : Path) { @@ -39,7 +39,7 @@ abstract class AbstractServerTest { abstract fun tearDown() private fun startServer(cfg : Configuration) { - this.serverHandle = GradleBuildCacheServer(cfg).run() + this.serverHandle = RemoteBuildCacheServer(cfg).run() } private fun stopServer() { diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractTlsServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractTlsServerTest.kt similarity index 92% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractTlsServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractTlsServerTest.kt index 7ff0e9e..db365fe 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/AbstractTlsServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractTlsServerTest.kt @@ -1,13 +1,13 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Role -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.server.cache.FileSystemCacheConfiguration -import net.woggioni.gbcs.server.configuration.Serializer -import net.woggioni.gbcs.server.test.utils.CertificateUtils -import net.woggioni.gbcs.server.test.utils.CertificateUtils.X509Credentials -import net.woggioni.gbcs.server.test.utils.NetworkUtils +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Role +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.server.cache.FileSystemCacheConfiguration +import net.woggioni.rbcs.server.configuration.Serializer +import net.woggioni.rbcs.server.test.utils.CertificateUtils +import net.woggioni.rbcs.server.test.utils.CertificateUtils.X509Credentials +import net.woggioni.rbcs.server.test.utils.NetworkUtils import org.bouncycastle.asn1.x500.X500Name import java.net.URI import java.net.http.HttpClient @@ -30,9 +30,9 @@ import kotlin.random.Random abstract class AbstractTlsServerTest : AbstractServerTest() { companion object { - private const val CA_CERTIFICATE_ENTRY = "gbcs-ca" - private const val CLIENT_CERTIFICATE_ENTRY = "gbcs-client" - private const val SERVER_CERTIFICATE_ENTRY = "gbcs-server" + private const val CA_CERTIFICATE_ENTRY = "rbcs-ca" + private const val CLIENT_CERTIFICATE_ENTRY = "rbcs-client" + private const val SERVER_CERTIFICATE_ENTRY = "rbcs-server" private const val PASSWORD = "password" } diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/BasicAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt similarity index 97% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/BasicAuthServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt index 91ef79b..c5b8349 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/BasicAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/BasicAuthServerTest.kt @@ -1,9 +1,9 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import io.netty.handler.codec.http.HttpResponseStatus -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Role -import net.woggioni.gbcs.common.PasswordSecurity.hashPassword +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Role +import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/ConfigurationTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/ConfigurationTest.kt similarity index 57% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/ConfigurationTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/ConfigurationTest.kt index 2a63b10..fc8f7b4 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/ConfigurationTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/ConfigurationTest.kt @@ -1,10 +1,10 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test -import net.woggioni.gbcs.common.GBCS.toUrl -import net.woggioni.gbcs.common.GbcsUrlStreamHandlerFactory -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.server.configuration.Parser -import net.woggioni.gbcs.server.configuration.Serializer +import net.woggioni.rbcs.common.RBCS.toUrl +import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.server.configuration.Parser +import net.woggioni.rbcs.server.configuration.Serializer import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.io.TempDir import org.junit.jupiter.params.ParameterizedTest @@ -17,18 +17,18 @@ class ConfigurationTest { @ValueSource( strings = [ - "classpath:net/woggioni/gbcs/server/test/valid/gbcs-default.xml", - "classpath:net/woggioni/gbcs/server/test/valid/gbcs-memcached.xml", - "classpath:net/woggioni/gbcs/server/test/valid/gbcs-tls.xml", - "classpath:net/woggioni/gbcs/server/test/valid/gbcs-memcached-tls.xml", + "classpath:net/woggioni/rbcs/server/test/valid/rbcs-default.xml", + "classpath:net/woggioni/rbcs/server/test/valid/rbcs-memcached.xml", + "classpath:net/woggioni/rbcs/server/test/valid/rbcs-tls.xml", + "classpath:net/woggioni/rbcs/server/test/valid/rbcs-memcached-tls.xml", ] ) @ParameterizedTest fun test(configurationUrl: String, @TempDir testDir: Path) { - GbcsUrlStreamHandlerFactory.install() + RbcsUrlStreamHandlerFactory.install() val doc = Xml.parseXml(configurationUrl.toUrl()) val cfg = Parser.parse(doc) - val configFile = testDir.resolve("gbcs.xml") + val configFile = testDir.resolve("rbcs.xml") Files.newOutputStream(configFile).use { Xml.write(Serializer.serialize(cfg), it) } @@ -40,15 +40,15 @@ class ConfigurationTest { @ValueSource( strings = [ - "classpath:net/woggioni/gbcs/server/test/invalid/invalid-user-ref.xml", - "classpath:net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user.xml", - "classpath:net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user2.xml", - "classpath:net/woggioni/gbcs/server/test/invalid/multiple-user-quota.xml", + "classpath:net/woggioni/rbcs/server/test/invalid/invalid-user-ref.xml", + "classpath:net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user.xml", + "classpath:net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user2.xml", + "classpath:net/woggioni/rbcs/server/test/invalid/multiple-user-quota.xml", ] ) @ParameterizedTest fun invalidConfigurationTest(configurationUrl: String) { - GbcsUrlStreamHandlerFactory.install() + RbcsUrlStreamHandlerFactory.install() Assertions.assertThrows(SAXParseException::class.java) { Xml.parseXml(configurationUrl.toUrl()) } diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt similarity index 92% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt index 1672b7f..e6f41bb 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserBasicAuthServerTest.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import io.netty.handler.codec.http.HttpResponseStatus -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.PasswordSecurity.hashPassword +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.PasswordSecurity.hashPassword import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserTlsServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt similarity index 95% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserTlsServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt index 5ebab76..af168db 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAnonymousUserTlsServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAnonymousUserTlsServerTest.kt @@ -1,7 +1,7 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import io.netty.handler.codec.http.HttpResponseStatus -import net.woggioni.gbcs.api.Configuration +import net.woggioni.rbcs.api.Configuration import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAuthServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt similarity index 93% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAuthServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt index 474ec6e..b0d5c46 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAuthServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt @@ -1,11 +1,11 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import io.netty.handler.codec.http.HttpResponseStatus -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.common.Xml -import net.woggioni.gbcs.server.cache.InMemoryCacheConfiguration -import net.woggioni.gbcs.server.configuration.Serializer -import net.woggioni.gbcs.server.test.utils.NetworkUtils +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.common.Xml +import net.woggioni.rbcs.server.cache.InMemoryCacheConfiguration +import net.woggioni.rbcs.server.configuration.Serializer +import net.woggioni.rbcs.server.test.utils.NetworkUtils import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/TlsServerTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt similarity index 98% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/TlsServerTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt index e753a53..3f95cb0 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/TlsServerTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/TlsServerTest.kt @@ -1,8 +1,8 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import io.netty.handler.codec.http.HttpResponseStatus -import net.woggioni.gbcs.api.Configuration -import net.woggioni.gbcs.api.Role +import net.woggioni.rbcs.api.Configuration +import net.woggioni.rbcs.api.Role import org.bouncycastle.asn1.x500.X500Name import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Order diff --git a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/X500NameTest.kt b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/X500NameTest.kt similarity index 93% rename from gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/X500NameTest.kt rename to rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/X500NameTest.kt index 1c89bec..6306278 100644 --- a/gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/X500NameTest.kt +++ b/rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/X500NameTest.kt @@ -1,4 +1,4 @@ -package net.woggioni.gbcs.server.test +package net.woggioni.rbcs.server.test import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/gbcs-server/src/test/resources/logback.xml b/rbcs-server/src/test/resources/logback.xml similarity index 100% rename from gbcs-server/src/test/resources/logback.xml rename to rbcs-server/src/test/resources/logback.xml diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user.xml similarity index 60% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user.xml index 01bebab..10f25bd9 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user.xml @@ -1,9 +1,9 @@ - + - + @@ -16,4 +16,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user2.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user2.xml similarity index 65% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user2.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user2.xml index 0a2f507..ffc82b9 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/duplicate-anonymous-user2.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/duplicate-anonymous-user2.xml @@ -1,9 +1,9 @@ - + - + @@ -22,4 +22,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/invalid-user-ref.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/invalid-user-ref.xml similarity index 65% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/invalid-user-ref.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/invalid-user-ref.xml index 0669ea4..643674f 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/invalid-user-ref.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/invalid-user-ref.xml @@ -1,9 +1,9 @@ - + - + @@ -21,4 +21,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/multiple-user-quota.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/multiple-user-quota.xml similarity index 53% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/multiple-user-quota.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/multiple-user-quota.xml index 75da0ac..b6ddc17 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/invalid/multiple-user-quota.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/invalid/multiple-user-quota.xml @@ -1,9 +1,9 @@ - + - + @@ -12,4 +12,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-default.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-default.xml similarity index 60% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-default.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-default.xml index b302012..6f4a6c7 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-default.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-default.xml @@ -1,7 +1,7 @@ - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached-tls.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached-tls.xml similarity index 71% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached-tls.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached-tls.xml index 42965df..05a96e2 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached-tls.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached-tls.xml @@ -1,8 +1,8 @@ - - + @@ -47,7 +47,7 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached.xml similarity index 54% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached.xml index 457105c..9c1e0fb 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-memcached.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-memcached.xml @@ -1,8 +1,8 @@ - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-tls.xml b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-tls.xml similarity index 87% rename from gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-tls.xml rename to rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-tls.xml index 2eb0f7d..284c0dd 100644 --- a/gbcs-server/src/test/resources/net/woggioni/gbcs/server/test/valid/gbcs-tls.xml +++ b/rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-tls.xml @@ -1,7 +1,7 @@ - + - + @@ -65,4 +65,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d05c61c..761ac6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,12 +23,12 @@ dependencyResolutionManagement { } } -rootProject.name = 'gbcs' +rootProject.name = 'rbcs' -include 'gbcs-api' -include 'gbcs-common' -include 'gbcs-server-memcache' -include 'gbcs-cli' +include 'rbcs-api' +include 'rbcs-common' +include 'rbcs-server-memcache' +include 'rbcs-cli' include 'docker' -include 'gbcs-client' -include 'gbcs-server' +include 'rbcs-client' +include 'rbcs-server'