From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Jun 2012 13:22:02 +0000 (+0000)
Subject: Put RAP upload and map widgets to org.argeo.tp.rap
X-Git-Tag: argeo-slc-2.1.7~720
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=22844f4a3356859d2f930a07ce24b777693cc49d;p=gpl%2Fargeo-slc.git

Put RAP upload and map widgets to org.argeo.tp.rap

git-svn-id: https://svn.argeo.org/slc/trunk@5321 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 8b15eaea2..f7446b8aa 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
@@ -125,9 +125,10 @@ public class Migration_01_03 implements Runnable, SlcNames {
 
 		// 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")
+				.getArtifactId().equals("org.eclipse.osgi")
+				|| origArtifact.getArtifactId().equals(
+						"org.eclipse.osgi.source") || origArtifact
+				.getArtifactId().startsWith("org.eclipse.rwt.widgets.upload")))
 				|| origArtifact.getArtifactId().startsWith("com.ibm.icu")) {
 			if (log.isDebugEnabled())
 				log.debug("Skip " + origArtifact);
@@ -260,9 +261,16 @@ public class Migration_01_03 implements Runnable, SlcNames {
 
 		// target coordinates
 		final String targetGroupId;
-		if (origArtifact.getGroupId().startsWith("org.eclipse")
+		if (origArtifact.getArtifactId().startsWith(
+				"org.eclipse.rwt.widgets.upload"))
+			targetGroupId = "org.argeo.tp.rap";
+		else if (origArtifact.getArtifactId().startsWith("org.polymap"))
+			targetGroupId = "org.argeo.tp.rap";
+		else if (origArtifact.getGroupId().startsWith("org.eclipse")
 				&& !origArtifact.getArtifactId().equals("org.eclipse.osgi"))
-			targetGroupId = "org.argeo.tp.eclipse";
+			throw new SlcException(origArtifact + " should have been excluded");// targetGroupId
+																				// =
+																				// "org.argeo.tp.eclipse";
 		else
 			targetGroupId = "org.argeo.tp";