From 2521d13558baa4b8bceba1dea345569c601506c2 Mon Sep 17 00:00:00 2001
From: David Carver <d_a_carver@yahoo.com>
Date: Thu, 10 Nov 2016 08:54:05 -0500
Subject: [PATCH] Issue #1 - create standalone assembly and zip files

---
 pom.xml                                       | 337 ++++++++++--------
 src/assembly/README                           |  30 ++
 src/assembly/assembly.xml                     |  39 ++
 src/assembly/xstreamer.cmd                    |   1 +
 src/assembly/xstreamer.sh                     |   3 +
 .../nineworlds/xstreamer/XStreamerFrame.java  |   1 -
 6 files changed, 266 insertions(+), 145 deletions(-)
 create mode 100644 src/assembly/README
 create mode 100644 src/assembly/assembly.xml
 create mode 100644 src/assembly/xstreamer.cmd
 create mode 100755 src/assembly/xstreamer.sh

diff --git a/pom.xml b/pom.xml
index 2a3ff78..84d32a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,153 +1,202 @@
 <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>
+	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>
 
-   <groupId>us.nineworlds</groupId>
-   <artifactId>xstreamer</artifactId>
-   <version>0.0.1-SNAPSHOT</version>
-   <packaging>jar</packaging>
+	<groupId>us.nineworlds</groupId>
+	<artifactId>xstreamer</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
 
-   <name>xstreamer</name>
-   <url>http://maven.apache.org</url>
+	<name>xstreamer</name>
+	<url>http://maven.apache.org</url>
 
-   <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-   </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
-   <build>
-      <plugins>
-         <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.6.0</version>
-            <configuration>
-               <source>1.8</source>
-               <target>1.8</target>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>us.nineworlds.xstreamer.XStreamer</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>build-all-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<archive>
+								<manifest>
+									<mainClass>us.nineworlds.xstreamer.XStreamer</mainClass>
+								</manifest>
+							</archive>
+							<descriptorRefs>
+								<descriptorRef>jar-with-dependencies</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+					</execution>
+					<execution>
+						<id>build-zips</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>						
+							<descriptors>
+								<descriptor>src/assembly/assembly.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>us.nineworlds.xstreamer.XStreamer</mainClass>
+						</manifest>
+					</archive>
+					<finalName>xstreamer-all</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.swixml</groupId>
-         <artifactId>swixml</artifactId>
-         <version>2.6.20130530</version>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.jnlp</groupId>
-               <artifactId>jnlp</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.quartz-scheduler</groupId>
-         <artifactId>quartz</artifactId>
-         <version>2.2.3</version>
-      </dependency>
-      <dependency>
-         <groupId>joda-time</groupId>
-         <artifactId>joda-time</artifactId>
-         <version>2.9.4</version>
-      </dependency>
-      <dependency>
-         <groupId>commons-lang</groupId>
-         <artifactId>commons-lang</artifactId>
-         <version>2.4</version>
-      </dependency>
-      <dependency>
-         <groupId>commons-configuration</groupId>
-         <artifactId>commons-configuration</artifactId>
-         <version>1.10</version>
-      </dependency>
-      <dependency>
-         <groupId>commons-io</groupId>
-         <artifactId>commons-io</artifactId>
-         <version>2.5</version>
-      </dependency>
-      <dependency>
-         <groupId>com.google.guava</groupId>
-         <artifactId>guava</artifactId>
-         <version>20.0</version>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-databind</artifactId>
-         <version>2.8.4</version>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>3.8.1</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.freemarker</groupId>
-         <artifactId>freemarker</artifactId>
-         <version>2.3.20</version>
-      </dependency>
-   </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.swixml</groupId>
+			<artifactId>swixml</artifactId>
+			<version>2.6.20130530</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.jnlp</groupId>
+					<artifactId>jnlp</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>2.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.9.4</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>20.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.4</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>2.3.20</version>
+		</dependency>
+	</dependencies>
 
