You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/04/18 19:28:22 UTC

svn commit: r766361 - in /webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets: client/ client/model/ client/service/ server/service/

Author: kstam
Date: Sat Apr 18 17:28:22 2009
New Revision: 766361

URL: http://svn.apache.org/viewvc?rev=766361&view=rev
Log:
juddi 201 adding DetailPanel

Modified:
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/BusinessTreePanel.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/ServiceBinding.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/BusinessTreePanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/BusinessTreePanel.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/BusinessTreePanel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/BusinessTreePanel.java Sat Apr 18 17:28:22 2009
@@ -18,6 +18,7 @@
 
 public class BusinessTreePanel extends Composite implements TreeListener {
 
+	private static String SERVICES_LABEL="Services owned by this business";
 	private Tree publisherTree;
 	private PublicationServiceAsync publicationService = (PublicationServiceAsync) GWT.create(PublicationService.class);
 	UDDIBrowser browser = null;
@@ -47,15 +48,9 @@
 						TreeItem businessTree = new TreeItem(UDDIBrowser.images.business().getHTML() + " " + business.getName());
 						businessTree.setStyleName("portlet-form-field-label");
 						businessTree.setState(true);
-						
-						TreeItem keyItem = new TreeItem(UDDIBrowser.images.key().getHTML() + " " + business.getKey());
-						keyItem.setStyleName("portlet-form-field-label");
-						businessTree.addItem(keyItem);
-						
-						TreeItem descriptionItem = new TreeItem(UDDIBrowser.images.description().getHTML() + " " + business.getDescription());
-						descriptionItem.setStyleName("portlet-form-field-label");
-						businessTree.addItem(descriptionItem);
-						TreeItem serviceTree = new TreeItem(UDDIBrowser.images.services().getHTML() + " Services owned by this business");
+						businessTree.setUserObject(business);
+						TreeItem serviceTree = new TreeItem(UDDIBrowser.images.services().getHTML() + SERVICES_LABEL);
+						serviceTree.setUserObject(business);
 						for (Service service : business.getServices()) {
 							TreeItem serviceItem = new TreeItem(UDDIBrowser.images.service().getHTML() + " " + service.getName());
 							serviceItem.setStyleName("portlet-form-field-label");
@@ -81,7 +76,14 @@
 			Service service = (Service) treeItem.getUserObject();
 			browser.getDetailPanel().setVisible(true);
 			browser.getDetailPanel().displayService(service.getKey());
-			
+		} else if (treeItem.getUserObject()!=null && Business.class.equals(treeItem.getUserObject().getClass())) {
+			Business business = (Business) treeItem.getUserObject();
+			browser.getDetailPanel().setVisible(true);
+			if (SERVICES_LABEL.equals(treeItem.getText())) {
+				browser.getDetailPanel().displayServices(business.getKey());
+			} else {
+				browser.getDetailPanel().displayBusiness(business.getKey());
+			}
 		}
 	}
 

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java Sat Apr 18 17:28:22 2009
@@ -1,5 +1,6 @@
 package org.apache.juddi.portlets.client;
 
+import org.apache.juddi.portlets.client.model.Business;
 import org.apache.juddi.portlets.client.model.Service;
 import org.apache.juddi.portlets.client.model.ServiceBinding;
 import org.apache.juddi.portlets.client.service.InquiryResponse;
@@ -17,24 +18,81 @@
 
 	private InquiryServiceAsync inquiryService = (InquiryServiceAsync) GWT.create(InquiryService.class); 
 	private UDDIBrowser browser = null;
-	private FlexTable table = null;
+	private DetailPanel detailPanel = null;
+	FlexTable table = null;
 
 	public DetailPanel(UDDIBrowser browser) {
 		this.browser = browser;
-		table = new FlexTable();
-		table.setTitle("Service");
-		this.add(table);
+		detailPanel = this;
 	}
