Author: kstam
Date: Fri Sep 30 05:34:34 2011
New Revision: 1177512
URL: http://svn.apache.org/viewvc?rev=1177512&view=rev
Log:
JUDDI-532 fixing nullpointer and refreshing when an deleted service is selected
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java?rev=1177512&r1=1177511&r2=1177512&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
Fri Sep 30 05:34:34 2011
@@ -161,6 +161,7 @@ public class DetailPanel extends FlowPa
}
} else {
Window.alert("error: " +
response.getMessage());
+ Window.Location.reload();
}
}
});
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java?rev=1177512&r1=1177511&r2=1177512&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
Fri Sep 30 05:34:34 2011
@@ -16,11 +16,13 @@
*/
package org.apache.juddi.portlets.server.service;
+import java.lang.reflect.UndeclaredThrowableException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import javax.xml.ws.soap.SOAPFaultException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,12 +39,14 @@ import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetBusinessDetail;
import org.uddi.api_v3.GetServiceDetail;
import org.uddi.api_v3.GetTModelDetail;
import org.uddi.api_v3.ServiceDetail;
import org.uddi.api_v3.TModel;
import org.uddi.api_v3.TModelDetail;
+import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIInquiryPortType;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -55,38 +59,38 @@ public class InquiryServiceImpl extends
private static final long serialVersionUID = 8509627428299232161L;
private Log logger = LogFactory.getLog(this.getClass());
-
+
public InquiryServiceImpl() {
super();
-
+
}
public SearchResponse queryJUDDI(String query) {
HttpServletRequest request = this.getThreadLocalRequest();
HttpSession session = request.getSession();
SearchResponse response = new SearchResponse();
- try {
- Transport transport =
WebHelper.getTransport(session.getServletContext());
- UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
-
org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService uis =
- new
org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService();
- String reply = uis.inquire(inquiryService, query);
- response.setMessage(reply);
- response.setSuccess(true);
- } catch (Exception e) {
- logger.error("Could not obtain token. " + e.getMessage(), e);
- response.setSuccess(false);
- response.setMessage(e.getMessage());
- response.setErrorCode("102");
- } catch (Throwable t) {
- logger.error("Could not obtain token. " + t.getMessage(), t);
- response.setSuccess(false);
- response.setMessage(t.getMessage());
- response.setErrorCode("102");
- }
- return response;
+ try {
+ Transport transport =
WebHelper.getTransport(session.getServletContext());
+ UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
+
org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService uis =
+ new
org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService();
+ String reply = uis.inquire(inquiryService, query);
+ response.setMessage(reply);
+ response.setSuccess(true);
+ } catch (Exception e) {
+ logger.error("Could not obtain token. " +
e.getMessage(), e);
+ response.setSuccess(false);
+ response.setMessage(e.getMessage());
+ response.setErrorCode("102");
+ } catch (Throwable t) {
+ logger.error("Could not obtain token. " +
t.getMessage(), t);
+ response.setSuccess(false);
+ response.setMessage(t.getMessage());
+ response.setErrorCode("102");
+ }
+ return response;
}
-
+
public InquiryResponse getTModelDetail(String authToken, String
tModelKey)
{
HttpServletRequest request = this.getThreadLocalRequest();
@@ -98,121 +102,140 @@ public class InquiryServiceImpl extends
logger.debug("TModelDetail " + getTModelDetail + " sending
tmodelDetail request..");
Map<String,String> tmodelDetailMap = new
HashMap<String,String>();
try {
- Transport transport =
WebHelper.getTransport(session.getServletContext());
- UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
- TModelDetail tmodelDetail =
inquiryService.getTModelDetail(getTModelDetail);
- //demo code fix up what to return for real.
- for (TModel tmodel : tmodelDetail.getTModel()) {
-
tmodelDetailMap.put("name",tmodel.getName().getValue());
- }
- response.setSuccess(true);
-
- } catch (Exception e) {
- logger.error("Could not obtain token. " + e.getMessage(), e);
- response.setSuccess(false);
- response.setMessage(e.getMessage());
- response.setErrorCode("102");
- } catch (Throwable t) {
- logger.error("Could not obtain token. " + t.getMessage(), t);
- response.setSuccess(false);
- response.setMessage(t.getMessage());
- response.setErrorCode("102");
- }
- return response;
+ Transport transport =
WebHelper.getTransport(session.getServletContext());
+ UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
+ TModelDetail tmodelDetail =
inquiryService.getTModelDetail(getTModelDetail);
+ //demo code fix up what to return for real.
+ for (TModel tmodel : tmodelDetail.getTModel()) {
+
tmodelDetailMap.put("name",tmodel.getName().getValue());
+ }
+ response.setSuccess(true);
+
+ } catch (Exception e) {
+ logger.error("Could not obtain token. " +
e.getMessage(), e);
+ response.setSuccess(false);
+ response.setMessage(e.getMessage());
+ response.setErrorCode("102");
+ } catch (Throwable t) {
+ logger.error("Could not obtain token. " +
t.getMessage(), t);
+ response.setSuccess(false);
+ response.setMessage(t.getMessage());
+ response.setErrorCode("102");
+ }
+ return response;
}
-
+
public InquiryResponse getBusinessDetail(String authToken, String
businessKey)
{
HttpServletRequest request = this.getThreadLocalRequest();
HttpSession session = request.getSession();
String lang = request.getLocale().getLanguage();
-
+
GetBusinessDetail getBusinessDetail = new GetBusinessDetail();
getBusinessDetail.setAuthInfo(authToken);
getBusinessDetail.getBusinessKey().add(businessKey);
InquiryResponse response = new InquiryResponse();
logger.debug("BusinessDetail " + getBusinessDetail + " sending
businessDetail request..");
try {
- Transport transport =
WebHelper.getTransport(session.getServletContext());
- UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
- BusinessDetail businessDetail =
inquiryService.getBusinessDetail(getBusinessDetail);
- for (BusinessEntity businessEntity :
businessDetail.getBusinessEntity()) {
- Business business = new Business(
- businessEntity.getBusinessKey(),
-
EntityForLang.getName(businessEntity.getName(),lang).getValue(),
-
EntityForLang.getDescription(businessEntity.getDescription(),lang).getValue());
- if (businessEntity.getBusinessServices()!=null) {
- for (BusinessService businessService :
businessEntity.getBusinessServices().getBusinessService()) {
- Service service = new Service(
-
businessService.getServiceKey(),
-
EntityForLang.getName(businessService.getName(),lang).getValue(),
-
EntityForLang.getDescription(businessService.getDescription(),lang).getValue());
- business.getServices().add(service);
- }
- }
- //for (Contact contact :
businessEntity.getContacts().getContact()) {
- //contact.get
- //}
- response.setBusiness(business);
- }
-
- response.setSuccess(true);
- } catch (Exception e) {
- logger.error("Could not obtain token. " + e.getMessage(), e);
- response.setSuccess(false);
- response.setMessage(e.getMessage());
- response.setErrorCode("102");
- } catch (Throwable t) {
- logger.error("Could not obtain token. " + t.getMessage(), t);
- response.setSuccess(false);
- response.setMessage(t.getMessage());
- response.setErrorCode("102");
- }
- return response;
+ Transport transport =
WebHelper.getTransport(session.getServletContext());
+ UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
+ BusinessDetail businessDetail =
inquiryService.getBusinessDetail(getBusinessDetail);
+ for (BusinessEntity businessEntity :
businessDetail.getBusinessEntity()) {
+ Business business = new Business(
+ businessEntity.getBusinessKey(),
+
EntityForLang.getName(businessEntity.getName(),lang).getValue(),
+
EntityForLang.getDescription(businessEntity.getDescription(),lang).getValue());
+ if (businessEntity.getBusinessServices()!=null)
{
+ for (BusinessService businessService :
businessEntity.getBusinessServices().getBusinessService()) {
+ Service service = new Service(
+
businessService.getServiceKey(),
+
EntityForLang.getName(businessService.getName(),lang).getValue(),
+
EntityForLang.getDescription(businessService.getDescription(),lang).getValue());
+
business.getServices().add(service);
+ }
+ }
+ //for (Contact contact :
businessEntity.getContacts().getContact()) {
+ //contact.get
+ //}
+ response.setBusiness(business);
+ }
+
+ response.setSuccess(true);
+ } catch (Exception e) {
+ logger.error("Could not obtain token. " +
e.getMessage(), e);
+ response.setSuccess(false);
+ response.setMessage(e.getMessage());
+ response.setErrorCode("102");
+ } catch (Throwable t) {
+ logger.error("Could not obtain token. " +
t.getMessage(), t);
+ response.setSuccess(false);
+ response.setMessage(t.getMessage());
+ response.setErrorCode("102");
+ }
+ return response;
}
-
+
public InquiryResponse getServiceDetail(String authToken, String
serviceKey)
{
HttpServletRequest request = this.getThreadLocalRequest();
HttpSession session = request.getSession();
String lang = request.getLocale().getLanguage();
-
+
GetServiceDetail getServiceDetail = new GetServiceDetail();
getServiceDetail.setAuthInfo(authToken);
getServiceDetail.getServiceKey().add(serviceKey);
InquiryResponse response = new InquiryResponse();
logger.debug("ServiceDetail " + getServiceDetail + " sending
serviceDetail request..");
+ DispositionReport report = null;
+ String message = null;
try {
- Transport transport =
WebHelper.getTransport(session.getServletContext());
- UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
- ServiceDetail serviceDetail =
inquiryService.getServiceDetail(getServiceDetail);
- for (BusinessService businessService :
serviceDetail.getBusinessService()) {
- Service service = new Service(
- businessService.getServiceKey(),
-
EntityForLang.getName(businessService.getName(),lang).getValue(),
-
EntityForLang.getDescription(businessService.getDescription(),lang).getValue());
- for (BindingTemplate bindingTemplate :
businessService.getBindingTemplates().getBindingTemplate()) {
- ServiceBinding serviceBinding = new
ServiceBinding(
-
bindingTemplate.getBindingKey(),
-
bindingTemplate.getAccessPoint().getValue(),
-
EntityForLang.getDescription(bindingTemplate.getDescription(),lang).getValue(),
-
bindingTemplate.getAccessPoint().getUseType());
-
service.getServiceBindings().add(serviceBinding);
- }
- response.setService(service);
- }
- response.setSuccess(true);
- } catch (Exception e) {
- logger.error("Could not obtain token. " + e.getMessage(), e);
- response.setSuccess(false);
- response.setMessage(e.getMessage());
- response.setErrorCode("102");
- } catch (Throwable t) {
- logger.error("Could not obtain token. " + t.getMessage(), t);
- response.setSuccess(false);
- response.setMessage(t.getMessage());
- response.setErrorCode("102");
- }
- return response;
+ Transport transport =
WebHelper.getTransport(session.getServletContext());
+ UDDIInquiryPortType inquiryService =
transport.getUDDIInquiryService();
+ ServiceDetail serviceDetail =
inquiryService.getServiceDetail(getServiceDetail);
+ for (BusinessService businessService :
serviceDetail.getBusinessService()) {
+ Service service = new Service(
+ businessService.getServiceKey(),
+
EntityForLang.getName(businessService.getName(),lang).getValue(),
+
EntityForLang.getDescription(businessService.getDescription(),lang).getValue());
+ if
(businessService.getBindingTemplates()!=null) {
+ for (BindingTemplate bindingTemplate :
businessService.getBindingTemplates().getBindingTemplate()) {
+ ServiceBinding serviceBinding =
new ServiceBinding(
+
bindingTemplate.getBindingKey(),
+
bindingTemplate.getAccessPoint().getValue(),
+
EntityForLang.getDescription(bindingTemplate.getDescription(),lang).getValue(),
+
bindingTemplate.getAccessPoint().getUseType());
+
service.getServiceBindings().add(serviceBinding);
+ }
+ }
+ response.setService(service);
+ }
+ response.setSuccess(true);
+ } catch (DispositionReportFaultMessage dr) {
+ report =
DispositionReportFaultMessage.getDispositionReport(dr);
+ message = "";
+ } catch (SOAPFaultException sfe) {
+ report =
DispositionReportFaultMessage.getDispositionReport(sfe);
+ message = "";
+ } catch (UndeclaredThrowableException ute) {
+ report =
DispositionReportFaultMessage.getDispositionReport(ute);
+ message = "";
+ } catch (Exception e) {
+ logger.error("Could not obtain token. " +
e.getMessage(), e);
+ response.setSuccess(false);
+ response.setMessage(e.getMessage());
+ response.setErrorCode("102");
+ } catch (Throwable t) {
+ logger.error("Could not obtain token. " +
t.getMessage(), t);
+ response.setSuccess(false);
+ response.setMessage(t.getMessage());
+ response.setErrorCode("102");
+ }
+ if (report!=null || message!=null) {
+ response.setSuccess(false);
+ response.setMessage("Invalid ServiceKey");
+ response.setErrorCode("103");
+ }
+ return response;
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@juddi.apache.org
For additional commands, e-mail: commits-h...@juddi.apache.org
