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/08 23:26:04 UTC
svn commit: r823330 - in
/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main:
java/org/apache/juddi/portlets/client/
java/org/apache/juddi/portlets/client/service/
java/org/apache/juddi/portlets/server/service/ resources/META-INF/
Author: kstam
Date: Thu Oct 8 21:26:04 2009
New Revision: 823330
URL: http://svn.apache.org/viewvc?rev=823330&view=rev
Log:
JUDDI-240 working on xregistration, we need this to make sure we register our listener in the affiliate UDDI
Modified:
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.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/service/JUDDIApiService.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiServiceAsync.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java?rev=823330&r1=823329&r2=823330&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java Thu Oct 8 21:26:04 2009
@@ -134,9 +134,9 @@
}
}
- public void startManagers() {
+ public void crossRegister() {
String token = getToken();
- juddiApiService.startManagers(token, new AsyncCallback<JUDDIApiResponse>()
+ juddiApiService.restartManager(token, new AsyncCallback<JUDDIApiResponse>()
{
public void onFailure(Throwable caught) {
Window.alert("Could not connect to the UDDI registry. " + caught.getMessage());
@@ -144,7 +144,7 @@
public void onSuccess(JUDDIApiResponse response) {
if (response.isSuccess()) {
-
+ Window.alert(response.getMessage());
} else {
Window.alert("error: " + response.getMessage());
}
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=823330&r1=823329&r2=823330&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 8 21:26:04 2009
@@ -71,7 +71,7 @@
} else if (sender == syncButton) {
UDDISubscription.getInstance().syncListedServices();
} else if (sender == managerButton) {
- JUDDIPublisher.getInstance().startManagers();
+ JUDDIPublisher.getInstance().crossRegister();
}
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java?rev=823330&r1=823329&r2=823330&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java Thu Oct 8 21:26:04 2009
@@ -31,5 +31,5 @@
public JUDDIApiResponse getPublishers(String authToken, String publisherId);
public JUDDIApiResponse savePublisher(String authToken, Publisher publisher);
public JUDDIApiResponse deletePublisher(String authToken, String publisherId);
- public JUDDIApiResponse startManagers(String authToken);
+ public JUDDIApiResponse restartManager(String authToken);
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiServiceAsync.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiServiceAsync.java?rev=823330&r1=823329&r2=823330&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiServiceAsync.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiServiceAsync.java Thu Oct 8 21:26:04 2009
@@ -29,6 +29,6 @@
public void getPublishers(String authToken, String publisherId, AsyncCallback<JUDDIApiResponse> callback);
public void savePublisher(String authToken, Publisher publisher, AsyncCallback<JUDDIApiResponse> callback);
public void deletePublisher(String authToken, String publisherId, AsyncCallback<JUDDIApiResponse> callback);
- public void startManagers(String authToken, AsyncCallback<JUDDIApiResponse> callback);
+ public void restartManager(String authToken, AsyncCallback<JUDDIApiResponse> callback);
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java?rev=823330&r1=823329&r2=823330&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java Thu Oct 8 21:26:04 2009
@@ -24,7 +24,6 @@
import javax.servlet.http.HttpSession;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.api_v3.DeletePublisher;
import org.apache.juddi.api_v3.GetAllPublisherDetail;
import org.apache.juddi.api_v3.GetPublisherDetail;
@@ -65,10 +64,10 @@
Class<?> transportClass = Loader.loadClass(clazz);
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
JUDDIApiPortType apiService = transport.getJUDDIApiService();
- PublisherDetail publisherDetail = null;
- publisherDetail = apiService.getPublisherDetail(getPublisherDetail);
+ PublisherDetail publisherDetail = apiService.getPublisherDetail(getPublisherDetail);
//if the publisher is an admin, then return ALL publishers
if ("true".equalsIgnoreCase(publisherDetail.getPublisher().get(0).getIsAdmin())) {
+
GetAllPublisherDetail getAllPublisherDetail = new GetAllPublisherDetail();
getAllPublisherDetail.setAuthInfo(authToken);
logger.debug("GetAllPublisherDetail " + getAllPublisherDetail + " sending get AllPublisherDetail request..");
@@ -98,7 +97,7 @@
public JUDDIApiResponse savePublisher(String token, Publisher publisher) {
JUDDIApiResponse response = new JUDDIApiResponse();
try {
- String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
JUDDIApiPortType apiService = transport.getJUDDIApiService();
@@ -156,7 +155,9 @@
return response;
}
- public JUDDIApiResponse startManagers(String authToken) {
+ public JUDDIApiResponse restartManager(String authToken) {
+
+ JUDDIApiResponse response = new JUDDIApiResponse();
HttpServletRequest request = getThreadLocalRequest();
HttpSession session = request.getSession();
@@ -167,16 +168,35 @@
username = user.getName();
}
}
+ GetPublisherDetail getPublisherDetail = new GetPublisherDetail();
+ getPublisherDetail.setAuthInfo(authToken);
+ getPublisherDetail.getPublisherId().add(username);
try {
- System.out.println("managerName=" + UDDIClerkManager.getClientConfig().getManagerName());
-
- } catch (ConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
+ Class<?> transportClass = Loader.loadClass(clazz);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
+ JUDDIApiPortType apiService = transport.getJUDDIApiService();
+ PublisherDetail publisherDetail = apiService.getPublisherDetail(getPublisherDetail);
+ org.apache.juddi.api_v3.Publisher publisher = publisherDetail.getPublisher().get(0);
+ if ("true".equalsIgnoreCase(publisher.getIsAdmin())) {
+ logger.info("managerName=" + UDDIClerkManager.getClientConfig().getManagerName());
+ UDDIClerkManager.restart();
+ response.setMessage("Successfull manager restart.");
+ response.setSuccess(true);
+ } else {
+ response.setMessage("Only publishers with Admin privileges can perform a restart.");
+ response.setSuccess(false);
+ }
+ } catch (Exception e) {
+ response.setMessage("Configuration issue: " + e.getMessage());
+ response.setErrorCode("104");
+ } catch (Throwable t) {
+ response.setMessage("Configuration issue: " + t.getMessage());
+ response.setErrorCode("104");
}
- return null;
+ return response;
}
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml?rev=823330&r1=823329&r2=823330&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml Thu Oct 8 21:26:04 2009
@@ -2,7 +2,7 @@
<uddi>
<reloadDelay>5000</reloadDelay>
- <manager name="uddi-portlet-man">
+ <manager name="uddi-portlet-manager">
<nodes>
<node>
<name>default</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org