juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r760306 - in /webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets: ./ client/ client/model/ client/service/ server/ server/service/
Date Tue, 31 Mar 2009 03:41:08 GMT
Author: kstam
Date: Tue Mar 31 03:41:06 2009
New Revision: 760306

URL: http://svn.apache.org/viewvc?rev=760306&view=rev
Log:
JUDDI-201 adding business tree control to the uddi-browser

Added:
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/
    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/service/
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
  (contents, props changed)
      - copied, changed from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
  (contents, props changed)
      - copied, changed from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
  (contents, props changed)
      - copied, changed from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationResponse.java
  (contents, props changed)
      - copied, changed from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationService.java
  (contents, props changed)
      - copied, changed from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationServiceAsync.java
  (contents, props changed)
      - copied, changed from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/Response.java
  (contents, props changed)
      - copied, changed from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Response.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityResponse.java
  (contents, props changed)
      - copied, changed from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java
      - copied, changed from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java
      - copied, changed from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
  (contents, props changed)
      - copied, changed from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/InquiryServiceImpl.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
  (contents, props changed)
      - copied, changed from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/PublicationServiceImpl.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
      - copied, changed from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/SecurityServiceImpl.java
Removed:
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Response.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityResponse.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityService.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityServiceAsync.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/InquiryServiceImpl.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/PublicationServiceImpl.java
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/SecurityServiceImpl.java
Modified:
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDIBrowser.java

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml?rev=760306&r1=760305&r2=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
Tue Mar 31 03:41:06 2009
@@ -9,8 +9,8 @@
       <!-- Specify the application specific style sheet.              -->
       <stylesheet src="uddiportlets.css"/>
 	
-	  <servlet class="org.apache.juddi.portlets.server.SecurityServiceImpl" path="/security"/>
-	  <servlet class="org.apache.juddi.portlets.server.InquiryServiceImpl" path="/inquiry"/>
-	  <servlet class="org.apache.juddi.portlets.server.PublicationServiceImpl" path="/publication"/>
+	  <servlet class="org.apache.juddi.portlets.server.service.SecurityServiceImpl"    path="/security"/>
+	  <servlet class="org.apache.juddi.portlets.server.service.InquiryServiceImpl"     path="/inquiry"/>
+	  <servlet class="org.apache.juddi.portlets.server.service.PublicationServiceImpl" path="/publication"/>
 	 
 </module>
\ No newline at end of file

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDIBrowser.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDIBrowser.java?rev=760306&r1=760305&r2=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDIBrowser.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDIBrowser.java
Tue Mar 31 03:41:06 2009
@@ -19,8 +19,17 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.juddi.portlets.client.SecurityService;
-import org.apache.juddi.portlets.client.SecurityServiceAsync;
+import org.apache.juddi.portlets.client.model.Business;
+import org.apache.juddi.portlets.client.model.Service;
+import org.apache.juddi.portlets.client.service.InquiryResponse;
+import org.apache.juddi.portlets.client.service.InquiryService;
+import org.apache.juddi.portlets.client.service.InquiryServiceAsync;
+import org.apache.juddi.portlets.client.service.PublicationResponse;
+import org.apache.juddi.portlets.client.service.PublicationService;
+import org.apache.juddi.portlets.client.service.PublicationServiceAsync;
+import org.apache.juddi.portlets.client.service.SecurityResponse;
+import org.apache.juddi.portlets.client.service.SecurityService;
+import org.apache.juddi.portlets.client.service.SecurityServiceAsync;
 
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
@@ -28,12 +37,13 @@
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PasswordTextBox;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -59,7 +69,7 @@
 	private InquiryServiceAsync inquiryService = (InquiryServiceAsync) GWT.create(InquiryService.class);
 	
 	private FlowPanel browsePanel = new FlowPanel();
