From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 26 Jun 2014 17:45:26 +0000 (+0000)
Subject: Incremental improvements.
X-Git-Tag: argeo-slc-2.1.7~160
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=af67496c90f9e0347b3b6c39805f9ce673695baf;p=gpl%2Fargeo-slc.git

Incremental improvements.

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

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
index 1ffcf5332..3355424c5 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
@@ -119,7 +119,7 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 				if (baseName.endsWith("-sources")) {
 					String bundle = baseName.substring(0, baseName.length()
 							- "-sources".length());
-					log.debug(name + "," + baseName + ", " + bundle);
+					// log.debug(name + "," + baseName + ", " + bundle);
 					String bundlePath = FilenameUtils.getPath(name) + bundle
 							+ ".jar";
 					if (wrappers.containsKey(bundlePath)) {
@@ -196,6 +196,7 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 				}
 			}
 
+			// FIXME Fail if not all wrappers matched
 		} catch (Exception e) {
 			throw new SlcException("Cannot wrap distribution " + uri, e);
 		} finally {
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java
index bb2bf2404..2604e1473 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java
@@ -49,7 +49,7 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
 				String sourceSymbolicName = sourceManifest.getMainAttributes()
 						.getValue(BUNDLE_SYMBOLICNAME);
 				if (sourceSymbolicName != null
-						&& sourceSymbolicName.equals(name))
+						&& !sourceSymbolicName.equals(name))
 					log.warn("The new symbolic name ("
 							+ name
 							+ ") is not consistant with the wrapped bundle symbolic name ("
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java
index 35668373a..5330e67e2 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java
@@ -38,7 +38,13 @@ public class MavenWrapper extends BndWrapper implements Runnable {
 		try {
 			distSession = osgiFactory.openDistSession();
 			javaSession = osgiFactory.openJavaSession();
-			Node origArtifact = osgiFactory.getMaven(distSession, sourceCoords);
+			Node origArtifact;
+			try {
+				origArtifact = osgiFactory.getMaven(distSession, sourceCoords);
+			} catch (Exception e1) {
+				origArtifact = osgiFactory.getMaven(distSession, sourceCoords
+						+ ":" + getVersion());
+			}
 
 			in = origArtifact.getNode(Node.JCR_CONTENT)
 					.getProperty(Property.JCR_DATA).getBinary().getStream();
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
index 86a15ef27..dd90a2686 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
@@ -228,4 +228,12 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 		this.mirrors = mirrors;
 	}
 
+	public void setMavenRepositories(List<String> mavenRepositories) {
+		this.mavenRepositories = mavenRepositories;
+	}
+
+	public void setMavenProxyBase(String mavenProxyBase) {
+		this.mavenProxyBase = mavenProxyBase;
+	}
+
 }