Search custom archetype catalog (first)

Author: adrienlauer

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Version 2.6.1 (2017-08-04)
 
-* [new] Fallback to seedstack.org archetype catalog if nothing is found on the default remote or locally.
+* [chg] Search custom archetype catalog first (`http://seedstack.org/maven/` by default), then central, then local, then manual coordinates.
 
 # Version 2.6.0 (2017-08-03)
 

src/license/THIRD-PARTY.properties

@@ -13,7 +13,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Fri Aug 04 17:22:50 CEST 2017
+#Fri Aug 04 17:39:15 CEST 2017
 classworlds--classworlds--1.1-alpha-2=
 commons-collections--commons-collections--3.1=
 dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/GenerateMojo.java

@@ -96,7 +96,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 version = mavenSession.getUserProperties().getProperty("version"),
                 archetypeGroupId = mavenSession.getUserProperties().getProperty("archetypeGroupId"),
                 archetypeArtifactId = mavenSession.getUserProperties().getProperty("archetypeArtifactId"),
-                archetypeVersion = mavenSession.getUserProperties().getProperty("archetypeVersion");
+                archetypeVersion = mavenSession.getUserProperties().getProperty("archetypeVersion"),
+                remoteCatalog = mavenSession.getUserProperties().getProperty("remoteCatalog", SEEDSTACK_ORG);
         boolean allowSnapshots = !mavenSession.getUserProperties().getProperty("allowSnapshots", "false").equals("false");
 
 
@@ -112,15 +113,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     archetypeVersion = artifactResolver.getHighestVersion(mavenProject, distributionGroupId, distributionArtifactId, allowSnapshots);
                     getLog().info("Resolved version " + archetypeVersion);
                 }
-                Set<String> possibleTypes = findProjectTypes(archetypeGroupId, archetypeVersion);
+                Set<String> possibleTypes = findProjectTypes(archetypeGroupId, archetypeVersion, remoteCatalog);
                 try {
                     // We have a list of possible types, let the user choose
                     if (!possibleTypes.isEmpty()) {
                         ArrayList<String> list = new ArrayList<>(possibleTypes);
                         Collections.sort(list);
                         list.add("custom archetype");
                         type = prompter.promptList("Choose the project type", Value.convertList(list));
+                    } else {
+                        getLog().info("No " + archetypeVersion + " archetype found, enter coordinates manually");
                     }
+
                     // No possible types or the user wants to input a custom archetype
                     if (possibleTypes.isEmpty() || "custom archetype".equals(type)) {
                         // Ask for archetype group id (defaults to distribution group id)
@@ -311,21 +315,18 @@ private String processPath(String absolutePath, Map<String, Object> vars) {
         }
     }
 
-    private Set<String> findProjectTypes(String archetypeGroupId, String archetypeVersion) {
+    private Set<String> findProjectTypes(String archetypeGroupId, String archetypeVersion, String remoteCatalog) {
         Set<String> possibleTypes = new HashSet<>();
-        getLog().info("Searching for archetypes in remote catalog");
-        possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getRemoteCatalog()));
+        getLog().info("Searching for " + archetypeVersion + " archetypes in remote catalog " + remoteCatalog);
+        possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getRemoteCatalog(remoteCatalog)));
 
         if (possibleTypes.isEmpty()) {
-            getLog().info("No remote archetype found with version " + archetypeVersion + ", trying the local catalog");
-            possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getDefaultLocalCatalog()));
-        }
-        if (possibleTypes.isEmpty()) {
-            getLog().info("No local archetype found with version " + archetypeVersion + ", falling back to seedstack.org");
-            possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getRemoteCatalog(SEEDSTACK_ORG)));
+            getLog().info("No remote " + archetypeVersion + " archetype found, trying the central catalog");
+            possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getRemoteCatalog()));
         }
         if (possibleTypes.isEmpty()) {
-            getLog().info("No suitable archetype found");
+            getLog().info("No remote or central " + archetypeVersion + " archetype found, trying the local catalog");
+            possibleTypes.addAll(findArchetypes(archetypeGroupId, archetypeVersion, archetypeManager.getDefaultLocalCatalog()));
         }
 
         return possibleTypes;