-	private FlexTable businessTable = new FlexTable();
+	private Tree publisherTree = new Tree();
 	private PublicationServiceAsync publicationService = (PublicationServiceAsync) GWT.create(PublicationService.class);
 	/**
 	 * This is the entry point method.
@@ -98,7 +108,7 @@
 		Label businesses = new Label ("Businesses");
 		businesses.setStyleName("portlet-form-field-label");
 		browsePanel.add(businesses);
-		browsePanel.add(businessTable);
+		browsePanel.add(publisherTree);
 		
 		getToken();
 	}
@@ -126,7 +136,7 @@
 			}
 
 			public void onSuccess(SecurityResponse response) {
-				if (response.isSuccess) {
+				if (response.isSuccess()) {
 					RootPanel.get("browser").clear();
 					token = response.getResponse();
 					if (token == null ) {
@@ -154,7 +164,7 @@
 			}
 
 			public void onSuccess(SecurityResponse response) {
-				if (response.isSuccess) {
+				if (response.isSuccess()) {
 					RootPanel.get("browser").clear();
 					token = response.getResponse();
 					if (token == null ) {
@@ -182,7 +192,7 @@
 			}
 
 			public void onSuccess(InquiryResponse response) {
-				if (response.isSuccess) {
+				if (response.isSuccess()) {
 					Map<String,String> tModelMap= response.getResponse();
 					tmodelLabel.setText("tmodelMap: " + tModelMap);
 				} else {
@@ -201,13 +211,17 @@
 			}
 
 			public void onSuccess(PublicationResponse response) {
-				if (response.isSuccess) {
-					List<String> businesses= response.getBusinesses();
+				if (response.isSuccess()) {
+					List<Business> businesses= response.getBusinesses();
+					businesses.add(new Business("Another one"));
 					System.out.println("Businesses=" + businesses);
-					businessTable.setTitle("Businesses");
-					int i=0;
-					for (String business : businesses) {
-						businessTable.setText(i++, 0, business);
+					
+					for (Business business : businesses) {
+						TreeItem serviceTree = new TreeItem(business.getName());
+						for (Service service : business.getServices()) {
+							serviceTree.addItem("Service " + service.getName());
+						}
+						publisherTree.addItem(serviceTree);
 					}
 					//tmodelLabel.setText("tmodelMap: " + tModelMap);
 				} else {

Added: 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=760306&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java
(added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Business.java
Tue Mar 31 03:41:06 2009
@@ -0,0 +1,54 @@
+package org.apache.juddi.portlets.client.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Business implements Serializable{
+
+	public Business() {}
+		
+	public Business(String name) {
+		super();
+		this.name = name;
+	}
+
+	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;
+	}
+
+	public void setServices(List<Service> services) {
+		this.services = services;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}

Added: 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=760306&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java
(added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Service.java
Tue Mar 31 03:41:06 2009
@@ -0,0 +1,25 @@
+package org.apache.juddi.portlets.client.model;
+
+import java.io.Serializable;
+
+public class Service implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+
+	private String name;
+
+	public Service() {}
+		
+	public Service(String name) {
+		super();
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
(from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/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?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryResponse.java&r1=759289&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryResponse.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import java.util.Map;
 /**

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryResponse.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
(from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/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?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryService.java&r1=759289&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryService.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
(from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/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?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryServiceAsync.java&r1=759289&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/InquiryServiceAsync.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.RemoteService;

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/InquiryServiceAsync.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationResponse.java
(from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationResponse.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/PublicationResponse.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationResponse.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationResponse.java&r1=759799&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationResponse.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationResponse.java
Tue Mar 31 03:41:06 2009
@@ -14,9 +14,11 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import java.util.List;
+
+import org.apache.juddi.portlets.client.model.Business;
 /**
  * 
  *  @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
@@ -25,12 +27,12 @@
 public class PublicationResponse extends Response {
 	
 	private static final long serialVersionUID = 1L;
-	List<String> businesses;
+	List<Business> businesses;
 	
-	public List<String> getBusinesses() {
+	public List<Business> getBusinesses() {
 		return businesses;
 	}
-	public void setBusinesses(List<String> businesses) {
+	public void setBusinesses(List<Business> businesses) {
 		this.businesses = businesses;
 	}
 

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationResponse.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationService.java
(from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationService.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/PublicationService.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationService.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationService.java&r1=759799&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationService.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationService.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationServiceAsync.java
(from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationServiceAsync.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/PublicationServiceAsync.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationServiceAsync.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationServiceAsync.java&r1=759799&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/PublicationServiceAsync.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationServiceAsync.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.RemoteService;

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/PublicationServiceAsync.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/Response.java
(from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Response.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/Response.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/Response.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Response.java&r1=759289&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Response.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/Response.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import java.io.Serializable;
 /**

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/Response.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityResponse.java
(from r759289, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityResponse.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/SecurityResponse.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityResponse.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityResponse.java&r1=759289&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityResponse.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityResponse.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 /**
  * 
  *  @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityResponse.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java
(from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityService.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/SecurityService.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityService.java&r1=759738&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityService.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java
(from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityServiceAsync.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/SecurityServiceAsync.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityServiceAsync.java&r1=759738&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SecurityServiceAsync.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java
Tue Mar 31 03:41:06 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.client;
+package org.apache.juddi.portlets.client.service;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.RemoteService;

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
(from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/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?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/InquiryServiceImpl.java&r1=759738&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/InquiryServiceImpl.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
Tue Mar 31 03:41:06 2009
@@ -14,13 +14,13 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.server;
+package org.apache.juddi.portlets.server.service;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.juddi.portlets.client.InquiryResponse;
-import org.apache.juddi.portlets.client.InquiryService;
+import org.apache.juddi.portlets.client.service.InquiryResponse;
+import org.apache.juddi.portlets.client.service.InquiryService;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Loader;
 import org.uddi.api_v3.GetTModelDetail;
@@ -58,8 +58,8 @@
         	 Transport transport = (Transport) transportClass.newInstance(); 
         	 UDDIInquiryPortType inquiryService = transport.getInquiryService();
         	 TModelDetail tmodelDetail = inquiryService.getTModelDetail(getTModelDetail);
+        	 //demo code fix up what to return for real.
         	 for (TModel tmodel : tmodelDetail.getTModel()) {
-        		 //TODO figure out how to deal with i18n
         		 tmodelDetailMap.put("name",tmodel.getName().getValue());
 			 }
         	 response.setSuccess(true);

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
(from r759799, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/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?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/PublicationServiceImpl.java&r1=759799&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/PublicationServiceImpl.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
Tue Mar 31 03:41:06 2009
@@ -14,22 +14,27 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.server;
+package org.apache.juddi.portlets.server.service;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.juddi.portlets.client.PublicationResponse;
-import org.apache.juddi.portlets.client.PublicationService;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.juddi.portlets.client.model.Business;
+import org.apache.juddi.portlets.client.model.Service;
+import org.apache.juddi.portlets.client.service.PublicationResponse;
+import org.apache.juddi.portlets.client.service.PublicationService;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Loader;
 import org.uddi.api_v3.BusinessInfo;
 import org.uddi.api_v3.GetRegisteredInfo;
 import org.uddi.api_v3.InfoSelection;
-import org.uddi.api_v3.Name;
 import org.uddi.api_v3.RegisteredInfo;
+import org.uddi.api_v3.ServiceInfo;
 import org.uddi.api_v3.client.config.ClientConfig;
 import org.uddi.api_v3.client.config.Property;
+import org.uddi.api_v3.client.i18n.EntityForLang;
 import org.uddi.api_v3.client.transport.Transport;
 import org.uddi.v3_service.UDDIPublicationPortType;
 
@@ -46,13 +51,16 @@
 	
 	public PublicationResponse getBusinesses(String authToken, String infoSelection) 
 	{
+		HttpServletRequest request = this.getThreadLocalRequest();
+		String lang = request.getLocale().getLanguage();
+		
 		GetRegisteredInfo getRegistrationInfo = new GetRegisteredInfo();
 		getRegistrationInfo.setAuthInfo(authToken);
 		getRegistrationInfo.setInfoSelection(InfoSelection.ALL);
 		
 		PublicationResponse response = new PublicationResponse();
 		logger.debug("GetRegistrationInfo " + getRegistrationInfo + " sending get Busineses request..");
-		List<String> businesses = new ArrayList<String>();
+		List<Business> businesses = new ArrayList<Business>();
 		try {
 	    	 String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
 	         Class<?> transportClass = Loader.loadClass(clazz);
@@ -60,13 +68,15 @@
         	 UDDIPublicationPortType publicationService = transport.getPublishService();
         	 RegisteredInfo info = publicationService.getRegisteredInfo(getRegistrationInfo);
         	 for (BusinessInfo businessInfo : info.getBusinessInfos().getBusinessInfo()) {
-				List<Name> names = businessInfo.getName();
-				for (Name name : names) {
-					if ("en".equals(name.getLang())) {
-						String businessName = name.getValue();
-						businesses.add(businessName);
-					}
+				Business business = new Business(EntityForLang.get(businessInfo.getName(),lang).getValue());
+				business.setKey(businessInfo.getBusinessKey());
+				business.setDescription(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());
+					services.add(service);
 				}
+				business.setServices(services);
 			 }
         	 response.setSuccess(true);
         	 response.setBusinesses(businesses);

Propchange: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
(from r759738, webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/SecurityServiceImpl.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/SecurityServiceImpl.java?p2=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java&p1=webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/SecurityServiceImpl.java&r1=759738&r2=760306&rev=760306&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/SecurityServiceImpl.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
Tue Mar 31 03:41:06 2009
@@ -14,15 +14,15 @@
  * limitations under the License.
  *
  */
-package org.apache.juddi.portlets.server;
+package org.apache.juddi.portlets.server.service;
 
 import java.security.Principal;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.apache.juddi.portlets.client.SecurityService;
-import org.apache.juddi.portlets.client.SecurityResponse;
+import org.apache.juddi.portlets.client.service.SecurityResponse;
+import org.apache.juddi.portlets.client.service.SecurityService;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Loader;
 import org.uddi.api_v3.AuthToken;



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


Mime
View raw message