You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/11/01 14:40:59 UTC
[13/21] archiva git commit: Adapting cli to the new repository api
Adapting cli to the new repository api
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/2f131c66
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/2f131c66
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/2f131c66
Branch: refs/heads/master
Commit: 2f131c666ad40f02ba617abe3f8b4490e3bfc45f
Parents: 3dc8542
Author: Martin Stockhammer <ma...@apache.org>
Authored: Wed Nov 1 15:36:28 2017 +0100
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Wed Nov 1 15:36:28 2017 +0100
----------------------------------------------------------------------
.../org/apache/archiva/cli/AbstractProgressConsumer.java | 2 +-
.../src/main/java/org/apache/archiva/cli/ArchivaCli.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/2f131c66/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
index c415fac..be552a3 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
@@ -19,10 +19,10 @@ package org.apache.archiva.cli;
* under the License.
*/
-import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.RepositoryContentConsumer;
+import org.apache.archiva.repository.ManagedRepository;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/archiva/blob/2f131c66/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index dad00f6..d274c3d 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -21,13 +21,14 @@ package org.apache.archiva.cli;
import com.sampullara.cli.Args;
import com.sampullara.cli.Argument;
-import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.consumers.RepositoryContentConsumer;
import org.apache.archiva.converter.RepositoryConversionException;
import org.apache.archiva.converter.legacy.LegacyRepositoryConverter;
+import org.apache.archiva.repository.BasicManagedRepository;
+import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
@@ -47,6 +48,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -166,10 +168,8 @@ public class ArchivaCli
private void doScan( String path, String[] consumers )
throws ConsumerException, MalformedURLException
{
- ManagedRepository repo = new ManagedRepository();
- repo.setId( Paths.get( path ).getFileName().toString());
- repo.setName( "Archiva CLI Provided Repo" );
- repo.setLocation( path );
+ BasicManagedRepository repo = new BasicManagedRepository( Paths.get(path).getFileName().toString(), "Archiva CLI Provided Repo" );
+ repo.setLocation( Paths.get(path).toUri() );
List<KnownRepositoryContentConsumer> knownConsumerList = new ArrayList<>();