diff --git a/com.io7m.mesquida.main/pom.xml b/com.io7m.mesquida.main/pom.xml new file mode 100644 index 0000000..32a7249 --- /dev/null +++ b/com.io7m.mesquida.main/pom.xml @@ -0,0 +1,296 @@ + + + + + 4.0.0 + + + com.io7m.mesquida + com.io7m.mesquida + 0.0.3-SNAPSHOT + + + com.io7m.mesquida.main + + com.io7m.mesquida.main + Stream box (Main) + https://www.io7m.com/software/mesquida/ + + + + ch.qos.logback + logback-classic + + + com.sun.mail + javax.mail + + + + + + org.slf4j + slf4j-api + + + + org.apache.activemq + artemis-core-client + + + org.apache.activemq + artemis-commons + + + org.apache.activemq + artemis-jms-client + + + + org.pircbotx + pircbotx + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + org.apache.derby + derbyclient + + + org.apache.derby + derbytools + + + org.apache.derby + derbynet + + + + org.apache.commons + commons-text + + + + org.jooq + jooq + + + + com.io7m.trasco + com.io7m.trasco.api + + + com.io7m.trasco + com.io7m.trasco.vanilla + + + com.io7m.trasco + com.io7m.trasco.xml.schemas + + + + com.io7m.claypot + com.io7m.claypot.core + + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-servlet + + + + com.io7m.jxtrand + com.io7m.jxtrand.vanilla + + + com.io7m.jxtrand + com.io7m.jxtrand.api + + + + com.io7m.dixmont + com.io7m.dixmont.core + + + + commons-io + commons-io + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + com.io7m.junreachable + com.io7m.junreachable.core + + + com.io7m.jmulticlose + com.io7m.jmulticlose.core + + + com.io7m.jproperties + com.io7m.jproperties.core + + + com.io7m.jdeferthrow + com.io7m.jdeferthrow.core + + + org.osgi + org.osgi.annotation.bundle + + + org.osgi + org.osgi.annotation.versioning + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + com.io7m.trasco + com.io7m.trasco.api + ${com.io7m.trasco.version} + + + com.io7m.trasco + com.io7m.trasco.vanilla + ${com.io7m.trasco.version} + + + com.io7m.trasco + com.io7m.trasco.xml.schemas + ${com.io7m.trasco.version} + + + + + generate-sql + generate-sources + + java + + + com.io7m.trasco.vanilla.TrSchemaRevisionSetSQLMain + true + false + + ${project.basedir}/src/main/resources/com/io7m/mesquida/internal/database.xml + ${project.build.directory}/database.sql + + + + + + + + org.jooq + jooq-codegen-maven + ${jooq.version} + + ${project.basedir}/src/main/jooq/configuration.xml + + + + jooq-codegen + generate-sources + + generate + + + + + + org.jooq + jooq-meta-extensions + ${jooq.version} + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-jooq-sources + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/jooq + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + distribution + + single + + package + + mesquida + true + + ${project.basedir}/src/main/assembly/distribution.xml + + + + + + + + io.github.zlika + reproducible-build-maven-plugin + + + + + diff --git a/src/main/assembly/distribution.xml b/com.io7m.mesquida.main/src/main/assembly/distribution.xml similarity index 72% rename from src/main/assembly/distribution.xml rename to com.io7m.mesquida.main/src/main/assembly/distribution.xml index e468876..2b9fca1 100644 --- a/src/main/assembly/distribution.xml +++ b/com.io7m.mesquida.main/src/main/assembly/distribution.xml @@ -14,13 +14,15 @@ zip + + + lib + true + true + + + - - target/com.io7m.mesquida-${project.version}-main.jar - /lib - 0644 - mesquida.jar - src/main/sh/mesquida /bin diff --git a/src/main/java/com/io7m/mesquida/Main.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/Main.java similarity index 100% rename from src/main/java/com/io7m/mesquida/Main.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/Main.java diff --git a/src/main/java/com/io7m/mesquida/internal/MConfiguration.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MConfiguration.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MConfiguration.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MConfiguration.java diff --git a/src/main/java/com/io7m/mesquida/internal/MJson.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MJson.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MJson.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MJson.java diff --git a/src/main/java/com/io7m/mesquida/internal/MResources.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MResources.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MResources.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MResources.java diff --git a/src/main/java/com/io7m/mesquida/internal/MServerConfiguration.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerConfiguration.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MServerConfiguration.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerConfiguration.java diff --git a/src/main/java/com/io7m/mesquida/internal/MServerMain.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerMain.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MServerMain.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerMain.java diff --git a/src/main/java/com/io7m/mesquida/internal/MServerStrings.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerStrings.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/MServerStrings.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/MServerStrings.java diff --git a/src/main/java/com/io7m/mesquida/internal/cli/MCommandIRCBot.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandIRCBot.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/cli/MCommandIRCBot.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandIRCBot.java diff --git a/src/main/java/com/io7m/mesquida/internal/cli/MCommandMatrixBot.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandMatrixBot.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/cli/MCommandMatrixBot.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandMatrixBot.java diff --git a/src/main/java/com/io7m/mesquida/internal/cli/MCommandServer.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandServer.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/cli/MCommandServer.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/MCommandServer.java diff --git a/src/main/java/com/io7m/mesquida/internal/cli/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/cli/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/cli/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/database/MDatabase.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/MDatabase.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/database/MDatabase.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/MDatabase.java diff --git a/src/main/java/com/io7m/mesquida/internal/database/MDatabaseConfiguration.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/MDatabaseConfiguration.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/database/MDatabaseConfiguration.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/MDatabaseConfiguration.java diff --git a/src/main/java/com/io7m/mesquida/internal/database/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/database/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/database/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/irc/MIRCService.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/MIRCService.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/irc/MIRCService.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/MIRCService.java diff --git a/src/main/java/com/io7m/mesquida/internal/irc/MIRCServiceConfiguration.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/MIRCServiceConfiguration.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/irc/MIRCServiceConfiguration.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/MIRCServiceConfiguration.java diff --git a/src/main/java/com/io7m/mesquida/internal/irc/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/irc/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/irc/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixClient.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixClient.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixClient.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixClient.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixJSON.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixJSON.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixJSON.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixJSON.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixMessage.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixMessage.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixMessage.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixMessage.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixObjectMappers.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixObjectMappers.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixObjectMappers.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixObjectMappers.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixService.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixService.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixService.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixService.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixServiceConfiguration.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixServiceConfiguration.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/MMatrixServiceConfiguration.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/MMatrixServiceConfiguration.java diff --git a/src/main/java/com/io7m/mesquida/internal/matrix/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/matrix/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/matrix/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatted.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatted.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatted.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatted.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatter.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatter.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatter.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageFormatter.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageService.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageService.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageService.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageService.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamEnded.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamEnded.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamEnded.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamEnded.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamStarted.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamStarted.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamStarted.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageStreamStarted.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/MMessageType.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageType.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/MMessageType.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/MMessageType.java diff --git a/src/main/java/com/io7m/mesquida/internal/mq/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/mq/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/mq/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MMessageQueuePut.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MMessageQueuePut.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MMessageQueuePut.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MMessageQueuePut.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivAuthenticatedHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivAuthenticatedHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivAuthenticatedHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivAuthenticatedHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivErrorHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivErrorHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivErrorHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivErrorHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivMessageQueuePutHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivMessageQueuePutHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivMessageQueuePutHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivMessageQueuePutHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivRootHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivRootHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivRootHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivRootHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamAddressPutHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamAddressPutHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamAddressPutHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamAddressPutHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamDeleteHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamDeleteHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamDeleteHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamDeleteHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamListHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamListHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamListHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamListHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamPutHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamPutHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamPutHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamPutHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStartHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStartHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStartHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStartHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStopHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStopHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStopHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivStreamStopHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserListHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserListHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserListHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserListHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserPutHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserPutHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserPutHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MPrivUserPutHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStream.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStream.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStream.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStream.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddress.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddress.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddress.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddress.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddressPut.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddressPut.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddressPut.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamAddressPut.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamDelete.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamDelete.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamDelete.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamDelete.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamList.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamList.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamList.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamList.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamPut.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamPut.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamPut.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamPut.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStart.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStart.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamStart.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStart.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStop.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStop.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MStreamStop.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MStreamStop.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MUserList.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserList.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MUserList.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserList.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MUserListed.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserListed.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MUserListed.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserListed.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/MUserPut.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserPut.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/MUserPut.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/MUserPut.java diff --git a/src/main/java/com/io7m/mesquida/internal/private_api/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/private_api/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/private_api/package-info.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubAuthenticatedHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubAuthenticatedHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubAuthenticatedHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubAuthenticatedHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubPages.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubPages.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubPages.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubPages.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubRootHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubRootHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubRootHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubRootHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubServletHolder.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubServletHolder.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubServletHolder.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubServletHolder.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubStaticHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubStaticHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubStaticHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubStaticHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/MPubStreamEditHandler.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubStreamEditHandler.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/MPubStreamEditHandler.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/MPubStreamEditHandler.java diff --git a/src/main/java/com/io7m/mesquida/internal/public_api/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/internal/public_api/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/internal/public_api/package-info.java diff --git a/src/main/java/com/io7m/mesquida/package-info.java b/com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/package-info.java similarity index 100% rename from src/main/java/com/io7m/mesquida/package-info.java rename to com.io7m.mesquida.main/src/main/java/com/io7m/mesquida/package-info.java diff --git a/src/main/jooq/configuration.xml b/com.io7m.mesquida.main/src/main/jooq/configuration.xml similarity index 100% rename from src/main/jooq/configuration.xml rename to com.io7m.mesquida.main/src/main/jooq/configuration.xml diff --git a/src/main/resources/com/io7m/mesquida/internal/Messages.xml b/com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/Messages.xml similarity index 100% rename from src/main/resources/com/io7m/mesquida/internal/Messages.xml rename to com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/Messages.xml diff --git a/src/main/resources/com/io7m/mesquida/internal/Pages.xml b/com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/Pages.xml similarity index 100% rename from src/main/resources/com/io7m/mesquida/internal/Pages.xml rename to com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/Pages.xml diff --git a/src/main/resources/com/io7m/mesquida/internal/database.xml b/com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/database.xml similarity index 100% rename from src/main/resources/com/io7m/mesquida/internal/database.xml rename to com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/database.xml diff --git a/src/main/resources/com/io7m/mesquida/internal/style.css b/com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/style.css similarity index 100% rename from src/main/resources/com/io7m/mesquida/internal/style.css rename to com.io7m.mesquida.main/src/main/resources/com/io7m/mesquida/internal/style.css diff --git a/src/main/resources/logback.xml b/com.io7m.mesquida.main/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to com.io7m.mesquida.main/src/main/resources/logback.xml diff --git a/src/main/sh/mesquida b/com.io7m.mesquida.main/src/main/sh/mesquida similarity index 61% rename from src/main/sh/mesquida rename to com.io7m.mesquida.main/src/main/sh/mesquida index bd2e9b2..4295367 100644 --- a/src/main/sh/mesquida +++ b/com.io7m.mesquida.main/src/main/sh/mesquida @@ -7,6 +7,6 @@ then fi exec /usr/bin/env java \ --cp "${MESQUIDA_HOME}/lib/mesquida.jar" \ -com.io7m.mesquida.Main \ +-p "${MESQUIDA_HOME}/lib" \ +-m com.io7m.mesquida.main/com.io7m.mesquida.Main \ "$@" diff --git a/src/test/java/com/io7m/mesquida/tests/MMessageFormatterTest.java b/com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MMessageFormatterTest.java similarity index 100% rename from src/test/java/com/io7m/mesquida/tests/MMessageFormatterTest.java rename to com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MMessageFormatterTest.java diff --git a/src/test/java/com/io7m/mesquida/tests/MServerTest.java b/com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MServerTest.java similarity index 100% rename from src/test/java/com/io7m/mesquida/tests/MServerTest.java rename to com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MServerTest.java diff --git a/src/test/java/com/io7m/mesquida/tests/MTestDirectories.java b/com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MTestDirectories.java similarity index 100% rename from src/test/java/com/io7m/mesquida/tests/MTestDirectories.java rename to com.io7m.mesquida.main/src/test/java/com/io7m/mesquida/tests/MTestDirectories.java diff --git a/com.io7m.mesquida.oci/pom.xml b/com.io7m.mesquida.oci/pom.xml new file mode 100644 index 0000000..6985716 --- /dev/null +++ b/com.io7m.mesquida.oci/pom.xml @@ -0,0 +1,148 @@ + + + + + 4.0.0 + + + com.io7m.mesquida + com.io7m.mesquida + 0.0.3-SNAPSHOT + + + com.io7m.mesquida.oci + + com.io7m.mesquida.oci + Stream box (OCI) + https://www.io7m.com/software/mesquida/ + + + + ${project.groupId} + com.io7m.mesquida.main + ${project.version} + + + + + + io7m-oci-image + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-sources + package + + unpack-dependencies + + + module-info.java + ${project.groupId} + com.io7m.mesquida.main + zip + distribution + true + ${project.build.directory}/oci + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-containerfile + package + + copy-resources + + + + + src/main/resources + true + + + ${project.build.directory}/oci + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + oci-image-create + + exec + + package + + podman + + build + --timestamp + 1577836800 + -t + quay.io/io7mcom/mesquida:${project.version} + ${project.build.directory}/oci + + + + + + + oci-image-run-check + + exec + + package + + podman + + run + --rm + quay.io/io7mcom/mesquida:${project.version} + help + + + + + + + oci-image-push + + exec + + deploy + + podman + + push + quay.io/io7mcom/mesquida:${project.version} + + + + + + + + + + + diff --git a/com.io7m.mesquida.oci/src/main/resources/Containerfile b/com.io7m.mesquida.oci/src/main/resources/Containerfile new file mode 100644 index 0000000..7a1e5a2 --- /dev/null +++ b/com.io7m.mesquida.oci/src/main/resources/Containerfile @@ -0,0 +1,19 @@ +FROM docker.io/library/alpine:${com.io7m.oci.versionAlpine} +FROM docker.io/library/eclipse-temurin:${com.io7m.oci.versionTemurin} + +ENV PATH="/mesquida/bin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/java/openjdk/bin" +ENV MESQUIDA_HOME="/mesquida" +ENV _JAVA_OPTIONS="-Dorg.sqlite.tmpdir=/mesquida/var" + +COPY mesquida /mesquida + +LABEL "org.opencontainers.image.authors"="Mark Raynsford" +LABEL "org.opencontainers.image.description"="Mesquida server" +LABEL "org.opencontainers.image.licenses"="ISC" +LABEL "org.opencontainers.image.source"="https://www.github.com/io7m/mesquida" +LABEL "org.opencontainers.image.title"="Mesquida" +LABEL "org.opencontainers.image.url"="https://www.io7m.com/software/mesquida" +LABEL "org.opencontainers.image.version"="${project.version}" +LABEL "org.opencontainers.image.revision"="${buildNumber}" + +ENTRYPOINT ["/mesquida/bin/mesquida"] diff --git a/pom.xml b/pom.xml index 5ce18f5..b01909d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,26 +13,39 @@ com.io7m.mesquida com.io7m.mesquida 0.0.3-SNAPSHOT - jar + pom Stream box com.io7m.mesquida https://www.github.com/io7m/mesquida + + com.io7m.mesquida.main + com.io7m.mesquida.oci + + - 2.31.2 - 2.0.0 - 1.1.0 + + + true 0.0.3-SNAPSHOT 21 - 2.16.1 + + + 2.0.0 + 1.1.0 + + + 2.33.0 + 2.17.0 11.0.20 3.19.7 5.10.2 10.17.1.0 - - true + + 3.18.2 + 21_35-jre-alpine @@ -79,343 +92,206 @@ https://github.com/mesquida/actions - - - ch.qos.logback - logback-classic - 1.4.14 - - - com.sun.mail - javax.mail - - - - - - org.slf4j - slf4j-api - 2.0.13 - - - - org.apache.activemq - artemis-core-client - ${artemis.version} - - - org.apache.activemq - artemis-commons - ${artemis.version} - - - org.apache.activemq - artemis-jms-client - ${artemis.version} - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - 1.0-alpha-2 - - - - org.pircbotx - pircbotx - 2.1 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - org.apache.derby - derbyclient - ${org.apache.derby.version} - - - org.apache.derby - derbytools - ${org.apache.derby.version} - - - org.apache.derby - derbynet - ${org.apache.derby.version} - - - - org.apache.commons - commons-text - 1.11.0 - - - - org.jooq - jooq - ${jooq.version} - - - - com.io7m.trasco - com.io7m.trasco.api - ${com.io7m.trasco.version} - - - com.io7m.trasco - com.io7m.trasco.vanilla - ${com.io7m.trasco.version} - - - com.io7m.trasco - com.io7m.trasco.xml.schemas - ${com.io7m.trasco.version} - - - - com.io7m.claypot - com.io7m.claypot.core - 0.0.8 - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - com.io7m.jxtrand - com.io7m.jxtrand.vanilla - ${com.io7m.jxtrand.version} - - - com.io7m.jxtrand - com.io7m.jxtrand.api - ${com.io7m.jxtrand.version} - - - - com.io7m.dixmont - com.io7m.dixmont.core - 1.0.0 - - - - commons-io - commons-io - 2.16.1 - - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - - com.io7m.junreachable - com.io7m.junreachable.core - 4.0.0 - - - com.io7m.jmulticlose - com.io7m.jmulticlose.core - 1.1.0 - - - com.io7m.jproperties - com.io7m.jproperties.core - 3.2.0 - - - com.io7m.jdeferthrow - com.io7m.jdeferthrow.core - 1.2.0 - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - com.io7m.trasco - com.io7m.trasco.api - ${com.io7m.trasco.version} - - - com.io7m.trasco - com.io7m.trasco.vanilla - ${com.io7m.trasco.version} - - - com.io7m.trasco - com.io7m.trasco.xml.schemas - ${com.io7m.trasco.version} - - - - - generate-sql - generate-sources - - java - - - com.io7m.trasco.vanilla.TrSchemaRevisionSetSQLMain - true - false - - src/main/resources/com/io7m/mesquida/internal/database.xml - ${project.build.directory}/database.sql - - - - - - - + + + + ch.qos.logback + logback-classic + 1.5.6 + + + com.sun.mail + javax.mail + + + + + + org.slf4j + slf4j-api + 2.0.13 + + + + org.apache.activemq + artemis-core-client + ${artemis.version} + + + org.apache.activemq + artemis-commons + ${artemis.version} + + + org.apache.activemq + artemis-jms-client + ${artemis.version} + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + 1.0-alpha-2 + + + + org.pircbotx + pircbotx + 2.1 + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + org.apache.derby + derbyclient + ${org.apache.derby.version} + + + org.apache.derby + derbytools + ${org.apache.derby.version} + + + org.apache.derby + derbynet + ${org.apache.derby.version} + + + + org.apache.commons + commons-text + 1.12.0 + + + org.jooq - jooq-codegen-maven + jooq ${jooq.version} - - src/main/jooq/configuration.xml - - - - jooq-codegen - generate-sources - - generate - - - - - - org.jooq - jooq-meta-extensions - ${jooq.version} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-jooq-sources - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/jooq - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - false - main - true - - - - - com.io7m.mesquida.Main - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - distribution - - single - - package - - mesquida - true - - src/main/assembly/distribution.xml - - - - - - - - io.github.zlika - reproducible-build-maven-plugin - + + + + com.io7m.trasco + com.io7m.trasco.api + ${com.io7m.trasco.version} + + + com.io7m.trasco + com.io7m.trasco.vanilla + ${com.io7m.trasco.version} + + + com.io7m.trasco + com.io7m.trasco.xml.schemas + ${com.io7m.trasco.version} + + + + com.io7m.claypot + com.io7m.claypot.core + 0.0.8 + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + + com.io7m.jxtrand + com.io7m.jxtrand.vanilla + ${com.io7m.jxtrand.version} + + + com.io7m.jxtrand + com.io7m.jxtrand.api + ${com.io7m.jxtrand.version} + + + + com.io7m.dixmont + com.io7m.dixmont.core + 1.0.0 + + + + commons-io + commons-io + 2.16.1 + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + com.io7m.junreachable + com.io7m.junreachable.core + 4.0.0 + + + com.io7m.jmulticlose + com.io7m.jmulticlose.core + 1.1.2 + + + com.io7m.jproperties + com.io7m.jproperties.core + 3.2.0 + + + com.io7m.jdeferthrow + com.io7m.jdeferthrow.core + 1.2.0 + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + + + + + com.io7m.minisite