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/20 09:58:19 UTC
svn commit: r826988 - in /webservices/juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/...
Author: kstam
Date: Tue Oct 20 07:58:18 2009
New Revision: 826988
URL: http://svn.apache.org/viewvc?rev=826988&view=rev
Log:
JUDDI-240 adding xregistration
Added:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
Modified:
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ClientSubscriptionInfo.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClientSubscriptionInfo.java
webservices/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SyncSubscriptionDetail.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/sub_v3/SubscriptionResultsList.java
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Tue Oct 20 07:58:18 2009
@@ -43,7 +43,8 @@
private Configuration config = null;;
private Map<String,UDDINode> uddiNodes = null;
private Map<String,UDDIClerk> uddiClerks = null;
- private Set<XRegistration> xRegistrations = null;
+ private Set<XRegistration> xBusinessRegistrations = null;
+ private Set<XRegistration> xServiceBindingRegistrations = null;
private String managerName = null;
/**
@@ -57,7 +58,8 @@
protected void loadManager() throws ConfigurationException {
uddiNodes = readNodeConfig(config);
uddiClerks = readClerkConfig(config, uddiNodes);
- xRegistrations = readXRegConfig(config,uddiClerks);
+ xServiceBindingRegistrations = readXServiceBindingRegConfig(config,uddiClerks);
+ xBusinessRegistrations = readXBusinessRegConfig(config, uddiClerks);
}
/**
* Does the actual work of reading the configuration from System
@@ -153,24 +155,32 @@
}
return nodes;
}
- /*
- * only works for services right now
- */
- private Set<XRegistration> readXRegConfig(Configuration config, Map<String,UDDIClerk> clerks)
+
+ private Set<XRegistration> readXBusinessRegConfig(Configuration config, Map<String,UDDIClerk> clerks)
+ throws ConfigurationException {
+ return readXRegConfig(config, clerks, "business");
+ }
+
+ private Set<XRegistration> readXServiceBindingRegConfig(Configuration config, Map<String,UDDIClerk> clerks)
throws ConfigurationException {
- String[] bindingKeys = config.getStringArray("manager.clerks.xregister.service[@bindingKey]");
+ return readXRegConfig(config, clerks, "servicebinding");
+ }
+
+ private Set<XRegistration> readXRegConfig(Configuration config, Map<String,UDDIClerk> clerks, String entityType)
+ throws ConfigurationException {
+ String[] entityKeys = config.getStringArray("manager.clerks.xregister." + entityType + "[@entityKey]");
Set<XRegistration> xRegistrations = new HashSet<XRegistration>();
- log.info("XRegistration bindingKeys=" + bindingKeys);
- for (int i=0; i<bindingKeys.length; i++) {
+ log.info("XRegistration " + entityKeys.length + " " + entityType + "Keys");
+ for (int i=0; i<entityKeys.length; i++) {
XRegistration xRegistration = new XRegistration();
- xRegistration.setBindingKey(config.getString("manager.clerks.xregister.service(" + i + ")[@bindingKey]"));
+ xRegistration.setEntityKey(config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@entityKey]"));
- String fromClerkRef = config.getString("manager.clerks.xregister.service(" + i + ")[@fromClerk]");
+ String fromClerkRef = config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@fromClerk]");
if (!clerks.containsKey(fromClerkRef)) throw new ConfigurationException("Could not find fromClerk with name=" + fromClerkRef);
UDDIClerk fromClerk = clerks.get(fromClerkRef);
xRegistration.setFromClerk(fromClerk);
- String toClerkRef = config.getString("manager.clerks.xregister.service(" + i + ")[@toClerk]");
+ String toClerkRef = config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@toClerk]");
if (!clerks.containsKey(toClerkRef)) throw new ConfigurationException("Could not find toClerk with name=" + toClerkRef);
UDDIClerk toClerk = clerks.get(toClerkRef);
xRegistration.setToClerk(toClerk);
@@ -197,8 +207,12 @@
return uddiClerks;
}
- public Set<XRegistration> getXRegistrations() {
- return xRegistrations;
+ public Set<XRegistration> getXServiceBindingRegistrations() {
+ return xServiceBindingRegistrations;
+ }
+
+ public Set<XRegistration> getXBusinessRegistrations() {
+ return xBusinessRegistrations;
}
public Configuration getConfiguration() {
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Tue Oct 20 07:58:18 2009
@@ -18,11 +18,15 @@
import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingDetail;
import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessDetail;
+import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessService;
import org.uddi.api_v3.DeleteBinding;
import org.uddi.api_v3.GetAuthToken;
import org.uddi.api_v3.GetBindingDetail;
+import org.uddi.api_v3.GetBusinessDetail;
import org.uddi.api_v3.GetServiceDetail;
+import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveService;
import org.uddi.api_v3.ServiceDetail;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -43,6 +47,21 @@
private Map<String,Properties> services = new HashMap<String,Properties>();
+
+
+ public UDDIClerk() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public UDDIClerk(Clerk clerk) {
+ super();
+ this.name = clerk.getName();
+ this.password = clerk.getPassword();
+ this.publisher = clerk.getPublisher();
+ this.uddiNode = new UDDINode(clerk.getNode());
+ }
+
public String[] getClassWithAnnotations() {
return classWithAnnotations;
}
@@ -70,17 +89,17 @@
* Register a service.
*
*/
- public BusinessService register(BusinessService service) {
+ public BusinessService register(BusinessService service, Node node) {
BusinessService businessService=null;
log.info("Registering service " + service.getName().get(0).getValue()
+ " with key " + service.getServiceKey());
try {
- String authToken = getAuthToken();
+ String authToken = getAuthToken(node.getSecurityUrl());
SaveService saveService = new SaveService();
saveService.setAuthInfo(authToken);
saveService.getBusinessService().add(service);
- ServiceDetail serviceDetail = getUDDINode().getTransport().getUDDIPublishService().saveService(saveService);
+ ServiceDetail serviceDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveService(saveService);
businessService = serviceDetail.getBusinessService().get(0);
} catch (Exception e) {
log.error("Unable to register service " + service.getName().get(0).getValue()
@@ -93,53 +112,89 @@
return businessService;
}
/**
+ * Register a service.
+ *
+ */
+ public BusinessEntity register(BusinessEntity business, Node node) {
+
+ BusinessEntity businessEntity=null;
+ log.info("Registering business " + business.getName().get(0).getValue()
+ + " with key " + business.getBusinessKey());
+ try {
+ String authToken = getAuthToken(node.getSecurityUrl());
+ SaveBusiness saveBusiness = new SaveBusiness();
+ saveBusiness.setAuthInfo(authToken);
+ saveBusiness.getBusinessEntity().add(business);
+ BusinessDetail businessDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveBusiness(saveBusiness);
+ businessEntity = businessDetail.getBusinessEntity().get(0);
+ } catch (Exception e) {
+ log.error("Unable to register business " + business.getName().get(0).getValue()
+ + " ." + e.getMessage(),e);
+ } catch (Throwable t) {
+ log.error("Unable to register business " + business.getName().get(0).getValue()
+ + " ." + t.getMessage(),t);
+ }
+ log.info("Registering businessEntity " + businessEntity.getName().get(0).getValue() + " completed.");
+ return businessEntity;
+ }
+ /**
* Unregisters the BindingTemplates for this service.
* @param service
*/
- public void unRegister(BusinessService service) {
+ public void unRegister(BusinessService service, Node node) {
log.info("UnRegistering binding for service " + service.getName().get(0).getValue());
try {
- String authToken = getAuthToken();
+ String authToken = getAuthToken(node.getSecurityUrl());
DeleteBinding deleteBinding = new DeleteBinding();
deleteBinding.setAuthInfo(authToken);
for (BindingTemplate binding : service.getBindingTemplates().getBindingTemplate()) {
deleteBinding.getBindingKey().add(binding.getBindingKey());
}
- getUDDINode().getTransport().getUDDIPublishService().deleteBinding(deleteBinding);
+ getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).deleteBinding(deleteBinding);
} catch (Exception e) {
log.error("Unable to register service " + service.getName().get(0).getValue()
+ " ." + e.getMessage(),e);
}
}
- public BusinessService findService(String serviceKey) throws DispositionReportFaultMessage, RemoteException,
+ public BusinessService findService(String serviceKey, Node node) throws DispositionReportFaultMessage, RemoteException,
TransportException, ConfigurationException {
GetServiceDetail getServiceDetail = new GetServiceDetail();
getServiceDetail.getServiceKey().add(serviceKey);
- getServiceDetail.setAuthInfo(getAuthToken());
- ServiceDetail sd = getUDDINode().getTransport().getUDDIInquiryService().getServiceDetail(getServiceDetail);
+ getServiceDetail.setAuthInfo(getAuthToken(node.getSecurityUrl()));
+ ServiceDetail sd = getUDDINode().getTransport().getUDDIInquiryService(node.getInquiryUrl()).getServiceDetail(getServiceDetail);
List<BusinessService> businessServiceList = sd.getBusinessService();
if (businessServiceList.size() == 0) throw new ConfigurationException("Could not find Service with key=" + serviceKey);
return businessServiceList.get(0);
}
- public BindingTemplate findServiceBinding(String bindingKey) throws DispositionReportFaultMessage, RemoteException,
+ public BindingTemplate findServiceBinding(String bindingKey, Node node) throws DispositionReportFaultMessage, RemoteException,
TransportException, ConfigurationException {
GetBindingDetail getBindingDetail = new GetBindingDetail();
getBindingDetail.getBindingKey().add(bindingKey);
- getBindingDetail.setAuthInfo(getAuthToken());
- BindingDetail bd = getUDDINode().getTransport().getUDDIInquiryService().getBindingDetail(getBindingDetail);
+ getBindingDetail.setAuthInfo(getAuthToken(node.getSecurityUrl()));
+ BindingDetail bd = getUDDINode().getTransport().getUDDIInquiryService(node.getInquiryUrl()).getBindingDetail(getBindingDetail);
List<BindingTemplate> bindingTemplateList = bd.getBindingTemplate();
- if (bindingTemplateList.size() == 0) throw new ConfigurationException("Could not find ServiceBbinding with key=" + bindingKey);
+ if (bindingTemplateList.size() == 0) throw new ConfigurationException("Could not find ServiceBinding with key=" + bindingKey);
return bindingTemplateList.get(0);
}
- private String getAuthToken() throws TransportException, DispositionReportFaultMessage, RemoteException {
+ public BusinessEntity findBusiness(String businessKey, Node node) throws DispositionReportFaultMessage, RemoteException,
+ TransportException, ConfigurationException {
+ GetBusinessDetail getBusinessDetail = new GetBusinessDetail();
+ getBusinessDetail.getBusinessKey().add(businessKey);
+ getBusinessDetail.setAuthInfo(node.getSecurityUrl());
+ BusinessDetail bd = getUDDINode().getTransport().getUDDIInquiryService(node.getInquiryUrl()).getBusinessDetail(getBusinessDetail);
+ if (bd.getBusinessEntity().size() == 0) throw new ConfigurationException("Could not find BusinessEntity with key=" + businessKey);
+ return bd.getBusinessEntity().get(0);
+ }
+
+ private String getAuthToken(String endpointURL) throws TransportException, DispositionReportFaultMessage, RemoteException {
if (authToken==null) {
GetAuthToken getAuthToken = new GetAuthToken();
getAuthToken.setUserID(getPublisher());
getAuthToken.setCred(getPassword());
- authToken = getUDDINode().getTransport().getUDDISecurityService().getAuthToken(getAuthToken).getAuthInfo();
+ authToken = getUDDINode().getTransport().getUDDISecurityService(endpointURL).getAuthToken(getAuthToken).getAuthInfo();
}
return authToken;
}
@@ -148,9 +203,9 @@
NodeDetail nodeDetail = null;
try {
SaveNode saveNode = new SaveNode();
- saveNode.setAuthInfo(getAuthToken());
+ saveNode.setAuthInfo(node.getSecurityUrl());
saveNode.getNode().add(node);
- nodeDetail =getUDDINode().getTransport().getJUDDIApiService().saveNode(saveNode);
+ nodeDetail =getUDDINode().getTransport().getJUDDIApiService(node.getJuddiApiUrl()).saveNode(saveNode);
} catch (Exception e) {
log.error("Unable to save node " + node.getName()
+ " ." + e.getMessage(),e);
@@ -165,9 +220,9 @@
ClerkDetail clerkDetail = null;
try {
SaveClerk saveClerk = new SaveClerk();
- saveClerk.setAuthInfo(getAuthToken());
+ saveClerk.setAuthInfo(getAuthToken(senderClerk.getUDDINode().getSecurityUrl()));
saveClerk.getClerk().add(getApiClerk());
- clerkDetail = senderClerk.getUDDINode().getTransport().getJUDDIApiService().saveClerk(saveClerk);
+ clerkDetail = senderClerk.getUDDINode().getTransport().getJUDDIApiService(senderClerk.getUDDINode().getJuddiApiUrl()).saveClerk(saveClerk);
} catch (Exception e) {
log.error("Unable to save clerk " + getName()
+ " ." + e.getMessage(),e);
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java Tue Oct 20 07:58:18 2009
@@ -102,11 +102,16 @@
* X-Register services listed in the uddi.xml
*/
public void xRegister() {
- //XRegistration of listed services
- Set<XRegistration> xRegistrations = clientConfig.getXRegistrations();
log.info("Starting cross registration...");
- for (XRegistration xRegistration : xRegistrations) {
- xRegistration.xRegister();
+ //XRegistration of listed businesses
+ Set<XRegistration> xBusinessRegistrations = clientConfig.getXBusinessRegistrations();
+ for (XRegistration xRegistration : xBusinessRegistrations) {
+ xRegistration.xRegisterBusiness();
+ }
+ //XRegistration of listed serviceBindings
+ Set<XRegistration> xServiceBindingRegistrations = clientConfig.getXServiceBindingRegistrations();
+ for (XRegistration xRegistration : xServiceBindingRegistrations) {
+ xRegistration.xRegisterServiceBinding();
}
log.info("Cross registration completed");
}
@@ -122,7 +127,7 @@
Collection<BusinessService> services = ap.readServiceAnnotations(
uddiClerk.getClassWithAnnotations(),uddiClerk.getUDDINode().getProperties());
for (BusinessService businessService : services) {
- uddiClerk.register(businessService);
+ uddiClerk.register(businessService,null);
}
}
}
@@ -138,7 +143,7 @@
Collection<BusinessService> services = ap.readServiceAnnotations(
clerk.getClassWithAnnotations(),clerk.getUDDINode().getProperties());
for (BusinessService businessService : services) {
- clerk.unRegister(businessService);
+ clerk.unRegister(businessService,clerk.getUDDINode().getApiNode());
}
}
}
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Tue Oct 20 07:58:18 2009
@@ -28,6 +28,28 @@
private String factoryURLPkgs;
private String factoryNamingProvider;
+
+ public UDDINode() {
+ super();
+ }
+
+ public UDDINode(Node node) {
+ super();
+ name = node.getName();
+ description = node.getDescription();
+ custodyTransferUrl = node.getCustodyTransferUrl();
+ inquiryUrl = node.getInquiryUrl();
+ publishUrl = node.getPublishUrl();
+ securityUrl = node.getSecurityUrl();
+ subscriptionUrl = node.getSubscriptionUrl();
+ subscriptionListenerUrl = node.getSubscriptionListenerUrl();
+ juddiApiUrl = node.getJuddiApiUrl();
+ proxyTransport = node.getProxyTransport();
+ factoryInitial = node.getFactoryInitial();
+ factoryURLPkgs = node.getFactoryURLPkgs();
+ factoryNamingProvider = node.getFactoryNamingProvider();
+ }
+
public Properties getProperties() {
return properties;
}
@@ -57,7 +79,7 @@
public Transport getTransport() throws TransportException {
if (transport==null) {
try {
- String clazz = UDDIClerkManager.getClientConfig().getUDDINode(name).getProxyTransport();
+ String clazz = getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
transport = (Transport) transportClass.getConstructor(String.class).newInstance(name);
} catch (Exception e) {
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java Tue Oct 20 07:58:18 2009
@@ -2,16 +2,25 @@
import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessService;
public class XRegistration {
-
-
private Logger log = Logger.getLogger(this.getClass());
private UDDIClerk toClerk;
private UDDIClerk fromClerk;
- private String bindingKey;
+ private String entityKey;
+
+ public XRegistration() {}
+
+ public XRegistration(String entityKey, UDDIClerk fromClerk,
+ UDDIClerk toClerk) {
+ super();
+ this.fromClerk = fromClerk;
+ this.toClerk = toClerk;
+ this.entityKey = entityKey;
+ }
public UDDIClerk getToClerk() {
return toClerk;
@@ -25,30 +34,56 @@
public void setFromClerk(UDDIClerk fromClerk) {
this.fromClerk = fromClerk;
}
- public String getBindingKey() {
- return bindingKey;
+ public String getEntityKey() {
+ return entityKey;
+ }
+ public void setEntityKey(String entityKey) {
+ this.entityKey = entityKey;
+ }
+
+
+ public void xRegisterBusiness() {
+ BusinessEntity businessEntity;
+ try {
+ businessEntity = fromClerk.findBusiness(entityKey,fromClerk.getUDDINode().getApiNode());
+ log.info("xregister business " + businessEntity.getName().get(0).getValue() + " + from "
+ + fromClerk.getName() + " to " + toClerk.getName());
+ businessEntity.setBusinessServices(null);
+ toClerk.register(businessEntity,toClerk.getUDDINode().getApiNode());
+ } catch (Exception e) {
+ log.error("Could not " + toString() + ". " + e.getMessage() + " " + e.getCause(),e);
+ }
}
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
+
+ public void xRegisterService() {
+ BusinessService businessService;
+ try {
+ businessService = fromClerk.findService(entityKey,fromClerk.getUDDINode().getApiNode());
+ log.info("xregister service " + businessService.getName().get(0).getValue() + " + from "
+ + fromClerk.getName() + " to " + toClerk.getName());
+ toClerk.register(businessService,toClerk.getUDDINode().getApiNode());
+ } catch (Exception e) {
+ log.error("Could not " + toString() + ". " + e.getMessage() + " " + e.getCause(),e);
+ }
}
- public void xRegister() {
+ public void xRegisterServiceBinding() {
BusinessService businessService;
try {
- BindingTemplate bindingTemplate = fromClerk.findServiceBinding(bindingKey);
- businessService = fromClerk.findService(bindingTemplate.getServiceKey());
+ BindingTemplate bindingTemplate = fromClerk.findServiceBinding(entityKey,fromClerk.getUDDINode().getApiNode());
+ businessService = fromClerk.findService(bindingTemplate.getServiceKey(),fromClerk.getUDDINode().getApiNode());
businessService.getBindingTemplates().getBindingTemplate().clear();
businessService.getBindingTemplates().getBindingTemplate().add(bindingTemplate);
log.info("xregister service " + businessService.getName().get(0).getValue() + " + from "
+ fromClerk.getName() + " to " + toClerk.getName());
- toClerk.register(businessService);
+ toClerk.register(businessService,toClerk.getUDDINode().getApiNode());
} catch (Exception e) {
log.error("Could not " + toString() + ". " + e.getMessage() + " " + e.getCause(),e);
}
}
public String toString() {
- return " xregister binding: " + bindingKey + " + from " + fromClerk.getName() + " to " + toClerk.getName();
+ return " xregister entityKey: " + entityKey + " + from " + fromClerk.getName() + " to " + toClerk.getName();
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java Tue Oct 20 07:58:18 2009
@@ -19,7 +19,9 @@
import java.io.StringWriter;
import java.rmi.RemoteException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.jws.WebService;
import javax.persistence.EntityManager;
@@ -508,6 +510,8 @@
SyncSubscriptionDetail syncSubscriptionDetail = new SyncSubscriptionDetail();
+ Map<String,org.apache.juddi.api_v3.ClientSubscriptionInfo> clientSubscriptionInfoMap
+ = new HashMap<String,org.apache.juddi.api_v3.ClientSubscriptionInfo>();
//find the clerks to go with these subscriptions
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -524,7 +528,7 @@
}
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
- syncSubscriptionDetail.getClientSubscriptionInfoMap().put(apiClientSubscriptionInfo.getSubscriptionKey(),apiClientSubscriptionInfo);
+ clientSubscriptionInfoMap.put(apiClientSubscriptionInfo.getSubscriptionKey(),apiClientSubscriptionInfo);
}
tx.commit();
@@ -538,17 +542,18 @@
for (GetSubscriptionResults getSubscriptionResult : body.getGetSubscriptionResultsList()) {
try {
String subscriptionKey = getSubscriptionResult.getSubscriptionKey();
- Clerk clerk = syncSubscriptionDetail.getClientSubscriptionInfoMap().get(subscriptionKey).getClerk();
- String clazz = clerk.getNode().getProxyTransport();
+ Clerk fromClerk = clientSubscriptionInfoMap.get(subscriptionKey).getFromClerk();
+ Clerk toClerk = clientSubscriptionInfoMap.get(subscriptionKey).getToClerk();
+ String clazz = fromClerk.getNode().getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getNode().getName());
- UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService(clerk.getNode().getSubscriptionUrl());
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(fromClerk.getNode().getName());
+ UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService(fromClerk.getNode().getSubscriptionUrl());
SubscriptionResultsList list = subscriptionService.getSubscriptionResults(getSubscriptionResult);
JAXBContext context = JAXBContext.newInstance(list.getClass());
Marshaller marshaller = context.createMarshaller();
StringWriter sw = new StringWriter();
- marshaller.marshal(body, sw);
+ marshaller.marshal(list, sw);
log.info("Notification received by UDDISubscriptionListenerService : " + sw.toString());
@@ -556,8 +561,7 @@
nl.getNotifications().add(sw.toString());
//update the registry with the notification list.
- //TODO
-
+ XRegisterHelper.handle(fromClerk, toClerk, list);
syncSubscriptionDetail.getSubscriptionResultsList().add(list);
} catch (Exception ce) {
@@ -570,6 +574,7 @@
}
}
}
+ //for now sending a clean object back
return syncSubscriptionDetail;
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java Tue Oct 20 07:58:18 2009
@@ -20,13 +20,17 @@
import java.io.StringWriter;
import javax.jws.WebService;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.FatalErrorException;
-
+import org.apache.juddi.error.InvalidKeyPassedException;
+import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.subscription.NotificationList;
import org.apache.juddi.validation.ValidateSubscriptionListener;
import org.apache.log4j.Logger;
@@ -59,8 +63,34 @@
NotificationList nl = NotificationList.getInstance();
nl.getNotifications().add(sw.toString());
- logger.info("Notification received by UDDISubscriptionListenerService : "
- + sw.toString());
+ org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = null;
+
+ //find the clerks to go with this subscription
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ this.getEntityPublisher(em, body.getAuthInfo());
+ String subscriptionKey = body.getSubscriptionResultsList().getSubscription().getSubscriptionKey();
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo =
+ em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ if (modelClientSubscriptionInfo == null) {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
+ }
+ apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
+
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ XRegisterHelper.handle(apiClientSubscriptionInfo.getFromClerk(),apiClientSubscriptionInfo.getToClerk(), body.getSubscriptionResultsList());
+
} catch (JAXBException jaxbe) {
logger.error("", jaxbe);
throw new FatalErrorException(new ErrorMessage("errors.subscriptionnotifier.client"));
Added: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java?rev=826988&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java (added)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java Tue Oct 20 07:58:18 2009
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.juddi.api.impl;
+
+import org.apache.juddi.api_v3.Clerk;
+import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.config.XRegistration;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.sub_v3.SubscriptionResultsList;
+
+
+/**
+ * Used to factor out inquiry functionality as it is used in more than one spot.
+ *
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class XRegisterHelper {
+
+ public static void handle(Clerk fromClerk, Clerk toClerk, SubscriptionResultsList list) {
+
+ if (list.getServiceList()!=null) {
+ for (ServiceInfo serviceInfo : list.getServiceList().getServiceInfos().getServiceInfo() ) {
+ serviceInfo.getBusinessKey();
+ new XRegistration(serviceInfo.getBusinessKey(), new UDDIClerk(fromClerk), new UDDIClerk(toClerk)).xRegisterBusiness();
+ new XRegistration(serviceInfo.getServiceKey(), new UDDIClerk(fromClerk), new UDDIClerk(toClerk)).xRegisterService();
+ }
+ }
+
+ }
+
+
+}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Tue Oct 20 07:58:18 2009
@@ -600,10 +600,15 @@
modelClientSubscriptionInfo.setLastNotified(new Date());
modelClientSubscriptionInfo.setSubscriptionKey(apiClientSubscriptionInfo.getSubscriptionKey());
- if (apiClientSubscriptionInfo.getClerk()!=null) {
+ if (apiClientSubscriptionInfo.getFromClerk()!=null) {
org.apache.juddi.model.Clerk modelClerk = new org.apache.juddi.model.Clerk();
- mapClerk(apiClientSubscriptionInfo.getClerk(), modelClerk);
- modelClientSubscriptionInfo.setClerk(modelClerk);
+ mapClerk(apiClientSubscriptionInfo.getFromClerk(), modelClerk);
+ modelClientSubscriptionInfo.setFromClerk(modelClerk);
+ }
+ if (apiClientSubscriptionInfo.getToClerk()!=null) {
+ org.apache.juddi.model.Clerk modelToClerk = new org.apache.juddi.model.Clerk();
+ mapClerk(apiClientSubscriptionInfo.getToClerk(), modelToClerk);
+ modelClientSubscriptionInfo.setToClerk(modelToClerk);
}
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Tue Oct 20 07:58:18 2009
@@ -761,10 +761,15 @@
apiClientSubscriptionInfo.setSubscriptionKey(modelClientSubscriptionInfo.getSubscriptionKey());
apiClientSubscriptionInfo.setLastModified(modelClientSubscriptionInfo.getLastNotified());
- if (modelClientSubscriptionInfo.getClerk()!=null) {
- org.apache.juddi.api_v3.Clerk apiClerk = new org.apache.juddi.api_v3.Clerk();
- mapClerk(modelClientSubscriptionInfo.getClerk(), apiClerk);
- apiClientSubscriptionInfo.setClerk(apiClerk);
+ if (modelClientSubscriptionInfo.getFromClerk()!=null) {
+ org.apache.juddi.api_v3.Clerk apiFromClerk = new org.apache.juddi.api_v3.Clerk();
+ mapClerk(modelClientSubscriptionInfo.getFromClerk(), apiFromClerk);
+ apiClientSubscriptionInfo.setFromClerk(apiFromClerk);
+ }
+ if (modelClientSubscriptionInfo.getToClerk()!=null) {
+ org.apache.juddi.api_v3.Clerk apiToClerk = new org.apache.juddi.api_v3.Clerk();
+ mapClerk(modelClientSubscriptionInfo.getToClerk(), apiToClerk);
+ apiClientSubscriptionInfo.setToClerk(apiToClerk);
}
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ClientSubscriptionInfo.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ClientSubscriptionInfo.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ClientSubscriptionInfo.java Tue Oct 20 07:58:18 2009
@@ -41,17 +41,20 @@
@Column(name="subscription_key", nullable = false, length=255)
private String subscriptionKey;
@ManyToOne(fetch = FetchType.EAGER)
- private Clerk clerk;
+ private Clerk fromClerk;
+ @ManyToOne(fetch = FetchType.EAGER)
+ private Clerk toClerk;
@Temporal(TemporalType.TIMESTAMP)
@Column(name="last_notified", length = 29)
private Date lastNotified;
public ClientSubscriptionInfo(){}
- public ClientSubscriptionInfo(Clerk clerk, Date lastNotified,
+ public ClientSubscriptionInfo(Clerk fromClerk, Clerk toClerk, Date lastNotified,
String subscriptionKey) {
super();
- this.clerk = clerk;
+ this.fromClerk = fromClerk;
+ this.toClerk = toClerk;
this.lastNotified = lastNotified;
this.subscriptionKey = subscriptionKey;
}
@@ -61,11 +64,17 @@
public void setSubscriptionKey(String subscriptionKey) {
this.subscriptionKey = subscriptionKey;
}
- public Clerk getClerk() {
- return clerk;
+ public Clerk getFromClerk() {
+ return fromClerk;
+ }
+ public void setFromClerk(Clerk fromClerk) {
+ this.fromClerk = fromClerk;
+ }
+ public Clerk getToClerk() {
+ return toClerk;
}
- public void setClerk(Clerk clerk) {
- this.clerk = clerk;
+ public void setToClerk(Clerk toClerk) {
+ this.toClerk = toClerk;
}
public Date getLastNotified() {
return lastNotified;
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClientSubscriptionInfo.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClientSubscriptionInfo.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClientSubscriptionInfo.java Tue Oct 20 07:58:18 2009
@@ -89,7 +89,7 @@
if (clientSubscriptionInfo.getSubscriptionKey()==null || clientSubscriptionInfo.getSubscriptionKey().equals("")) {
throw new ValueNotAllowedException(new ErrorMessage("errors.saveclientsubscriptionKey.NoInput"));
}
- validateClerk(em, clientSubscriptionInfo.getClerk());
+ validateClerk(em, clientSubscriptionInfo.getFromClerk());
}
}
Modified: webservices/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java (original)
+++ webservices/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java Tue Oct 20 07:58:18 2009
@@ -94,7 +94,7 @@
saveClerk.setAuthInfo(authInfoJoe);
saveClerk.getClerk().add(clerk);
- clientSubscriptionInfo.setClerk(clerk);
+ clientSubscriptionInfo.setFromClerk(clerk);
Node node2 = new Node();
node2.setSecurityUrl("http://localhost:8080/services/securityUrl2");
@@ -113,7 +113,7 @@
clerk2.setNode(node2);
saveClerk.getClerk().add(clerk2);
- clientSubscriptionInfo.setClerk(clerk);
+ clientSubscriptionInfo.setFromClerk(clerk);
clientSubscriptionInfo.setSubscriptionKey("mykey");
@@ -123,7 +123,7 @@
ClientSubscriptionInfo clientSubscriptionInfo2 = new ClientSubscriptionInfo();
clientSubscriptionInfo2.setSubscriptionKey("mykey2");
- clientSubscriptionInfo2.setClerk(clerk2);
+ clientSubscriptionInfo2.setFromClerk(clerk2);
saveClientSubscriptionInfo.getClientSubscriptionInfo().add(clientSubscriptionInfo2);
try {
Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java Tue Oct 20 07:58:18 2009
@@ -93,7 +93,7 @@
clerk.setPublisher("root");
clerk.setNode(node);
- clientSubscriptionInfo.setClerk(clerk);
+ clientSubscriptionInfo.setFromClerk(clerk);
clientSubscriptionInfo.setSubscriptionKey("mykey");
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java Tue Oct 20 07:58:18 2009
@@ -36,7 +36,8 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "clientSubscriptionInfo", propOrder = {
"subscriptionKey",
- "clerk",
+ "fromClerk",
+ "toClerk",
"lastModified"
})
public class ClientSubscriptionInfo implements Serializable{
@@ -46,7 +47,9 @@
@XmlElement(required = true)
protected String subscriptionKey;
@XmlElement(required = true)
- protected Clerk clerk;
+ protected Clerk toClerk;
+ @XmlElement(required = true)
+ protected Clerk fromClerk;
protected Date lastModified;
public String getSubscriptionKey() {
@@ -55,11 +58,17 @@
public void setSubscriptionKey(String subscriptionKey) {
this.subscriptionKey = subscriptionKey;
}
- public Clerk getClerk() {
- return clerk;
+ public Clerk getToClerk() {
+ return toClerk;
+ }
+ public void setToClerk(Clerk toClerk) {
+ this.toClerk = toClerk;
+ }
+ public Clerk getFromClerk() {
+ return fromClerk;
}
- public void setClerk(Clerk clerk) {
- this.clerk = clerk;
+ public void setFromClerk(Clerk fromClerk) {
+ this.fromClerk = fromClerk;
}
public Date getLastModified() {
return lastModified;
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SyncSubscriptionDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SyncSubscriptionDetail.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SyncSubscriptionDetail.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SyncSubscriptionDetail.java Tue Oct 20 07:58:18 2009
@@ -20,9 +20,7 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -39,15 +37,13 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "syncSubscriptionDetail", propOrder = {
- "list",
- "clientSubcriptionInfoMap"
+ "list"
})
public class SyncSubscriptionDetail implements Serializable{
@XmlTransient
private static final long serialVersionUID = -4039550325209019888L;
private List<SubscriptionResultsList> list;
- private Map<String,ClientSubscriptionInfo> clientSubcriptionInfoMap;
public List<SubscriptionResultsList> getSubscriptionResultsList() {
if (this.list==null) {
@@ -55,13 +51,6 @@
}
return this.list;
}
-
- public Map<String,ClientSubscriptionInfo> getClientSubscriptionInfoMap() {
- if (this.clientSubcriptionInfoMap==null) {
- this.clientSubcriptionInfoMap = new HashMap<String,ClientSubscriptionInfo>();
- }
- return this.clientSubcriptionInfoMap;
- }
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/sub_v3/SubscriptionResultsList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/sub_v3/SubscriptionResultsList.java?rev=826988&r1=826987&r2=826988&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/sub_v3/SubscriptionResultsList.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/sub_v3/SubscriptionResultsList.java Tue Oct 20 07:58:18 2009
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.uddi.api_v3.AssertionStatusReport;
@@ -88,6 +89,7 @@
"assertionStatusReport",
"keyBag"
})
+@XmlRootElement(name="subscriptionResultsList")
public class SubscriptionResultsList implements Serializable{
@XmlTransient
private static final long serialVersionUID = 8704510604661100139L;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org