+ one .sh deployment.

copy-restart.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
-cp ./mispbridge.war /home/user/app/tomcat/webapps
-cp ./mispclient.war /home/user/app/tomcat/webapps
+
+cwd=$(pwd)
+
+cp "${cwd}/mirror/war/mirror.war" /home/user/app/tomcat/webapps
+cp "${cwd}/mispbridge/war/mispbridge.war" /home/user/app/tomcat/webapps
+cp "${cwd}/mispclient/war/mispclient.war" /home/user/app/tomcat/webapps
+
 /home/user/app/tomcat/bin/shutdown.sh
 /home/user/app/tomcat/bin/startup.sh

make-war.sh

@@ -2,20 +2,34 @@
 cwd=$(pwd)
 
 
-cp -r ./production/mispbridge/core/ mispbridge-war-wrapper/WEB-INF/classes
+mispbridge_out='/out/production/mispbridge/com/olexyn/misp/bridge'
+mispbridge_wrapper='/mispbridge/war/wrapper';
 
+# copy compiled code into the wrapper.
+cp -r "${cwd}${mispbridge_out}" "${cwd}${mispbridge_wrapper}/WEB-INF/classes"
 
+# compress .war
+cd "${cwd}${mispbridge_wrapper}" || exit
+jar -cvf ../mispbridge.war *
 
 
+mispclient_out='/out/production/mispclient/com/olexyn/misp/client'
+mispclient_wrapper='/mispclient/war/wrapper';
 
-cd warbridge
+# copy compiled code into the wrapper.
+cp -r "${cwd}${mispclient_out}" "${cwd}${mispclient_wrapper}/WEB-INF/classes"
 
+# compress .war
+cd "${cwd}${mispclient_wrapper}" || exit
+jar -cvf ../mispclient.war *
 
-jar -cvf ../mispbridge.war *
 
-cd $cwd
+mirror_out='/out/production/mirror/com/olexyn/mirror'
+mirror_wrapper='/mirror/war/wrapper';
 
-cp -r ./production/mispclient/core/ mispclient-war-wrapper/WEB-INF/classes
+# copy compiled code into the wrapper.
+cp -r "${cwd}${mirror_out}" "${cwd}${mirror_wrapper}/WEB-INF/classes"
 
-cd warclient
-jar -cvf ../mispclient.war *
+# compress .war
+cd "${cwd}${mirror_wrapper}" || exit
+jar -cvf ../mirror.war *

mirror/README.md

@@ -0,0 +1,5 @@
+#### About
+The `mirror` servlet. Prints the list of request it received.
+* `./src` the code.
+* `./war/wrapper` supplements needed for `.war`.
+* `./war/<name>.war` copy this to `tomcat/webapps`.

mirror/mirror.iml

@@ -9,5 +9,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+    <orderEntry type="module" module-name="misphelper" />
+    <orderEntry type="library" name="org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="commons-io:commons-io:2.6" level="project" />
   </component>
 </module>

mirror/src/com/olexyn/mirror/Mirror.java

