X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FBndWrapper.java;h=ddb569bbdc75fb38bf1f64b12cede47566d525fd;hb=4316ea22964732db743118a1d319ab5ed2ac6a79;hp=42111e7df52b4b019509d584712725f2d1b66213;hpb=3ff90591a4e64b7459372afe4129f84fb959bbe0;p=gpl%2Fargeo-slc.git

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 42111e7df..ddb569bbd 100644
--- 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