Fix MANIFEST generation

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / osgi / MavenWrapper.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
index a5b6ec9341501e08650a405a92dfc97853baf91e..84d29a8952762da73b9b33693f31bc75a5f31c55 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
@@ -8,8 +8,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;
@@ -17,14 +16,13 @@ import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.RepoUtils;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.util.artifact.SubArtifact;
 
 /**
  * BND wrapper based on a Maven artifact available from one of the configured
  * repositories.
  */
 public class MavenWrapper extends BndWrapper implements Runnable {
-       private final static Log log = LogFactory.getLog(MavenWrapper.class);
+       private final static CmsLog log = CmsLog.getLog(MavenWrapper.class);
 
        private String sourceCoords;
 
@@ -56,55 +54,45 @@ public class MavenWrapper extends BndWrapper implements Runnable {
                        try {
                                origArtifact = osgiFactory.getMaven(distSession, sourceCoords);
                        } catch (Exception e1) {
-                               origArtifact = osgiFactory.getMaven(distSession, sourceCoords
-                                               + ":" + getVersion());
+                               origArtifact = osgiFactory.getMaven(distSession, sourceCoords + ":" + getVersion());
                        }
 
-                       in = origArtifact.getNode(Node.JCR_CONTENT)
-                                       .getProperty(Property.JCR_DATA).getBinary().getStream();
+                       in = origArtifact.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())
-                               log.debug("Wrapped Maven " + sourceCoords + " to "
-                                               + newJarNode.getPath());
+                               log.debug("Wrapped Maven " + sourceCoords + " to " + newJarNode.getPath());
 
                        // sources
-                       Artifact sourcesArtifact = new SubArtifact(new DefaultArtifact(
-                                       sourceCoords), "sources", null);
+                       Artifact sourcesArtifact = new SubArtifact(new DefaultArtifact(sourceCoords), "sources", null);
                        Node sourcesArtifactNode;
                        try {
 
-                               sourcesArtifactNode = osgiFactory.getMaven(distSession,
-                                               sourcesArtifact.toString());
+                               sourcesArtifactNode = osgiFactory.getMaven(distSession, sourcesArtifact.toString());
                        } catch (SlcException e) {
                                // no sources available
                                return;
                        }
 
                        IOUtils.closeQuietly(in);
-                       in = sourcesArtifactNode.getNode(Node.JCR_CONTENT)
-                                       .getProperty(Property.JCR_DATA).getBinary().getStream();
+                       in = sourcesArtifactNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary().getStream();
                        byte[] pdeSource;
                        if (doNotModifySources)
                                pdeSource = IOUtils.toByteArray(in);
                        else
-                               pdeSource = RepoUtils.packageAsPdeSource(in,
-                                               new DefaultNameVersion(getName(), getVersion()));
-                       Node pdeSourceNode = RepoUtils.copyBytesAsArtifact(javaSession
-                                       .getRootNode(), new DefaultArtifact(getCategory(),
-                                       getName() + ".source", "jar", getVersion()), pdeSource);
+                               pdeSource = RepoUtils.packageAsPdeSource(in, new DefaultNameVersion(getName(), getVersion()));
+                       Node pdeSourceNode = RepoUtils.copyBytesAsArtifact(javaSession.getRootNode(),
+                                       new DefaultArtifact(getCategory(), getName() + ".source", "jar", getVersion()), pdeSource);
                        osgiFactory.indexNode(pdeSourceNode);
                        pdeSourceNode.getSession().save();
 
                        if (log.isDebugEnabled())
-                               log.debug("Wrapped Maven " + sourcesArtifact
-                                               + " to PDE sources " + pdeSourceNode.getPath());
+                               log.debug("Wrapped Maven " + sourcesArtifact + " to PDE sources " + pdeSourceNode.getPath());
                } catch (Exception e) {
                        throw new SlcException("Cannot wrap Maven " + sourceCoords, e);
                } finally {
@@ -119,6 +107,10 @@ public class MavenWrapper extends BndWrapper implements Runnable {
                this.sourceCoords = sourceCoords;
        }
 
+       public String getSourceCoords() {
+               return sourceCoords;
+       }
+
        public void setOsgiFactory(OsgiFactory osgiFactory) {
                this.osgiFactory = osgiFactory;
        }