new version 0.0.10:

* add ignore self signed SSL certificate (issue #1)
* fix readme and build with maven 3

Author: mhelleboid

remotesync-api/pom.xml

@@ -143,7 +143,7 @@
 	<parent>
 		<groupId>piwigo</groupId>
 		<artifactId>remotesync</artifactId>
-		<version>0.0.9</version>
+		<version>0.0.10</version>
 		<relativePath>../remotesync</relativePath>
 	</parent>
 </project>

remotesync-api/src/main/java/org/piwigo/remotesync/api/IClientConfiguration.java

@@ -22,5 +22,7 @@ public interface IClientConfiguration {
 	public String getProxyUsername();
 	public String getProxyPassword();
 
+	public boolean getIgnoreSelfSignedSSLCertificate();
+
 	public int getChunkSize();
 }

remotesync-api/src/main/java/org/piwigo/remotesync/api/Tasks.java

@@ -20,6 +20,7 @@ public class Tasks {
 
 	//TODO return float/boolean/int instead of types
 
+	//TODO implement debug option from UI 
 	//TODO implement progressmonitor
 	//TODO implement estimated time
 	//TODO implement allpaging

remotesync-api/src/main/java/org/piwigo/remotesync/api/client/WSClient.java

@@ -25,6 +25,9 @@
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -156,7 +159,7 @@ else if (value instanceof List) {
 		}
 	}
 
-	protected CloseableHttpClient getHttpClient() {
+	protected CloseableHttpClient getHttpClient() throws Exception {
 		if (httpClient == null) {
 			HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
 
@@ -176,6 +179,13 @@ protected CloseableHttpClient getHttpClient() {
 				HttpHost proxy = new HttpHost(proxyUrl, proxyPort);
 				requestConfig = RequestConfig.custom().setProxy(proxy).build();
 			}
+			
+			if (clientConfiguration.getIgnoreSelfSignedSSLCertificate()) {
+				SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
+				sslContextBuilder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
+			    httpClientBuilder.setSSLSocketFactory(new SSLConnectionSocketFactory(sslContextBuilder.build()));
+			}
+
 			httpClient = httpClientBuilder.build();
 		}
 

remotesync-api/src/main/java/org/piwigo/remotesync/api/conf/SyncConfiguration.java

@@ -70,6 +70,10 @@ public class SyncConfiguration implements ISyncConfiguration {
 	@Validator(type = ValidatorType.string)
 	protected String proxyPassword;
 
+	@Element(required = false)
+	@Option(name = "-isssc", usage = "ignore self signed ssl certificates")
+	protected String ignoreSelfSignedSSLCertificates = Boolean.FALSE.toString();
+
 	@Element(required = false)
 	@Option(name = "-cs", usage = "chunk size (in Kbytes)")
 	@Validator(type = ValidatorType.integer)
@@ -128,7 +132,7 @@ public void setDirectory(String directory) {
 	public boolean getUsesProxy() {
 		try {
 			return Boolean.parseBoolean(usesProxy);
-		} catch (NumberFormatException e) {
+		} catch (Exception e) {
 			return false;
 		}
 	}
@@ -173,6 +177,18 @@ public void setProxyPassword(String proxyPassword) {
 		this.proxyPassword = proxyPassword;
 	}
 
+	public boolean getIgnoreSelfSignedSSLCertificate() {
+		try {
+			return Boolean.parseBoolean(ignoreSelfSignedSSLCertificates);
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	public void setIgnoreSelfSignedSSLCertificate(String string) {
+		this.ignoreSelfSignedSSLCertificates = string;
+	}
+	
 	public int getChunkSize() {
 		try {
 			return Integer.parseInt(chunkSize);

remotesync-ui/pom.xml

@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>piwigo</groupId>
 			<artifactId>remotesync-api</artifactId>
-			<version>0.0.9</version>
+			<version>0.0.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.pivot</groupId>
@@ -73,7 +73,7 @@
 	<parent>
 		<groupId>piwigo</groupId>
 		<artifactId>remotesync</artifactId>
-		<version>0.0.9</version>
+		<version>0.0.10</version>
 		<relativePath>../remotesync</relativePath>
 	</parent>
 </project>

…/piwigo/remotesync/ui/swing/ProxyUI.java …iwigo/remotesync/ui/swing/OptionsUI.javaremotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/ProxyUI.java renamed to remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/OptionsUI.java remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/ProxyUI.java renamed to remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/OptionsUI.java

@@ -26,7 +26,7 @@
 
 import org.piwigo.remotesync.api.conf.SyncConfiguration;
 
-public class ProxyUI extends JFrame {
+public class OptionsUI extends JFrame {
 
 	private static final long serialVersionUID = -7945236553585527567L;
 
@@ -36,12 +36,13 @@ public class ProxyUI extends JFrame {
 	private JTextField proxyLogintextField;
 	private JTextField proxyPasswordtextField;
 	private JCheckBox chckbxUseProxy;
+	private JCheckBox chckbxISSSC;
 
 	public static void run(final SyncConfiguration syncConfiguration) {
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-					ProxyUI frame = new ProxyUI(syncConfiguration);
+					OptionsUI frame = new OptionsUI(syncConfiguration);
 					frame.chckbxUseProxy.setSelected(false);
 					frame.disableTextFields();
 					frame.setVisible(true);
@@ -57,7 +58,7 @@ public void run() {
 	 * 
 	 * @param syncConfiguration
 	 */
-	public ProxyUI(final SyncConfiguration syncConfiguration) {
+	public OptionsUI(final SyncConfiguration syncConfiguration) {
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setBounds(100, 100, 450, 300);
 		contentPane = new JPanel();
@@ -110,6 +111,10 @@ public void stateChanged(ChangeEvent e) {
 		contentPane.add(proxyPasswordtextField);
 		proxyPasswordtextField.setColumns(10);
 
+		chckbxISSSC = new JCheckBox("Ignore self signed SSL certificates");
+		chckbxISSSC.setBounds(8, 170, 300, 23);
+		contentPane.add(chckbxISSSC);
+
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent e) {
@@ -119,6 +124,7 @@ public void windowClosing(WindowEvent e) {
 				syncConfiguration.setProxyPort(proxyPorttextField.getText());
 				syncConfiguration.setProxyUsername(proxyLogintextField.getText());
 				syncConfiguration.setProxyPassword(proxyPasswordtextField.getText());
+				syncConfiguration.setIgnoreSelfSignedSSLCertificate(Boolean.toString(chckbxISSSC.isSelected()));
 			}
 
 			@Override
@@ -129,6 +135,7 @@ public void windowOpened(WindowEvent e) {
 				proxyPorttextField.setText(syncConfiguration.getProxyPort() + "");
 				proxyLogintextField.setText(syncConfiguration.getProxyUsername());
 				proxyPasswordtextField.setText(syncConfiguration.getProxyPassword());
+				chckbxISSSC.setSelected(syncConfiguration.getIgnoreSelfSignedSSLCertificate());
 			}
 
 		});

remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/RemotesyncUI.java

@@ -50,7 +50,7 @@ public class RemotesyncUI {
 	private JButton syncButton;
 	private JButton directoryButton;
 	private JTextArea textArea;
-	private JButton proxyButton;
+	private JButton optionsButton;
 
 	private SyncConfiguration syncConfiguration = ConfigurationUtil.INSTANCE.getUserConfiguration().getCurrentSyncConfiguration();
 	private JScrollPane scrollPane;
@@ -167,14 +167,14 @@ public void actionPerformed(ActionEvent e) {
 		frame.getContentPane().add(directoryText);
 		directoryText.setColumns(10);
 
-		proxyButton = new JButton("Proxy");
-		proxyButton.addActionListener(new ActionListener() {
+		optionsButton = new JButton("Options");
+		optionsButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				proxy();
 			}
 		});
-		proxyButton.setBounds(25, 257, 94, 36);
-		frame.getContentPane().add(proxyButton);
+		optionsButton.setBounds(25, 257, 94, 36);
+		frame.getContentPane().add(optionsButton);
 
 		syncButton = new JButton("Sync");
 		syncButton.addActionListener(new ActionListener() {
@@ -198,7 +198,7 @@ public void actionPerformed(ActionEvent e) {
 
 	protected void proxy() {
 		logger.debug("RemotesyncUI proxy button pressed");
-		ProxyUI.run(syncConfiguration);
+		OptionsUI.run(syncConfiguration);
 	}
 
 	protected void selectDirectory() {

remotesync/README.txt

@@ -9,12 +9,12 @@
 #     Matthieu Helleboid - initial API and implementation
 #-------------------------------------------------------------------------------
 
-#checkout remote sync
-svn checkout http://piwigo.org/svn/extensions/piwigo-remote-sync
-cd piwigo-remote-sync
+#install tools
+apt-get install git maven 
 
-#install build system
-apt-get install maven2
+#clone remote sync
+git clone https://github.com/Piwigo/Piwigo-Java.git
+cd Piwigo-Java
 
 #build remote sync without tests
 cd remotesync

remotesync/pom.xml

@@ -14,7 +14,7 @@
 	<groupId>piwigo</groupId>
 	<artifactId>remotesync</artifactId>
 	<name>Piwigo Remote Sync</name>
-	<version>0.0.9</version>
+	<version>0.0.10</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,16 +34,17 @@
         </license>
     </licenses>
 	<scm>
-		<url>http://piwigo.org/svn/extensions/piwigo-remote-sync</url>
+		<url>https://github.com/Piwigo/Piwigo-Java.git</url>
 	</scm>
 	<issueManagement>
-		<url>http://piwigo.org/bugs</url>
+		<url>https://github.com/Piwigo/Piwigo-Java/issues</url>
 	</issueManagement>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>