@@ -0,0 +1,200 @@
+package com.olexyn.mirror;
+
+import com.olexyn.misp.helper.Ride;
+import org.apache.commons.io.IOUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Mirror extends HttpServlet {
+
+    protected static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core";
+
+    public final Map<Long, Ride> available = new HashMap<>();
+    public final Map<Long, Ride> booked = new HashMap<>();
+    public final Map<Long, Ride> loaded = new HashMap<>();
+
+    // #######
+    //
+    // #######
+
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+
+
+
+            String payload = IOUtils.toString(request.getReader());
+
+            JSONObject obj = new JSONObject();
+            try {
+                obj = new JSONObject(payload);
+            }catch (JSONException jsonE){
+                int br = 0;
+                Thread handleGetUserRequestThread = new Thread(() -> {
+                    try {
+                        handleGetRequest(request, response);
+                    } catch (IOException | InterruptedException e) {e.printStackTrace(); }
+                });
+                handleGetUserRequestThread.setName("handleGetUserRequestThread");
+                handleGetUserRequestThread.start();
+            }
+
+        Ride ridePayload = new Ride(payload);
+        boolean hasID = ridePayload.getID() != null;
+        boolean hasRequest = ridePayload.getRequest() != null;
+        boolean hasData = ridePayload.getData() != null;
+
+
+
+
+        if (hasID && hasRequest && hasData) {
+            Thread handleGetRideRequestDataThread = new Thread(() -> {
+                try {
+                    handleGetRideRequestData(request, response);
+                } catch (IOException | InterruptedException e) { e.printStackTrace(); }
+            });
+            handleGetRideRequestDataThread.setName("handleGetRideRequestDataThread");
+            handleGetRideRequestDataThread.start();
+        }
+
+
+    }
+
+
+    /**
+     * handle GET (Link)
+     * remove Ride from AvailableRides
+     * add Ride to ReservedRides
+     * send OK (Ride) to mispclient
+     * send OK (Ride) to public
+     */
+    protected void handleGetRequest(HttpServletRequest request, HttpServletResponse response) throws IOException, InterruptedException {
+        final Ride ride;
+        String parsedRequest = IOUtils.toString(request.getReader());
+
+
+        synchronized (available) {
+
+            while (available.size() < 1) {
+                available.notify();
+                available.wait();
+            }
+            // ride exists only locally, thus safe
+            ride = available.entrySet().iterator().next().getValue();
+            // ride exists only in "available", access through which is sync, thus safe
+            available.remove(ride.getID());
+            // needed because POST (Ride) wait()s
+            available.notify();
+        }
+
+        synchronized (booked) {
+            // ride exists only locally, thus safe
+            booked.put(ride.getID(), ride);
+            // ride exists only in "booked", access through which is sync, thus safe
+            ride.setRequest(parsedRequest);
+            // POST (Ride) wait()s
+            booked.notify();
+        }
+
+        synchronized (loaded) {
+
+            while (!loaded.containsKey(ride.getID())) {
+                loaded.notify();
+                loaded.wait();
+            }
+
+
+            // CARE this is tricky
+            // what if ride exists in another map, e.g. "available'
+            // in that case illegal access is possible
+            // be carefull to removing ride from all other references, when adding it to "loaded".
+            ride.setData(loaded.remove(ride.getID()).getData());
+        }
+
+        response.setStatus(200);
+        final PrintWriter writer = response.getWriter();
+        writer.write(ride.getData());
+        writer.flush();
+        writer.close();    }
+
+
+    /**
+     * handle GET (Ride)(Data)
+     * if Ride in ForwardedRequest
+     * remove Ride from ForwardedRequest
+     * add Ride to NewData
+     * send OK (Ride)(Data)
+     * remove Ride from NewData
+     * add Ride to ForwardedData
+     * send OK (EOL)
+     * remove Ride from ForwardedData
+     * add Ride to EOL
+     */
+    protected void handleGetRideRequestData(HttpServletRequest request, HttpServletResponse response) throws IOException, InterruptedException {
+        final String jsonPayload = IOUtils.toString(request.getReader());
+        final Ride ride = new Ride(jsonPayload);
+
+        synchronized (booked) {
+            booked.remove(ride.getID());
+        }
+
+        synchronized (loaded) {
+            loaded.put(ride.getID(), ride);
+            loaded.notify();
+        }
+    }
+
+    // #######
+    //
+    // #######
+
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        Thread handlePostRideThread = new Thread(() -> {
+            try {handlePostRide(request, response); } catch (IOException | InterruptedException e) { e.printStackTrace(); }
+        });
+        handlePostRideThread.setName("handlePostRideThread");
+        handlePostRideThread.start();
+    }
+
+
+    /**
+     * handle POST (Ride)
+     * add Ride to AvailableRides
+     */
+    protected void handlePostRide(HttpServletRequest request, HttpServletResponse response) throws IOException, InterruptedException {
+        String jsonPayload = IOUtils.toString(request.getReader());
+        final Ride ride = new Ride(jsonPayload);
+
+        synchronized (available) {
+            available.put(ride.getID(), ride);
+            available.notify();
+        }
+
+        // ID is final/threadsafe
+        while(!(booked.containsKey(ride.getID()))){
+
+        }
+
+        synchronized (booked) {
+            //booked.notify();
+            //booked.wait();
+            ride.setRequest(booked.get(ride.getID()).getRequest());
+        }
+
+        response.setStatus(200);
+        PrintWriter writer = response.getWriter();
+        writer.write(ride.json());
+        writer.flush();
+        writer.close();
+    }
+}

