X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FNormalizeWorkspace.java;h=7f3f3b5a3968d090ee9c649eff823b4a21c25bf1;hb=5f40d8d483bdd509881bf09fa9eedf259146be65;hp=d70d904f9bfdaf5028b6c6fed1f46018defdca53;hpb=cccc27ac3b1d94116b457b2ffd3d71e7af0db193;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index d70d904f9..7f3f3b5a3 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -36,7 +36,7 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.ArtifactIndexer;
-import org.argeo.slc.repo.DistributionBundleIndexer;
+import org.argeo.slc.repo.ModularDistributionIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.PdeSourcesIndexer;
 import org.argeo.slc.repo.RepoConstants;
@@ -74,12 +74,11 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 	private Keyring keyring;
 	private Repository repository;
 
-	// RElevant default node indexers 
+	// Relevant default node indexers
 	private ArtifactIndexer artifactIndexer = new ArtifactIndexer();
 	private JarFileIndexer jarFileIndexer = new JarFileIndexer();
-	private DistributionBundleIndexer distBundleIndexer = new DistributionBundleIndexer();
-	private PdeSourcesIndexer pdeSourceIndexer = new PdeSourcesIndexer(
-			artifactIndexer, jarFileIndexer);
+	private ModularDistributionIndexer distBundleIndexer = new ModularDistributionIndexer();
+	private PdeSourcesIndexer pdeSourceIndexer = new PdeSourcesIndexer();
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH);
@@ -201,11 +200,15 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 							monitor.worked(1);
 						}
 				} else if (node.getName().endsWith(".pom")) {
-					distBundleIndexer.index(node);
+					if (distBundleIndexer.support(node.getPath()))
+						distBundleIndexer.index(node);
+					if (artifactIndexer.support(node.getPath()))
+						artifactIndexer.index(node);
 					if (node.getSession().hasPendingChanges()) {
 						node.getSession().save();
 						if (log.isDebugEnabled())
-							log.debug("Processed pom artifact " + node.getPath());
+							log.debug("Processed pom artifact "
+									+ node.getPath());
 					}
 					monitor.worked(1);
 				} else {