From 14593ef20a5476d3771c424b95acec0927fa46b0 Mon Sep 17 00:00:00 2001
From: Drew Short <nerian.drew@gmail.com>
Date: Fri, 3 Jan 2014 18:44:25 -0500
Subject: [PATCH] Fixing maven build file and packaging scripts to make sure
 that the deployment file is executable.

---
 build.sh   |  2 +-
 package.sh |  7 ++++++-
 pom.xml    | 35 +----------------------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/build.sh b/build.sh
index 829d2c6..266b2fb 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mvn clean package
+mvn clean jfx:jar
diff --git a/package.sh b/package.sh
index 28949ec..831cb28 100755
--- a/package.sh
+++ b/package.sh
@@ -7,8 +7,13 @@ PACKAGETAR=$PACKAGENAME.tar.gz
 PACKAGEZIP=$PACKAGENAME.zip
 TARGET=$PWD/target
 
-cd target/build/
+#Packaging Jar Distributable
+cd target/jfx/app/
 echo "creating $PACKAGETAR in $TARGET"
 tar -zcvf $TARGET/$PACKAGETAR .
 echo "creating $PACKAGEZIP in $TARGET"
 zip -r $TARGET/$PACKAGEZIP ./*
+#Removing prebuilt jar in target
+rm $TARGET/*.jar
+#Copying Jar to target for archiving
+cp ./*.jar $TARGET
diff --git a/pom.xml b/pom.xml
index 32a5a40..1ef70bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,39 +176,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <outputDirectory>${project.build.directory}/build/</outputDirectory>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <mainClass>com.sothr.imagetools.App</mainClass>
-              <classpathPrefix>lib</classpathPrefix>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.5.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/build/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <version>2.6</version>
         <executions>
@@ -235,7 +202,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/build</outputDirectory>
+              <outputDirectory>${project.build.directory}/jfx/app</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/includes</directory>