Massive Argeo APIs refactoring

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

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
index 42111e7df52b4b019509d584712725f2d1b66213..efd1591cd12206dbd93ec15f0e51e77853af4b9c 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
@@ -7,24 +7,22 @@ import java.util.Properties;
 import java.util.jar.Manifest;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.CategorizedNameVersion;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.slc.CategoryNameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.License;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Version;
-import org.springframework.beans.factory.BeanNameAware;
 
 import aQute.bnd.osgi.Builder;
 import aQute.bnd.osgi.Constants;
 import aQute.bnd.osgi.Jar;
 
 /** Utilities around the BND library, which manipulates OSGi metadata. */
-public class BndWrapper implements Constants, CategorizedNameVersion, Distribution, BeanNameAware {
-       private final static Log log = LogFactory.getLog(BndWrapper.class);
+public class BndWrapper implements Constants, CategoryNameVersion, Distribution {
+       private final static CmsLog log = CmsLog.getLog(BndWrapper.class);
 
        private String groupId;
        private String name;
@@ -170,15 +168,6 @@ public class BndWrapper implements Constants, CategorizedNameVersion, Distributi
                this.bndProperties = bndProperties;
        }
 
-       public void setBeanName(String name) {
-               if (this.name == null) {
-                       this.name = name;
-               } else {
-                       if (!name.contains("#"))
-                               log.warn("Using explicitely set name " + this.name + " and not bean name " + name);
-               }
-       }
-
        public String getGroupId() {
                return groupId;
        }
@@ -213,8 +202,8 @@ public class BndWrapper implements Constants, CategorizedNameVersion, Distributi
 
        @Override
        public boolean equals(Object obj) {
-               if (obj instanceof CategorizedNameVersion) {
-                       CategorizedNameVersion cnv = (CategorizedNameVersion) obj;
+               if (obj instanceof CategoryNameVersion) {
+                       CategoryNameVersion cnv = (CategoryNameVersion) obj;
                        return getCategory().equals(cnv.getCategory()) && getName().equals(cnv.getName())
                                        && getVersion().equals(cnv.getVersion());
                } else