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/03 20:25:03 UTC
svn commit: r821388 - in
/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets:
client/ client/model/ client/service/ server/service/
Author: kstam
Date: Sat Oct 3 18:25:02 2009
New Revision: 821388
URL: http://svn.apache.org/viewvc?rev=821388&view=rev
Log:
JUDDI-204, adding code to create and save a subscription
Modified:
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/client/service/SubscriptionService.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionServiceAsync.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/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=821388&r1=821387&r2=821388&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 Sat Oct 3 18:25:02 2009
@@ -19,6 +19,7 @@
private SubscriptionServiceAsync subscriptionServiceAsync = (SubscriptionServiceAsync) GWT.create(SubscriptionService.class);
+ private TextBox clerkNameBox = new TextBox();
private TextBox bindingKeyBox = new TextBox();
private CheckBox isBriefBox = new CheckBox();
private TextBox expiresAfterBox = new TextBox();
@@ -36,62 +37,65 @@
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);
- bindingKeyBox.setText(this.subscription.getBindingKey());
- bindingKeyBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(0, 1, bindingKeyBox);
+ Label clerkName = new Label ("Clerk:");
+ clerkName.setStyleName("portlet-form-field-label-right");
+ flexTable.setWidget(0, 0, clerkName);
+ clerkNameBox.setText(String.valueOf(this.subscription.getNode().getClerkName()));
+ clerkNameBox.setStyleName("portlet-form-input-field");
+ flexTable.setWidget(0, 1, clerkNameBox);
+
+ Label subscriptionKey = new Label ("Subscription Key:");
+ subscriptionKey.setStyleName("portlet-form-field-label-right");
+ flexTable.setWidget(1, 0, subscriptionKey);
+ subscriptionKeyBox.setText(String.valueOf(this.subscription.getSubscriptionKey()));
+ subscriptionKeyBox.setStyleName("portlet-form-input-field");
+ flexTable.setWidget(1, 1, subscriptionKeyBox);
Label isBrief = new Label ("Is Brief:");
isBrief.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(1, 0,isBrief);
+ flexTable.setWidget(2, 0,isBrief);
isBriefBox.setChecked(this.subscription.getBrief());
isBriefBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(1, 1,isBriefBox);
+ flexTable.setWidget(2, 1, isBriefBox);
Label expiresAfter = new Label ("Expires After:");
expiresAfter.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(2, 0, expiresAfter);
+ flexTable.setWidget(3, 0, expiresAfter);
expiresAfterBox.setText(this.subscription.getExpiresAfter());
expiresAfterBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(2, 1,expiresAfterBox);
+ flexTable.setWidget(3, 1, expiresAfterBox);
Label maxEntities = new Label ("Max Entities:");
maxEntities.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(3, 0, maxEntities);
+ flexTable.setWidget(4, 0, maxEntities);
maxEntitiesBox.setText(String.valueOf(this.subscription.getMaxEntities()));
maxEntitiesBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(3, 1,maxEntitiesBox);
-
- Label notificationInterval = new Label ("Notification Interval:");
- notificationInterval.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(4, 0, notificationInterval);
- notificationIntervalBox.setText(String.valueOf(this.subscription.getNotificationInterval()));
- notificationIntervalBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(4, 1,notificationIntervalBox);
-
- Label subscriptionKey = new Label ("Subscription Key:");
- subscriptionKey.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(5, 0, subscriptionKey);
- subscriptionKeyBox.setText(String.valueOf(this.subscription.getSubscriptionKey()));
- subscriptionKeyBox.setStyleName("portlet-form-input-field");
- flexTable.setWidget(5, 1,subscriptionKeyBox);
+ flexTable.setWidget(4, 1, maxEntitiesBox);
Label subscriptionFilter = new Label ("Search Filter:");
subscriptionFilter.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(6, 0, subscriptionFilter);
+ flexTable.setWidget(5, 0, subscriptionFilter);
subscriptionFilterBox.setText(String.valueOf(this.subscription.getSubscriptionFilter()));
subscriptionFilterBox.setStyleName("portlet-form-input-field");
subscriptionFilterBox.setHeight("100px");
- flexTable.setWidget(6, 1,subscriptionFilterBox);
+ flexTable.setWidget(5, 1, subscriptionFilterBox);
+
+ Label id = new Label ("Binding Key:");
+ id.setStyleName("portlet-form-field-label-right");
+ flexTable.setWidget(6, 0, id);
+ bindingKeyBox.setText(this.subscription.getBindingKey());
+ bindingKeyBox.setStyleName("portlet-form-input-field");
+ flexTable.setWidget(6, 1, bindingKeyBox);
+
+ Label notificationInterval = new Label ("Notification Interval:");
+ notificationInterval.setStyleName("portlet-form-field-label-right");
+ flexTable.setWidget(7, 0, notificationInterval);
+ notificationIntervalBox.setText(String.valueOf(this.subscription.getNotificationInterval()));
+ notificationIntervalBox.setStyleName("portlet-form-input-field");
+ flexTable.setWidget(7, 1, notificationIntervalBox);
}
@@ -141,7 +145,7 @@
}
- protected void saveSubscription(String token) {
+ protected void saveSubscription() {
if (subscription!=null) {
subscription.setBindingKey(bindingKeyBox.getText());
@@ -151,8 +155,9 @@
subscription.setNotificationInterval(notificationIntervalBox.getText());
subscription.setSubscriptionFilter(subscriptionFilterBox.getText());
subscription.setSubscriptionKey(subscriptionKeyBox.getText());
+ subscription.setClerkName(clerkNameBox.getText());
- subscriptionServiceAsync.saveSubscription(token, subscription, new AsyncCallback<SubscriptionResponse>()
+ subscriptionServiceAsync.saveSubscription(subscription, new AsyncCallback<SubscriptionResponse>()
{
public void onFailure(Throwable caught) {
Window.alert("Could not connect to the UDDI registry. " + caught.getMessage());
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=821388&r1=821387&r2=821388&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 Sat Oct 3 18:25:02 2009
@@ -34,7 +34,7 @@
protected void getSubscriptions() {
- subscriptionService.getSubscriptions(UDDISubscription.getInstance().getToken(), new AsyncCallback<SubscriptionResponse>()
+ subscriptionService.getSubscriptions(new AsyncCallback<SubscriptionResponse>()
{
public void onFailure(Throwable caught) {
Window.alert("Could not connect to the UDDI registry.");
@@ -43,7 +43,7 @@
public void onSuccess(SubscriptionResponse response) {
if (response.isSuccess()) {
List<Node> nodes = response.getNodes();
- System.out.println("Node=" + nodes);
+ System.out.println("Nodes=" + nodes);
for (Node node : nodes) {
String statusImg = UDDIBrowser.images.down().getHTML();
if ("Up".equals(node.getStatus())) {
@@ -69,7 +69,7 @@
for (Subscription subcription : node.getSubscriptions()) {
TreeItem subcriptionItem = new TreeItem(UDDIBrowser.images.subscription().getHTML() + " "
- + subcription.getSubscriptionKey() + ":" + subcription.getExpiresAfter());
+ + subcription.getSubscriptionKey());
subcriptionItem.setStyleName("portlet-form-field-label");
subcription.setNode(node);
subcriptionItem.setUserObject(subcription);
@@ -88,15 +88,17 @@
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;
+ System.out.println("Selected " + selectedNode);
}
if (treeItem.getUserObject()!=null && Subscription.class.equals(treeItem.getUserObject().getClass())) {
Subscription subscription = (Subscription) treeItem.getUserObject();
UDDISubscription.getInstance().displaySubscription(subscription);
selectedNode = subscription.getNode();
+ System.out.println("Selected " + selectedNode);
}
}
@@ -108,5 +110,9 @@
public Node getSelectedNode() {
return selectedNode;
}
+
+ public Tree getSubscriptionTree() {
+ return subscriptionTree;
+ }
}
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=821388&r1=821387&r2=821388&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 Sat Oct 3 18:25:02 2009
@@ -78,7 +78,6 @@
if (detailPanel!=null ) dockPanel.remove(detailPanel);
detailPanel = new SubscriptionPanel(subscription, subscription.getNode());
dockPanel.add(detailPanel,DockPanel.EAST);
- treePanel.loadSubscriptions();
}
// public void setSelectedSubscription(String selectedSubscriptionId) {
@@ -100,8 +99,10 @@
public void saveSubscription() {
if (detailPanel!=null) {
- detailPanel.saveSubscription(getToken());
+ detailPanel.saveSubscription();
}
+ treePanel.getSubscriptionTree().clear();
+ treePanel.loadSubscriptions();
}
public void newSubscription() {
@@ -110,7 +111,6 @@
detailPanel = new SubscriptionPanel(null, treePanel.getSelectedNode());
dockPanel.add(detailPanel,DockPanel.EAST);
}
- //treePanel.selectRow(0);
}
public void deleteSubscription() {
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=821388&r1=821387&r2=821388&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 Sat Oct 3 18:25:02 2009
@@ -39,6 +39,7 @@
protected String subscriptionKey;
private Node node;
+ private String clerkName;
public Subscription() {
super();
@@ -111,16 +112,23 @@
return subscriptionFilter;
}
+ public void setSubscriptionFilter(String subscriptionFilter) {
+ this.subscriptionFilter = subscriptionFilter;
+ }
+
public Node getNode() {
return node;
}
public void setNode(Node node) {
this.node = node;
}
-
- public void setSubscriptionFilter(String subscriptionFilter) {
- this.subscriptionFilter = subscriptionFilter;
+ public String getClerkName() {
+ return clerkName;
}
+ public void setClerkName(String clerkName) {
+ this.clerkName = clerkName;
+ }
+
}
\ No newline at end of file
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionService.java?rev=821388&r1=821387&r2=821388&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionService.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionService.java Sat Oct 3 18:25:02 2009
@@ -28,6 +28,6 @@
@RemoteServiceRelativePath("subscription")
public interface SubscriptionService extends RemoteService {
- public SubscriptionResponse getSubscriptions(String authToken);
- public SubscriptionResponse saveSubscription(String authToken, Subscription subscription);
+ public SubscriptionResponse getSubscriptions();
+ public SubscriptionResponse saveSubscription(Subscription subscription);
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionServiceAsync.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionServiceAsync.java?rev=821388&r1=821387&r2=821388&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionServiceAsync.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SubscriptionServiceAsync.java Sat Oct 3 18:25:02 2009
@@ -26,7 +26,7 @@
*
*/
public interface SubscriptionServiceAsync extends RemoteService {
- public void getSubscriptions(String authToken, AsyncCallback<SubscriptionResponse> callback);
- public void saveSubscription(String authToken, Subscription subscription, AsyncCallback<SubscriptionResponse> callback);
+ public void getSubscriptions(AsyncCallback<SubscriptionResponse> callback);
+ public void saveSubscription(Subscription subscription, AsyncCallback<SubscriptionResponse> callback);
}
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=821388&r1=821387&r2=821388&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 Sat Oct 3 18:25:02 2009
@@ -55,7 +55,7 @@
private final static String UP = "Up";
private static final long serialVersionUID = 1L;
- public SubscriptionResponse getSubscriptions(String authToken)
+ public SubscriptionResponse getSubscriptions()
{
SubscriptionResponse response = new SubscriptionResponse();
response.setSuccess(false);
@@ -94,6 +94,7 @@
Node modelNode = new Node();
UDDINode node = clerk.getNode();
modelNode.setName(node.getName());
+ modelNode.setClerkName(clerk.getName());
modelNode.setDescription(node.getDescription());
try {
String clazz = ClientConfig.getInstance().getNodes().get(node.getName()).getProxyTransport();
@@ -126,14 +127,18 @@
return modelNode;
}
- public SubscriptionResponse saveSubscription(String authToken, Subscription modelSubscription) {
+ public SubscriptionResponse saveSubscription(Subscription modelSubscription) {
+
+ HttpServletRequest request = getThreadLocalRequest();
+ HttpSession session = request.getSession();
SubscriptionResponse response = new SubscriptionResponse();
- Node modelNode = modelSubscription.getNode();
+
logger.debug("Sending saveSubscriptions request..");
try {
- String clazz = ClientConfig.getInstance().getNodes().get(modelNode.getName()).getProxyTransport();
+ UDDIClerk clerk = ClientConfig.getInstance().getClerks().get(modelSubscription.getClerkName());
+ String clazz = ClientConfig.getInstance().getNodes().get(clerk.getNode().getName()).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(modelNode.getName());
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getNode().getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
List<org.uddi.sub_v3.Subscription> subscriptionList = new ArrayList<org.uddi.sub_v3.Subscription>();
org.uddi.sub_v3.Subscription subscription = new org.uddi.sub_v3.Subscription();
@@ -156,6 +161,7 @@
subscriptionList.add(subscription);
Holder<List<org.uddi.sub_v3.Subscription>> subscriptionHolder = new Holder<List<org.uddi.sub_v3.Subscription>>();
subscriptionHolder.value = subscriptionList;
+ String authToken = (String) session.getAttribute(clerk.getName());
subscriptionService.saveSubscription(authToken, subscriptionHolder);
response.setSuccess(true);
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org