Improve archive and BND wrappers

[gpl/argeo-slc.git] / runtime / org.argeo.slc.repo / src / main / java / org / argeo / slc / repo / osgi / BndWrapper.java

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 f1acf49e4d8c54fb2e10c3d953ab73db1455beba..6601db0b93bc708d6e6de51b98a1ac9512e1c345 100644 (file)
--- 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
@@ -10,6 +10,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.CategorizedNameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.Distribution;
+import org.argeo.slc.build.License;
 import org.osgi.framework.Version;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.util.artifact.DefaultArtifact;
@@ -26,11 +27,15 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
 
        private String groupId;
        private String name;
-       private String version;
        private Properties bndProperties = new Properties();
 
+       private String version;
+       private License license;
+
        private Boolean doNotModify = false;
 
+       private Runnable factory = null;
+
        public void wrapJar(InputStream in, OutputStream out) {
                Builder b = new Builder();
                try {
@@ -40,15 +45,17 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
 
                        Version versionToUse;
                        if (sourceManifest != null) {
+                               // Symbolic name
                                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 ("
                                                        + sourceSymbolicName + ")");
 
+                               // Version
                                String sourceVersion = sourceManifest.getMainAttributes()
                                                .getValue(BUNDLE_VERSION);
                                if (version == null && sourceVersion == null) {
@@ -83,6 +90,21 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
                                properties.setProperty(BUNDLE_SYMBOLICNAME, name);
                                properties.setProperty(BUNDLE_VERSION, versionToUse.toString());
 
+                               // License
+                               if (license != null) {
+                                       StringBuilder sb = new StringBuilder(license.getUri());
+                                       if (license.getName() != null)
+                                               sb.append(';').append("description=")
+                                                               .append(license.getName());
+                                       if (license.getLink() != null)
+                                               sb.append(';').append("link=")
+                                                               .append(license.getLink());
+                                       properties.setProperty(BUNDLE_LICENSE, sb.toString());
+                                       // TODO add LICENSE.TXT
+                               } else {
+                                       log.warn("No license set for " + toString());
+                               }
+
                                // b.addIncluded(jarFile);
                                b.addClasspath(jar);
 
@@ -101,6 +123,16 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
 
        }
 
+       public Runnable getFactory() {
+               return factory;
+       }
+
+       public void setFactory(Runnable factory) {
+               if (this.factory != null)
+                       throw new SlcException("Factory already set on " + name);
+               this.factory = factory;
+       }
+
        public void setName(String bsn) {
                this.name = bsn;
        }
@@ -110,6 +142,9 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
        }
 
        public void setVersion(String version) {
+               if (this.version != null)
+                       throw new SlcException("Version already set on " + name + " ("
+                                       + this.version + ")");
                this.version = version;
        }
 
@@ -117,6 +152,16 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
                return version;
        }
 
+       public License getLicense() {
+               return license;
+       }
+
+       public void setLicense(License license) {
+               if (this.license != null)
+                       throw new SlcException("License already set on " + name);
+               this.license = license;
+       }
+
        public Properties getBndProperties() {
                return bndProperties;
        }
@@ -126,7 +171,12 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
        }
 
        public void setBeanName(String name) {
-               this.name = name;
+               if (this.name == null) {
+                       this.name = name;
+               } else {
+                       log.warn("Using explicitely set name " + this.name
+                                       + " and not bean name " + name);
+               }
        }
 
        public String getGroupId() {