This closes #743

Author: ahgittin

api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java

@@ -56,6 +56,9 @@ public interface BrooklynObject extends Identifiable, Configurable {
      * <p>
      * In some cases this may be set heuristically from context and so may not be accurate.
      * Callers can set an explicit catalog item ID if inferencing is not correct.
+     * <p>
+     * This should conform to OSGi specs for <code>symbolic_name:version</code>
+     * but weaker semantics are usually allowed so long as neither segment contains a <code>:</code> or whitespace.
      */
     String getCatalogItemId();
 

api/src/main/java/org/apache/brooklyn/api/typereg/OsgiBundleWithUrl.java

@@ -24,7 +24,11 @@
 public interface OsgiBundleWithUrl {
 
     public String getSymbolicName();
-    public String getVersion();
+    /** guaranteed to be in OSGi syntax, or null if name+version not available */
+    public String getOsgiVersionString();
+    
+    /** string as defined by caller; not necessarily in OSGi syntax */
+    public String getSuppliedVersionString();
 
     /** where this bundle can be downloaded; typically required unless we are guaranteed the bundle will be manually installed or handled by persistence */
     public String getUrl();

camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java

@@ -32,7 +32,6 @@
 
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.framework.FrameworkLookup;
 import org.apache.brooklyn.api.location.LocationSpec;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
@@ -41,8 +40,6 @@
 import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants;
 import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys;
 import org.apache.brooklyn.camp.brooklyn.spi.creation.service.CampServiceSpecResolver;
-import org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver;
-import org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolverAdaptor;
 import org.apache.brooklyn.camp.spi.AbstractResource;
 import org.apache.brooklyn.camp.spi.ApplicationComponentTemplate;
 import org.apache.brooklyn.camp.spi.AssemblyTemplate;
@@ -81,10 +78,9 @@
 import com.google.common.collect.Maps;
 
 /**
- * This generates instances of a template resolver that use a {@link ServiceTypeResolver}
+ * This generates instances of a template resolver that use a {@link EntitySpecResolver}
  * to parse the {@code serviceType} line in the template.
  */
-@SuppressWarnings("deprecation")  // Because of ServiceTypeResolver
 public class BrooklynComponentTemplateResolver {
 
     private static final Logger log = LoggerFactory.getLogger(BrooklynComponentTemplateResolver.class);
@@ -205,10 +201,7 @@ public <T extends Entity> EntitySpec<T> resolveSpec(Set<String> encounteredRegis
 
     private List<EntitySpecResolver> getServiceTypeResolverOverrides() {
         List<EntitySpecResolver> overrides = new ArrayList<>();
-        Iterable<ServiceTypeResolver> loader = FrameworkLookup.lookupAll(ServiceTypeResolver.class, mgmt.getCatalogClassLoader());
-        for (ServiceTypeResolver resolver : loader) {
-            overrides.add(new ServiceTypeResolverAdaptor(this, resolver));
-        }
+        // none for now -- previously supported ServiceTypeResolver service
         return overrides;
     }
 

camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java

@@ -193,7 +193,7 @@ public void testExternalisedCatalogConfigReferencedFromYamlWithLibraryMap() thro
         CatalogBundle bundle = Iterables.getOnlyElement(item.getLibraries());
         assertEquals(bundle.getUrl(), LIBRARY_URL);
         assertEquals(bundle.getSymbolicName(), LIBRARY_SYMBOLIC_NAME);
-        assertEquals(bundle.getVersion(), LIBRARY_VERSION);
+        assertEquals(bundle.getSuppliedVersionString(), LIBRARY_VERSION);
     }
 
     // Will download the given catalog library jar