release 1.5.0

andresoviedo · Aug 4, 2018 · c5caebe · c5caebe
1 parent e7a8503
commit c5caebe
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -69,15 +69,11 @@ Source Code
 
 [GitHub](https://github.com/andresoviedo/google-drive-ftp-adapter)
 
-Web Site
-========
-
-[www.andresoviedo.org](http://www.andresoviedo.org/google-drive-ftp-adapter)
 
 Downloads
 =========
 
-Latest Release 1.4.1 - 8 December 2017
+Latest Release 1.5.8 - 04/08/2018
 - Option 1 - /¡\ Java Required          : [jar-with-dependencies.jar](https://raw.github.com/andresoviedo/google-drive-ftp-adapter/master/build/google-drive-ftp-adapter-jar-with-dependencies.jar)
 - Option 2 - /¡\ Java Required          : [adapter-bundle.zip](https://raw.github.com/andresoviedo/google-drive-ftp-adapter/master/build/google-drive-ftp-adapter-bundle.zip)
 - Option 3 - Java for Windows included  : [adapter-bundle-jre7-win32.zip](https://raw.github.com/andresoviedo/google-drive-ftp-adapter/master/build/google-drive-ftp-adapter-win32-jre7-bundle.zip)
@@ -86,14 +82,20 @@ Latest Release 1.4.1 - 8 December 2017
 Buid It!
 =======
 
-The project is packaged with Maven. If you want to build it just download the project, compile it and run Java with "Main"
+Install java 8 and maven 3. Then execute the following commands in the terminal:
+
+    git clone https://github.com/andresoviedo/google-drive-ftp-adapter.git
+    cd google-drive-ftp-adapter
+    mvn clean package
+
 
 Run it!
 ======
 
-- If you have Java installed already all you have to do is download jar-with-dependencies.jar and double click on it or run from command line:
+- Install java 8. Then double click on jar-with-dependencies.jar or execute the following command in the terminal:
+
+    java -jar google-drive-ftp-adapter-jar-with-dependencies.jar
 
-    $ java -jar google-drive-ftp-adapter-jar-with-dependencies.jar
 
 - If you don't have Java installed and you are in Windows:
   - Download from [here](https://raw.github.com/andresoviedo/google-drive-ftp-adapter/master/build/google-drive-ftp-adapter-win32-jre7-bundle.zip)

diff --git a/build/google-drive-ftp-adapter-bundle.zip b/build/google-drive-ftp-adapter-bundle.zip
diff --git a/build/google-drive-ftp-adapter-jar-with-dependencies.jar b/build/google-drive-ftp-adapter-jar-with-dependencies.jar
diff --git a/build/google-drive-ftp-adapter-win32-jre7-bundle.zip b/build/google-drive-ftp-adapter-win32-jre7-bundle.zip
diff --git a/src/main/assembly/bundle.xml b/src/main/assembly/bundle.xml
@@ -12,24 +12,28 @@
 	<files>
 		<file>
 			<source>README.md</source>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
+		</file>
+		<file>
+			<source>LICENSE</source>
+			<outputDirectory>./</outputDirectory>
 		</file>
 		<file>
 			<source>src/main/resources/configuration.properties</source>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 		</file>
 	</files>
 
 	<fileSets>
 		<fileSet>
 			<directory>src/main/bundle</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 		</fileSet>
 	</fileSets>
 
 	<dependencySets>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<useProjectArtifact>true</useProjectArtifact>
 			<scope>provided</scope>
 			<outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
@@ -38,7 +42,7 @@
 			</includes>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>/lib</outputDirectory>
+			<outputDirectory>./lib</outputDirectory>
 			<useProjectArtifact>false</useProjectArtifact>
 			<scope>runtime</scope>
 		</dependencySet>

diff --git a/src/main/assembly/jar-with-dependencies.xml b/src/main/assembly/jar-with-dependencies.xml
@@ -8,15 +8,15 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<dependencySets>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<useProjectArtifact>true</useProjectArtifact>
 			<includes>
 				<include>org.andresoviedo:*:*:*</include>
 			</includes>
 			<unpack>true</unpack>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<useProjectArtifact>false</useProjectArtifact>
 			<unpack>true</unpack>
 			<unpackOptions>

diff --git a/src/main/assembly/win32-jre7.xml b/src/main/assembly/win32-jre7.xml
@@ -12,28 +12,32 @@
 	<files>
 		<file>
 			<source>README.md</source>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
+		</file>
+		<file>
+			<source>LICENSE</source>
+			<outputDirectory>./</outputDirectory>
 		</file>
 		<file>
 			<source>src/main/resources/configuration.properties</source>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 		</file>
 	</files>
 
 	<fileSets>
 		<fileSet>
 			<directory>src/main/bundle</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/win32-jre7</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 		</fileSet>
 	</fileSets>
 
 	<dependencySets>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<useProjectArtifact>true</useProjectArtifact>
 			<scope>provided</scope>
 			<outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
@@ -42,7 +46,7 @@
 			</includes>
 		</dependencySet>
 		<dependencySet>
-			<outputDirectory>/lib</outputDirectory>
+			<outputDirectory>./lib</outputDirectory>
 			<useProjectArtifact>false</useProjectArtifact>
 			<scope>runtime</scope>
 		</dependencySet>

diff --git a/src/main/java/org/andresoviedo/google_drive_ftp_adapter/Main.java b/src/main/java/org/andresoviedo/google_drive_ftp_adapter/Main.java
@@ -5,6 +5,7 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
 
+import javax.swing.*;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -29,43 +30,46 @@ public final class Main {
 
 	public static void main(String[] args) {
 
-		// configurePrimitiveLogging();
-
-		JarUtils.printManifestAttributesToString();
+		try {
+			JarUtils.printManifestAttributesToString();
 
-		LOG.info("Program info: " + JarUtils.getManifestAttributesAsMap());
+			LOG.info("Program info: " + JarUtils.getManifestAttributesAsMap());
 
-		LOG.info("Started with args '" + Arrays.asList(args) + "'...");
+			LOG.info("Started with args '" + Arrays.asList(args) + "'...");
 
-		// print again info so it's registered in the logs
-		LOG.info("Loading configuration...");
+			// print again info so it's registered in the logs
+			LOG.info("Loading configuration...");
 
-		// Load properties from multiple sources
-		Properties configuration = loadPropertiesFromClasspath();
-		configuration.putAll(loadProperties("configuration.properties"));
-		if (args.length == 1 && !"configuration.properties".equals(args[0])) {
-			configuration.putAll(loadProperties(args[0]));
-		}
-		configuration.putAll(readCommandLineConfiguration(args));
+			// Load properties from multiple sources
+			Properties configuration = loadPropertiesFromClasspath();
+			configuration.putAll(loadProperties("configuration.properties"));
+			if (args.length == 1 && !"configuration.properties".equals(args[0])) {
+				configuration.putAll(loadProperties(args[0]));
+			}
+			configuration.putAll(readCommandLineConfiguration(args));
 
-		// validate params
-		if (args.length == 2) {
-			// legacy version. see if below
-		} else if (args.length > 1) {
-			throw new IllegalArgumentException("usage: args [propertiesFile]");
-		}
+			// validate params
+			if (args.length == 2) {
+				// legacy version. see if below
+			} else if (args.length > 1) {
+				throw new IllegalArgumentException("usage: args [propertiesFile]");
+			}
 
-		// INFO: uncomment to support multiples user environments
-		// properties = new MultiProperties(properties);
+			// INFO: uncomment to support multiples user environments
+			// properties = new MultiProperties(properties);
 
-		configureLogging(configuration);
+			configureLogging(configuration);
 
-		LOG.info("Creating application with configuration '" + configuration + "'");
-		app = new GoogleDriveFtpAdapter(configuration);
+			LOG.info("Creating application with configuration '" + configuration + "'");
+			app = new GoogleDriveFtpAdapter(configuration);
 
-		registerShutdownHook();
+			registerShutdownHook();
 
-		start();
+			start();
+		} catch (Exception e) {
+			LOG.error("Error loading app",e);
+			JOptionPane.showMessageDialog(null, "Error: "+e.getMessage());
+		}
 	}
 
 	private static void start() {