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/10/01 19:15:02 UTC
svn commit: r820721 - in /webservices/juddi/trunk/juddi-console:
juddi-portal/pluto/WEB-INF/ uddi-portlets/
uddi-portlets/src/main/java/org/apache/juddi/portlets/
uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java...
Author: kstam
Date: Thu Oct 1 17:15:01 2009
New Revision: 820721
URL: http://svn.apache.org/viewvc?rev=820721&view=rev
Log:
JUDDI-204, adding subscription portlet work
Modified:
webservices/juddi/trunk/juddi-console/juddi-portal/pluto/WEB-INF/pluto-portal-driver-config.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Images.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDISubscription.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Subscription.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/public/uddiportlets.css
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/UDDIBrowserPortlet.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
Modified: webservices/juddi/trunk/juddi-console/juddi-portal/pluto/WEB-INF/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/pluto/WEB-INF/pluto-portal-driver-config.xml?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/pluto/WEB-INF/pluto-portal-driver-config.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/pluto/WEB-INF/pluto-portal-driver-config.xml Thu Oct 1 17:15:01 2009
@@ -46,13 +46,13 @@
<portlet context="/uddi-portlets" name="UDDIBrowserPortlet"/>
<portlet context="/uddi-portlets" name="UDDISearchPortlet"/>
</page>
- <page name="jUDDI Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/uddi-portlets" name="JUDDIPublisherPortlet"/>
- </page>
<page name="jUDDI Subscriptions" uri="/WEB-INF/themes/pluto-default-theme.jsp">
<portlet context="/uddi-portlets" name="UDDISubscriptionPortlet"/>
<portlet context="/uddi-portlets" name="UDDISubscriptionNotificationPortlet"/>
</page>
+ <page name="jUDDI Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/uddi-portlets" name="JUDDIPublisherPortlet"/>
+ </page>
<page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
<portlet context="/pluto" name="PlutoPageAdmin"/>
<portlet context="/pluto" name="AboutPortlet"/>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml Thu Oct 1 17:15:01 2009
@@ -162,6 +162,8 @@
<compileTargets>
<value>org.apache.juddi.portlets.UDDISubscriptionNotification</value>
<value>org.apache.juddi.portlets.UDDIBrowser</value>
+ <value>org.apache.juddi.portlets.UDDISubscription</value>
+ <value>org.apache.juddi.portlets.UDDISearch</value>
<value>org.apache.juddi.portlets.JUDDIPublisher</value>
</compileTargets>
<runTarget>org.apache.juddi.portlets.UDDIBrowser/UDDIBrowser.html</runTarget>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml Thu Oct 1 17:15:01 2009
@@ -9,7 +9,7 @@
<!-- Specify the application specific style sheet. -->
<stylesheet src="uddiportlets.css"/>
- <servlet class="org.apache.juddi.portlets.server.service.SecurityServiceImpl" path="/security"/>
+ <servlet class="org.apache.juddi.portlets.server.service.SecurityServiceImpl" path="/security"/>
<servlet class="org.apache.juddi.portlets.server.service.JUDDIApiServiceImpl" path="/juddi-api"/>
</module>
\ No newline at end of file
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml Thu Oct 1 17:15:01 2009
@@ -9,7 +9,6 @@
<!-- Specify the application specific style sheet. -->
<stylesheet src="uddiportlets.css"/>
- <servlet class="org.apache.juddi.portlets.server.service.NotifyServiceImpl" path="/notify"/>
<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"/>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Images.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Images.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Images.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/Images.java Thu Oct 1 17:15:01 2009
@@ -18,7 +18,9 @@
AbstractImagePrototype down();
AbstractImagePrototype up();
+ //MenuBar
AbstractImagePrototype create();
AbstractImagePrototype save();
AbstractImagePrototype delete();
+ AbstractImagePrototype sync();
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java Thu Oct 1 17:15:01 2009
@@ -15,6 +15,7 @@
PushButton saveButton = new PushButton();
PushButton newButton = new PushButton();
PushButton deleteButton = new PushButton();
+ PushButton syncButton = new PushButton();
String context = PUBLISHER;
public MenuBarPanel(String context) {
@@ -38,6 +39,11 @@
deleteButton.addClickListener(this);
pushPanel.add(deleteButton);
+ if (SUBSCRIPTION.equals(context)) {
+ syncButton.setHTML(images.sync().getHTML());
+ syncButton.setStyleName(("portlet-form-button"));
+ syncButton.addClickListener(this);
+ }
add(pushPanel);
}
@@ -52,6 +58,8 @@
} else if (sender == deleteButton) {
if (PUBLISHER.equals(context)) JUDDIPublisher.getInstance().deletePublisher();
else if (SUBSCRIPTION.equals(context)) UDDISubscription.getInstance().deleteSubscription();
+ } else if (sender == syncButton) {
+ if (PUBLISHER.equals(context)) UDDISubscription.getInstance().syncListedServices();
}
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java Thu Oct 1 17:15:01 2009
@@ -1,5 +1,6 @@
package org.apache.juddi.portlets.client;
+import org.apache.juddi.portlets.client.model.Node;
import org.apache.juddi.portlets.client.model.Subscription;
import org.apache.juddi.portlets.client.service.SubscriptionResponse;
import org.apache.juddi.portlets.client.service.SubscriptionService;
@@ -27,17 +28,21 @@
private TextBox subscriptionKeyBox = new TextBox();
Subscription subscription = null;
- public SubscriptionPanel(Subscription subscription) {
+ public SubscriptionPanel(Subscription subscription, Node node) {
if (subscription==null) {
- newSubscription();
+ newSubscription(node);
} else {
this.subscription = subscription;
}
+
FlexTable flexTable = new FlexTable();
add(flexTable);
+ Label nodeLabel = new Label("Subscription on node " + node.getName());
+ add(nodeLabel);
+
Label id = new Label ("Binding Key:");
id.setStyleName("portlet-form-field-label-right");
flexTable.setWidget(0, 0, id);
@@ -109,13 +114,13 @@
// }
// }
//
- protected void newSubscription(){
+ protected void newSubscription(Node node){
subscription = new Subscription();
+ subscription.setSubscriptionKey("uddi:uddi.listeningforchanges.com:callthiskeytonotify");
subscription.setBindingKey("uddi:uddi.example.com:subscriptionone");
subscription.setBrief(true);
subscription.setMaxEntities(1000);
subscription.setNotificationInterval("P5D");
- subscription.setSubscriptionKey("uddi:uddi.listeningforchanges.com:callthiskeytonotify");
subscription.setSubscriptionFilter(
"<subscriptionFilter xmlns=\"urn:uddi-org:sub_v3\">"
+ " <find_service xmlns=\"urn:uddi-org:api_v3\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\">"
@@ -132,6 +137,7 @@
+ " </categoryBag>"
+ " </find_service>"
+ "</subscriptionFilter>");
+ subscription.setNode(node);
}
@@ -154,9 +160,7 @@
public void onSuccess(SubscriptionResponse response) {
if (response.isSuccess()) {
- //Publisher publisher = response.getPublishers().get(0);
- ////JUDDIPublisher.getInstance().setSelectedPublisher(publisher.getAuthorizedName());
- //JUDDIPublisher.getInstance().displayPublisher(publisher);
+ UDDISubscription.getInstance().displaySubscription(subscription);
} else {
Window.alert("error: " + response.getMessage() + ". Make sure the UDDI server is up and running.");
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java Thu Oct 1 17:15:01 2009
@@ -2,7 +2,6 @@
import java.util.List;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.portlets.client.model.Node;
import org.apache.juddi.portlets.client.model.Subscription;
import org.apache.juddi.portlets.client.service.SubscriptionResponse;
@@ -20,6 +19,7 @@
public class SubscriptionTreePanel extends Composite implements TreeListener {
private Tree subscriptionTree;
+ private Node selectedNode=null;
private SubscriptionServiceAsync subscriptionService = (SubscriptionServiceAsync) GWT.create(SubscriptionService.class);
public SubscriptionTreePanel() {
@@ -47,9 +47,10 @@
for (Node node : nodes) {
String statusImg = UDDIBrowser.images.down().getHTML();
if ("Up".equals(node.getStatus())) {
- statusImg = UDDIBrowser.images.down().getHTML();
+ statusImg = UDDIBrowser.images.up().getHTML();
}
TreeItem nodeTree = new TreeItem(statusImg + node.getName());
+ nodeTree.setUserObject(node);
nodeTree.setStyleName("portlet-form-field-label");
nodeTree.setState(true);
nodeTree.setUserObject(node);
@@ -61,6 +62,7 @@
TreeItem subcriptionItem = new TreeItem(UDDIBrowser.images.subscription().getHTML() + " "
+ subcription.getSubscriptionKey() + ":" + subcription.getExpiresAfter());
subcriptionItem.setStyleName("portlet-form-field-label");
+ subcription.setNode(node);
subcriptionItem.setUserObject(subcription);
nodeTree.addItem(subcriptionItem);
}
@@ -78,9 +80,14 @@
public void onTreeItemSelected(TreeItem treeItem) {
System.out.println("Selected " + treeItem.getText());
+ if (treeItem.getUserObject()!=null && Node.class.equals(treeItem.getUserObject().getClass())) {
+ Node node = (Node) treeItem.getUserObject();
+ selectedNode = node;
+ }
if (treeItem.getUserObject()!=null && Subscription.class.equals(treeItem.getUserObject().getClass())) {
Subscription subscription = (Subscription) treeItem.getUserObject();
UDDISubscription.getInstance().displaySubscription(subscription);
+ selectedNode = subscription.getNode();
}
}
@@ -89,4 +96,8 @@
System.out.println("StateChanged " + arg0.getText());
}
+ public Node getSelectedNode() {
+ return selectedNode;
+ }
+
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDISubscription.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDISubscription.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDISubscription.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/UDDISubscription.java Thu Oct 1 17:15:01 2009
@@ -16,7 +16,12 @@
*/
package org.apache.juddi.portlets.client;
+import java.util.Set;
+
import org.apache.juddi.portlets.client.model.Subscription;
+import org.apache.juddi.v3.client.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.ClientConfig;
+import org.apache.juddi.v3.client.config.XRegistration;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.user.client.ui.DockPanel;
@@ -76,7 +81,7 @@
public void displaySubscription(Subscription subscription) {
if (detailPanel!=null ) dockPanel.remove(detailPanel);
- detailPanel = new SubscriptionPanel(subscription);
+ detailPanel = new SubscriptionPanel(subscription, subscription.getNode());
dockPanel.add(detailPanel,DockPanel.EAST);
treePanel.loadSubscriptions();
}
@@ -105,9 +110,11 @@
}
public void newSubscription() {
- if (detailPanel!=null ) dockPanel.remove(detailPanel);
- detailPanel = new SubscriptionPanel(null);
- dockPanel.add(detailPanel,DockPanel.EAST);
+ if (treePanel.getSelectedNode()!=null) {
+ if (detailPanel!=null ) dockPanel.remove(detailPanel);
+ detailPanel = new SubscriptionPanel(null, treePanel.getSelectedNode());
+ dockPanel.add(detailPanel,DockPanel.EAST);
+ }
//treePanel.selectRow(0);
}
@@ -116,6 +123,10 @@
// subscriptionPanel.deleteSubscription(getToken());
}
}
+
+ public void syncListedServices() {
+
+ }
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Subscription.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Subscription.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Subscription.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/model/Subscription.java Thu Oct 1 17:15:01 2009
@@ -38,7 +38,9 @@
protected String subscriptionFilter;
protected String subscriptionKey;
- public Subscription() {
+ private Node node;
+
+ public Subscription() {
super();
}
public Subscription(String bindingKey, Boolean brief, String expiresAfter,
@@ -108,6 +110,13 @@
public String getSubscriptionFilter() {
return subscriptionFilter;
}
+
+ public Node getNode() {
+ return node;
+ }
+ public void setNode(Node node) {
+ this.node = node;
+ }
public void setSubscriptionFilter(String subscriptionFilter) {
this.subscriptionFilter = subscriptionFilter;
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/public/uddiportlets.css
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/public/uddiportlets.css?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/public/uddiportlets.css (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/public/uddiportlets.css Thu Oct 1 17:15:01 2009
@@ -82,7 +82,7 @@
.detail-panel {
background: #eee;
- border:1px solid #000000; padding:5px
+ border:1px solid #000000;
margin-right:10px;
- padding-top:10px;
+ padding:10px 5px 5px 5px;
}
\ No newline at end of file
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/UDDIBrowserPortlet.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/UDDIBrowserPortlet.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/UDDIBrowserPortlet.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/UDDIBrowserPortlet.java Thu Oct 1 17:15:01 2009
@@ -25,12 +25,11 @@
+ "/org.apache.juddi.portlets.UDDIBrowser/org.apache.juddi.portlets.UDDIBrowser.nocache.js'></script>");
writer.println("<div id=\"token\"></div>");
writer.println("<div id=\"browser\"></div>");
- PortletURL url = renderResponse.createActionURL();
- url.setWindowState(WindowState.MAXIMIZED);
- writer.print("<form method=\"post\" action=\"" + url.toString() + ">");
- writer.print("<input type='submit'");
- writer.print("</form>");
-
+// PortletURL url = renderResponse.createActionURL();
+// url.setWindowState(WindowState.MAXIMIZED);
+// writer.print("<form method=\"post\" action=\"" + url.toString() + ">");
+// writer.print("<input type='submit'");
+// writer.print("</form>");
writer.close();
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java Thu Oct 1 17:15:01 2009
@@ -26,6 +26,7 @@
import org.apache.juddi.portlets.client.service.PublicationResponse;
import org.apache.juddi.portlets.client.service.PublicationService;
import org.apache.juddi.v3.client.config.ClientConfig;
+import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.i18n.EntityForLang;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
@@ -96,4 +97,56 @@
}
return response;
}
+
+ public PublicationResponse syncServices(UDDIClerk fromClerk, UDDIClerk toClerk, String serviceKey)
+ {
+ 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<Business> businesses = new ArrayList<Business>();
+// try {
+// String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
+// Class<?> transportClass = Loader.loadClass(clazz);
+// Transport transport = (Transport) transportClass.newInstance();
+// UDDIPublicationPortType publicationService = transport.getUDDIPublishService();
+// RegisteredInfo info = publicationService.getRegisteredInfo(getRegistrationInfo);
+// for (BusinessInfo businessInfo : info.getBusinessInfos().getBusinessInfo()) {
+// Business business = new Business(
+// businessInfo.getBusinessKey(),
+// EntityForLang.getName(businessInfo.getName(),lang).getValue(),
+// EntityForLang.getDescription(businessInfo.getDescription(),lang).getValue());
+// List<Service> services = new ArrayList<Service>();
+// for (ServiceInfo serviceInfo : businessInfo.getServiceInfos().getServiceInfo()) {
+// Service service = new Service(
+// serviceInfo.getServiceKey(),
+// EntityForLang.getName(serviceInfo.getName(), lang).getValue());
+// services.add(service);
+// }
+// business.setServices(services);
+// businesses.add(business);
+// }
+// response.setSuccess(true);
+// response.setBusinesses(businesses);
+// } 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;
+ }
+
+
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java?rev=820721&r1=820720&r2=820721&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java Thu Oct 1 17:15:01 2009
@@ -111,7 +111,8 @@
subscription.getNotificationInterval().toString(),
rawFilter,
subscription.getSubscriptionKey());
- modelNode.getSubscriptions().add(modelSubscription);
+ modelSubscription.setNode(modelNode);
+ modelNode.getSubscriptions().add(modelSubscription);
}
modelNode.setStatus(UP);
} catch (Exception e) {
@@ -123,9 +124,10 @@
public SubscriptionResponse saveSubscription(String authToken, Subscription modelSubscription) {
SubscriptionResponse response = new SubscriptionResponse();
+ Node modelNode = modelSubscription.getNode();
logger.debug("Sending saveSubscriptions request..");
try {
- String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
+ String clazz = ClientConfig.getInstance().getNodes().get(modelNode.getName()).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
Transport transport = (Transport) transportClass.newInstance();
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
@@ -152,7 +154,6 @@
subscriptionHolder.value = subscriptionList;
subscriptionService.saveSubscription(authToken, subscriptionHolder);
response.setSuccess(true);
- //TODO, do we get a response? response.setSubscriptions(modelSubscriptions);
} catch (Exception e) {
logger.error("Could not obtain subscription. " + e.getMessage(), e);
response.setSuccess(false);
@@ -167,5 +168,7 @@
return response;
}
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org