Index: juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java =================================================================== --- juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (revision 1451436) +++ juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (working copy) @@ -256,7 +256,7 @@ } /** * Register a service. - * + * returns null if not successful */ public BusinessEntity register(BusinessEntity business, Node node) { @@ -270,6 +270,7 @@ saveBusiness.getBusinessEntity().add(business); BusinessDetail businessDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveBusiness(saveBusiness); businessEntity = businessDetail.getBusinessEntity().get(0); + log.debug("Registering businessEntity " + businessEntity.getName().get(0).getValue() + " completed."); } catch (Exception e) { log.error("Unable to register business " + business.getName().get(0).getValue() + " ." + e.getMessage(),e); @@ -277,7 +278,6 @@ log.error("Unable to register business " + business.getName().get(0).getValue() + " ." + t.getMessage(),t); } - log.debug("Registering businessEntity " + businessEntity.getName().get(0).getValue() + " completed."); return businessEntity; } Index: juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java =================================================================== --- juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java (revision 1451436) +++ juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java (working copy) @@ -480,8 +480,8 @@ FindTModel findTModel = new FindTModel(); CategoryBag categoryBag = new CategoryBag(); - - if (namespace!=null && namespace!="") { + + if (namespace!=null && namespace.length()!=0) { KeyedReference namespaceReference = newKeyedReference( "uddi:uddi.org:xml:namespace", namespace); categoryBag.getKeyedReference().add(namespaceReference); @@ -516,7 +516,7 @@ findTModel.setName(name); CategoryBag categoryBag = new CategoryBag(); - if (namespace!=null && namespace!="") { + if (namespace!=null && namespace.length()!=0) { KeyedReference namespaceReference = newKeyedReference( "uddi:uddi.org:xml:namespace", namespace); categoryBag.getKeyedReference().add(namespaceReference); Index: juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java =================================================================== --- juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java (revision 1451436) +++ juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java (working copy) @@ -84,7 +84,10 @@ } catch (Exception e) { log.error(e.getMessage(),e); } - log.debug("importUrl: " + importUrl.toExternalForm()); + if (importUrl != null) + log.debug("importUrl: " + importUrl.toExternalForm()); + else + log.debug("importUrl is null!"); return importUrl; } Index: juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (working copy) @@ -122,7 +122,7 @@ */ public static void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List tmodelKeys) { - if (tmodelKeys != null & tmodelKeys.size() > 0) { + if (tmodelKeys != null && tmodelKeys.size() > 0) { StringBuffer thetaJoins = new StringBuffer(200); int tblCount = 0; Index: juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (working copy) @@ -121,7 +121,7 @@ public static void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List tmodelKeys) { - if (tmodelKeys != null & tmodelKeys.size() > 0) { + if (tmodelKeys != null && tmodelKeys.size() > 0) { qry.comma().pad().append(BusinessServiceQuery.ENTITY_NAME + " " + BusinessServiceQuery.ENTITY_ALIAS).pad(); qry.comma().pad().append(BindingTemplateQuery.ENTITY_NAME + " " + BindingTemplateQuery.ENTITY_ALIAS).pad(); Index: juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (working copy) @@ -243,7 +243,7 @@ */ public void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List keyedRefs) { - if (keyedRefs != null & keyedRefs.size() > 0) { + if (keyedRefs != null && keyedRefs.size() > 0) { // Sorting the collection by tModel Key Collections.sort(keyedRefs, new KeyedRefTModelComparator()); Index: juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java (working copy) @@ -332,7 +332,7 @@ */ public void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List keyedRefs) { - if (keyedRefs != null & keyedRefs.size() > 0) { + if (keyedRefs != null && keyedRefs.size() > 0) { // Sorting the collection by tModel Key Collections.sort(keyedRefs, new KeyedRefTModelComparator()); Index: juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (working copy) @@ -228,7 +228,7 @@ */ public void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List keyedRefs) { - if (keyedRefs != null & keyedRefs.size() > 0) { + if (keyedRefs != null && keyedRefs.size() > 0) { // Sorting the collection by tModel Key Collections.sort(keyedRefs, new KeyedRefTModelComparator()); Index: juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java (working copy) @@ -126,7 +126,7 @@ public static void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List tmodelKeys) { - if (tmodelKeys != null & tmodelKeys.size() > 0) { + if (tmodelKeys != null && tmodelKeys.size() > 0) { qry.comma().pad().append(BindingTemplateQuery.ENTITY_NAME + " " + BindingTemplateQuery.ENTITY_ALIAS).pad(); StringBuffer thetaJoins = new StringBuffer(200); Index: juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java (working copy) @@ -82,8 +82,11 @@ } try { - // try to instantiate the Authenticator implementation - auth = (Authenticator)authClass.newInstance(); + if (authClass!=null) + { + // try to instantiate the Authenticator implementation + auth = (Authenticator)authClass.newInstance(); + } } catch(Exception e) { log.error("Exception while attempting to instantiate the implementation of Authenticator: " + authClass.getName() + "\n" + e.getMessage()); Index: juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java (working copy) @@ -112,7 +112,7 @@ // a userID must be specified. if (userID == null) { throw new UnknownUserException(new ErrorMessage( - "errors.auth.InvalidUserId", userID)); + "errors.auth.InvalidUserId")); } // credential (password) must be specified. if (credential == null) { Index: juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java (working copy) @@ -80,6 +80,7 @@ authURL = AppConfig.getConfiguration().getString(Property.JUDDI_AUTHENTICATOR_URL, DEFAULT_URL); } catch (ConfigurationException ce) { logger.error("Configuration exception occurred retrieving: " + Property.JUDDI_AUTHENTICATOR_URL); + throw new NamingException(Property.JUDDI_AUTHENTICATOR_URL + " missing from config or config is not available."); } init(authURL); } Index: juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java (working copy) @@ -109,7 +109,7 @@ { // a userID must be specified. if (userID == null) - throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId", userID)); + throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId")); // credential (password) must be specified. if (credential == null) Index: juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java =================================================================== --- juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (revision 1451436) +++ juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (working copy) @@ -288,6 +288,7 @@ } } catch (ConfigurationException e) { log.error(e.getMessage(), e); + maxBusinesses =-1; //in case the configuration is not available } //if we have the maxBusinesses set for this publisher then we need to make sure we did not exceed it. if (maxBusinesses > 0) { @@ -338,6 +339,7 @@ } } catch (ConfigurationException e) { log.error(e.getMessage(), e); + maxServices = -1; //incase the configuration isn't available } //if we have the maxServices set for a business then we need to make sure we did not exceed it. if (maxServices > 0) { @@ -386,6 +388,7 @@ } } catch (ConfigurationException e) { log.error(e.getMessage(), e); + maxBindings = -1; //incase the config isn't available } //if we have the maxBindings set for a service then we need to make sure we did not exceed it. if (maxBindings > 0) { @@ -434,6 +437,7 @@ } } catch (ConfigurationException e) { log.error(e.getMessage(), e); + maxTModels = -1; //incase the config isn't available } //if we have the TModels set for a publisher then we need to make sure we did not exceed it. if (maxTModels > 0) {