-   <profiles>
-      <profile>
-         <id>run</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <version>1.5.0</version>
-                  <executions>
-                     <execution>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>java</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <mainClass>us.nineworlds.xstreamer.XStreamer</mainClass>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>generate</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.jsonschema2pojo</groupId>
-                  <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                  <version>0.4.27</version>
-                  <executions>
-<!--                      <execution>
-                        <id>xws</id>
-                        <goals>
-                           <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                           <sourceDirectory>${basedir}/src/main/resources/schemas</sourceDirectory>
-                           <outputDirectory>${project.build.directory}/generated-sources/schemas</outputDirectory>
-                           <targetPackage>com.github.xws.temp</targetPackage>
-                        </configuration>
-                     </execution>
- -->                     <execution>
-                        <id>xws-data-pilots</id>
-                        <goals>
-                           <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                           <sourceDirectory>${basedir}/src/main/resources/xws-data</sourceDirectory>
-                           <outputDirectory>${project.build.directory}/generated-sources/xws-data</outputDirectory>
-                           <targetPackage>com.github.xws.pilots</targetPackage>
-                           <sourceType>json</sourceType>
-                        </configuration>
-                     </execution>
+	<profiles>
+		<profile>
+			<id>run</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.5.0</version>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>java</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<mainClass>us.nineworlds.xstreamer.XStreamer</mainClass>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jsonschema2pojo</groupId>
+						<artifactId>jsonschema2pojo-maven-plugin</artifactId>
+						<version>0.4.27</version>
+						<executions>
+							<!-- <execution> <id>xws</id> <goals> <goal>generate</goal> </goals> 
+								<configuration> <sourceDirectory>${basedir}/src/main/resources/schemas</sourceDirectory> 
+								<outputDirectory>${project.build.directory}/generated-sources/schemas</outputDirectory> 
+								<targetPackage>com.github.xws.temp</targetPackage> </configuration> </execution> -->
+							<execution>
+								<id>xws-data-pilots</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<sourceDirectory>${basedir}/src/main/resources/xws-data</sourceDirectory>
+									<outputDirectory>${project.build.directory}/generated-sources/xws-data</outputDirectory>
+									<targetPackage>com.github.xws.pilots</targetPackage>
+									<sourceType>json</sourceType>
+								</configuration>
+							</execution>
 
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/src/assembly/README b/src/assembly/README
new file mode 100644
index 0000000..dd7fd1d
--- /dev/null
+++ b/src/assembly/README
@@ -0,0 +1,30 @@
+Installation
+
+You will need two player squad files created, that were exported from one of
+the squad builders.  These files must be named as follows:
+
+player1.json - this is the squad file for player 1
+player2.json - this is the squad file for player 2
+
+Als you will need an empty file called  timer.txt.
+
+Place these files in the same directory as the xstreamer-all.jar
+
+Configuring the Application
+
+You may want to update the location as to where the files are being output.
+
+By default it will output everything to the same directory as the program was executed.
+
+Configuration files reside in two location:
+
+* config
+* templates
+
+Templates contains the FTL files used to generate the actual squads.  Two are included
+as examples on how to generate player squad overlays.
+
+Config contains the locations where the input files and output files reside.
+
+The application includes many of the resources from the Vassal program, and these reside in the images
+directory.  You may reference these in your squad templates.
diff --git a/src/assembly/assembly.xml b/src/assembly/assembly.xml
new file mode 100644
index 0000000..a8dbf6b
--- /dev/null
+++ b/src/assembly/assembly.xml
@@ -0,0 +1,39 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>project</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <includes>
+        <include>**/config/**</include>
+        <include>**/templates/**</include>
+        <include>**/images/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target</directory>
+      <outputDirectory></outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <includes>
+        <include>xstreamer-all.jar</include>
+      </includes>      
+    </fileSet>
+    <fileSet>
+    	<directory>${basedir}/src/assembly</directory>
+    	<outputDirectory/>
+    	<useDefaultExcludes>true</useDefaultExcludes>
+    	<includes>
+    		<include>xstreamer.cmd</include>
+    		<include>xstreamer.sh</include>
+    		<include>README</include>
+    	</includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/xstreamer.cmd b/src/assembly/xstreamer.cmd
new file mode 100644
index 0000000..6cfd679
--- /dev/null
+++ b/src/assembly/xstreamer.cmd
@@ -0,0 +1 @@
+java -jar xstreamer-all.jar
diff --git a/src/assembly/xstreamer.sh b/src/assembly/xstreamer.sh
new file mode 100755
index 0000000..213cbc8
--- /dev/null
+++ b/src/assembly/xstreamer.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -jar xstreamer-all.jar
diff --git a/src/main/java/us/nineworlds/xstreamer/XStreamerFrame.java b/src/main/java/us/nineworlds/xstreamer/XStreamerFrame.java
index 1d38e03..31c797d 100644
--- a/src/main/java/us/nineworlds/xstreamer/XStreamerFrame.java
+++ b/src/main/java/us/nineworlds/xstreamer/XStreamerFrame.java
@@ -150,7 +150,6 @@ private void loadPilotValues(Pilot pilot, JTextField shields, JTextField hull) {
    }
    
 	public Object getSelectedObject( MouseEvent ev ) {
-	    
 		Object source = ev.getSource();
 		
 		if( source instanceof JTree ) {