You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/03/22 03:04:40 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/function SaveServiceFunction.java FindTModelFunction.java FindPublisherFunction.java GetBusinessDetailFunction.java SaveTModelFunction.java GetBindingDetailFunction.java SaveBusinessFunction.java DiscardAuthTokenFunction.java GetPublisherDetailFunction.java GetTModelDetailFunction.java GetServiceDetailFunction.java DeleteTModelFunction.java GetBusinessDetailExtFunction.java AddPublisherAssertionsFunction.java FindBusinessFunction.java SaveBindingFunction.java DeleteServiceFunction.java FindBindingFunction.java DeleteBindingFunction.java DeleteBusinessFunction.java FindServiceFunction.java GetAuthTokenFunction.java
sviens 2005/03/21 18:04:40
Modified: src/java/org/apache/juddi/function SaveServiceFunction.java
FindTModelFunction.java FindPublisherFunction.java
GetBusinessDetailFunction.java
SaveTModelFunction.java
GetBindingDetailFunction.java
SaveBusinessFunction.java
DiscardAuthTokenFunction.java
GetPublisherDetailFunction.java
GetTModelDetailFunction.java
GetServiceDetailFunction.java
DeleteTModelFunction.java
GetBusinessDetailExtFunction.java
AddPublisherAssertionsFunction.java
FindBusinessFunction.java SaveBindingFunction.java
DeleteServiceFunction.java FindBindingFunction.java
DeleteBindingFunction.java
DeleteBusinessFunction.java
FindServiceFunction.java GetAuthTokenFunction.java
Log:
Fix for bug# JUDDI-57 - delete_business | service | binding do not return problem keys in error text (see: http://issues.apache.org/jira/browse/JUDDI-57)
Revision Changes Path
1.8 +7 -3 ws-juddi/src/java/org/apache/juddi/function/SaveServiceFunction.java
Index: SaveServiceFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveServiceFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveServiceFunction.java 8 Mar 2005 03:17:05 -0000 1.7
+++ SaveServiceFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -96,16 +96,20 @@
// If a BusinessKey wasn't included or it is an invalid BusinessKey then
// throw an InvalidKeyPassedException
if ((businessKey == null) || (businessKey.length() == 0) || (!dataStore.isValidBusinessKey(businessKey)))
- throw new InvalidKeyPassedException("businessKey="+businessKey);
+ throw new InvalidKeyPassedException("save_service: "+
+ "businessKey="+businessKey);
// Confirm that 'publisherID' controls the BusinessEntity that this
// BusinessService belongs to. If not then throw a UserMismatchException.
if (!dataStore.isBusinessPublisher(businessKey,publisherID))
- throw new UserMismatchException("businessKey="+serviceKey);
+ throw new UserMismatchException("save_service: "+
+ "userID="+publisherID+", "+
+ "businessKey="+serviceKey);
// If a ServiceKey was specified then make sure it's a valid one.
if (((serviceKey != null) && (serviceKey.length() > 0)) && (!dataStore.isValidServiceKey(serviceKey)))
- throw new InvalidKeyPassedException("serviceKey="+serviceKey);
+ throw new InvalidKeyPassedException("save_service: "+
+ "serviceKey="+serviceKey);
// Normally, a valid tModelKey MUST be specified for the keyedReference
// to be valid. However, in the case of a keyedReference that is used in
1.9 +6 -2 ws-juddi/src/java/org/apache/juddi/function/FindTModelFunction.java
Index: FindTModelFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindTModelFunction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FindTModelFunction.java 8 Mar 2005 03:17:05 -0000 1.8
+++ FindTModelFunction.java 22 Mar 2005 02:04:40 -0000 1.9
@@ -123,7 +123,10 @@
// value is configurable in jUDDI.
int maxNameLength = Config.getMaxNameLengthAllowed();
if (tModelName.length() > maxNameLength)
- throw new NameTooLongException(tModelName+" (max_name="+maxNameLength+")");
+ throw new NameTooLongException("find_tModel: "+
+ "name="+tModelName+", "+
+ "length="+tModelName.length()+", "+
+ "maxNameLength="+maxNameLength);
}
// validate the 'qualifiers' parameter as much as possible up-front before
@@ -149,7 +152,8 @@
(!qValue.equals(FindQualifier.SORT_BY_DATE_DESC)) &&
(!qValue.equals(FindQualifier.SERVICE_SUBSET)) &&
(!qValue.equals(FindQualifier.COMBINE_CATEGORY_BAGS)))
- throw new UnsupportedException("find_qualifier="+qValue);
+ throw new UnsupportedException("find_tModel: "+
+ "findQualifier="+qValue);
}
}
}
1.8 +6 -2 ws-juddi/src/java/org/apache/juddi/function/FindPublisherFunction.java
Index: FindPublisherFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindPublisherFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FindPublisherFunction.java 8 Mar 2005 03:17:05 -0000 1.7
+++ FindPublisherFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -102,7 +102,10 @@
// value is configurable in jUDDI.
int maxNameLength = Config.getMaxNameLengthAllowed();
if (name.length() > maxNameLength)
- throw new NameTooLongException("Name: '"+name+"' (max="+maxNameLength+")");
+ throw new NameTooLongException("find_publisher: "+
+ "name="+name+", "+
+ "length="+name.length()+", "+
+ "maxNameLength="+maxNameLength);
}
// validate the 'qualifiers' parameter as much as possible up-front before
@@ -128,7 +131,8 @@
(!qValue.equals(FindQualifier.SORT_BY_DATE_DESC)) &&
(!qValue.equals(FindQualifier.SERVICE_SUBSET)) &&
(!qValue.equals(FindQualifier.COMBINE_CATEGORY_BAGS)))
- throw new UnsupportedException("FindQualifier: "+qValue);
+ throw new UnsupportedException("find_publisher: "+
+ "findQualifier="+qValue);
}
}
}
1.6 +2 -1 ws-juddi/src/java/org/apache/juddi/function/GetBusinessDetailFunction.java
Index: GetBusinessDetailFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetBusinessDetailFunction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GetBusinessDetailFunction.java 30 Apr 2004 03:52:24 -0000 1.5
+++ GetBusinessDetailFunction.java 22 Mar 2005 02:04:40 -0000 1.6
@@ -69,7 +69,8 @@
// If the a BusinessEntity doesn't exist throw an InvalidKeyPassedException.
if ((businessKey == null) || (businessKey.length() == 0) ||
(!dataStore.isValidBusinessKey(businessKey)))
- throw new InvalidKeyPassedException(businessKey);
+ throw new InvalidKeyPassedException("get_businessDetail: "+
+ "businessKey="+businessKey);
}
Vector businessVector = new Vector();
1.8 +5 -2 ws-juddi/src/java/org/apache/juddi/function/SaveTModelFunction.java
Index: SaveTModelFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveTModelFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveTModelFunction.java 8 Mar 2005 03:17:05 -0000 1.7
+++ SaveTModelFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -93,11 +93,14 @@
// If a TModelKey was specified then make sure it's a valid one.
if (((tModelKey != null) && (tModelKey.length() > 0)) && (!dataStore.isValidTModelKey(tModelKey)))
- throw new InvalidKeyPassedException("TModelKey: "+tModelKey);
+ throw new InvalidKeyPassedException("save_tModel: "+
+ "tModelKey="+tModelKey);
// If a TModelKey was specified then make sure 'publisherID' controls it.
if (((tModelKey != null) && (tModelKey.length() > 0)) && !dataStore.isTModelPublisher(tModelKey,publisherID))
- throw new UserMismatchException("TModelKey: "+tModelKey);
+ throw new UserMismatchException("save_tModel: "+
+ "userID="+publisherID+", "+
+ "tModelKey="+tModelKey);
// Normally, a valid tModelKey MUST be specified for the keyedReference
// to be valid. However, in the case of a keyedReference that is used in
1.7 +5 -4 ws-juddi/src/java/org/apache/juddi/function/GetBindingDetailFunction.java
Index: GetBindingDetailFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetBindingDetailFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetBindingDetailFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetBindingDetailFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -65,13 +65,14 @@
for (int i=0; i<keyVector.size(); i++)
{
// grab the next key from the vector
- String key = (String)keyVector.elementAt(i);
+ String bindingKey = (String)keyVector.elementAt(i);
// check that this binding template really exists.
// If not then throw an InvalidKeyPassedException.
- if ((key == null) || (key.length() == 0) ||
- (!dataStore.isValidBindingKey(key)))
- throw new InvalidKeyPassedException(key);
+ if ((bindingKey == null) || (bindingKey.length() == 0) ||
+ (!dataStore.isValidBindingKey(bindingKey)))
+ throw new InvalidKeyPassedException("get_bindingDetail: "+
+ "bindingKey="+bindingKey);
}
Vector bindingVector = new Vector();
1.12 +7 -4 ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java
Index: SaveBusinessFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SaveBusinessFunction.java 17 Mar 2005 03:39:58 -0000 1.11
+++ SaveBusinessFunction.java 22 Mar 2005 02:04:40 -0000 1.12
@@ -82,8 +82,8 @@
// UploadRegistry functionality is not currently supported.
if ((uploadRegVector != null) && (uploadRegVector.size() > 0))
- throw new UnsupportedException("Saving BusinessEntities via " +
- "UploadRegistry is not supported.");
+ throw new UnsupportedException("save_business: "+
+ "UploadRegistry is not supported.");
// aquire a jUDDI datastore instance
DataStore dataStore = DataStoreFactory.getDataStore();
@@ -108,11 +108,14 @@
// If a BusinessKey was specified then make sure it's a valid one.
if ((businessKey != null) && (businessKey.length() > 0) && (!dataStore.isValidBusinessKey(businessKey)))
- throw new InvalidKeyPassedException("businessKey="+businessKey);
+ throw new InvalidKeyPassedException("save_business: "+
+ "businessKey="+businessKey);
// If a BusinessKey was specified then make sure 'publisherID' controls it.
if ((businessKey != null) && (businessKey.length() > 0) && (!dataStore.isBusinessPublisher(businessKey,publisherID)))
- throw new UserMismatchException("businessKey="+businessKey);
+ throw new UserMismatchException("save_business: "+
+ "userID="+publisherID+", "+
+ "businessKey="+businessKey);
// Normally, a valid tModelKey MUST be specified for the keyedReference
// to be valid. However, in the case of a keyedReference that is used in
1.8 +2 -1 ws-juddi/src/java/org/apache/juddi/function/DiscardAuthTokenFunction.java
Index: DiscardAuthTokenFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/DiscardAuthTokenFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DiscardAuthTokenFunction.java 21 Mar 2005 03:45:08 -0000 1.7
+++ DiscardAuthTokenFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -72,7 +72,8 @@
String authToken = authInfo.getValue();
if ((authInfo == null) || (authInfo.getValue() == null))
- throw new AuthTokenRequiredException("authInfo="+authInfo);
+ throw new AuthTokenRequiredException("discard_authToken: "+
+ "authInfo="+authInfo);
dataStore.retireAuthToken(authToken);
dataStore.commit();
1.7 +2 -1 ws-juddi/src/java/org/apache/juddi/function/GetPublisherDetailFunction.java
Index: GetPublisherDetailFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetPublisherDetailFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetPublisherDetailFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetPublisherDetailFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -69,7 +69,8 @@
// If the a Publisher doesn't exist hrow an UnknownUserException.
if ((publisherID == null) || (publisherID.length() == 0) ||
(dataStore.getPublisher(publisherID) == null))
- throw new UnknownUserException("PublisherID: "+publisherID);
+ throw new UnknownUserException("get_publisher: "+
+ "userID="+publisherID);
}
Vector publisherVector = new Vector();
1.7 +2 -1 ws-juddi/src/java/org/apache/juddi/function/GetTModelDetailFunction.java
Index: GetTModelDetailFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetTModelDetailFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetTModelDetailFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetTModelDetailFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -69,7 +69,8 @@
// If the a TModel doesn't exist hrow an InvalidKeyPassedException.
if ((tModelKey == null) || (tModelKey.length() == 0) ||
(!dataStore.isValidTModelKey(tModelKey)))
- throw new InvalidKeyPassedException(tModelKey);
+ throw new InvalidKeyPassedException("get_tModelDetail: "+
+ "tModelKey="+tModelKey);
}
Vector tModelVector = new Vector();
1.7 +2 -1 ws-juddi/src/java/org/apache/juddi/function/GetServiceDetailFunction.java
Index: GetServiceDetailFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetServiceDetailFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetServiceDetailFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetServiceDetailFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -70,7 +70,8 @@
// If the a BusinessService doesn't exist hrow an InvalidKeyPassedException.
if ((serviceKey == null) || (serviceKey.length() == 0) ||
(!dataStore.isValidServiceKey(serviceKey)))
- throw new InvalidKeyPassedException(serviceKey);
+ throw new InvalidKeyPassedException("get_serviceDetail: "+
+ "serviceKey="+serviceKey);
}
Vector serviceVector = new Vector();
1.9 +5 -2 ws-juddi/src/java/org/apache/juddi/function/DeleteTModelFunction.java
Index: DeleteTModelFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/DeleteTModelFunction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeleteTModelFunction.java 21 Mar 2005 03:45:08 -0000 1.8
+++ DeleteTModelFunction.java 22 Mar 2005 02:04:40 -0000 1.9
@@ -82,12 +82,15 @@
// then throw an InvalidKeyPassedException.
if ((tModelKey == null) || (tModelKey.length() == 0) ||
(!dataStore.isValidTModelKey(tModelKey)))
- throw new InvalidKeyPassedException(tModelKey);
+ throw new InvalidKeyPassedException("delete_tModel: "+
+ "tModelKey="+tModelKey);
// check to make sure that 'authorizedName' controls this
// TModel. If not then throw a UserMismatchException.
if (!dataStore.isTModelPublisher(tModelKey,publisherID))
- throw new UserMismatchException("publisher="+publisherID+" tModelKey="+tModelKey);
+ throw new UserMismatchException("delete_tModel: "+
+ "userID="+publisherID+", "+
+ "tModelKey="+tModelKey);
// TModel exists and we control it so let's marke it as deleted.
dataStore.markTModelAsDeleted(tModelKey);
1.7 +2 -1 ws-juddi/src/java/org/apache/juddi/function/GetBusinessDetailExtFunction.java
Index: GetBusinessDetailExtFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetBusinessDetailExtFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetBusinessDetailExtFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetBusinessDetailExtFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -72,7 +72,8 @@
// If the a BusinessEntity doesn't exist hrow an InvalidKeyPassedException.
if ((businessKey == null) || (businessKey.length() == 0) ||
(!dataStore.isValidBusinessKey(businessKey)))
- throw new InvalidKeyPassedException(businessKey);
+ throw new InvalidKeyPassedException("get_businessDetailExt: "+
+ "businessKey="+businessKey);
}
Vector businessEntityExtVector = new Vector();
1.9 +16 -7 ws-juddi/src/java/org/apache/juddi/function/AddPublisherAssertionsFunction.java
Index: AddPublisherAssertionsFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/AddPublisherAssertionsFunction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddPublisherAssertionsFunction.java 21 Mar 2005 03:45:08 -0000 1.8
+++ AddPublisherAssertionsFunction.java 22 Mar 2005 02:04:40 -0000 1.9
@@ -90,32 +90,38 @@
// make sure we've got a 'fromKey'
String fromKey = assertion.getFromKey();
if ((fromKey == null) || (fromKey.length() == 0))
- throw new InvalidKeyPassedException("fromKey="+fromKey);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "fromKey="+fromKey);
// make sure we've got a 'toKey'
String toKey = assertion.getToKey();
if ((toKey == null) || (toKey.length() == 0))
- throw new InvalidKeyPassedException("toKey="+toKey);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "toKey="+toKey);
// make sure we've got a 'KeyedRefernce'
KeyedReference keyedRef = assertion.getKeyedReference();
if (keyedRef == null)
- throw new InvalidKeyPassedException("keyedRef="+keyedRef);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "keyedRef="+keyedRef);
// make sure the 'KeyedRefernce' contains a 'TModelKey'
String tModelKey = keyedRef.getTModelKey();
if ((tModelKey == null) || (tModelKey.length() == 0))
- throw new InvalidKeyPassedException("tModelKey="+keyedRef);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "tModelKey="+keyedRef);
// verify that the BusinessEntities or tModel identified by the 'fromKey'
// really exists. If not then throw an InvalidKeyPassedException.
if ((!dataStore.isValidBusinessKey(fromKey)) && (!dataStore.isValidTModelKey(fromKey)))
- throw new InvalidKeyPassedException("fromKey="+fromKey);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "fromKey="+fromKey);
// verify that the BusinessEntitys or tModel identified by the 'fromKey'
// really exists. If not then throw an InvalidKeyPassedException.
if ((!dataStore.isValidBusinessKey(toKey)) && (!dataStore.isValidTModelKey(toKey)))
- throw new InvalidKeyPassedException("toKey="+toKey);
+ throw new InvalidKeyPassedException("add_publisherAssertion: "+
+ "toKey="+toKey);
// verify that the 'publisherID' controls at least one of the
// BusinessEntities or TModels that are identified in this
@@ -124,7 +130,10 @@
(!dataStore.isBusinessPublisher(toKey,publisherID)) &&
(!dataStore.isTModelPublisher(fromKey,publisherID)) &&
(!dataStore.isTModelPublisher(toKey,publisherID)))
- throw new UserMismatchException("fromKey="+fromKey+" toKey="+toKey);
+ throw new UserMismatchException("add_publisherAssertion: "+
+ "userID="+publisherID+", "+
+ "fromKey="+fromKey+", "+
+ "toKey="+toKey);
}
dataStore.saveAssertions(publisherID,assertionVector);
1.9 +9 -5 ws-juddi/src/java/org/apache/juddi/function/FindBusinessFunction.java
Index: FindBusinessFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindBusinessFunction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FindBusinessFunction.java 29 Jun 2004 13:49:22 -0000 1.8
+++ FindBusinessFunction.java 22 Mar 2005 02:04:40 -0000 1.9
@@ -149,7 +149,9 @@
// dependent). This value is configurable in jUDDI.
int maxNames = Config.getMaxNameElementsAllowed();
if ((nameVector != null) && (nameVector.size() > maxNames))
- throw new TooManyOptionsException("max=" + maxNames);
+ throw new TooManyOptionsException("find_business: "+
+ "names="+nameVector.size()+", "+
+ "maxNames=" + maxNames);
// names can not exceed the maximum character length specified by the
// UDDI specification (v2.0 specifies a max character length of 255). This
@@ -159,8 +161,10 @@
{
String name = ((Name) nameVector.elementAt(i)).getValue();
if (name.length() > maxNameLength)
- throw new NameTooLongException(name +
- "(max=" + maxNameLength + ")");
+ throw new NameTooLongException("find_business: "+
+ "name="+name+", "+
+ "length="+name.length()+", "+
+ "maxNameLength="+maxNameLength);
}
}
@@ -188,8 +192,8 @@
&& (!qValue.equals(FindQualifier.SERVICE_SUBSET))
&& (!qValue
.equals(FindQualifier.COMBINE_CATEGORY_BAGS)))
- throw new UnsupportedException(
- "findQualifier=" + qValue);
+ throw new UnsupportedException("find_business: "+
+ "findQualifier="+qValue);
}
}
}
1.8 +7 -3 ws-juddi/src/java/org/apache/juddi/function/SaveBindingFunction.java
Index: SaveBindingFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveBindingFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveBindingFunction.java 8 Mar 2005 03:17:05 -0000 1.7
+++ SaveBindingFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -88,16 +88,20 @@
// Confirm that the 'BusinessService' that this binding belongs to
// really exists. If not then throw an InvalidKeyPassedException.
if ((serviceKey == null) || (serviceKey.length() == 0) || (!dataStore.isValidServiceKey(serviceKey)))
- throw new InvalidKeyPassedException("ServiceKey: "+serviceKey);
+ throw new InvalidKeyPassedException("save_binding: "+
+ "serviceKey="+serviceKey);
// Confirm that 'publisherID' controls the BusinessService that this
// binding template belongs to. If not then throw a UserMismatchException.
if (!dataStore.isServicePublisher(serviceKey,publisherID))
- throw new UserMismatchException("ServiceKey: "+serviceKey);
+ throw new UserMismatchException("save_binding: "+
+ "publisherID="+publisherID+", "+
+ "serviceKey="+serviceKey);
// If a BindingKey was specified then make sure it's a valid one.
if ((bindingKey != null) && (bindingKey.length() > 0) && (!dataStore.isValidBindingKey(bindingKey)))
- throw new InvalidKeyPassedException("BindingKey: "+bindingKey);
+ throw new InvalidKeyPassedException("save_binding: "+
+ "bindingKey="+bindingKey);
// Normally, a valid tModelKey MUST be specified for the keyedReference
// to be valid. However, in the case of a keyedReference that is used in
1.8 +5 -2 ws-juddi/src/java/org/apache/juddi/function/DeleteServiceFunction.java
Index: DeleteServiceFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/DeleteServiceFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeleteServiceFunction.java 21 Mar 2005 03:45:08 -0000 1.7
+++ DeleteServiceFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -82,13 +82,16 @@
// If not then throw an InvalidKeyPassedException.
if ((serviceKey == null) || (serviceKey.length() == 0) ||
(!dataStore.isValidServiceKey(serviceKey)))
- throw new InvalidKeyPassedException(serviceKey);
+ throw new InvalidKeyPassedException("delete_service: "+
+ "serviceKey="+serviceKey);
// check to make sure that 'authorizedName' controls the
// business entity that this server belongs to. If not
// then throw a UserMismatchException.
if (!dataStore.isServicePublisher(serviceKey,publisherID))
- throw new UserMismatchException("serviceKey="+serviceKey);
+ throw new UserMismatchException("delete_service: "+
+ "userID="+publisherID+", "+
+ "serviceKey="+serviceKey);
}
// delete the BusinessServices
1.10 +4 -2 ws-juddi/src/java/org/apache/juddi/function/FindBindingFunction.java
Index: FindBindingFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindBindingFunction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FindBindingFunction.java 16 Mar 2005 03:39:40 -0000 1.9
+++ FindBindingFunction.java 22 Mar 2005 02:04:40 -0000 1.10
@@ -117,7 +117,8 @@
// a find_binding request MUST include a service_key attribute
if ((serviceKey == null) || (serviceKey.length() == 0))
- throw new InvalidKeyPassedException("serviceKey="+serviceKey);
+ throw new InvalidKeyPassedException("find_binding: "+
+ "serviceKey="+serviceKey);
// validate the 'qualifiers' parameter as much as possible up-front before
// calling into the data layer for relational validation.
@@ -142,7 +143,8 @@
(!qValue.equals(FindQualifier.SORT_BY_DATE_DESC)) &&
(!qValue.equals(FindQualifier.SERVICE_SUBSET)) &&
(!qValue.equals(FindQualifier.COMBINE_CATEGORY_BAGS)))
- throw new UnsupportedException("findQualifier="+qValue);
+ throw new UnsupportedException("find_binding: "+
+ "findQualifier="+qValue);
}
}
}
1.8 +5 -2 ws-juddi/src/java/org/apache/juddi/function/DeleteBindingFunction.java
Index: DeleteBindingFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/DeleteBindingFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeleteBindingFunction.java 21 Mar 2005 03:45:08 -0000 1.7
+++ DeleteBindingFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -84,13 +84,16 @@
// If not then throw an InvalidKeyPassedException.
if ((bindingKey == null) || (bindingKey.length() == 0) ||
(!dataStore.isValidBindingKey(bindingKey)))
- throw new InvalidKeyPassedException(bindingKey);
+ throw new InvalidKeyPassedException("delete_binding: "+
+ "bindingKey="+bindingKey);
// check to make sure that 'authorizedName' controls the
// business entity that this binding belongs to. If not
// then throw a UserMismatchException.
if (!dataStore.isBindingPublisher(bindingKey,publisherID))
- throw new UserMismatchException(bindingKey);
+ throw new UserMismatchException("delete_binding: "+
+ "userID="+publisherID+", "+
+ "bindingKey="+bindingKey);
}
// delete the BindingTemplates
1.8 +5 -2 ws-juddi/src/java/org/apache/juddi/function/DeleteBusinessFunction.java
Index: DeleteBusinessFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/DeleteBusinessFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeleteBusinessFunction.java 21 Mar 2005 03:45:08 -0000 1.7
+++ DeleteBusinessFunction.java 22 Mar 2005 02:04:40 -0000 1.8
@@ -81,12 +81,15 @@
// check that this business entity really exists.
// If not then throw an InvalidKeyPassedException.
if ((!dataStore.isValidBusinessKey(businessKey)))
- throw new InvalidKeyPassedException(businessKey);
+ throw new InvalidKeyPassedException("delete_business: "+
+ "businessKey="+businessKey);
// check to make sure that 'authorizedName' controls this
// business entity. If not then throw a UserMismatchException.
if (!dataStore.isBusinessPublisher(businessKey,publisherID))
- throw new UserMismatchException(businessKey);
+ throw new UserMismatchException("delete_business: "+
+ "userID="+publisherID+", "+
+ "businessKey="+businessKey);
}
// delete the BusinessEntities
1.10 +9 -3 ws-juddi/src/java/org/apache/juddi/function/FindServiceFunction.java
Index: FindServiceFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindServiceFunction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FindServiceFunction.java 16 Mar 2005 03:39:40 -0000 1.9
+++ FindServiceFunction.java 22 Mar 2005 02:04:40 -0000 1.10
@@ -126,7 +126,9 @@
// dependent). This value is configurable in jUDDI.
int maxNames = Config.getMaxNameElementsAllowed();
if ((nameVector != null) && (nameVector.size() > maxNames))
- throw new TooManyOptionsException("max_names= "+maxNames);
+ throw new TooManyOptionsException("find_service: "+
+ "names="+nameVector.size()+", "+
+ "maxNames=" + maxNames);
// names can not exceed the maximum character length specified by the
// UDDI specification (v2.0 specifies a max character length of 255). This
@@ -136,7 +138,10 @@
{
String name = ((Name)nameVector.elementAt(i)).getValue();
if (name.length() > maxNameLength)
- throw new NameTooLongException(name+" (max="+maxNameLength+")");
+ throw new NameTooLongException("find_service: "+
+ "name="+name+", "+
+ "length="+name.length()+", "+
+ "maxNameLength="+maxNameLength);
}
}
@@ -163,7 +168,8 @@
(!qValue.equals(FindQualifier.SORT_BY_DATE_DESC)) &&
(!qValue.equals(FindQualifier.SERVICE_SUBSET)) &&
(!qValue.equals(FindQualifier.COMBINE_CATEGORY_BAGS)))
- throw new UnsupportedException("findQualifier="+qValue);
+ throw new UnsupportedException("find_service: "+
+ "findQualifier="+qValue);
}
}
}
1.7 +4 -2 ws-juddi/src/java/org/apache/juddi/function/GetAuthTokenFunction.java
Index: GetAuthTokenFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/GetAuthTokenFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetAuthTokenFunction.java 8 Mar 2005 03:17:05 -0000 1.6
+++ GetAuthTokenFunction.java 22 Mar 2005 02:04:40 -0000 1.7
@@ -72,12 +72,14 @@
// authenticate the requestor's credentials
String publisherID = authenticator.authenticate(userID,cred);
if (publisherID == null)
- throw new UnknownUserException("user ID: "+userID);
+ throw new UnknownUserException("get_authToken: "+
+ "userID="+userID);
// ensure the user has the authority to publish
Publisher publisher = dataStore.getPublisher(publisherID);
if (publisher == null)
- throw new UnknownUserException("user ID: "+userID);
+ throw new UnknownUserException("get_authToken: "+
+ "userID="+userID);
// generate a new token (optionally using publisher info)
String token = dataStore.generateToken(publisher);
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org