X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FMigration_01_03.java;h=56ffd7f67f5dd18cbba7863a8fc0448a33da1113;hb=0e2862f3efc104beecea43b054e2ba00b03fd2c2;hp=9e37f7592516e5de8b0aa099f7c57050516615b1;hpb=44c43b9c874d7c6edd4327f180d5506b3e9c99e6;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java
index 9e37f7592..56ffd7f67 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java
@@ -1,8 +1,11 @@
 package org.argeo.slc.repo.maven;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.jar.Attributes.Name;
 import java.util.jar.Manifest;
 
@@ -52,6 +55,9 @@ public class Migration_01_03 implements Runnable, SlcNames {
 	private String sourceWorkspace;
 	private String targetWorkspace;
 
+	private List<String> excludedBundles = new ArrayList<String>();
+	private Map<String, String> symbolicNamesMapping = new HashMap<String, String>();
+
 	private Session origSession;
 	private Session targetSession;
 
@@ -81,19 +87,21 @@ public class Migration_01_03 implements Runnable, SlcNames {
 	public void run() {
 
 		try {
-			NodeIterator origArtifacts = listArtifactVersions(origSession);
-
 			// clear target
 			NodeIterator nit = targetSession.getNode(artifactBasePath)
 					.getNodes();
 			while (nit.hasNext()) {
 				Node node = nit.nextNode();
 				if (node.isNodeType(NodeType.NT_FOLDER)
-						|| node.isNodeType(NodeType.NT_UNSTRUCTURED))
+						|| node.isNodeType(NodeType.NT_UNSTRUCTURED)) {
 					node.remove();
+					node.getSession().save();
+					if (log.isDebugEnabled())
+						log.debug("Cleared " + node);
+				}
 			}
-			targetSession.save();
 
+			NodeIterator origArtifacts = listArtifactVersions(origSession);
 			// process
 			while (origArtifacts.hasNext()) {
 				Node origArtifactNode = origArtifacts.nextNode();
@@ -133,35 +141,52 @@ public class Migration_01_03 implements Runnable, SlcNames {
 		String origSymbolicName = origManifest.getMainAttributes().getValue(
 				Constants.BUNDLE_SYMBOLICNAME);
 		final String targetSymbolicName;
-		if (origSymbolicName.startsWith(SPRING_SOURCE_PREFIX)
+		if (symbolicNamesMapping.containsKey(origSymbolicName)) {
+			targetSymbolicName = symbolicNamesMapping.get(origSymbolicName);
+		} else if (origSymbolicName.startsWith(SPRING_SOURCE_PREFIX)
 				&& !origSymbolicName.equals(SPRING_SOURCE_PREFIX + ".json")) {
 			targetSymbolicName = origSymbolicName
 					.substring(SPRING_SOURCE_PREFIX.length() + 1);
-			if (log.isDebugEnabled())
-				log.debug(Constants.BUNDLE_SYMBOLICNAME + " to "
-						+ targetSymbolicName + " \t\tfrom " + origSymbolicName);
+		} else {
+			targetSymbolicName = origSymbolicName;
+		}
+
+		if (!targetSymbolicName.equals(origSymbolicName)) {
 			targetManifest.getMainAttributes().putValue(
 					Constants.BUNDLE_SYMBOLICNAME, targetSymbolicName);
 			manifestModified = true;
-		} else {
-			targetSymbolicName = origSymbolicName;
+			if (log.isDebugEnabled())
+				log.debug(Constants.BUNDLE_SYMBOLICNAME + " to "
+						+ targetSymbolicName + " \t\tfrom " + origSymbolicName);
 		}
 
+		// skip excluded bundles
+		if (excludedBundles.contains(targetSymbolicName))
+			return;
+
 		// check fragment host
 		if (origManifest.getMainAttributes().containsKey(
 				new Name(Constants.FRAGMENT_HOST))) {
 			String origFragmentHost = origManifest.getMainAttributes()
 					.getValue(Constants.FRAGMENT_HOST);
-			if (origFragmentHost.startsWith(SPRING_SOURCE_PREFIX)
+			String targetFragmentHost;
+			if (symbolicNamesMapping.containsKey(origFragmentHost)) {
+				targetFragmentHost = symbolicNamesMapping.get(origFragmentHost);
+			} else if (origFragmentHost.startsWith(SPRING_SOURCE_PREFIX)
 					&& !origFragmentHost.equals(SPRING_SOURCE_PREFIX + ".json")) {
-				String targetFragmentHost = origFragmentHost
+				targetFragmentHost = origFragmentHost
 						.substring(SPRING_SOURCE_PREFIX.length() + 1);
-				if (log.isDebugEnabled())
-					log.debug(Constants.FRAGMENT_HOST + " to "
-							+ targetFragmentHost + " from " + origFragmentHost);
+			} else {
+				targetFragmentHost = origFragmentHost;
+			}
+
+			if (!targetFragmentHost.equals(origFragmentHost)) {
 				targetManifest.getMainAttributes().putValue(
 						Constants.FRAGMENT_HOST, targetFragmentHost);
 				manifestModified = true;
+				if (log.isDebugEnabled())
+					log.debug(Constants.FRAGMENT_HOST + " to "
+							+ targetFragmentHost + " from " + origFragmentHost);
 			}
 		}
 
@@ -183,7 +208,7 @@ public class Migration_01_03 implements Runnable, SlcNames {
 				if (systemPackages.contains(pkg)) {
 					if (!(sourceVersion.trim().equals("0") || sourceVersion
 							.trim().equals("0.0.0"))) {
-						targetVersion = "0";
+						targetVersion = null;
 						importPackagesModified = true;
 						if (log.isDebugEnabled())
 							log.debug(origSymbolicName
@@ -191,8 +216,9 @@ public class Migration_01_03 implements Runnable, SlcNames {
 									+ sourceVersion);
 					}
 				}
-				targetImportPackages.append(";version=\"")
-						.append(targetVersion).append("\"");
+				if (targetVersion != null)
+					targetImportPackages.append(";version=\"")
+							.append(targetVersion).append("\"");
 			}
 			if (importPackage.hasProperty(SLC_OPTIONAL)) {
 				Boolean optional = importPackage.getProperty(SLC_OPTIONAL)
@@ -340,4 +366,13 @@ public class Migration_01_03 implements Runnable, SlcNames {
 	public void setTargetWorkspace(String targetWorkspace) {
 		this.targetWorkspace = targetWorkspace;
 	}
+
+	public void setExcludedBundles(List<String> excludedBundles) {
+		this.excludedBundles = excludedBundles;
+	}
+
+	public void setSymbolicNamesMapping(Map<String, String> symbolicNamesMapping) {
+		this.symbolicNamesMapping = symbolicNamesMapping;
+	}
+
 }