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 21:46:40 UTC
svn commit: r823292 - in /webservices/juddi/trunk/juddi-console:
subscription-listener/src/main/resources/META-INF/
subscription-listener/src/main/webapp/WEB-INF/
uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java...
Author: kstam
Date: Thu Oct 8 19:46:38 2009
New Revision: 823292
URL: http://svn.apache.org/viewvc?rev=823292&view=rev
Log:
JUDDI-287 removing the managerName from the transport. Not needed after all.
Added:
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/manager.png (with props)
Modified:
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.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/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/Constants.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.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/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/SecurityServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml Thu Oct 8 19:46:38 2009
@@ -2,16 +2,18 @@
<uddi>
<reloadDelay>5000</reloadDelay>
- <manager name="sub-man">
+ <manager name="subcription-manager">
<nodes>
<node>
<name>default</name>
+ <description>Main jUDDI node</description>
+ <!--
<properties>
<property name="serverName" value="localhost"/>
<property name="serverPort" value="8080"/>
</properties>
- <description>Main jUDDI node</description>
- <!-- JAX-WS Transport -->
+ -->
+ <!-- JAX-WS Transport
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
@@ -20,12 +22,27 @@
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
</node>
</nodes>
- <clerks>
+ <clerks registerOnStartup="true">
<clerk name="default" node="default" publisher="root" password="root">
<class>org.apache.juddi.test.HelloWorldImpl</class>
</clerk>
+ <!--
+ <clerk name="medroot" node="med" publisher="root" password="root" />
+ <xregister>
+ <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+ </xregister>
+ -->
</clerks>
</manager>
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml Thu Oct 8 19:46:38 2009
@@ -56,8 +56,7 @@
</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
- <!--
+
<servlet>
<servlet-name>UDDIClerkServlet</servlet-name>
<display-name>Clerk Servlet</display-name>
@@ -65,13 +64,8 @@
org.apache.juddi.v3.client.config.UDDIClerkServlet
</servlet-class>
<load-on-startup>1</load-on-startup>
- <init-param>
- <param-name>managerName</param-name>
- <param-value>sub-man</param-value>
- </init-param>
-
+
</servlet>
- -->
<servlet-mapping>
<servlet-name>NotifyServlet</servlet-name>
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=823292&r1=823291&r2=823292&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 8 19:46:38 2009
@@ -23,4 +23,5 @@
AbstractImagePrototype save();
AbstractImagePrototype delete();
AbstractImagePrototype sync();
+ AbstractImagePrototype manager();
}
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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -17,8 +17,14 @@
package org.apache.juddi.portlets.client;
import org.apache.juddi.portlets.client.model.Publisher;
+import org.apache.juddi.portlets.client.service.JUDDIApiResponse;
+import org.apache.juddi.portlets.client.service.JUDDIApiService;
+import org.apache.juddi.portlets.client.service.JUDDIApiServiceAsync;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.DockPanel;
import com.google.gwt.user.client.ui.RootPanel;
@@ -36,6 +42,7 @@
private LoginPanel loginPanel = new LoginPanel(this);
private PublisherListPanel publisherListPanel = new PublisherListPanel();
private PublisherPanel publisherPanel = null;
+ private JUDDIApiServiceAsync juddiApiService = (JUDDIApiServiceAsync) GWT.create(JUDDIApiService.class);
public static JUDDIPublisher getInstance() {
return singleton;
@@ -126,9 +133,24 @@
publisherPanel.deletePublisher(getToken());
}
}
-
-
-
+ public void startManagers() {
+ String token = getToken();
+ juddiApiService.startManagers(token, new AsyncCallback<JUDDIApiResponse>()
+ {
+ public void onFailure(Throwable caught) {
+ Window.alert("Could not connect to the UDDI registry. " + caught.getMessage());
+ }
+
+ public void onSuccess(JUDDIApiResponse response) {
+ if (response.isSuccess()) {
+
+ } 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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -10,12 +10,14 @@
public class MenuBarPanel extends FlowPanel implements ClickListener {
public static final String PUBLISHER = "publisher";
+ public static final String ADMIN = "admin";
public static final String SUBSCRIPTION = "subscription";
public static final Images images = (Images) GWT.create(Images.class);
PushButton saveButton = new PushButton();
PushButton newButton = new PushButton();
PushButton deleteButton = new PushButton();
PushButton syncButton = new PushButton();
+ PushButton managerButton = new PushButton();
String context = PUBLISHER;
public MenuBarPanel(String context) {
@@ -43,6 +45,14 @@
syncButton.setHTML(images.sync().getHTML());
syncButton.setStyleName(("portlet-form-button"));
syncButton.addClickListener(this);
+ pushPanel.add(syncButton);
+ }
+
+ if (PUBLISHER.equals(context)) {
+ managerButton.setHTML(images.manager().getHTML());
+ managerButton.setStyleName(("portlet-form-button"));
+ managerButton.addClickListener(this);
+ pushPanel.add(managerButton);
}
add(pushPanel);
@@ -59,7 +69,9 @@
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();
+ UDDISubscription.getInstance().syncListedServices();
+ } else if (sender == managerButton) {
+ JUDDIPublisher.getInstance().startManagers();
}
}
Added: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/manager.png
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/manager.png?rev=823292&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/manager.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -31,4 +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);
}
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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -29,5 +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);
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/Constants.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/Constants.java?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/Constants.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/Constants.java Thu Oct 8 19:46:38 2009
@@ -2,6 +2,5 @@
public interface Constants {
- public final static String MANAGER_NAME = "uddi-portlet-man";
public final static String NODE_NAME = "default";
}
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java Thu Oct 8 19:46:38 2009
@@ -71,9 +71,9 @@
logger.debug("FindBusiness " + findBusiness + " sending findBusinesses request..");
List<Business> businesses = new ArrayList<Business>();
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
UDDIInquiryPortType inquiryService = transport.getUDDIInquiryService();
BusinessList businessList = inquiryService.findBusiness(findBusiness);
for (BusinessInfo businessInfo : businessList.getBusinessInfos().getBusinessInfo()) {
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java Thu Oct 8 19:46:38 2009
@@ -66,9 +66,9 @@
private Transport getTransport()
throws ConfigurationException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, SecurityException, InvocationTargetException, NoSuchMethodException {
if (transport==null) {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).getNodes().get(Constants.NODE_NAME).getProxyTransport();
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
}
return transport;
}
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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -16,10 +16,15 @@
*/
package org.apache.juddi.portlets.server.service;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+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;
@@ -56,9 +61,9 @@
JUDDIApiResponse response = new JUDDIApiResponse();
List<Publisher> publishers = new ArrayList<Publisher>();
try {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
JUDDIApiPortType apiService = transport.getJUDDIApiService();
PublisherDetail publisherDetail = null;
publisherDetail = apiService.getPublisherDetail(getPublisherDetail);
@@ -93,9 +98,9 @@
public JUDDIApiResponse savePublisher(String token, Publisher publisher) {
JUDDIApiResponse response = new JUDDIApiResponse();
try {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
JUDDIApiPortType apiService = transport.getJUDDIApiService();
SavePublisher savePublisher = new SavePublisher();
savePublisher.setAuthInfo(token);
@@ -128,9 +133,9 @@
public JUDDIApiResponse deletePublisher(String token, String publisherId) {
JUDDIApiResponse response = new JUDDIApiResponse();
try {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
JUDDIApiPortType apiService = transport.getJUDDIApiService();
DeletePublisher deletePublisher = new DeletePublisher();
deletePublisher.setAuthInfo(token);
@@ -150,5 +155,28 @@
}
return response;
}
+
+ public JUDDIApiResponse startManagers(String authToken) {
+
+ HttpServletRequest request = getThreadLocalRequest();
+ HttpSession session = request.getSession();
+ String username = (String) session.getAttribute("UserName");
+ if (username==null) {
+ Principal user = request.getUserPrincipal();
+ if (user!=null) {
+ username = user.getName();
+ }
+ }
+
+ try {
+ System.out.println("managerName=" + UDDIClerkManager.getClientConfig().getManagerName());
+
+ } catch (ConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return null;
+ }
}
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=823292&r1=823291&r2=823292&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 8 19:46:38 2009
@@ -25,7 +25,6 @@
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.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.i18n.EntityForLang;
import org.apache.juddi.v3.client.transport.Transport;
@@ -63,9 +62,9 @@
logger.debug("GetRegistrationInfo " + getRegistrationInfo + " sending get Busineses request..");
List<Business> businesses = new ArrayList<Business>();
try {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
UDDIPublicationPortType publicationService = transport.getUDDIPublishService();
RegisteredInfo info = publicationService.getRegisteredInfo(getRegistrationInfo);
for (BusinessInfo businessInfo : info.getBusinessInfos().getBusinessInfo()) {
@@ -99,55 +98,4 @@
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/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=823292&r1=823291&r2=823292&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java Thu Oct 8 19:46:38 2009
@@ -81,7 +81,7 @@
session.setAttribute("UserName", username);
//upon success obtain tokens from other registries
- Map<String, UDDIClerk> clerks = UDDIClerkManager.getClientConfig("uddi-portlet-man").getClerks();
+ Map<String, UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getClerks();
for (UDDIClerk clerk : clerks.values()) {
if (username.equals(clerk.getPublisher())) {
try {
@@ -118,9 +118,9 @@
InstantiationException, IllegalAccessException, TransportException, DispositionReportFaultMessage, RemoteException,
IllegalArgumentException, SecurityException, InvocationTargetException, NoSuchMethodException {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
UDDISecurityPortType securityService = transport.getUDDISecurityService();
GetAuthToken getAuthToken = new GetAuthToken();
getAuthToken.setUserID(username);
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=823292&r1=823291&r2=823292&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 8 19:46:38 2009
@@ -71,7 +71,7 @@
}
logger.debug("Publisher " + publisher + " sending getSubscription request..");
try {
- Map<String, UDDIClerk> clerks = UDDIClerkManager.getClientConfig("uddi-portlet-man").getClerks();
+ Map<String, UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getClerks();
for (UDDIClerk clerk : clerks.values()) {
if (publisher.equals(clerk.getPublisher())) {
@@ -99,9 +99,9 @@
modelNode.setClerkName(clerk.getName());
modelNode.setDescription(node.getDescription());
try {
- String clazz = UDDIClerkManager.getClientConfig(Constants.MANAGER_NAME).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,String.class).newInstance(Constants.MANAGER_NAME,Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
String authToken = (String) session.getAttribute(clerk.getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
@@ -137,10 +137,10 @@
logger.debug("Sending saveSubscriptions request..");
try {
- UDDIClerk clerk = UDDIClerkManager.getClientConfig("uddi-portlet-man").getClerks().get(modelSubscription.getClerkName());
- String clazz = UDDIClerkManager.getClientConfig(clerk.getManagerName()).getNodes().get(clerk.getNode().getName()).getProxyTransport();
+ UDDIClerk clerk = UDDIClerkManager.getClientConfig().getClerks().get(modelSubscription.getClerkName());
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(clerk.getNode().getName()).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getManagerName(),clerk.getNode().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();
@@ -204,8 +204,8 @@
logger.debug("Sending deleteSubscriptions request for subscriptionKey="
+ modelSubscription.getSubscriptionKey());
try {
- UDDIClerk clerk = UDDIClerkManager.getClientConfig("uddi-portlet-man").getClerks().get(modelSubscription.getClerkName());
- String clazz = UDDIClerkManager.getClientConfig("uddi-portlet-man").getNodes().get(clerk.getNode().getName()).getProxyTransport();
+ UDDIClerk clerk = UDDIClerkManager.getClientConfig().getClerks().get(modelSubscription.getClerkName());
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(clerk.getNode().getName()).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getNode().getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
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=823292&r1=823291&r2=823292&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 19:46:38 2009
@@ -62,7 +62,7 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
</node>
</nodes>
- <clerks>
+ <clerks registerOnStartup="false">
<clerk name="default" node="default" publisher="root" password="root"/>
<clerk name="medroot" node="med" publisher="root" password="root"/>
<xregister>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org