address comments on PR in #737

Author: ahgittin

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

@@ -76,7 +76,7 @@
 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.
  */
 public class BrooklynComponentTemplateResolver {

camp/camp-brooklyn/src/test/resources/META-INF/services/org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver

@@ -908,7 +908,7 @@ private boolean attemptType(String key, CatalogItemType candidateCiType) {
             }
             {
                 // legacy routine; should be the same as above code added in 0.12 because:
-                // if type is symbolic_name, the type will match below, and version will be null so any version allowed to match 
+                // if type is symbolic_name, the type will match above, and version will be null so any version allowed to match 
                 // if type is symbolic_name:version, the id will match, and the version will also have to match 
                 // SHOULD NEVER NEED THIS - remove during or after 0.13
                 String typeWithId = type;
@@ -922,7 +922,7 @@ private boolean attemptType(String key, CatalogItemType candidateCiType) {
                         if (candidateCiType == candidate.getCatalogItemType() &&
                                 (type.equals(candidate.getSymbolicName()) || type.equals(candidate.getId()))) {
                             if (version==null || version.equals(candidate.getVersion())) {
-                                log.warn("Lookup of '"+type+"' version '"+version+"' only worked using legacy routines; please advise Brooklyn community so they understand why");
+                                log.error("Lookup of '"+type+"' version '"+version+"' only worked using legacy routines; please advise Brooklyn community so they understand why");
                                 // matched - exit
                                 catalogItemType = candidateCiType;
                                 planYaml = candidateYaml;

core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java

@@ -35,9 +35,9 @@ public class RegisteredTypeNaming {
     public final static String QUALIFIER = OSGI_TOKEN_REGEX;
     public final static String VERSION_REGEX = 
         NUMBER + 
-            "(" + "\\." + NUMBER +  
-                "(" + "\\." + NUMBER +  
-                    "(" + "\\." + QUALIFIER +  
+            "(" + DOT + NUMBER +  
+                "(" + DOT + NUMBER +  
+                    "(" + DOT + QUALIFIER +  
                     ")?" +
                 ")?" +
             ")?";
@@ -49,7 +49,8 @@ private static boolean isUsable(String candidate) {
     /** 
      * For type names we currently work with any non-empty string that does not contain 
      * a ':' or whitespace or forward slash or backslash.
-     * However we discourage things that are not OSGi symbolic names; see {@link #isValidTypeName(String)}. 
+     * However we discourage things that are not OSGi symbolic names; 
+     * see {@link #isGoodTypeName(String)}. 
      * In some places (eg bundles) the use of OSGi symbolic names may be enforced.  
      */
     public static boolean isUsableTypeName(String candidate) {