You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/10/28 19:48:45 UTC
svn commit: r1536483 [2/2] - in /juddi/trunk:
juddi-examples/uddi-samples/cxf.wadl
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1536483&r1=1536482&r2=1536483&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Mon Oct 28 18:48:44 2013
@@ -100,7 +100,7 @@ public class UddiHub {
*/
public static final Log log = LogFactory.getLog(LOGGER_NAME);
private DatatypeFactory df;
-
+
private UddiHub() throws DatatypeConfigurationException {
df = DatatypeFactory.newInstance();
}
@@ -127,7 +127,7 @@ public class UddiHub {
} catch (Exception ex) {
HandleException(ex);
}
-
+
token = null;
inquiry = null;
publish = null;
@@ -153,7 +153,7 @@ public class UddiHub {
_session.setAttribute("hub", hub);
return hub;
}
-
+
return (UddiHub) j;
}
String locale = "en";
@@ -177,7 +177,7 @@ public class UddiHub {
public Properties GetRawConfiguration() {
return properties;
}
-
+
private UddiHub(ServletContext application, HttpSession _session) throws Exception {
URL prop = application.getResource("/META-INF/config.properties");
if (prop == null) {
@@ -197,30 +197,32 @@ public class UddiHub {
style = AuthStyle.UDDI_AUTH;
}
try {
-
+
String clazz = UDDIClientContainer.getUDDIClient(null).
getClientConfig().getUDDINode("default").getProxyTransport();
Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
if (transportClass != null) {
- Transport transport = (Transport) transportClass.
+ transport = (Transport) transportClass.
getConstructor(String.class).newInstance("default");
-
+
security = transport.getUDDISecurityService();
inquiry = transport.getUDDIInquiryService();
subscription = transport.getUDDISubscriptionService();
publish = transport.getUDDIPublishService();
custody = transport.getUDDICustodyTransferService();
-
+
}
} catch (Exception ex) {
HandleException(ex);
}
}
private HttpSession session;
+ private Transport transport = null;
/**
- * gets a reference to the current juddi client config file. this is a live instance
- * changes can be stored to disk, usually
+ * gets a reference to the current juddi client config file. this is a live
+ * instance changes can be stored to disk, usually
+ *
* @return
* @throws ConfigurationException g
*/
@@ -231,7 +233,8 @@ public class UddiHub {
/**
* returns all of the current properties defining digital signatures
- * @return
+ *
+ * @return
*/
public Properties GetDigitalSignatureConfig() {
try {
@@ -241,30 +244,42 @@ public class UddiHub {
}
return new Properties();
}
-
+
private String GetToken() {
if (style != AuthStyle.UDDI_AUTH) {
BindingProvider bp = null;
Map<String, Object> context = null;
bp = (BindingProvider) inquiry;
context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
- context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
-
+ context.put(BindingProvider.PASSWORD_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+
bp = (BindingProvider) publish;
context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
- context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
-
+ context.put(BindingProvider.PASSWORD_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+
bp = (BindingProvider) custody;
context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
- context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
-
+ context.put(BindingProvider.PASSWORD_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+
bp = (BindingProvider) subscription;
context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
- context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+ context.put(BindingProvider.PASSWORD_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
/*
bp = (BindingProvider) juddi;
@@ -276,11 +291,44 @@ public class UddiHub {
if (token != null) {
return token;
}
+ BindingProvider bp = null;
+ Map<String, Object> context = null;
+
+ bp = (BindingProvider) inquiry;
+ context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
+ bp = (BindingProvider) publish;
+ context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
+
+ bp = (BindingProvider) custody;
+ context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
+ bp = (BindingProvider) subscription;
+ context = bp.getRequestContext();
+ context.remove(BindingProvider.USERNAME_PROPERTY);
+ context.remove(BindingProvider.PASSWORD_PROPERTY);
+
+
GetAuthToken req = new GetAuthToken();
+ try {
+ if (security == null) {
+ security = transport.getUDDISecurityService();
+ }
+ } catch (Exception ex) {
+ log.error(ex);
+ }
if (session.getAttribute("username") != null
&& session.getAttribute("password") != null) {
req.setUserID((String) session.getAttribute("username"));
req.setCred(AES.Decrypt((String) session.getAttribute("password"), (String) properties.get("key")));
+ log.info("fetching auth token for " + req.getUserID() + " security enable is " + ((security == null) ? "null" : "active"));
try {
AuthToken authToken = security.getAuthToken(req);
token = authToken.getAuthInfo();
@@ -324,7 +372,7 @@ public class UddiHub {
ret.offset = offset;
ret.displaycount = 0;
ret.totalrecords = 0;
-
+
try {
FindBusiness fb = new FindBusiness();
fb.setMaxRows(maxrecords);
@@ -332,7 +380,7 @@ public class UddiHub {
fb.setAuthInfo(GetToken());
org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
-
+
fb.setFindQualifiers(fq);
Name searchname = new Name();
searchname.setLang(lang);
@@ -345,7 +393,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findBusiness(fb);
@@ -360,11 +408,11 @@ public class UddiHub {
ret.totalrecords = findBusiness.getListDescription().getActualCount();
ret.renderedHtml = Printers.BusinessListAsTable(findBusiness, session, isChooser);
}
-
+
} catch (Exception ex) {
ret.renderedHtml = (HandleException(ex));
}
-
+
return ret;
}
@@ -381,10 +429,10 @@ public class UddiHub {
* @return
*/
public String GetMyTransferableKeys(boolean businesses, boolean tModels) {
-
+
StringBuilder sb = new StringBuilder();
-
-
+
+
RegisteredInfo findBusiness = null;
try {
GetRegisteredInfo r = new GetRegisteredInfo();
@@ -393,13 +441,13 @@ public class UddiHub {
return ToErrorAlert(ResourceLoader.GetResource(session, "errors.notsignedin"));
}
r.setInfoSelection(InfoSelection.ALL);
-
+
try {
findBusiness = publish.getRegisteredInfo(r);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
findBusiness = publish.getRegisteredInfo(r);
@@ -408,15 +456,15 @@ public class UddiHub {
throw ex;
}
}
-
+
} catch (Exception ex) {
return ToErrorAlert(HandleException(ex));
}
-
-
+
+
if (findBusiness == null || findBusiness.getBusinessInfos() == null) {
return (ResourceLoader.GetResource(session, "errors.nodatareturned"));
-
+
} else {
if (findBusiness.getBusinessInfos() != null && businesses) {
sb.append("<select id=\"businesslist\" multiple=\"multiple\" size=\"10\">");
@@ -444,10 +492,10 @@ public class UddiHub {
}
sb.append("</select>");
}
-
+
return sb.toString();
}
-
+
}
/**
@@ -471,7 +519,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
gbd.setAuthInfo(GetToken());
get = inquiry.getServiceDetail(gbd);
@@ -492,7 +540,7 @@ public class UddiHub {
} else {
sb.append(ResourceLoader.GetResource(session, "items.signed.not")).append("<Br>");
}
-
+
sb.append(Printers.PrintBindingTemplates(get.getBusinessService().get(i).getBindingTemplates(), (String) session.getAttribute("locale"))).append("<Br>");
}
} else {
@@ -526,7 +574,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
gbd.setAuthInfo(GetToken());
businessDetail = inquiry.getBusinessDetail(gbd);
@@ -566,7 +614,7 @@ public class UddiHub {
if (serviceid == null || serviceid.length() == 0) {
return null;
}
-
+
try {
GetServiceDetail gbd = new GetServiceDetail();
gbd.setAuthInfo(GetToken());
@@ -577,7 +625,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
gbd.setAuthInfo(GetToken());
get = inquiry.getServiceDetail(gbd);
@@ -586,12 +634,12 @@ public class UddiHub {
throw ex;
}
}
-
+
if (get == null || get.getBusinessService().isEmpty()) {
return null;
}
return get.getBusinessService().get(0);
-
+
} catch (Exception ex) {
HandleException(ex);
}
@@ -614,7 +662,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
sb.setAuthInfo(GetToken());
publish.saveService(sb);
@@ -623,7 +671,7 @@ public class UddiHub {
throw ex;
}
}
-
+
return ResourceLoader.GetResource(session, "actions.saved");
} catch (Exception ex) {
return HandleException(ex);
@@ -647,7 +695,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
sb.setAuthInfo(GetToken());
publish.saveBinding(sb);
@@ -670,35 +718,35 @@ public class UddiHub {
* @return a localized Saved or an error message
*/
public String SaveServiceDetails(HttpServletRequest request) {
-
+
BusinessService be = new BusinessService();
be.setBusinessKey(request.getParameter(PostBackConstants.BUSINESSKEY).trim());
be.setServiceKey(request.getParameter(PostBackConstants.SERVICEKEY).trim());
-
+
if (be.getServiceKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
be.setServiceKey(null);
}
if (be.getBusinessKey() == null || be.getBusinessKey().length() == 0) {
return ResourceLoader.GetResource(session, "errors.noinput.businesskey");
}
-
+
be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME, ResourceLoader.GetResource(session, "items.clicktoedit")));
BindingTemplates bt = new BindingTemplates();
bt.getBindingTemplate().addAll(Builders.BuildBindingTemplates(Builders.MapFilter(request.getParameterMap(), PostBackConstants.BINDINGTEMPLATE), PostBackConstants.BINDINGTEMPLATE, ResourceLoader.GetResource(session, "items.clicktoedit")));
if (!bt.getBindingTemplate().isEmpty()) {
be.setBindingTemplates(bt);
}
-
+
be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION, ResourceLoader.GetResource(session, "items.clicktoedit")));
-
+
CategoryBag cb = new CategoryBag();
cb.getKeyedReference().addAll(Builders.BuildKeyedReference(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF), PostBackConstants.CATBAG_KEY_REF));
cb.getKeyedReferenceGroup().addAll(Builders.BuildKeyedReferenceGroup(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF_GRP), PostBackConstants.CATBAG_KEY_REF_GRP));
-
+
if (!cb.getKeyedReference().isEmpty() || !cb.getKeyedReferenceGroup().isEmpty()) {
be.setCategoryBag(cb);
}
-
+
return SaveServiceDetails(be);
}
@@ -718,7 +766,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
sb.setAuthInfo(GetToken());
publish.saveService(sb);
@@ -749,7 +797,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
sb.setAuthInfo(GetToken());
publish.saveBusiness(sb);
@@ -758,7 +806,7 @@ public class UddiHub {
throw ex;
}
}
-
+
return ResourceLoader.GetResource(session, "actions.saved");
} catch (Exception ex) {
return HandleException(ex);
@@ -776,9 +824,9 @@ public class UddiHub {
* @return
*/
public String SaveBusinessDetails(HttpServletRequest request) {
-
-
-
+
+
+
BusinessEntity be = new BusinessEntity();
be.setBusinessKey(request.getParameter(PostBackConstants.BUSINESSKEY).trim());
if (be.getBusinessKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
@@ -793,16 +841,16 @@ public class UddiHub {
}
}
be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME, ResourceLoader.GetResource(session, "items.clicktoedit")));
-
-
+
+
be.setContacts(Builders.BuildContacts(request.getParameterMap(), ResourceLoader.GetResource(session, "items.clicktoedit")));
-
+
be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION, ResourceLoader.GetResource(session, "items.clicktoedit")));
be.setDiscoveryURLs(Builders.BuildDisco(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DISCOVERYURL), PostBackConstants.DISCOVERYURL));
CategoryBag cb = new CategoryBag();
cb.getKeyedReference().addAll(Builders.BuildKeyedReference(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF), PostBackConstants.CATBAG_KEY_REF));
cb.getKeyedReferenceGroup().addAll(Builders.BuildKeyedReferenceGroup(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF_GRP), PostBackConstants.CATBAG_KEY_REF_GRP));
-
+
if (!cb.getKeyedReference().isEmpty() || !cb.getKeyedReferenceGroup().isEmpty()) {
be.setCategoryBag(cb);
}
@@ -826,17 +874,17 @@ public class UddiHub {
try {
GetBusinessDetail gbd = new GetBusinessDetail();
gbd.setAuthInfo(GetToken());
-
+
gbd.getBusinessKey().add(bizid);
-
+
BusinessDetail businessDetail = null;
-
+
try {
businessDetail = inquiry.getBusinessDetail(gbd);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
gbd.setAuthInfo(GetToken());
businessDetail = inquiry.getBusinessDetail(gbd);
@@ -864,7 +912,7 @@ public class UddiHub {
sb.append(ResourceLoader.GetResource(session, "errors.nodatareturned"));
}
} catch (Exception ex) {
-
+
sb.append(HandleException(ex));
}
return sb.toString();
@@ -880,20 +928,20 @@ public class UddiHub {
if (bizid == null || bizid.isEmpty()) {
return null;
}
-
+
try {
GetBusinessDetail gbd = new GetBusinessDetail();
gbd.setAuthInfo(GetToken());
-
+
gbd.getBusinessKey().add(bizid);
-
+
BusinessDetail businessDetail = null;
try {
businessDetail = inquiry.getBusinessDetail(gbd);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
gbd.setAuthInfo(GetToken());
businessDetail = inquiry.getBusinessDetail(gbd);
@@ -909,7 +957,7 @@ public class UddiHub {
HandleException(ex);
}
return null;
-
+
}
/**
@@ -965,7 +1013,7 @@ public class UddiHub {
ret.offset = offset;
ret.totalrecords = 0;
try {
-
+
FindService fs = new FindService();
fs.setAuthInfo(GetToken());
fs.setMaxRows(maxrecords);
@@ -986,7 +1034,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fs.setAuthInfo(GetToken());
findService = inquiry.findService(fs);
@@ -995,7 +1043,7 @@ public class UddiHub {
throw ex;
}
}
-
+
if (findService == null || findService.getServiceInfos() == null) {
ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
return ret;
@@ -1010,7 +1058,7 @@ public class UddiHub {
ret.renderedHtml = HandleException(ex);
}
return ret;
-
+
}
/**
@@ -1028,13 +1076,13 @@ public class UddiHub {
try {
if (!partitionName.startsWith("uddi:")) {
return ResourceLoader.GetResource(session, "errors.tmodel.prefix");
-
+
}
if (!partitionName.endsWith(":keyGenerator")) {
return ResourceLoader.GetResource(session, "errors.tmodel.postfix");
}
-
-
+
+
SaveTModel st = new SaveTModel();
st.setAuthInfo(GetToken());
TModel tm = new TModel();
@@ -1126,7 +1174,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fm.setAuthInfo(GetToken());
findTModel = inquiry.findTModel(fm);
@@ -1135,7 +1183,7 @@ public class UddiHub {
throw ex;
}
}
-
+
ret.offset = offset;
ret.displaycount = findTModel.getListDescription().getIncludeCount();
ret.totalrecords = findTModel.getListDescription().getActualCount();
@@ -1167,32 +1215,32 @@ public class UddiHub {
if (id == null || id.length() == 0) {
return null;
}
-
+
GetTModelDetail req = new GetTModelDetail();
req.setAuthInfo(GetToken());
req.getTModelKey().add(id);
TModelDetail tModelDetail = null;
try {
tModelDetail = inquiry.getTModelDetail(req);
-
+
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
req.setAuthInfo(GetToken());
tModelDetail = inquiry.getTModelDetail(req);
-
+
}
} else {
throw ex;
}
}
-
+
if (tModelDetail != null && !tModelDetail.getTModel().isEmpty()) {
return tModelDetail.getTModel().get(0);
}
-
+
} catch (Exception ex) {
HandleException(ex);
}
@@ -1236,7 +1284,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
bindingDetail = inquiry.getBindingDetail(r);
@@ -1269,7 +1317,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
tModelDetail = inquiry.getTModelDetail(r);
@@ -1278,7 +1326,7 @@ public class UddiHub {
throw ex;
}
}
-
+
return tModelDetail.getTModel().get(0);
} catch (Exception ex) {
HandleException(ex);
@@ -1358,7 +1406,7 @@ public class UddiHub {
return FindBusiness(criteria, parameters, lang, findqualifier);
case RelatedBusiness:
return FindRelatedBusiness(criteria, parameters, lang, findqualifier);
-
+
case Service:
return FindService(criteria, parameters, lang, findqualifier);
case tModel:
@@ -1366,7 +1414,7 @@ public class UddiHub {
}
return ResourceLoader.GetResource(session, "items.unknown");
}
-
+
private String FindBindingTemplateToHtml(CriteriaType criteria, String parameters, String lang, String[] fq) {
try {
FindBinding fb = new FindBinding();
@@ -1396,9 +1444,9 @@ public class UddiHub {
findBusiness = new BindingDetail();
BindingTemplate bt = GetBindingDetailsAsObject(parameters);
findBusiness.getBindingTemplate().add(bt);
-
+
break;
-
+
}
if (findBusiness == null) {
try {
@@ -1406,7 +1454,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findBinding(fb);
@@ -1415,7 +1463,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (findBusiness != null && findBusiness.getBindingTemplate() != null) {
StringBuilder sb = new StringBuilder();
@@ -1447,7 +1495,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String FindBusiness(CriteriaType criteria, String parameters, String lang, String[] fq) {
try {
FindBusiness fb = new FindBusiness();
@@ -1482,22 +1530,22 @@ public class UddiHub {
BusinessEntity t = GetBusinessDetails(parameters);
findBusiness = new BusinessList();
findBusiness.setBusinessInfos(new BusinessInfos());
-
+
BusinessInfo bd = new BusinessInfo();
bd.setBusinessKey(t.getBusinessKey());
bd.getName().addAll(t.getName());
findBusiness.getBusinessInfos().getBusinessInfo().add(bd);
break;
-
+
}
if (findBusiness == null) {
-
+
try {
findBusiness = inquiry.findBusiness(fb);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findBusiness(fb);
@@ -1532,7 +1580,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String FindRelatedBusiness(CriteriaType criteria, String parameters, String lang, String[] fq) {
try {
FindRelatedBusinesses fb = new FindRelatedBusinesses();
@@ -1549,13 +1597,13 @@ public class UddiHub {
case uid:
break;
}
-
+
try {
findBusiness = inquiry.findRelatedBusinesses(fb);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findRelatedBusinesses(fb);
@@ -1564,8 +1612,8 @@ public class UddiHub {
throw ex;
}
}
-
-
+
+
if (findBusiness != null && findBusiness.getRelatedBusinessInfos() != null) {
StringBuilder sb = new StringBuilder();
sb.append("<table class=\"table\">");
@@ -1591,7 +1639,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String FindService(CriteriaType criteria, String parameters, String lang, String[] fq) {
try {
FindService fb = new FindService();
@@ -1625,13 +1673,15 @@ public class UddiHub {
findBusiness = new ServiceList();
findBusiness.setServiceInfos(new ServiceInfos());
BusinessService GetServiceDetail = GetServiceDetail(parameters);
- ServiceInfo si = new ServiceInfo();
- si.setBusinessKey(GetServiceDetail.getBusinessKey());
- si.setServiceKey(GetServiceDetail.getServiceKey());
- si.getName().addAll(GetServiceDetail.getName());
- findBusiness.getServiceInfos().getServiceInfo().add(si);
+ if (GetServiceDetail != null) {
+ ServiceInfo si = new ServiceInfo();
+ si.setBusinessKey(GetServiceDetail.getBusinessKey());
+ si.setServiceKey(GetServiceDetail.getServiceKey());
+ si.getName().addAll(GetServiceDetail.getName());
+ findBusiness.getServiceInfos().getServiceInfo().add(si);
+ }
break;
-
+
}
if (findBusiness == null) {
try {
@@ -1639,7 +1689,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findService(fb);
@@ -1648,7 +1698,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (findBusiness.getServiceInfos() != null) {
StringBuilder sb = new StringBuilder();
@@ -1675,7 +1725,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String FindtModels(CriteriaType criteria, String parameters, String lang, String[] fq) {
try {
FindTModel fb = new FindTModel();
@@ -1717,9 +1767,9 @@ public class UddiHub {
tmi.setTModelKey(tmodelDetails.getTModelKey());
tmi.getDescription().addAll(tmodelDetails.getDescription());
findBusiness.getTModelInfos().getTModelInfo().add(tmi);
-
+
break;
-
+
}
if (findBusiness == null) {
try {
@@ -1727,7 +1777,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fb.setAuthInfo(GetToken());
findBusiness = inquiry.findTModel(fb);
@@ -1736,7 +1786,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (findBusiness.getTModelInfos() != null) {
StringBuilder sb = new StringBuilder();
@@ -1813,7 +1863,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
db.setAuthInfo(GetToken());
publish.deleteService(db);
@@ -1847,7 +1897,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
db.setAuthInfo(GetToken());
publish.deleteBusiness(db);
@@ -1896,7 +1946,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
db.setAuthInfo(GetToken());
publish.deleteTModel(db);
@@ -1921,7 +1971,7 @@ public class UddiHub {
try {
SaveTModel sb = new SaveTModel();
sb.setAuthInfo(GetToken());
-
+
sb.getTModel().add(be);
JAXB.marshal(be, System.out);
try {
@@ -1929,7 +1979,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
sb.setAuthInfo(GetToken());
publish.saveTModel(sb);
@@ -1952,7 +2002,7 @@ public class UddiHub {
* @return
*/
public String SaveTModel(HttpServletRequest request) {
-
+
TModel be = new TModel();
be.setTModelKey(request.getParameter(PostBackConstants.SERVICEKEY).trim());
if (be.getTModelKey() != null && (be.getTModelKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")))
@@ -1968,7 +2018,7 @@ public class UddiHub {
if (t != null && !t.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")) && t.length() > 0) {
be.getName().setLang(t);
}
-
+
t = request.getParameter(PostBackConstants.TMODEL_DELETED);
if (t != null) {
if (t.equalsIgnoreCase("checked")) {
@@ -1989,15 +2039,15 @@ public class UddiHub {
CategoryBag cb = new CategoryBag();
cb.getKeyedReference().addAll(Builders.BuildKeyedReference(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF), PostBackConstants.CATBAG_KEY_REF));
cb.getKeyedReferenceGroup().addAll(Builders.BuildKeyedReferenceGroup(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF_GRP), PostBackConstants.CATBAG_KEY_REF_GRP));
-
+
if (!cb.getKeyedReference().isEmpty() || !cb.getKeyedReferenceGroup().isEmpty()) {
be.setCategoryBag(cb);
}
be.setIdentifierBag(Builders.BuildIdentBag(Builders.MapFilter(request.getParameterMap(), PostBackConstants.IDENT_KEY_REF), PostBackConstants.IDENT_KEY_REF));
-
+
JAXB.marshal(be, System.out);
return SaveTModel(be);
-
+
}
/**
@@ -2014,7 +2064,7 @@ public class UddiHub {
for (int i = 0; i < sig.getKeyInfo().getContent().size(); i++) {
//sb.append("Signature #").append((i + 1)).append(": ");
JAXBElement get = (JAXBElement) sig.getKeyInfo().getContent().get(i);
-
+
if (get.getValue() instanceof org.w3._2000._09.xmldsig_.X509DataType) {
X509DataType xd = (X509DataType) get.getValue();
for (int k = 0; k < xd.getX509IssuerSerialOrX509SKIOrX509SubjectName().size(); k++) {
@@ -2052,7 +2102,7 @@ public class UddiHub {
}
for (int i = 0; i < sig.getKeyInfo().getContent().size(); i++) {
JAXBElement get = (JAXBElement) sig.getKeyInfo().getContent().get(i);
-
+
if (get.getValue() instanceof org.w3._2000._09.xmldsig_.X509DataType) {
X509DataType xd = (X509DataType) get.getValue();
for (int k = 0; k < xd.getX509IssuerSerialOrX509SKIOrX509SubjectName().size(); k++) {
@@ -2067,7 +2117,7 @@ public class UddiHub {
//this is the most supportable way to do this
BASE64Encoder encoder = new BASE64Encoder();
return encoder.encodeBuffer(cert.getEncoded());
-
+
} catch (Exception ex) {
return HandleException(ex);
}
@@ -2117,7 +2167,7 @@ public class UddiHub {
return SignatureToBase64(GettModelDetailsAsObject.getSignature().get(index));
}
break;
-
+
}
return ResourceLoader.GetResource(session, "errors.unknownentity");
}
@@ -2133,7 +2183,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
return subscription.getSubscriptions(GetToken());
}
@@ -2163,7 +2213,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
subscription.saveSubscription(GetToken(), data);
}
@@ -2194,7 +2244,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
ds.setAuthInfo(GetToken());
subscription.deleteSubscription(ds);
@@ -2230,7 +2280,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
goi.setAuthInfo(GetToken());
operationalInfo = inquiry.getOperationalInfo(goi);
@@ -2239,7 +2289,7 @@ public class UddiHub {
throw ex;
}
}
-
+
return operationalInfo.getOperationalInfo();
} catch (Exception ex) {
HandleException(ex);
@@ -2255,7 +2305,7 @@ public class UddiHub {
*/
public String GetOperationalInfo(List<OperationalInfo> info) {
StringBuilder sb = new StringBuilder();
-
+
if (info != null) {
sb.append("<table class=\"table table-hover\">");
for (int i = 0; i < info.size(); i++) {
@@ -2322,7 +2372,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
registeredInfo = publish.getRegisteredInfo(r);
@@ -2356,20 +2406,20 @@ public class UddiHub {
*/
public List<AssertionStatusItem> GetPublisherAssertions(AtomicReference<String> msg) {
List<AssertionStatusItem> out = new ArrayList<AssertionStatusItem>();
-
+
if (GetToken() == null) {
msg.set(ResourceLoader.GetResource(session, "errors.notsignedin"));
return null;
}
List<AssertionStatusItem> STATUS_COMPLETE = null;
-
+
try {
try {
STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
}
@@ -2390,10 +2440,10 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
STATUS_FROM_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
-
+
}
} else {
throw ex;
@@ -2409,14 +2459,14 @@ public class UddiHub {
try {
try {
STATUS_TO_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
-
+
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
STATUS_TO_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
-
+
}
} else {
throw ex;
@@ -2428,8 +2478,8 @@ public class UddiHub {
if (STATUS_TO_KEY_INCOMPLETE != null) {
out.addAll(STATUS_TO_KEY_INCOMPLETE);
}
-
-
+
+
return out;
//return publisherAssertions;
}
@@ -2461,7 +2511,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
dp.setAuthInfo(GetToken());
publish.deletePublisherAssertions(dp);
@@ -2501,11 +2551,11 @@ public class UddiHub {
try {
try {
publish.addPublisherAssertions(r);
-
+
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
publish.addPublisherAssertions(r);
@@ -2539,13 +2589,13 @@ public class UddiHub {
try {
try {
subscriptions = subscription.getSubscriptions(GetToken());
-
+
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
-
+
subscriptions = subscription.getSubscriptions(GetToken());
}
} else {
@@ -2555,31 +2605,31 @@ public class UddiHub {
} catch (Exception ex) {
return HandleException(ex);
}
-
-
-
+
+
+
GregorianCalendar gcal = new GregorianCalendar();
gcal.setTimeInMillis(System.currentTimeMillis());
-
+
GetSubscriptionResults r = new GetSubscriptionResults();
r.setAuthInfo(GetToken());
r.setCoveragePeriod(new CoveragePeriod());
r.getCoveragePeriod().setEndPoint(df.newXMLGregorianCalendar(gcal));
-
+
r.getCoveragePeriod().setStartPoint(lastRefresh);
StringBuilder sb = new StringBuilder();
for (int k = 0; k < subscriptions.size(); k++) {
-
+
r.setSubscriptionKey(subscriptions.get(k).getSubscriptionKey());
SubscriptionResultsList subscriptionResults = null;
try {
try {
subscriptionResults = subscription.getSubscriptionResults(r);
-
+
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
subscriptionResults = subscription.getSubscriptionResults(r);
@@ -2591,7 +2641,7 @@ public class UddiHub {
} catch (Exception ex) {
return HandleException(ex);
}
-
+
if (subscriptionResults != null) {
// subscriptionResults.getAssertionStatusReport().
if (subscriptionResults.getAssertionStatusReport() != null) {
@@ -2660,7 +2710,7 @@ public class UddiHub {
for (int i = 0; i < subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().size(); i++) {
sb.append("<tr><td>");
sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getServiceKey()));
-
+
sb.append("</td><td>");
sb.append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getName())));
sb.append("</td></tr>");
@@ -2692,7 +2742,7 @@ public class UddiHub {
}
sb.append("</table>");
}
-
+
}
}
return sb.toString();
@@ -2716,7 +2766,7 @@ public class UddiHub {
ret.offset = offset;
ret.totalrecords = 0;
try {
-
+
FindService fs = new FindService();
fs.setAuthInfo(GetToken());
fs.setMaxRows(maxrecords);
@@ -2737,7 +2787,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fs.setAuthInfo(GetToken());
findService = inquiry.findService(fs);
@@ -2746,14 +2796,14 @@ public class UddiHub {
throw ex;
}
}
-
+
if (findService == null || findService.getServiceInfos() == null) {
ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
return ret;
}
ret.displaycount = findService.getListDescription().getIncludeCount();
ret.totalrecords = findService.getListDescription().getActualCount();
-
+
GetServiceDetail gs = new GetServiceDetail();
gs.setAuthInfo(GetToken());
for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
@@ -2765,7 +2815,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
fs.setAuthInfo(GetToken());
serviceDetail = inquiry.getServiceDetail(gs);
@@ -2778,9 +2828,9 @@ public class UddiHub {
ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
return ret;
}
-
-
-
+
+
+
StringBuilder sb = new StringBuilder();
sb.append("<table class=\"table\"><tr><th>").
append("</th><th>").
@@ -2792,7 +2842,7 @@ public class UddiHub {
append("</th><th>").
append(ResourceLoader.GetResource(session, "items.accesspoint.value")).
append("</th></tr>");
-
+
for (int i = 0; i < serviceDetail.getBusinessService().size(); i++) {
// System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size());
if (serviceDetail.getBusinessService().get(i).getBindingTemplates() != null) {
@@ -2824,7 +2874,7 @@ public class UddiHub {
}
}
}
-
+
sb.append("</table>");
ret.renderedHtml = sb.toString();
return ret;
@@ -2832,7 +2882,7 @@ public class UddiHub {
ret.renderedHtml = HandleException(ex);
}
return ret;
-
+
}
/**
@@ -2870,7 +2920,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
custody.getTransferToken(GetToken(), keys, nodeid, outExpires, outToken);
}
@@ -2880,7 +2930,7 @@ public class UddiHub {
}
} catch (Exception ex) {
return HandleException(ex);
-
+
}
return null;//"Success";
}
@@ -2908,14 +2958,14 @@ public class UddiHub {
DiscardTransferToken r = new DiscardTransferToken();
r.setAuthInfo(GetToken());
r.setTransferToken(JAXB.unmarshal(new StringReader(tokenxml), TransferToken.class));
-
+
try {
try {
custody.discardTransferToken(r);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
r.setAuthInfo(GetToken());
custody.discardTransferToken(r);
@@ -2946,13 +2996,13 @@ public class UddiHub {
te.setTransferToken(JAXB.unmarshal(sr, TransferToken.class));
sr = new StringReader(keyBagXML.trim());
te.setKeyBag(JAXB.unmarshal(sr, org.uddi.custody_v3.KeyBag.class));
-
+
try {
custody.transferEntities(te);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
te.setAuthInfo(GetToken());
custody.transferEntities(te);
@@ -3015,7 +3065,7 @@ public class UddiHub {
}
return "Unknown error";
}
-
+
private String SendAdvancedQueryInquiry(String method, Object request) {
Object response = null;
try {
@@ -3026,7 +3076,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((FindBinding) request).setAuthInfo(GetToken());
response = inquiry.findBinding((FindBinding) request);
@@ -3043,7 +3093,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((FindBusiness) request).setAuthInfo(GetToken());
response = inquiry.findBusiness((FindBusiness) request);
@@ -3052,7 +3102,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("findService")) {
((FindService) request).setAuthInfo(GetToken());
@@ -3061,7 +3111,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((FindService) request).setAuthInfo(GetToken());
response = inquiry.findService((FindService) request);
@@ -3070,7 +3120,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("findRelatedBusines")) {
((FindRelatedBusinesses) request).setAuthInfo(GetToken());
@@ -3079,7 +3129,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((FindRelatedBusinesses) request).setAuthInfo(GetToken());
response = inquiry.findRelatedBusinesses((FindRelatedBusinesses) request);
@@ -3088,17 +3138,17 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("findTModel")) {
((FindTModel) request).setAuthInfo(GetToken());
-
+
try {
response = inquiry.findTModel((FindTModel) request);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((FindTModel) request).setAuthInfo(GetToken());
response = inquiry.findTModel((FindTModel) request);
@@ -3107,7 +3157,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getBindingDetail")) {
((GetBindingDetail) request).setAuthInfo(GetToken());
@@ -3116,7 +3166,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((GetBindingDetail) request).setAuthInfo(GetToken());
response = inquiry.getBindingDetail((GetBindingDetail) request);
@@ -3125,17 +3175,17 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getBusinessDetail")) {
((GetBusinessDetail) request).setAuthInfo(GetToken());
-
+
try {
response = inquiry.getBusinessDetail((GetBusinessDetail) request);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((GetBusinessDetail) request).setAuthInfo(GetToken());
response = inquiry.getBusinessDetail((GetBusinessDetail) request);
@@ -3144,17 +3194,17 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getServiceDetail")) {
((GetServiceDetail) request).setAuthInfo(GetToken());
-
+
try {
response = inquiry.getServiceDetail((GetServiceDetail) request);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((GetServiceDetail) request).setAuthInfo(GetToken());
response = inquiry.getServiceDetail((GetServiceDetail) request);
@@ -3163,7 +3213,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getOperationalInfo")) {
((GetOperationalInfo) request).setAuthInfo(GetToken());
@@ -3173,7 +3223,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
response = inquiry.findBinding((FindBinding) request);
}
@@ -3181,7 +3231,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getTModelDetail")) {
((GetTModelDetail) request).setAuthInfo(GetToken());
@@ -3191,7 +3241,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
response = inquiry.findBinding((FindBinding) request);
}
@@ -3210,7 +3260,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String SendAdvancedQueryPublish(String method, Object request) {
Object response = null;
try {
@@ -3221,7 +3271,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((AddPublisherAssertions) request).setAuthInfo(GetToken());
publish.addPublisherAssertions((AddPublisherAssertions) request);
@@ -3238,7 +3288,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((DeleteBinding) request).setAuthInfo(GetToken());
publish.deleteBinding((DeleteBinding) request);
@@ -3255,7 +3305,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((DeleteBusiness) request).setAuthInfo(GetToken());
publish.deleteBusiness((DeleteBusiness) request);
@@ -3272,7 +3322,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((DeleteBusiness) request).setAuthInfo(GetToken());
publish.deletePublisherAssertions((DeletePublisherAssertions) request);
@@ -3289,7 +3339,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((DeleteBusiness) request).setAuthInfo(GetToken());
publish.deleteService((DeleteService) request);
@@ -3306,7 +3356,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((DeleteTModel) request).setAuthInfo(GetToken());
publish.deleteTModel((DeleteTModel) request);
@@ -3323,7 +3373,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
response = publish.getAssertionStatusReport(GetToken(), stat);
}
@@ -3331,7 +3381,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (method.equalsIgnoreCase("getPublisherAssertions")) {
try {
@@ -3339,7 +3389,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
response = publish.getPublisherAssertions(GetToken());
}
@@ -3355,7 +3405,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((GetRegisteredInfo) request).setAuthInfo(GetToken());
publish.getRegisteredInfo((GetRegisteredInfo) request);
@@ -3372,7 +3422,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((SaveBinding) request).setAuthInfo(GetToken());
publish.saveBinding((SaveBinding) request);
@@ -3389,7 +3439,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((SaveBusiness) request).setAuthInfo(GetToken());
publish.saveBusiness((SaveBusiness) request);
@@ -3406,7 +3456,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((SaveTModel) request).setAuthInfo(GetToken());
publish.saveTModel((SaveTModel) request);
@@ -3423,7 +3473,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((SaveService) request).setAuthInfo(GetToken());
publish.saveService((SaveService) request);
@@ -3442,7 +3492,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
((SetPublisherAssertions) request).setAuthInfo(GetToken());
publish.setPublisherAssertions(GetToken(), list);
@@ -3452,7 +3502,7 @@ public class UddiHub {
throw ex;
}
}
-
+
}
if (response == null) {
return "The operation completed without error";
@@ -3464,11 +3514,11 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+
private String SendAdvancedQueryCustody(String method, Object request) {
Object response = null;
try {
-
+
if (method.equalsIgnoreCase("discardTransferToken")) {
try {
((DiscardTransferToken) request).setAuthInfo(GetToken());
@@ -3476,7 +3526,7 @@ public class UddiHub {
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
[... 91 lines stripped ...]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org