From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Feb 2015 18:41:48 +0000 (+0000)
Subject: Start adapting Aether
X-Git-Tag: argeo-slc-2.1.7~92
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=288d632c6910aecf9ffd424db020cb4a5337aa45;p=gpl%2Fargeo-slc.git

Start adapting Aether

git-svn-id: https://svn.argeo.org/slc/trunk@7919 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
index 069e4c3e4..eddcea720 100644
--- a/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
@@ -15,7 +15,6 @@
  */
 package org.argeo.slc.aether.spring;
 
-import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
@@ -30,14 +29,14 @@ public class RemoteRepositoryFactory implements BeanNameAware, FactoryBean {
 	private String password;
 
 	public Object getObject() throws Exception {
+		RemoteRepository remoteRepository = new RemoteRepository.Builder(
+				id != null ? id : beanName, type, url).build();
 		// FIXME Adapt to changes in Aether
-//		RemoteRepository remoteRepository = new RemoteRepository(
-//				id != null ? id : beanName, type, url);
-//		if (username != null) {
-//			Authentication authentication = new Authentication(username,
-//					password);
-//			remoteRepository.setAuthentication(authentication);
-//		}
+		// if (username != null) {
+		// Authentication authentication = new Authentication(username,
+		// password);
+		// remoteRepository.setAuthentication(authentication);
+		// }
 		return null;
 	}