X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FMigration_01_03.java;h=8b15eaea292a4c240722fc156028d428cf9188c0;hb=ece297b709bf55a514b471e1141dcd22fcdc54c6;hp=56ffd7f67f5dd18cbba7863a8fc0448a33da1113;hpb=0e2862f3efc104beecea43b054e2ba00b03fd2c2;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 56ffd7f67..8b15eaea2 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
@@ -2,7 +2,6 @@ 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;
@@ -34,6 +33,7 @@ import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoUtils;
+import org.argeo.slc.repo.osgi.OsgiProfile;
 import org.osgi.framework.Constants;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.util.artifact.DefaultArtifact;
@@ -61,7 +61,8 @@ public class Migration_01_03 implements Runnable, SlcNames {
 	private Session origSession;
 	private Session targetSession;
 
-	private List<String> systemPackages;
+	private List<String> systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6
+			.getSystemPackages();
 
 	private String artifactBasePath = "/";
 
@@ -75,8 +76,8 @@ public class Migration_01_03 implements Runnable, SlcNames {
 				targetWorkspace);
 
 		// works only in OSGi!!
-		systemPackages = Arrays.asList(System.getProperty(
-				"org.osgi.framework.system.packages").split(","));
+		// systemPackages = Arrays.asList(System.getProperty(
+		// "org.osgi.framework.system.packages").split(","));
 	}
 
 	public void destroy() {
@@ -121,6 +122,18 @@ public class Migration_01_03 implements Runnable, SlcNames {
 	protected void processOrigArtifactVersion(Node origArtifactNode)
 			throws RepositoryException, IOException {
 		Artifact origArtifact = RepoUtils.asArtifact(origArtifactNode);
+
+		// skip eclipse artifacts
+		if ((origArtifact.getGroupId().startsWith("org.eclipse") && !(origArtifact
+				.getArtifactId().equals("org.eclipse.osgi") || origArtifact
+				.getArtifactId().equals("org.eclipse.osgi.source")))
+				|| origArtifact.getArtifactId().startsWith("org.polymap")
+				|| origArtifact.getArtifactId().startsWith("com.ibm.icu")) {
+			if (log.isDebugEnabled())
+				log.debug("Skip " + origArtifact);
+			return;
+		}
+
 		String origJarNodeName = MavenConventionsUtils
 				.artifactFileName(origArtifact);
 		if (!origArtifactNode.hasNode(origJarNodeName))
@@ -176,6 +189,10 @@ public class Migration_01_03 implements Runnable, SlcNames {
 					&& !origFragmentHost.equals(SPRING_SOURCE_PREFIX + ".json")) {
 				targetFragmentHost = origFragmentHost
 						.substring(SPRING_SOURCE_PREFIX.length() + 1);
+			} else if (origFragmentHost
+					.equals("org.argeo.dep.jacob;bundle-version=\"[1.14.3,1.14.4)\"")) {
+				// this one for those who think I cannot be pragmatic - mbaudier
+				targetFragmentHost = "com.jacob;bundle-version=\"[1.14.3,1.14.4)\"";
 			} else {
 				targetFragmentHost = origFragmentHost;
 			}
@@ -243,7 +260,8 @@ public class Migration_01_03 implements Runnable, SlcNames {
 
 		// target coordinates
 		final String targetGroupId;
-		if (origArtifact.getGroupId().startsWith("org.eclipse"))
+		if (origArtifact.getGroupId().startsWith("org.eclipse")
+				&& !origArtifact.getArtifactId().equals("org.eclipse.osgi"))
 			targetGroupId = "org.argeo.tp.eclipse";
 		else
 			targetGroupId = "org.argeo.tp";