Continue to remove dependencies with Spring.

[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 e11f7c13066605b1625bfca026f666dab892f469..ddb569bbdc75fb38bf1f64b12cede47566d525fd 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
@@ -9,21 +9,20 @@ 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.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 {
+public class BndWrapper implements Constants, CategoryNameVersion, Distribution {
        private final static Log log = LogFactory.getLog(BndWrapper.class);
 
        private String groupId;
@@ -170,15 +169,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 +203,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
@@ -225,4 +215,8 @@ public class BndWrapper implements Constants, CategorizedNameVersion, Distributi
                this.doNotModify = doNotModify;
        }
 
+       public Boolean getDoNotModify() {
+               return doNotModify;
+       }
+
 }