+	
+	public void displayServices( String businessKey) {
+		inquiryService.getBusinessDetail(browser.getToken(), businessKey, new AsyncCallback<InquiryResponse>() {
+			public void onFailure(Throwable caught) {
+				Window.alert("Could not connect to the UDDI registry.");
+			}
 
-	public void displayService(String key) {
-		System.out.println("Going to fetch the Service and Display it");
-		getService(browser.getToken(), key);
+			public void onSuccess(InquiryResponse response) {
+				if (response.isSuccess()) {
+					Business business = response.getBusiness();
+					if (table!=null) detailPanel.remove(table);
+					table = new FlexTable();
+					detailPanel.add(table);
+					int row = 0;
+					for (Service service : business.getServices()) {
+						table.getFlexCellFormatter().setColSpan(row, 0, 2);
+						table.setText(row++, 0, "service");
+						table.setHTML(row, 0, UDDIBrowser.images.service().getHTML());
+						table.setText(row++, 1, service.getName());
+						table.setHTML(row, 0, UDDIBrowser.images.key().getHTML());
+						table.setText(row++, 1, service.getKey());
+						table.setHTML(row, 0, UDDIBrowser.images.description().getHTML());
+						table.setHTML(row++, 1, service.getDescription());
+					}
+				} else {
+					Window.alert("error: " + response.getMessage() 
+							+ ". Make sure the UDDI service is up and running.");
+				}
+			}
+		});
+	}
+	
+	public void displayBusiness( String businessKey) {
+		inquiryService.getBusinessDetail(browser.getToken(), businessKey, new AsyncCallback<InquiryResponse>() {
+			public void onFailure(Throwable caught) {
+				Window.alert("Could not connect to the UDDI registry.");
+			}
 
+			public void onSuccess(InquiryResponse response) {
+				if (response.isSuccess()) {
+					Business business = response.getBusiness();
+					if (table!=null) detailPanel.remove(table);
+					table = new FlexTable();
+					detailPanel.add(table);
+					//table.setBorderWidth(1);
+					int row = 0;
+					table.getFlexCellFormatter().setColSpan(row, 0, 2);
+					table.setText(row++, 0, "business");
+					table.setHTML(row, 0, UDDIBrowser.images.business().getHTML());
+					table.setText(row++, 1, business.getName());
+					table.setHTML(row, 0, UDDIBrowser.images.key().getHTML());
+					table.setText(row++, 1, business.getKey());
+					table.setHTML(row, 0, UDDIBrowser.images.description().getHTML());
+					table.setText(row++, 1, business.getDescription());
+					
+					//Business Contact
+					
+				} else {
+					Window.alert("error: " + response.getMessage() 
+							+ ". Make sure the UDDI service is up and running.");
+				}
+			}
+		});
 	}
 
-	private void getService(String token, String serviceKey) {
+	public void displayService(String serviceKey) {
 
-		inquiryService.getServiceDetail(token, serviceKey, new AsyncCallback<InquiryResponse>() {
+		inquiryService.getServiceDetail(browser.getToken(), serviceKey, new AsyncCallback<InquiryResponse>() {
 			public void onFailure(Throwable caught) {
 				Window.alert("Could not connect to the UDDI registry.");
 			}
@@ -42,19 +100,29 @@
 			public void onSuccess(InquiryResponse response) {
 				if (response.isSuccess()) {
 					Service service = response.getService();
+					if (table!=null) detailPanel.remove(table);
+					table = new FlexTable();
+					detailPanel.add(table);
+					//table.setBorderWidth(1);
+					int row = 0;
+					table.getFlexCellFormatter().setColSpan(row, 0, 2);
+					table.setHTML(row++, 0, UDDIBrowser.images.service().getHTML() + " service - " + service.getName());
+					table.setHTML(row, 0, UDDIBrowser.images.key().getHTML());
+					table.setText(row++, 1, service.getKey());
+					table.setHTML(row, 0, UDDIBrowser.images.description().getHTML());
+					table.setText(row++, 1, service.getDescription());
 					
-					table.setText(0, 0, service.getName());
-					table.getFlexCellFormatter().setColSpan(0, 0, 2);
-					table.setHTML(1, 0, UDDIBrowser.images.key().getHTML() + " " + service.getKey());
-					table.getFlexCellFormatter().setColSpan(1, 0, 2);
-					table.setHTML(2, 0, UDDIBrowser.images.description().getHTML() + " " + service.getDescription());
-					table.getFlexCellFormatter().setColSpan(2, 0, 2);
-					int row = 4;
 					for (ServiceBinding serviceBinding : service.getServiceBindings()) {
-						table.setText(row, 0, "EPR");
-						table.setHTML(row, 1, new HTML("<a href='" + serviceBinding.getAccessPoint() + "'>" + serviceBinding.getAccessPoint() + "</a>").getHTML());
-						table.setText(++row, 0, "Description");
+						table.getFlexCellFormatter().setColSpan(row, 0, 2);
+						table.setText(row++, 0, "binding");
+						table.setHTML(row, 0, UDDIBrowser.images.key().getHTML());
+						table.setText(row++, 1, serviceBinding.getKey());
+						table.setHTML(row, 0, UDDIBrowser.images.description().getHTML());
 						table.setText(row++, 1,  serviceBinding.getDescription());
+						table.setText(row, 0, serviceBinding.getUrlType());
+						table.setHTML(row++, 1, new HTML("<a href='" 
+								+ serviceBinding.getAccessPoint() + "'>" 
+								+ serviceBinding.getAccessPoint() + "</a>").getHTML());
 					}
 				} else {
 					Window.alert("error: " + response.getMessage() 

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java Sat Apr 18 17:28:22 2009
@@ -120,7 +120,7 @@
 					}
 				} else {
 					//browser.getBrowsePanel().add(browser.getLoginPanel());
-					Window.alert("error: " + response.getMessage() + ". Make sure the UDDI server is up and running?");
+					Window.alert("error: " + response.getMessage() + ". Make sure the UDDI server is up and running.");
 				}
 			}
 		});

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java Sat Apr 18 17:28:22 2009
@@ -5,20 +5,23 @@
 import java.util.List;
 
 public class Business implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
 
+	private String key;
+	private String name;
+	private String description;
+	private List<Service> services = new ArrayList<Service>();
 	public Business() {}
 		
-	public Business(String name) {
+	public Business(String key, String name, String description) {
 		super();
+		this.key = key;
 		this.name = name;
+		this.description = description;
 	}
 
-	private static final long serialVersionUID = 1L;
-
-	private String name;
-	private String key;
-	private String description;
-	private List<Service> services = new ArrayList<Service>();
+	
 
 	public List<Service> getServices() {
 		return services;

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java Sat Apr 18 17:28:22 2009
@@ -8,23 +8,23 @@
 
 	private static final long serialVersionUID = 1L;
 
-	private String name;
 	private String key;
+	private String name;
 	private String description;
 	private Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
 
 	public Service() {}
 		
-	public Service(String name, String key) {
+	public Service(String key, String name) {
 		super();
-		this.name = name;
 		this.key = key;
+		this.name = name;
 	}
 	
-	public Service(String name, String key, String description) {
+	public Service(String key, String name, String description) {
 		super();
-		this.name = name;
 		this.key = key;
+		this.name = name;
 		this.description = description;
 	}
 

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/ServiceBinding.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/ServiceBinding.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/ServiceBinding.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/ServiceBinding.java Sat Apr 18 17:28:22 2009
@@ -5,16 +5,19 @@
 public class ServiceBinding implements Serializable{
 
 	private static final long serialVersionUID = 1L;
-
+    private String key;
 	private String accessPoint;
 	private String description;
+	private String urlType;
 
 	public ServiceBinding() {}
 		
-	public ServiceBinding(String accessPoint, String description) {
+	public ServiceBinding(String key, String accessPoint, String description, String urlType) {
 		super();
+		this.key = key;
 		this.accessPoint = accessPoint;
 		this.description = description;
+		this.urlType = urlType;
 	}
 
 	public String getAccessPoint() {
@@ -32,4 +35,20 @@
 	public void setDescription(String description) {
 		this.description = description;
 	}
+
+	public String getUrlType() {
+		return urlType;
+	}
+
+	public void setUrlType(String urlType) {
+		this.urlType = urlType;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
 }

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java Sat Apr 18 17:28:22 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.juddi.portlets.client.service;
 
+import org.apache.juddi.portlets.client.model.Business;
 import org.apache.juddi.portlets.client.model.Service;
 /**
  * 
@@ -26,6 +27,7 @@
 	
 	private static final long serialVersionUID = 1L;
 	private Service service;
+	private Business business;
 	
 	public Service getService() {
 		return service;
@@ -33,5 +35,11 @@
 	public void setService(Service service) {
 		this.service = service;
 	}
+	public Business getBusiness() {
+		return business;
+	}
+	public void setBusiness(Business business) {
+		this.business = business;
+	}
 
 }

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java Sat Apr 18 17:28:22 2009
@@ -28,4 +28,5 @@
 	
 	public InquiryResponse getTModelDetail(String authToken, String tModelKey);
 	public InquiryResponse getServiceDetail(String authToken, String serviceKey);
+	public InquiryResponse getBusinessDetail(String authToken, String businessKey); 
 }

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java Sat Apr 18 17:28:22 2009
@@ -26,5 +26,6 @@
 public interface InquiryServiceAsync extends RemoteService {
 	public void getTModelDetail(String authToken, String tModelKey, AsyncCallback<InquiryResponse> callback);
 	public void getServiceDetail(String authToken, String serviceKey, AsyncCallback<InquiryResponse> callback);
+	public void getBusinessDetail(String authToken, String businessKey, AsyncCallback<InquiryResponse> callback);
 }
 

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java Sat Apr 18 17:28:22 2009
@@ -22,6 +22,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.portlets.client.model.Business;
 import org.apache.juddi.portlets.client.model.Service;
 import org.apache.juddi.portlets.client.model.ServiceBinding;
 import org.apache.juddi.portlets.client.service.InquiryResponse;
@@ -29,7 +30,10 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Loader;
 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.GetBusinessDetail;
 import org.uddi.api_v3.GetServiceDetail;
 import org.uddi.api_v3.GetTModelDetail;
 import org.uddi.api_v3.ServiceDetail;
@@ -102,6 +106,52 @@
 		 return response;
 	}
 	
+	public InquiryResponse getBusinessDetail(String authToken, String businessKey) 
+	{
+		HttpServletRequest request = this.getThreadLocalRequest();
+		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 {
+        	 UDDIInquiryPortType inquiryService = getTransport().getInquiryService();
+        	 BusinessDetail businessDetail = inquiryService.getBusinessDetail(getBusinessDetail);
+        	 for (BusinessEntity businessEntity : businessDetail.getBusinessEntity()) {
+        		 Business business = new Business(
+        				 businessEntity.getBusinessKey(),
+        				 EntityForLang.get(businessEntity.getName(),lang).getValue(),
+        				 EntityForLang.get(businessEntity.getDescription(),lang).getValue());
+        		 for (BusinessService businessService : businessEntity.getBusinessServices().getBusinessService()) {
+        			 Service service = new Service(
+        					 businessService.getServiceKey(),
+        					 EntityForLang.get(businessService.getName(),lang).getValue(),
+        					 EntityForLang.get(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();
@@ -115,16 +165,17 @@
 		try {
         	 UDDIInquiryPortType inquiryService = getTransport().getInquiryService();
         	 ServiceDetail serviceDetail = inquiryService.getServiceDetail(getServiceDetail);
-        	 //demo code fix up what to return for real.
         	 for (BusinessService businessService : serviceDetail.getBusinessService()) {
         		 Service service = new Service(
-        				 EntityForLang.get(businessService.getName(),lang).getValue(),
         				 businessService.getServiceKey(),
+        				 EntityForLang.get(businessService.getName(),lang).getValue(),
         				 EntityForLang.get(businessService.getDescription(),lang).getValue());
         		 for (BindingTemplate bindingTemplate : businessService.getBindingTemplates().getBindingTemplate()) {
         			 ServiceBinding serviceBinding = new ServiceBinding(
+        					 bindingTemplate.getBindingKey(),
         					 bindingTemplate.getAccessPoint().getValue(),
-        					 EntityForLang.get(bindingTemplate.getDescription(),lang).getValue());
+        					 EntityForLang.get(bindingTemplate.getDescription(),lang).getValue(),
+        					 bindingTemplate.getAccessPoint().getUseType());
         			 service.getServiceBindings().add(serviceBinding);
         		 }
         		 response.setService(service);

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java?rev=766361&r1=766360&r2=766361&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java Sat Apr 18 17:28:22 2009
@@ -68,12 +68,15 @@
         	 UDDIPublicationPortType publicationService = transport.getPublishService();
         	 RegisteredInfo info = publicationService.getRegisteredInfo(getRegistrationInfo);
         	 for (BusinessInfo businessInfo : info.getBusinessInfos().getBusinessInfo()) {
-				Business business = new Business(EntityForLang.get(businessInfo.getName(),lang).getValue());
-				business.setKey(businessInfo.getBusinessKey());
-				business.setDescription(EntityForLang.get(businessInfo.getDescription(),lang).getValue());
+				Business business = new Business(
+						businessInfo.getBusinessKey(),
+						EntityForLang.get(businessInfo.getName(),lang).getValue(),
+						EntityForLang.get(businessInfo.getDescription(),lang).getValue());
 				List<Service> services = new ArrayList<Service>();
 				for (ServiceInfo serviceInfo : businessInfo.getServiceInfos().getServiceInfo()) {
-					Service service = new Service(EntityForLang.get(serviceInfo.getName(), lang).getValue(), serviceInfo.getServiceKey());
+					Service service = new Service(
+							serviceInfo.getServiceKey(),
+							EntityForLang.get(serviceInfo.getName(), lang).getValue());
 					services.add(service);
 				}
 				business.setServices(services);



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org