Initial failed repackaging.

io7m · Apr 25, 2024 · 3e2c5df · 3e2c5df
1 parent 5451cee
commit 3e2c5df
Show file tree

Hide file tree

Showing 80 changed files with 690 additions and 349 deletions.
diff --git a/com.io7m.mesquida.main/pom.xml b/com.io7m.mesquida.main/pom.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>com.io7m.mesquida</artifactId>
+    <groupId>com.io7m.mesquida</groupId>
+    <version>0.0.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>com.io7m.mesquida.main</artifactId>
+
+  <name>com.io7m.mesquida.main</name>
+  <description>Stream box (Main)</description>
+  <url>https://www.io7m.com/software/mesquida/</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.mail</groupId>
+          <artifactId>javax.mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-core-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-jms-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.pircbotx</groupId>
+      <artifactId>pircbotx</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbyclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbynet</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jooq</groupId>
+      <artifactId>jooq</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.io7m.trasco</groupId>
+      <artifactId>com.io7m.trasco.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.trasco</groupId>
+      <artifactId>com.io7m.trasco.vanilla</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.trasco</groupId>
+      <artifactId>com.io7m.trasco.xml.schemas</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.io7m.claypot</groupId>
+      <artifactId>com.io7m.claypot.core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.io7m.jxtrand</groupId>
+      <artifactId>com.io7m.jxtrand.vanilla</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.jxtrand</groupId>
+      <artifactId>com.io7m.jxtrand.api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.io7m.dixmont</groupId>
+      <artifactId>com.io7m.dixmont.core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.io7m.junreachable</groupId>
+      <artifactId>com.io7m.junreachable.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.jmulticlose</groupId>
+      <artifactId>com.io7m.jmulticlose.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.jproperties</groupId>
+      <artifactId>com.io7m.jproperties.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.io7m.jdeferthrow</groupId>
+      <artifactId>com.io7m.jdeferthrow.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.bundle</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.versioning</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>com.io7m.trasco</groupId>
+            <artifactId>com.io7m.trasco.api</artifactId>
+            <version>${com.io7m.trasco.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.io7m.trasco</groupId>
+            <artifactId>com.io7m.trasco.vanilla</artifactId>
+            <version>${com.io7m.trasco.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.io7m.trasco</groupId>
+            <artifactId>com.io7m.trasco.xml.schemas</artifactId>
+            <version>${com.io7m.trasco.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>generate-sql</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+            <configuration>
+              <mainClass>com.io7m.trasco.vanilla.TrSchemaRevisionSetSQLMain</mainClass>
+              <includePluginDependencies>true</includePluginDependencies>
+              <includeProjectDependencies>false</includeProjectDependencies>
+              <arguments>
+                <argument>${project.basedir}/src/main/resources/com/io7m/mesquida/internal/database.xml</argument>
+                <argument>${project.build.directory}/database.sql</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-codegen-maven</artifactId>
+        <version>${jooq.version}</version>
+        <configuration>
+          <configurationFile>${project.basedir}/src/main/jooq/configuration.xml</configurationFile>
+        </configuration>
+        <executions>
+          <execution>
+            <id>jooq-codegen</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>jooq-meta-extensions</artifactId>
+            <version>${jooq.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-jooq-sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/jooq</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Produce distribution. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>distribution</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <finalName>mesquida</finalName>
+              <attach>true</attach>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/distribution.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>io.github.zlika</groupId>
+        <artifactId>reproducible-build-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/main/assembly/distribution.xml → ...a.main/src/main/assembly/distribution.xml b/src/main/assembly/distribution.xml → ...a.main/src/main/assembly/distribution.xml
@@ -14,13 +14,15 @@
     <format>zip</format>
   </formats>
 
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
+
   <files>
-    <file>
-      <source>target/com.io7m.mesquida-${project.version}-main.jar</source>
-      <outputDirectory>/lib</outputDirectory>
-      <fileMode>0644</fileMode>
-      <destName>mesquida.jar</destName>
-    </file>
     <file>
       <source>src/main/sh/mesquida</source>
       <outputDirectory>/bin</outputDirectory>

diff --git a/src/main/java/com/io7m/mesquida/Main.java → ...src/main/java/com/io7m/mesquida/Main.java b/src/main/java/com/io7m/mesquida/Main.java → ...src/main/java/com/io7m/mesquida/Main.java
diff --git a/...o7m/mesquida/internal/MConfiguration.java → ...o7m/mesquida/internal/MConfiguration.java b/...o7m/mesquida/internal/MConfiguration.java → ...o7m/mesquida/internal/MConfiguration.java
diff --git a/...ava/com/io7m/mesquida/internal/MJson.java → ...ava/com/io7m/mesquida/internal/MJson.java b/...ava/com/io7m/mesquida/internal/MJson.java → ...ava/com/io7m/mesquida/internal/MJson.java
diff --git a/...om/io7m/mesquida/internal/MResources.java → ...om/io7m/mesquida/internal/MResources.java b/...om/io7m/mesquida/internal/MResources.java → ...om/io7m/mesquida/internal/MResources.java
diff --git a/...squida/internal/MServerConfiguration.java → ...squida/internal/MServerConfiguration.java b/...squida/internal/MServerConfiguration.java → ...squida/internal/MServerConfiguration.java
diff --git a/...m/io7m/mesquida/internal/MServerMain.java → ...m/io7m/mesquida/internal/MServerMain.java b/...m/io7m/mesquida/internal/MServerMain.java → ...m/io7m/mesquida/internal/MServerMain.java
diff --git a/...o7m/mesquida/internal/MServerStrings.java → ...o7m/mesquida/internal/MServerStrings.java b/...o7m/mesquida/internal/MServerStrings.java → ...o7m/mesquida/internal/MServerStrings.java
diff --git a/...mesquida/internal/cli/MCommandIRCBot.java → ...mesquida/internal/cli/MCommandIRCBot.java b/...mesquida/internal/cli/MCommandIRCBot.java → ...mesquida/internal/cli/MCommandIRCBot.java
diff --git a/...quida/internal/cli/MCommandMatrixBot.java → ...quida/internal/cli/MCommandMatrixBot.java b/...quida/internal/cli/MCommandMatrixBot.java → ...quida/internal/cli/MCommandMatrixBot.java
diff --git a/...mesquida/internal/cli/MCommandServer.java → ...mesquida/internal/cli/MCommandServer.java b/...mesquida/internal/cli/MCommandServer.java → ...mesquida/internal/cli/MCommandServer.java
diff --git a/...m/mesquida/internal/cli/package-info.java → ...m/mesquida/internal/cli/package-info.java b/...m/mesquida/internal/cli/package-info.java → ...m/mesquida/internal/cli/package-info.java
diff --git a/...mesquida/internal/database/MDatabase.java → ...mesquida/internal/database/MDatabase.java b/...mesquida/internal/database/MDatabase.java → ...mesquida/internal/database/MDatabase.java
diff --git a/...rnal/database/MDatabaseConfiguration.java → ...rnal/database/MDatabaseConfiguration.java b/...rnal/database/MDatabaseConfiguration.java → ...rnal/database/MDatabaseConfiguration.java
diff --git a/...quida/internal/database/package-info.java → ...quida/internal/database/package-info.java b/...quida/internal/database/package-info.java → ...quida/internal/database/package-info.java
diff --git a/...7m/mesquida/internal/irc/MIRCService.java → ...7m/mesquida/internal/irc/MIRCService.java b/...7m/mesquida/internal/irc/MIRCService.java → ...7m/mesquida/internal/irc/MIRCService.java
diff --git a/...nternal/irc/MIRCServiceConfiguration.java → ...nternal/irc/MIRCServiceConfiguration.java b/...nternal/irc/MIRCServiceConfiguration.java → ...nternal/irc/MIRCServiceConfiguration.java
diff --git a/...m/mesquida/internal/irc/package-info.java → ...m/mesquida/internal/irc/package-info.java b/...m/mesquida/internal/irc/package-info.java → ...m/mesquida/internal/irc/package-info.java
diff --git a/...squida/internal/matrix/MMatrixClient.java → ...squida/internal/matrix/MMatrixClient.java b/...squida/internal/matrix/MMatrixClient.java → ...squida/internal/matrix/MMatrixClient.java
diff --git a/...mesquida/internal/matrix/MMatrixJSON.java → ...mesquida/internal/matrix/MMatrixJSON.java b/...mesquida/internal/matrix/MMatrixJSON.java → ...mesquida/internal/matrix/MMatrixJSON.java
diff --git a/...quida/internal/matrix/MMatrixMessage.java → ...quida/internal/matrix/MMatrixMessage.java b/...quida/internal/matrix/MMatrixMessage.java → ...quida/internal/matrix/MMatrixMessage.java
diff --git a/...internal/matrix/MMatrixObjectMappers.java → ...internal/matrix/MMatrixObjectMappers.java b/...internal/matrix/MMatrixObjectMappers.java → ...internal/matrix/MMatrixObjectMappers.java
diff --git a/...quida/internal/matrix/MMatrixService.java → ...quida/internal/matrix/MMatrixService.java b/...quida/internal/matrix/MMatrixService.java → ...quida/internal/matrix/MMatrixService.java
diff --git a/...l/matrix/MMatrixServiceConfiguration.java → ...l/matrix/MMatrixServiceConfiguration.java b/...l/matrix/MMatrixServiceConfiguration.java → ...l/matrix/MMatrixServiceConfiguration.java
diff --git a/...esquida/internal/matrix/package-info.java → ...esquida/internal/matrix/package-info.java b/...esquida/internal/matrix/package-info.java → ...esquida/internal/matrix/package-info.java
diff --git a/...squida/internal/mq/MMessageFormatted.java → ...squida/internal/mq/MMessageFormatted.java b/...squida/internal/mq/MMessageFormatted.java → ...squida/internal/mq/MMessageFormatted.java
diff --git a/...squida/internal/mq/MMessageFormatter.java → ...squida/internal/mq/MMessageFormatter.java b/...squida/internal/mq/MMessageFormatter.java → ...squida/internal/mq/MMessageFormatter.java
diff --git a/...mesquida/internal/mq/MMessageService.java → ...mesquida/internal/mq/MMessageService.java b/...mesquida/internal/mq/MMessageService.java → ...mesquida/internal/mq/MMessageService.java
diff --git a/...uida/internal/mq/MMessageStreamEnded.java → ...uida/internal/mq/MMessageStreamEnded.java b/...uida/internal/mq/MMessageStreamEnded.java → ...uida/internal/mq/MMessageStreamEnded.java
diff --git a/...da/internal/mq/MMessageStreamStarted.java → ...da/internal/mq/MMessageStreamStarted.java b/...da/internal/mq/MMessageStreamStarted.java → ...da/internal/mq/MMessageStreamStarted.java
diff --git a/...7m/mesquida/internal/mq/MMessageType.java → ...7m/mesquida/internal/mq/MMessageType.java b/...7m/mesquida/internal/mq/MMessageType.java → ...7m/mesquida/internal/mq/MMessageType.java
diff --git a/...7m/mesquida/internal/mq/package-info.java → ...7m/mesquida/internal/mq/package-info.java b/...7m/mesquida/internal/mq/package-info.java → ...7m/mesquida/internal/mq/package-info.java
diff --git a/.../io7m/mesquida/internal/package-info.java → .../io7m/mesquida/internal/package-info.java b/.../io7m/mesquida/internal/package-info.java → .../io7m/mesquida/internal/package-info.java
diff --git a/...nternal/private_api/MMessageQueuePut.java → ...nternal/private_api/MMessageQueuePut.java b/...nternal/private_api/MMessageQueuePut.java → ...nternal/private_api/MMessageQueuePut.java
diff --git a/...rivate_api/MPrivAuthenticatedHandler.java → ...rivate_api/MPrivAuthenticatedHandler.java b/...rivate_api/MPrivAuthenticatedHandler.java → ...rivate_api/MPrivAuthenticatedHandler.java
diff --git a/...ternal/private_api/MPrivErrorHandler.java → ...ternal/private_api/MPrivErrorHandler.java b/...ternal/private_api/MPrivErrorHandler.java → ...ternal/private_api/MPrivErrorHandler.java
diff --git a/...vate_api/MPrivMessageQueuePutHandler.java → ...vate_api/MPrivMessageQueuePutHandler.java b/...vate_api/MPrivMessageQueuePutHandler.java → ...vate_api/MPrivMessageQueuePutHandler.java
diff --git a/...nternal/private_api/MPrivRootHandler.java → ...nternal/private_api/MPrivRootHandler.java b/...nternal/private_api/MPrivRootHandler.java → ...nternal/private_api/MPrivRootHandler.java
diff --git a/...ate_api/MPrivStreamAddressPutHandler.java → ...ate_api/MPrivStreamAddressPutHandler.java b/...ate_api/MPrivStreamAddressPutHandler.java → ...ate_api/MPrivStreamAddressPutHandler.java
diff --git a/...private_api/MPrivStreamDeleteHandler.java → ...private_api/MPrivStreamDeleteHandler.java b/...private_api/MPrivStreamDeleteHandler.java → ...private_api/MPrivStreamDeleteHandler.java
diff --git a/...l/private_api/MPrivStreamListHandler.java → ...l/private_api/MPrivStreamListHandler.java b/...l/private_api/MPrivStreamListHandler.java → ...l/private_api/MPrivStreamListHandler.java
diff --git a/...al/private_api/MPrivStreamPutHandler.java → ...al/private_api/MPrivStreamPutHandler.java b/...al/private_api/MPrivStreamPutHandler.java → ...al/private_api/MPrivStreamPutHandler.java
diff --git a/.../private_api/MPrivStreamStartHandler.java → .../private_api/MPrivStreamStartHandler.java b/.../private_api/MPrivStreamStartHandler.java → .../private_api/MPrivStreamStartHandler.java
diff --git a/...l/private_api/MPrivStreamStopHandler.java → ...l/private_api/MPrivStreamStopHandler.java b/...l/private_api/MPrivStreamStopHandler.java → ...l/private_api/MPrivStreamStopHandler.java
diff --git a/...nal/private_api/MPrivUserListHandler.java → ...nal/private_api/MPrivUserListHandler.java b/...nal/private_api/MPrivUserListHandler.java → ...nal/private_api/MPrivUserListHandler.java
diff --git a/...rnal/private_api/MPrivUserPutHandler.java → ...rnal/private_api/MPrivUserPutHandler.java b/...rnal/private_api/MPrivUserPutHandler.java → ...rnal/private_api/MPrivUserPutHandler.java
diff --git a/...esquida/internal/private_api/MStream.java → ...esquida/internal/private_api/MStream.java b/...esquida/internal/private_api/MStream.java → ...esquida/internal/private_api/MStream.java
diff --git a/.../internal/private_api/MStreamAddress.java → .../internal/private_api/MStreamAddress.java b/.../internal/private_api/MStreamAddress.java → .../internal/private_api/MStreamAddress.java
diff --git a/...ternal/private_api/MStreamAddressPut.java → ...ternal/private_api/MStreamAddressPut.java b/...ternal/private_api/MStreamAddressPut.java → ...ternal/private_api/MStreamAddressPut.java
diff --git a/...a/internal/private_api/MStreamDelete.java → ...a/internal/private_api/MStreamDelete.java b/...a/internal/private_api/MStreamDelete.java → ...a/internal/private_api/MStreamDelete.java
diff --git a/...ida/internal/private_api/MStreamList.java → ...ida/internal/private_api/MStreamList.java b/...ida/internal/private_api/MStreamList.java → ...ida/internal/private_api/MStreamList.java
diff --git a/...uida/internal/private_api/MStreamPut.java → ...uida/internal/private_api/MStreamPut.java b/...uida/internal/private_api/MStreamPut.java → ...uida/internal/private_api/MStreamPut.java
diff --git a/...da/internal/private_api/MStreamStart.java → ...da/internal/private_api/MStreamStart.java b/...da/internal/private_api/MStreamStart.java → ...da/internal/private_api/MStreamStart.java
diff --git a/...ida/internal/private_api/MStreamStop.java → ...ida/internal/private_api/MStreamStop.java b/...ida/internal/private_api/MStreamStop.java → ...ida/internal/private_api/MStreamStop.java
diff --git a/...quida/internal/private_api/MUserList.java → ...quida/internal/private_api/MUserList.java b/...quida/internal/private_api/MUserList.java → ...quida/internal/private_api/MUserList.java
diff --git a/...ida/internal/private_api/MUserListed.java → ...ida/internal/private_api/MUserListed.java b/...ida/internal/private_api/MUserListed.java → ...ida/internal/private_api/MUserListed.java
diff --git a/...squida/internal/private_api/MUserPut.java → ...squida/internal/private_api/MUserPut.java b/...squida/internal/private_api/MUserPut.java → ...squida/internal/private_api/MUserPut.java
diff --git a/...da/internal/private_api/package-info.java → ...da/internal/private_api/package-info.java b/...da/internal/private_api/package-info.java → ...da/internal/private_api/package-info.java
diff --git a/.../public_api/MPubAuthenticatedHandler.java → .../public_api/MPubAuthenticatedHandler.java b/.../public_api/MPubAuthenticatedHandler.java → .../public_api/MPubAuthenticatedHandler.java
diff --git a/...squida/internal/public_api/MPubPages.java → ...squida/internal/public_api/MPubPages.java b/...squida/internal/public_api/MPubPages.java → ...squida/internal/public_api/MPubPages.java
diff --git a/.../internal/public_api/MPubRootHandler.java → .../internal/public_api/MPubRootHandler.java b/.../internal/public_api/MPubRootHandler.java → .../internal/public_api/MPubRootHandler.java
diff --git a/...nternal/public_api/MPubServletHolder.java → ...nternal/public_api/MPubServletHolder.java b/...nternal/public_api/MPubServletHolder.java → ...nternal/public_api/MPubServletHolder.java
diff --git a/...nternal/public_api/MPubStaticHandler.java → ...nternal/public_api/MPubStaticHandler.java b/...nternal/public_api/MPubStaticHandler.java → ...nternal/public_api/MPubStaticHandler.java
diff --git a/...nal/public_api/MPubStreamEditHandler.java → ...nal/public_api/MPubStreamEditHandler.java b/...nal/public_api/MPubStreamEditHandler.java → ...nal/public_api/MPubStreamEditHandler.java
diff --git a/...ida/internal/public_api/package-info.java → ...ida/internal/public_api/package-info.java b/...ida/internal/public_api/package-info.java → ...ida/internal/public_api/package-info.java
diff --git a/.../java/com/io7m/mesquida/package-info.java → .../java/com/io7m/mesquida/package-info.java b/.../java/com/io7m/mesquida/package-info.java → .../java/com/io7m/mesquida/package-info.java
diff --git a/src/main/jooq/configuration.xml → ...uida.main/src/main/jooq/configuration.xml b/src/main/jooq/configuration.xml → ...uida.main/src/main/jooq/configuration.xml
diff --git a/...s/com/io7m/mesquida/internal/Messages.xml → ...s/com/io7m/mesquida/internal/Messages.xml b/...s/com/io7m/mesquida/internal/Messages.xml → ...s/com/io7m/mesquida/internal/Messages.xml
diff --git a/...rces/com/io7m/mesquida/internal/Pages.xml → ...rces/com/io7m/mesquida/internal/Pages.xml b/...rces/com/io7m/mesquida/internal/Pages.xml → ...rces/com/io7m/mesquida/internal/Pages.xml
diff --git a/...s/com/io7m/mesquida/internal/database.xml → ...s/com/io7m/mesquida/internal/database.xml b/...s/com/io7m/mesquida/internal/database.xml → ...s/com/io7m/mesquida/internal/database.xml
diff --git a/...rces/com/io7m/mesquida/internal/style.css → ...rces/com/io7m/mesquida/internal/style.css b/...rces/com/io7m/mesquida/internal/style.css → ...rces/com/io7m/mesquida/internal/style.css
diff --git a/src/main/resources/logback.xml → ...quida.main/src/main/resources/logback.xml b/src/main/resources/logback.xml → ...quida.main/src/main/resources/logback.xml
diff --git a/src/main/sh/mesquida → com.io7m.mesquida.main/src/main/sh/mesquida b/src/main/sh/mesquida → 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/...mesquida/tests/MMessageFormatterTest.java → ...mesquida/tests/MMessageFormatterTest.java b/...mesquida/tests/MMessageFormatterTest.java → ...mesquida/tests/MMessageFormatterTest.java
diff --git a/.../com/io7m/mesquida/tests/MServerTest.java → .../com/io7m/mesquida/tests/MServerTest.java b/.../com/io7m/mesquida/tests/MServerTest.java → .../com/io7m/mesquida/tests/MServerTest.java
diff --git a/...io7m/mesquida/tests/MTestDirectories.java → ...io7m/mesquida/tests/MTestDirectories.java b/...io7m/mesquida/tests/MTestDirectories.java → ...io7m/mesquida/tests/MTestDirectories.java