X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FUriWrapper.java;h=e2c785a1cf8474657737c772aa84ac8d6f954e51;hb=d64292c93f4a3532576e98f651344d89e883e2aa;hp=665bfce516a0edfcd0856342af44077d0b604322;hpb=10e9f177944b2737ee018ed695338cfeff4fd0a3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java
index 665bfce51..e2c785a1c 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java
@@ -11,8 +11,7 @@ import javax.jcr.Property;
 import javax.jcr.Session;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.SlcException;
@@ -24,7 +23,7 @@ import org.eclipse.aether.artifact.DefaultArtifact;
 import aQute.bnd.osgi.Jar;
 
 public class UriWrapper extends BndWrapper implements Runnable {
-	private final static Log log = LogFactory.getLog(UriWrapper.class);
+	private final static CmsLog log = CmsLog.getLog(UriWrapper.class);
 
 	private String uri;
 	private String baseUri;
@@ -48,20 +47,18 @@ public class UriWrapper extends BndWrapper implements Runnable {
 		try {
 			distSession = osgiFactory.openDistSession();
 			javaSession = osgiFactory.openJavaSession();
-			if (uri == null) {
-				uri = baseUri + '/' + getName() + versionSeparator
-						+ getVersion() + "." + extension;
-			}
+			String uri = getEffectiveUri();
+//			if (uri == null) {
+//				uri = baseUri + '/' + getName() + versionSeparator + getVersion() + "." + extension;
+//			}
 			Node sourceArtifact = osgiFactory.getDist(distSession, uri);
 
 			// TODO factorize with Maven
-			in = sourceArtifact.getNode(Node.JCR_CONTENT)
-					.getProperty(Property.JCR_DATA).getBinary().getStream();
+			in = sourceArtifact.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary().getStream();
 			out = new ByteArrayOutputStream();
 			wrapJar(in, out);
-			Node newJarNode = RepoUtils
-					.copyBytesAsArtifact(javaSession.getRootNode(),
-							getArtifact(), out.toByteArray());
+			Node newJarNode = RepoUtils.copyBytesAsArtifact(javaSession.getRootNode(), getArtifact(),
+					out.toByteArray());
 			osgiFactory.indexNode(newJarNode);
 			newJarNode.getSession().save();
 			if (log.isDebugEnabled())
@@ -76,23 +73,19 @@ public class UriWrapper extends BndWrapper implements Runnable {
 
 				IOUtils.closeQuietly(out);
 				out = new ByteArrayOutputStream();
-				sourcesProvider
-						.writeSources(packages, new ZipOutputStream(out));
+				sourcesProvider.writeSources(packages, new ZipOutputStream(out));
 
 				IOUtils.closeQuietly(in);
 				in = new ByteArrayInputStream(out.toByteArray());
-				byte[] sourcesJar = RepoUtils.packageAsPdeSource(in,
-						new DefaultNameVersion(this));
-				Artifact sourcesArtifact = new DefaultArtifact(getArtifact()
-						.getGroupId(), getArtifact().getArtifactId()
-						+ ".source", "jar", getArtifact().getVersion());
-				Node sourcesJarNode = RepoUtils.copyBytesAsArtifact(
-						javaSession.getRootNode(), sourcesArtifact, sourcesJar);
+				byte[] sourcesJar = RepoUtils.packageAsPdeSource(in, new DefaultNameVersion(this));
+				Artifact sourcesArtifact = new DefaultArtifact(getArtifact().getGroupId(),
+						getArtifact().getArtifactId() + ".source", "jar", getArtifact().getVersion());
+				Node sourcesJarNode = RepoUtils.copyBytesAsArtifact(javaSession.getRootNode(), sourcesArtifact,
+						sourcesJar);
 				sourcesJarNode.getSession().save();
 
 				if (log.isDebugEnabled())
-					log.debug("Added sources " + sourcesArtifact
-							+ " for bundle " + getArtifact());
+					log.debug("Added sources " + sourcesArtifact + " for bundle " + getArtifact());
 			}
 		} catch (Exception e) {
 			throw new SlcException("Cannot wrap URI " + uri, e);
@@ -110,6 +103,13 @@ public class UriWrapper extends BndWrapper implements Runnable {
 		this.uri = sourceCoords;
 	}
 
+	public String getEffectiveUri() {
+		if (uri == null) {
+			return baseUri + '/' + getName() + versionSeparator + getVersion() + "." + extension;
+		} else
+			return uri;
+	}
+
 	public void setOsgiFactory(OsgiFactory osgiFactory) {
 		this.osgiFactory = osgiFactory;
 	}
@@ -125,4 +125,17 @@ public class UriWrapper extends BndWrapper implements Runnable {
 	public void setSourcesProvider(SourcesProvider sourcesProvider) {
 		this.sourcesProvider = sourcesProvider;
 	}
+
+	public String getUri() {
+		return uri;
+	}
+
+	public String getBaseUri() {
+		return baseUri;
+	}
+
+	public String getVersionSeparator() {
+		return versionSeparator;
+	}
+
 }