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/15 06:18:41 UTC
svn commit: r825386 - in /webservices/juddi/trunk/juddi-console:
juddi-portal/ uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/
Author: kstam
Date: Thu Oct 15 04:18:39 2009
New Revision: 825386
URL: http://svn.apache.org/viewvc?rev=825386&view=rev
Log:
JUDDI-240 creating sync request
Modified:
webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml
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/UDDISubscription.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/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml?rev=825386&r1=825385&r2=825386&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml Thu Oct 15 04:18:39 2009
@@ -43,12 +43,6 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>subscription-listener</artifactId>
- <version>3.0.0.SNAPSHOT</version>
- <type>war</type>
- </dependency>
- <dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal</artifactId>
<version>1.1.7</version>
@@ -156,7 +150,6 @@
<property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
<property name="dependency.portlet-api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.uddi-portlets.war" value="${maven.dependency.org.apache.juddi.uddi-portlets.war.path}"/>
- <property name="dependency.subscription-listener.war" value="${maven.dependency.org.apache.juddi.subscription-listener.war.path}"/>
<property name="dependency.juddi-tomcat.zip" value="${maven.dependency.org.apache.juddi.juddi-tomcat.zip.path}"/>
<ant antfile="${basedir}/build.xml">
<target name="package-tomcat"/>
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=825386&r1=825385&r2=825386&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 15 04:18:39 2009
@@ -47,6 +47,9 @@
private TextBox coverageEndBox = new TextBox();
Subscription subscription = null;
+ FlexTable flexTable = null;
+
+ boolean isAsync=true;
public SubscriptionPanel(Subscription subscription, Node node) {
@@ -56,8 +59,13 @@
this.subscription = subscription;
}
- FlexTable flexTable = new FlexTable();
+ flexTable = new FlexTable();
add(flexTable);
+ drawPanel();
+
+ }
+
+ public void drawPanel() {
Label clerkName = new Label ("Clerk:");
clerkName.setStyleName("portlet-form-field-label-right");
@@ -73,49 +81,106 @@
subscriptionKeyBox.setStyleName("portlet-form-input-field");
flexTable.setWidget(1, 1, subscriptionKeyBox);
+ //async
Label isBrief = new Label ("Is Brief:");
isBrief.setStyleName("portlet-form-field-label-right");
+ isBrief.setVisible(isAsync);
flexTable.setWidget(2, 0,isBrief);
isBriefBox.setChecked(this.subscription.getBrief());
isBriefBox.setStyleName("portlet-form-input-field");
+ isBriefBox.setVisible(isAsync);
flexTable.setWidget(2, 1, isBriefBox);
Label expiresAfter = new Label ("Expires After:");
expiresAfter.setStyleName("portlet-form-field-label-right");
+ expiresAfter.setVisible(isAsync);
flexTable.setWidget(3, 0, expiresAfter);
expiresAfterBox.setText(this.subscription.getExpiresAfter());
expiresAfterBox.setStyleName("portlet-form-input-field");
+ expiresAfterBox.setVisible(isAsync);
flexTable.setWidget(3, 1, expiresAfterBox);
Label maxEntities = new Label ("Max Entities:");
maxEntities.setStyleName("portlet-form-field-label-right");
+ maxEntities.setVisible(isAsync);
flexTable.setWidget(4, 0, maxEntities);
maxEntitiesBox.setText(String.valueOf(this.subscription.getMaxEntities()));
maxEntitiesBox.setStyleName("portlet-form-input-field");
+ maxEntitiesBox.setVisible(isAsync);
flexTable.setWidget(4, 1, maxEntitiesBox);
Label subscriptionFilter = new Label ("Search Filter:");
subscriptionFilter.setStyleName("portlet-form-field-label-right");
+ subscriptionFilter.setVisible(isAsync);
flexTable.setWidget(5, 0, subscriptionFilter);
subscriptionFilterBox.setText(String.valueOf(this.subscription.getSubscriptionFilter()));
subscriptionFilterBox.setStyleName("portlet-form-input-field");
subscriptionFilterBox.setHeight("100px");
+ subscriptionFilterBox.setVisible(isAsync);
flexTable.setWidget(5, 1, subscriptionFilterBox);
- Label id = new Label ("Binding Key:");
- id.setStyleName("portlet-form-field-label-right");
- flexTable.setWidget(6, 0, id);
+ Label bindingKey = new Label ("Binding Key:");
+ bindingKey.setStyleName("portlet-form-field-label-right");
+ bindingKey.setVisible(isAsync);
+ flexTable.setWidget(6, 0, bindingKey);
bindingKeyBox.setText(this.subscription.getBindingKey());
bindingKeyBox.setStyleName("portlet-form-input-field");
+ bindingKeyBox.setVisible(isAsync);
flexTable.setWidget(6, 1, bindingKeyBox);
Label notificationInterval = new Label ("Notification Interval:");
notificationInterval.setStyleName("portlet-form-field-label-right");
+ notificationInterval.setVisible(isAsync);
flexTable.setWidget(7, 0, notificationInterval);
notificationIntervalBox.setText(String.valueOf(this.subscription.getNotificationInterval()));
notificationIntervalBox.setStyleName("portlet-form-input-field");
+ notificationIntervalBox.setVisible(isAsync);
flexTable.setWidget(7, 1, notificationIntervalBox);
+ Label coverageStart = new Label ("Coverage Start Date:");
+ coverageStart.setStyleName("portlet-form-field-label-right");
+ coverageStart.setVisible(!isAsync);
+ flexTable.setWidget(8, 0, coverageStart);
+ coverageStartBox.setText(this.subscription.getCoverageStart());
+ coverageStartBox.setStyleName("portlet-form-input-field");
+ coverageStartBox.setVisible(!isAsync);
+ flexTable.setWidget(8, 1, coverageStartBox);
+
+ Label coverageEnd = new Label ("Coverage End Date:");
+ coverageEnd.setStyleName("portlet-form-field-label-right");
+ coverageEnd.setVisible(!isAsync);
+ flexTable.setWidget(9, 0, coverageEnd);
+ coverageEndBox.setText(this.subscription.getCoverageStart());
+ coverageEndBox.setStyleName("portlet-form-input-field");
+ coverageEndBox.setVisible(!isAsync);
+ flexTable.setWidget(9, 1, coverageEndBox);
+
+ }
+
+ protected void invokeSyncSubscription(String authToken) {
+ if (subscription!=null) {
+ subscription.setSubscriptionKey(subscriptionKeyBox.getText());
+ subscription.setClerkName(clerkNameBox.getText());
+ subscription.setCoverageStart(coverageStartBox.getText());
+ subscription.setCoverageEnd(coverageEndBox.getText());
+
+ subscriptionServiceAsync.invokeSyncSubscription(authToken, subscription, new AsyncCallback<SubscriptionResponse>()
+ {
+ public void onFailure(Throwable caught) {
+ Window.alert("error:" + caught.getMessage());
+ }
+
+ public void onSuccess(SubscriptionResponse response) {
+ if (response.isSuccess()) {
+ UDDISubscription.getInstance().refreshSubscriptionTree();
+ UDDISubscription.getInstance().removeDetailPanel();
+ } else {
+ Window.alert("error: " + response.getMessage());
+ }
+ }
+ });
+ }
+
}
protected void deleteSubscription(String authToken){
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=825386&r1=825385&r2=825386&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 15 04:18:39 2009
@@ -127,7 +127,15 @@
}
public void syncListedServices() {
-
+ if (detailPanel!=null) {
+ System.out.println("hello");
+ if (detailPanel.isAsync) {
+ detailPanel.isAsync=false;
+ detailPanel.drawPanel();
+ } else {
+ detailPanel.invokeSyncSubscription(getToken());
+ }
+ }
}
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=825386&r1=825385&r2=825386&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 15 04:18:39 2009
@@ -45,10 +45,12 @@
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Loader;
+import org.uddi.sub_v3.CoveragePeriod;
import org.uddi.sub_v3.DeleteSubscription;
import org.uddi.sub_v3.GetSubscriptionResults;
import org.uddi.sub_v3.ObjectFactory;
import org.uddi.sub_v3.SubscriptionFilter;
+import org.uddi.sub_v3.SubscriptionResultsList;
import org.uddi.v3_service.UDDISubscriptionPortType;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -288,16 +290,40 @@
public SubscriptionResponse invokeSyncSubscription(String userAuthToken, Subscription modelSubscription) {
- HttpServletRequest request = getThreadLocalRequest();
- HttpSession session = request.getSession();
SubscriptionResponse response = new SubscriptionResponse();
- //Send a request to the listener serverNode
- GetSubscriptionResults getSubscriptionResults = new GetSubscriptionResults();
- getSubscriptionResults.setAuthInfo(userAuthToken);
- getSubscriptionResults.setSubscriptionKey(modelSubscription.getSubscriptionKey());
- //getSubscriptionResults.set
-
+ try {
+ //Send a request to the listener serverNode
+ GetSubscriptionResults getSubscriptionResults = new GetSubscriptionResults();
+ getSubscriptionResults.setAuthInfo(userAuthToken);
+ getSubscriptionResults.setSubscriptionKey(modelSubscription.getSubscriptionKey());
+
+ XMLGregorianCalendar calendarStart = DatatypeFactory.newInstance().newXMLGregorianCalendar(modelSubscription.getCoverageStart());
+ XMLGregorianCalendar calendarEnd = DatatypeFactory.newInstance().newXMLGregorianCalendar(modelSubscription.getCoverageEnd());
+ CoveragePeriod coverage = new CoveragePeriod();
+ coverage.setStartPoint(calendarStart);
+ coverage.setEndPoint(calendarEnd);
+ getSubscriptionResults.setCoveragePeriod(coverage);
+
+ UDDIClerk clerk = UDDIClerkManager.getClientConfig().getUDDIClerks().get(modelSubscription.getClerkName());
+ String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get(clerk.getUDDINode().getName()).getProxyTransport();
+ Class<?> transportClass = Loader.loadClass(clazz);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getUDDINode().getName());
+ UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
+
+ SubscriptionResultsList list = subscriptionService.getSubscriptionResults(getSubscriptionResults);
+ System.out.println("list=" + list);
+ } catch (Exception e) {
+ logger.error("Could not save subscription. " + e.getMessage(), e);
+ response.setSuccess(false);
+ response.setMessage(e.getMessage());
+ response.setErrorCode("102");
+ } catch (Throwable t) {
+ logger.error("Could not save subscription. " + t.getMessage(), t);
+ response.setSuccess(false);
+ response.setMessage(t.getMessage());
+ response.setErrorCode("102");
+ }
return response;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org