misp.properties

@@ -1,4 +0,0 @@
-path.variable.kotlin_bundled=/home/user/app/intellij-idea/plugins/Kotlin/kotlinc
-path.variable.maven_repository=/home/user/.m2/repository
-jdk.home.11=/usr/lib/jvm/java-11-openjdk-amd64
-javac2.instrumentation.includeJavaRuntime=false

misp.xml

@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="misp" default="all">
-  
-  
-  <property file="misp.properties"/>
-  <!-- Uncomment the following property if no tests compilation is needed -->
-  <!-- 
-  <property name="skip.tests" value="true"/>
-   -->
-  
-  <!-- Compiler options -->
-  
-  <property name="compiler.debug" value="on"/>
-  <property name="compiler.generate.no.warnings" value="off"/>
-  <property name="compiler.args" value=""/>
-  <property name="compiler.max.memory" value="700m"/>
-  <patternset id="ignored.files">
-    <exclude name="**/*.hprof/**"/>
-    <exclude name="**/*.pyc/**"/>
-    <exclude name="**/*.pyo/**"/>
-    <exclude name="**/*.rbc/**"/>
-    <exclude name="**/*.yarb/**"/>
-    <exclude name="**/*~/**"/>
-    <exclude name="**/.DS_Store/**"/>
-    <exclude name="**/.git/**"/>
-    <exclude name="**/.hg/**"/>
-    <exclude name="**/.svn/**"/>
-    <exclude name="**/CVS/**"/>
-    <exclude name="**/__pycache__/**"/>
-    <exclude name="**/_svn/**"/>
-    <exclude name="**/vssver.scc/**"/>
-    <exclude name="**/vssver2.scc/**"/>
-  </patternset>
-  <patternset id="library.patterns">
-    <include name="*.war"/>
-    <include name="*.swc"/>
-    <include name="*.zip"/>
-    <include name="*.egg"/>
-    <include name="*.ane"/>
-    <include name="*.jar"/>
-    <include name="*.ear"/>
-    <include name="*.klib"/>
-  </patternset>
-  <patternset id="compiler.resources">
-    <exclude name="**/?*.java"/>
-    <exclude name="**/?*.form"/>
-    <exclude name="**/?*.class"/>
-    <exclude name="**/?*.groovy"/>
-    <exclude name="**/?*.scala"/>
-    <exclude name="**/?*.flex"/>
-    <exclude name="**/?*.kt"/>
-    <exclude name="**/?*.clj"/>
-    <exclude name="**/?*.aj"/>
-  </patternset>
-  
-  <!-- JDK definitions -->
-  
-  <property name="jdk.bin.11" value="${jdk.home.11}/bin"/>
-  <path id="jdk.classpath.11">
-    <fileset dir="${jdk.home.11}">
-      <include name="../java-11-openjdk-amd64!/java.base"/>
-      <include name="../java-11-openjdk-amd64!/java.compiler"/>
-      <include name="../java-11-openjdk-amd64!/java.datatransfer"/>
-      <include name="../java-11-openjdk-amd64!/java.desktop"/>
-      <include name="../java-11-openjdk-amd64!/java.instrument"/>
-      <include name="../java-11-openjdk-amd64!/java.logging"/>
-      <include name="../java-11-openjdk-amd64!/java.management"/>
-      <include name="../java-11-openjdk-amd64!/java.management.rmi"/>
-      <include name="../java-11-openjdk-amd64!/java.naming"/>
-      <include name="../java-11-openjdk-amd64!/java.net.http"/>
-      <include name="../java-11-openjdk-amd64!/java.prefs"/>
-      <include name="../java-11-openjdk-amd64!/java.rmi"/>
-      <include name="../java-11-openjdk-amd64!/java.scripting"/>
-      <include name="../java-11-openjdk-amd64!/java.se"/>
-      <include name="../java-11-openjdk-amd64!/java.security.jgss"/>
-      <include name="../java-11-openjdk-amd64!/java.security.sasl"/>
-      <include name="../java-11-openjdk-amd64!/java.smartcardio"/>
-      <include name="../java-11-openjdk-amd64!/java.sql"/>
-      <include name="../java-11-openjdk-amd64!/java.sql.rowset"/>
-      <include name="../java-11-openjdk-amd64!/java.transaction.xa"/>
-      <include name="../java-11-openjdk-amd64!/java.xml"/>
-      <include name="../java-11-openjdk-amd64!/java.xml.crypto"/>
-      <include name="../java-11-openjdk-amd64!/jdk.accessibility"/>
-      <include name="../java-11-openjdk-amd64!/jdk.aot"/>
-      <include name="../java-11-openjdk-amd64!/jdk.attach"/>
-      <include name="../java-11-openjdk-amd64!/jdk.charsets"/>
-      <include name="../java-11-openjdk-amd64!/jdk.compiler"/>
-      <include name="../java-11-openjdk-amd64!/jdk.crypto.cryptoki"/>
-      <include name="../java-11-openjdk-amd64!/jdk.crypto.ec"/>
-      <include name="../java-11-openjdk-amd64!/jdk.dynalink"/>
-      <include name="../java-11-openjdk-amd64!/jdk.editpad"/>
-      <include name="../java-11-openjdk-amd64!/jdk.hotspot.agent"/>
-      <include name="../java-11-openjdk-amd64!/jdk.httpserver"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.ed"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.jvmstat"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.le"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.opt"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.vm.ci"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.vm.compiler"/>
-      <include name="../java-11-openjdk-amd64!/jdk.internal.vm.compiler.management"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jartool"/>
-      <include name="../java-11-openjdk-amd64!/jdk.javadoc"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jcmd"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jconsole"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jdeps"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jdi"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jdwp.agent"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jfr"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jlink"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jshell"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jsobject"/>
-      <include name="../java-11-openjdk-amd64!/jdk.jstatd"/>
-      <include name="../java-11-openjdk-amd64!/jdk.localedata"/>
-      <include name="../java-11-openjdk-amd64!/jdk.management"/>
-      <include name="../java-11-openjdk-amd64!/jdk.management.agent"/>
-      <include name="../java-11-openjdk-amd64!/jdk.management.jfr"/>
-      <include name="../java-11-openjdk-amd64!/jdk.naming.dns"/>
-      <include name="../java-11-openjdk-amd64!/jdk.naming.rmi"/>
-      <include name="../java-11-openjdk-amd64!/jdk.net"/>
-      <include name="../java-11-openjdk-amd64!/jdk.pack"/>
-      <include name="../java-11-openjdk-amd64!/jdk.rmic"/>
-      <include name="../java-11-openjdk-amd64!/jdk.scripting.nashorn"/>
-      <include name="../java-11-openjdk-amd64!/jdk.scripting.nashorn.shell"/>
-      <include name="../java-11-openjdk-amd64!/jdk.sctp"/>
-      <include name="../java-11-openjdk-amd64!/jdk.security.auth"/>
-      <include name="../java-11-openjdk-amd64!/jdk.security.jgss"/>
-      <include name="../java-11-openjdk-amd64!/jdk.unsupported"/>
-      <include name="../java-11-openjdk-amd64!/jdk.unsupported.desktop"/>
-      <include name="../java-11-openjdk-amd64!/jdk.xml.dom"/>
-      <include name="../java-11-openjdk-amd64!/jdk.zipfs"/>
-    </fileset>
-  </path>
-  
-  <property name="project.jdk.home" value="${jdk.home.11}"/>
-  <property name="project.jdk.bin" value="${jdk.bin.11}"/>
-  <property name="project.jdk.classpath" value="jdk.classpath.11"/>
-  
-  
-  <!-- Project Libraries -->
-  
-  <path id="library.commons-io:commons-io:2.6.classpath">
-    <pathelement location="${path.variable.maven_repository}/commons-io/commons-io/2.6/commons-io-2.6.jar"/>
-  </path>
-  
-  <path id="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath">
-    <pathelement location="${path.variable.maven_repository}/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar"/>
-  </path>
-  
-  <path id="library.org.json:json:20190722.classpath">
-    <pathelement location="${path.variable.maven_repository}/org/json/json/20190722/json-20190722.jar"/>
-  </path>
-  
-  <path id="library.springframework:spring-mock:1.2.6.classpath">
-    <pathelement location="${path.variable.maven_repository}/junit/junit/3.8.1/junit-3.8.1.jar"/>
-    <pathelement location="${path.variable.maven_repository}/org/springframework/spring-mock/1.2.6/spring-mock-1.2.6.jar"/>
-  </path>
-  
-  <path id="library.springframework:spring:1.2.6.classpath">
-    <pathelement location="${path.variable.maven_repository}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
-    <pathelement location="${path.variable.maven_repository}/org/springframework/spring/1.2.6/spring-1.2.6.jar"/>
-  </path>
-  <!-- Register Custom Compiler Taskdefs -->
-  <property name="javac2.home" value="${idea.home}/lib"/>
-  <path id="javac2.classpath">
-    <fileset dir="${javac2.home}">
-      <include name="javac2.jar"/>
-      <include name="jdom.jar"/>
-      <include name="asm-all*.jar"/>
-      <include name="forms-*.jar"/>
-    </fileset>
-  </path>
-  <target name="register.custom.compilers">
-    <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
-    <taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
-  </target>
-  
-  <!-- Modules -->
-  
-  
-  <!-- Module mispbridge -->
-  
-  <dirname property="module.mispbridge.basedir" file="${ant.file}"/>
-  
-  
-  <property name="module.jdk.home.mispbridge" value="${project.jdk.home}"/>
-  <property name="module.jdk.bin.mispbridge" value="${project.jdk.bin}"/>
-  <property name="module.jdk.classpath.mispbridge" value="${project.jdk.classpath}"/>
-  
-  <property name="compiler.args.mispbridge" value="-encoding UTF-8 -source 11 -target 11 ${compiler.args}"/>
-  
-  <property name="mispbridge.output.dir" value="${module.mispbridge.basedir}/production/mispbridge"/>
-  <property name="mispbridge.testoutput.dir" value="${module.mispbridge.basedir}/test/mispbridge"/>
-  
-  <path id="mispbridge.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  
-  <path id="mispbridge.module.production.classpath">
-    <path refid="${module.jdk.classpath.mispbridge}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispbridge.runtime.production.module.classpath">
-    <pathelement location="${mispbridge.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispbridge.module.classpath">
-    <path refid="${module.jdk.classpath.mispbridge}"/>
-    <pathelement location="${mispbridge.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispbridge.runtime.module.classpath">
-    <pathelement location="${mispbridge.testoutput.dir}"/>
-    <pathelement location="${mispbridge.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  
-  <patternset id="excluded.from.module.mispbridge">
-    <patternset refid="ignored.files"/>
-  </patternset>
-  
-  <patternset id="excluded.from.compilation.mispbridge">
-    <patternset refid="excluded.from.module.mispbridge"/>
-  </patternset>
-  
-  <path id="mispbridge.module.sourcepath">
-    <dirset dir="${module.mispbridge.basedir}/mispbridge">
-      <include name="src"/>
-    </dirset>
-  </path>
-  
-  
-  <target name="compile.module.mispbridge" depends="compile.module.mispbridge.production,compile.module.mispbridge.tests" description="Compile module mispbridge"/>
-  
-  <target name="compile.module.mispbridge.production" depends="register.custom.compilers" description="Compile module mispbridge; production classes">
-    <mkdir dir="${mispbridge.output.dir}"/>
-    <javac2 destdir="${mispbridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.mispbridge}/javac">
-      <compilerarg line="${compiler.args.mispbridge}"/>
-      <bootclasspath refid="mispbridge.module.bootclasspath"/>
-      <classpath refid="mispbridge.module.production.classpath"/>
-      <src refid="mispbridge.module.sourcepath"/>
-      <patternset refid="excluded.from.compilation.mispbridge"/>
-    </javac2>
-    
-    <copy todir="${mispbridge.output.dir}">
-      <fileset dir="${module.mispbridge.basedir}/mispbridge/src">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="compile.module.mispbridge.tests" depends="register.custom.compilers,compile.module.mispbridge.production" description="compile module mispbridge; test classes" unless="skip.tests"/>
-  
-  <target name="clean.module.mispbridge" description="cleanup module">
-    <delete dir="${mispbridge.output.dir}"/>
-    <delete dir="${mispbridge.testoutput.dir}"/>
-  </target>
-  
-  
-  <!-- Module mispclient -->
-  
-  <dirname property="module.mispclient.basedir" file="${ant.file}"/>
-  
-  
-  <property name="module.jdk.home.mispclient" value="${project.jdk.home}"/>
-  <property name="module.jdk.bin.mispclient" value="${project.jdk.bin}"/>
-  <property name="module.jdk.classpath.mispclient" value="${project.jdk.classpath}"/>
-  
-  <property name="compiler.args.mispclient" value="-encoding UTF-8 -source 11 -target 11 ${compiler.args}"/>
-  
-  <property name="mispclient.output.dir" value="${module.mispclient.basedir}/production/mispclient"/>
-  <property name="mispclient.testoutput.dir" value="${module.mispclient.basedir}/test/mispclient"/>
-  
-  <path id="mispclient.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  
-  <path id="mispclient.module.production.classpath">
-    <path refid="${module.jdk.classpath.mispclient}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispclient.runtime.production.module.classpath">
-    <pathelement location="${mispclient.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispclient.module.classpath">
-    <path refid="${module.jdk.classpath.mispclient}"/>
-    <pathelement location="${mispclient.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispclient.runtime.module.classpath">
-    <pathelement location="${mispclient.testoutput.dir}"/>
-    <pathelement location="${mispclient.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  
-  <patternset id="excluded.from.module.mispclient">
-    <patternset refid="ignored.files"/>
-  </patternset>
-  
-  <patternset id="excluded.from.compilation.mispclient">
-    <patternset refid="excluded.from.module.mispclient"/>
-  </patternset>
-  
-  <path id="mispclient.module.sourcepath">
-    <dirset dir="${module.mispclient.basedir}/mispclient">
-      <include name="src"/>
-    </dirset>
-  </path>
-  
-  
-  <target name="compile.module.mispclient" depends="compile.module.mispclient.production,compile.module.mispclient.tests" description="Compile module mispclient"/>
-  
-  <target name="compile.module.mispclient.production" depends="register.custom.compilers" description="Compile module mispclient; production classes">
-    <mkdir dir="${mispclient.output.dir}"/>
-    <javac2 destdir="${mispclient.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.mispclient}/javac">
-      <compilerarg line="${compiler.args.mispclient}"/>
-      <bootclasspath refid="mispclient.module.bootclasspath"/>
-      <classpath refid="mispclient.module.production.classpath"/>
-      <src refid="mispclient.module.sourcepath"/>
-      <patternset refid="excluded.from.compilation.mispclient"/>
-    </javac2>
-    
-    <copy todir="${mispclient.output.dir}">
-      <fileset dir="${module.mispclient.basedir}/mispclient/src">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="compile.module.mispclient.tests" depends="register.custom.compilers,compile.module.mispclient.production" description="compile module mispclient; test classes" unless="skip.tests"/>
-  
-  <target name="clean.module.mispclient" description="cleanup module">
-    <delete dir="${mispclient.output.dir}"/>
-    <delete dir="${mispclient.testoutput.dir}"/>
-  </target>
-  
-  
-  <!-- Module mispmock -->
-  
-  <dirname property="module.mispmock.basedir" file="${ant.file}"/>
-  
-  
-  <property name="module.jdk.home.mispmock" value="${project.jdk.home}"/>
-  <property name="module.jdk.bin.mispmock" value="${project.jdk.bin}"/>
-  <property name="module.jdk.classpath.mispmock" value="${project.jdk.classpath}"/>
-  
-  <property name="compiler.args.mispmock" value="-encoding UTF-8 -source 11 -target 11 ${compiler.args}"/>
-  
-  <property name="mispmock.output.dir" value="${module.mispmock.basedir}/production/mispmock"/>
-  <property name="mispmock.testoutput.dir" value="${module.mispmock.basedir}/test/mispmock"/>
-  
-  <path id="mispmock.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  
-  <path id="mispmock.module.production.classpath">
-    <path refid="${module.jdk.classpath.mispmock}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.springframework:spring-mock:1.2.6.classpath"/>
-    <path refid="library.springframework:spring:1.2.6.classpath"/>
-    <pathelement location="${mispclient.output.dir}"/>
-    <pathelement location="${mispbridge.output.dir}"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispmock.runtime.production.module.classpath">
-    <pathelement location="${mispmock.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.springframework:spring-mock:1.2.6.classpath"/>
-    <path refid="library.springframework:spring:1.2.6.classpath"/>
-    <path refid="mispclient.runtime.production.module.classpath"/>
-    <path refid="mispbridge.runtime.production.module.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispmock.module.classpath">
-    <path refid="${module.jdk.classpath.mispmock}"/>
-    <pathelement location="${mispmock.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.springframework:spring-mock:1.2.6.classpath"/>
-    <path refid="library.springframework:spring:1.2.6.classpath"/>
-    <pathelement location="${mispclient.testoutput.dir}"/>
-    <pathelement location="${mispclient.output.dir}"/>
-    <pathelement location="${mispbridge.testoutput.dir}"/>
-    <pathelement location="${mispbridge.output.dir}"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  <path id="mispmock.runtime.module.classpath">
-    <pathelement location="${mispmock.testoutput.dir}"/>
-    <pathelement location="${mispmock.output.dir}"/>
-    <path refid="library.org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016.classpath"/>
-    <path refid="library.springframework:spring-mock:1.2.6.classpath"/>
-    <path refid="library.springframework:spring:1.2.6.classpath"/>
-    <path refid="mispclient.runtime.module.classpath"/>
-    <path refid="mispbridge.runtime.module.classpath"/>
-    <path refid="library.commons-io:commons-io:2.6.classpath"/>
-    <path refid="library.org.json:json:20190722.classpath"/>
-  </path>
-  
-  
-  <patternset id="excluded.from.module.mispmock">
-    <patternset refid="ignored.files"/>
-  </patternset>
-  
-  <patternset id="excluded.from.compilation.mispmock">
-    <patternset refid="excluded.from.module.mispmock"/>
-  </patternset>
-  
-  <path id="mispmock.module.sourcepath">
-    <dirset dir="${module.mispmock.basedir}/mispmock">
-      <include name="src"/>
-    </dirset>
-  </path>
-  
-  
-  <target name="compile.module.mispmock" depends="compile.module.mispmock.production,compile.module.mispmock.tests" description="Compile module mispmock"/>
-  
-  <target name="compile.module.mispmock.production" depends="register.custom.compilers,compile.module.mispclient,compile.module.mispbridge" description="Compile module mispmock; production classes">
-    <mkdir dir="${mispmock.output.dir}"/>
-    <javac2 destdir="${mispmock.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.mispmock}/javac">
-      <compilerarg line="${compiler.args.mispmock}"/>
-      <bootclasspath refid="mispmock.module.bootclasspath"/>
-      <classpath refid="mispmock.module.production.classpath"/>
-      <src refid="mispmock.module.sourcepath"/>
-      <patternset refid="excluded.from.compilation.mispmock"/>
-    </javac2>
-    
-    <copy todir="${mispmock.output.dir}">
-      <fileset dir="${module.mispmock.basedir}/mispmock/src">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="compile.module.mispmock.tests" depends="register.custom.compilers,compile.module.mispmock.production" description="compile module mispmock; test classes" unless="skip.tests"/>
-  
-  <target name="clean.module.mispmock" description="cleanup module">
-    <delete dir="${mispmock.output.dir}"/>
-    <delete dir="${mispmock.testoutput.dir}"/>
-  </target>
-  
-  <target name="init" description="Build initialization">
-    <!-- Perform any build initialization in this target -->
-  </target>
-  
-  <target name="clean" depends="clean.module.mispbridge, clean.module.mispclient, clean.module.mispmock" description="cleanup all"/>
-  
-  <target name="build.modules" depends="init, clean, compile.module.mispbridge, compile.module.mispclient, compile.module.mispmock" description="build all modules"/>
-  
-  <target name="all" depends="build.modules" description="build all"/>
-</project>

mispbridge/README.md

@@ -1,4 +1,5 @@
 #### About
 The `mispbridge` servlet.
-* `./mispbridge` copy/link this to `tomcat/webapps`.
-* `./src` the source code.
+* `./src` the code.
+* `./war/wrapper` supplements needed for `.war`.
+* `./war/<name>.war` copy this to `tomcat/webapps`.

mispclient/README.md

@@ -1,4 +1,5 @@
 #### About
 The `mispclient` servlet.
-* `./mispclient` copy/link this to `tomcat/webapps`.
-* `./src` the source code.
+* `./src` the code.
+* `./war/wrapper` supplements needed for `.war`.
+* `./war/<name>.war` copy this to `tomcat/webapps`.