You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/24 03:04:08 UTC
svn commit: r1560885 [1/3] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/
juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ juddi-c...
Author: alexoree
Date: Fri Jan 24 02:04:07 2014
New Revision: 1560885
URL: http://svn.apache.org/r1560885
Log:
JUDDI-805 fixed
Added:
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/MapUDDI23Test.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AddressLine.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/Email.java
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java?rev=1560885&r1=1560884&r2=1560885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java Fri Jan 24 02:04:07 2014
@@ -24,14 +24,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
import org.uddi.api_v2.AssertionStatusReport;
import org.uddi.api_v2.GetBusinessDetailExt;
-import org.uddi.api_v2.GetPublisherAssertions;
import org.uddi.api_v2.GetTModelDetail;
import org.uddi.api_v2.SetPublisherAssertions;
import org.uddi.api_v2.Truncated;
import org.uddi.api_v3.AccessPoint;
+import org.uddi.api_v3.Address;
import org.uddi.api_v3.AssertionStatusItem;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -44,6 +43,8 @@ import org.uddi.api_v3.BusinessService;
import org.uddi.api_v3.BusinessServices;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.CompletionStatus;
+import org.uddi.api_v3.Contact;
+import org.uddi.api_v3.Contacts;
import org.uddi.api_v3.DeleteBinding;
import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.DeletePublisherAssertions;
@@ -53,6 +54,7 @@ import org.uddi.api_v3.Description;
import org.uddi.api_v3.Direction;
import org.uddi.api_v3.DiscoveryURL;
import org.uddi.api_v3.DiscoveryURLs;
+import org.uddi.api_v3.Email;
import org.uddi.api_v3.ErrInfo;
import org.uddi.api_v3.FindBinding;
import org.uddi.api_v3.FindBusiness;
@@ -75,6 +77,8 @@ import org.uddi.api_v3.ListDescription;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.OverviewDoc;
import org.uddi.api_v3.OverviewURL;
+import org.uddi.api_v3.PersonName;
+import org.uddi.api_v3.Phone;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.api_v3.RegisteredInfo;
import org.uddi.api_v3.RelatedBusinessInfo;
@@ -117,6 +121,11 @@ public class MapUDDIv2Tov3 {
BusinessEntity item = new org.uddi.api_v3.BusinessEntity();
item.setBusinessKey(be.getBusinessKey());
item.getName().addAll(MapName(be.getName()));
+ item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+ item.setDiscoveryURLs(MapDiscoveryURLs(be.getDiscoveryURLs()));
+ item.getDescription().addAll(MapDescription(be.getDescription()));
+ item.setContacts(MapContacts(be.getContacts()));
+ item.setIdentifierBag(MapIdentBag(be.getIdentifierBag()));
if (be.getBusinessServices() != null && !be.getBusinessServices().getBusinessService().isEmpty()) {
item.setBusinessServices(new BusinessServices());
item.getBusinessServices().getBusinessService().addAll(MapService(be.getBusinessServices().getBusinessService()));
@@ -136,6 +145,8 @@ public class MapUDDIv2Tov3 {
item.setBindingTemplates(new BindingTemplates());
item.getBindingTemplates().getBindingTemplate().addAll(MapBinding(be.getBindingTemplates().getBindingTemplate()));
}
+ item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+ item.getDescription().addAll(MapDescription(be.getDescription()));
return item;
}
@@ -157,6 +168,7 @@ public class MapUDDIv2Tov3 {
BindingTemplate item = new org.uddi.api_v3.BindingTemplate();
item.setBindingKey(be.getBindingKey());
item.setServiceKey(be.getServiceKey());
+
item.setAccessPoint(MapAccessPoint(be.getAccessPoint()));
item.setHostingRedirector(MapHostingRedir(be.getHostingRedirector()));
item.getDescription().addAll(MapDescription(be.getDescription()));
@@ -192,7 +204,7 @@ public class MapUDDIv2Tov3 {
private static List<Name> MapName(List<org.uddi.api_v2.Name> name) {
List<Name> items = new ArrayList<Name>();
for (int i = 0; i < name.size(); i++) {
- Name n = new Name(name.get(i).getValue(), name.get(i).getValue());
+ Name n = new Name(name.get(i).getValue(), name.get(i).getLang());
items.add(n);
}
return items;
@@ -243,6 +255,7 @@ public class MapUDDIv2Tov3 {
r.getDescription().addAll(MapDescription(overviewDoc.getDescription()));
if (overviewDoc.getOverviewURL() != null) {
r.setOverviewURL(new OverviewURL());
+ overviewDoc.getDescription();
r.getOverviewURL().setValue(overviewDoc.getOverviewURL());
}
return r;
@@ -744,7 +757,7 @@ public class MapUDDIv2Tov3 {
&& name.get(i).getLang().contains(UDDIConstants.WILDCARD)) {
return true;
}
- if (name.get(i).getLang() != null
+ if (name.get(i).getLang() != null
&& name.get(i).getLang().contains(UDDIConstants.WILDCARD_CHAR)) {
return true;
}
@@ -996,49 +1009,153 @@ public class MapUDDIv2Tov3 {
}
private static boolean ContainsWildCardSingle(Name name) {
- if (name!=null){
- if (name.getValue()!=null && name.getValue().contains(UDDIConstants.WILDCARD))
+ if (name != null) {
+ if (name.getValue() != null && name.getValue().contains(UDDIConstants.WILDCARD)) {
return true;
- if (name.getValue()!=null && name.getValue().contains(UDDIConstants.WILDCARD_CHAR))
+ }
+ if (name.getValue() != null && name.getValue().contains(UDDIConstants.WILDCARD_CHAR)) {
return true;
- if (name.getLang()!=null && name.getLang().contains(UDDIConstants.WILDCARD))
+ }
+ if (name.getLang() != null && name.getLang().contains(UDDIConstants.WILDCARD)) {
return true;
- if (name.getLang()!=null && name.getLang().contains(UDDIConstants.WILDCARD_CHAR))
+ }
+ if (name.getLang() != null && name.getLang().contains(UDDIConstants.WILDCARD_CHAR)) {
return true;
+ }
}
return false;
}
public static List<AssertionStatusItem> MapAssertionStatusItems(AssertionStatusReport assertionStatusReport) {
List<AssertionStatusItem> r = new ArrayList<AssertionStatusItem>();
- if (assertionStatusReport==null)return r;
- for (int i=0; i < assertionStatusReport.getAssertionStatusItem().size(); i++){
+ if (assertionStatusReport == null) {
+ return r;
+ }
+ for (int i = 0; i < assertionStatusReport.getAssertionStatusItem().size(); i++) {
AssertionStatusItem x = new AssertionStatusItem();
x.setFromKey(assertionStatusReport.getAssertionStatusItem().get(i).getFromKey());
x.setToKey(assertionStatusReport.getAssertionStatusItem().get(i).getToKey());
- if ("status:complete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus()))
+ if ("status:complete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus())) {
x.setCompletionStatus(CompletionStatus.STATUS_COMPLETE);
- else if (" status:toKey_incomplete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus()))
+ } else if ("status:toKey_incomplete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus())) {
x.setCompletionStatus(CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
- else if (" status:fromKey_incomplete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus()))
+ } else if ("status:fromKey_incomplete".equalsIgnoreCase(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus())) {
x.setCompletionStatus(CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
- else
- x.setCompletionStatus(CompletionStatus.STATUS_BOTH_INCOMPLETE);
+ } else {
+ x.setCompletionStatus(CompletionStatus.STATUS_BOTH_INCOMPLETE);
+ }
x.setKeysOwned(MapKeysOwned(assertionStatusReport.getAssertionStatusItem().get(i).getKeysOwned()));
- if (assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference()!=null)
- x.setKeyedReference(new KeyedReference(assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getTModelKey(),
- assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyName(),
- assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyValue()));
+ if (assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference() != null) {
+ x.setKeyedReference(new KeyedReference(assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getTModelKey(),
+ assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyName(),
+ assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyValue()));
+ }
}
return r;
}
private static KeysOwned MapKeysOwned(org.uddi.api_v2.KeysOwned keysOwned) {
- if (keysOwned==null)return null;
+ if (keysOwned == null) {
+ return null;
+ }
KeysOwned r = new KeysOwned();
r.setFromKey(keysOwned.getFromKey());
r.setToKey(keysOwned.getToKey());
return r;
}
+ private static Contacts MapContacts(org.uddi.api_v2.Contacts contacts) {
+ if (contacts == null) {
+ return null;
+ }
+ Contacts c = new Contacts();
+ c.getContact().addAll(MapContactList(contacts.getContact()));
+ return c;
+
+ }
+
+ private static List<Contact> MapContactList(List<org.uddi.api_v2.Contact> contact) {
+ List<Contact> r = new ArrayList<Contact>();
+ if (contact == null) {
+ return r;
+ }
+ for (int i = 0; i < contact.size(); i++) {
+ Contact c = new Contact();
+ c.setUseType(contact.get(i).getUseType());
+ if (contact.get(i).getPersonName() != null) {
+ c.getPersonName().add(new PersonName(contact.get(i).getPersonName(), null));
+ }
+ c.getAddress().addAll(MapAddress(contact.get(i).getAddress()));
+ c.getDescription().addAll(MapDescription(contact.get(i).getDescription()));
+ c.getEmail().addAll(MapEmail(contact.get(i).getEmail()));
+ c.getPhone().addAll(MapPhone(contact.get(i).getPhone()));
+
+ r.add(c);
+ }
+ return r;
+ }
+
+ private static Collection<? extends Address> MapAddress(List<org.uddi.api_v2.Address> address) {
+ List<Address> r = new ArrayList<Address>();
+ if (address == null) {
+ return r;
+ }
+ for (int i = 0; i < address.size(); i++) {
+ Address x = new Address();
+ x.setSortCode(address.get(i).getSortCode());
+ x.setTModelKey(address.get(i).getTModelKey());
+ x.setUseType(address.get(i).getUseType());
+ x.getAddressLine().addAll(MapAddressLine(address.get(i).getAddressLine()));
+ r.add(x);
+ }
+ return r;
+
+ }
+
+ private static Collection<? extends Email> MapEmail(List<org.uddi.api_v2.Email> email) {
+ List<Email> r = new ArrayList<Email>();
+ if (email == null) {
+ return r;
+ }
+ for (int i = 0; i < email.size(); i++) {
+ Email x = new Email();
+ x.setUseType(email.get(i).getUseType());
+ x.setValue(email.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
+ }
+
+ private static Collection<? extends Phone> MapPhone(List<org.uddi.api_v2.Phone> phone) {
+ List<Phone> r = new ArrayList<Phone>();
+ if (phone == null) {
+ return r;
+ }
+ for (int i = 0; i < phone.size(); i++) {
+ Phone x = new Phone();
+ x.setUseType(phone.get(i).getUseType());
+ x.setValue(phone.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
+ }
+
+ private static List<org.uddi.api_v3.AddressLine> MapAddressLine(List<org.uddi.api_v2.AddressLine> addressLine) {
+ List<org.uddi.api_v3.AddressLine> r = new ArrayList<org.uddi.api_v3.AddressLine>();
+ if (addressLine == null) {
+ return r;
+ }
+ for (int i = 0; i < addressLine.size(); i++) {
+ org.uddi.api_v3.AddressLine x = new org.uddi.api_v3.AddressLine();
+ x.setKeyName(addressLine.get(i).getKeyName());
+ x.setKeyValue(addressLine.get(i).getKeyValue());
+ x.setValue(addressLine.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
+ }
+
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java?rev=1560885&r1=1560884&r2=1560885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java Fri Jan 24 02:04:07 2014
@@ -16,12 +16,13 @@
package org.apache.juddi.v3.client.mapping;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import javax.xml.ws.Holder;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.juddi.v3.client.UDDIConstants;
import org.uddi.api_v2.AccessPoint;
import org.uddi.api_v2.AddPublisherAssertions;
+import org.uddi.api_v2.Address;
+import org.uddi.api_v2.AddressLine;
import org.uddi.api_v2.BindingDetail;
import org.uddi.api_v2.BindingTemplate;
import org.uddi.api_v2.BindingTemplates;
@@ -34,6 +35,8 @@ import org.uddi.api_v2.BusinessList;
import org.uddi.api_v2.BusinessService;
import org.uddi.api_v2.BusinessServices;
import org.uddi.api_v2.CategoryBag;
+import org.uddi.api_v2.Contact;
+import org.uddi.api_v2.Contacts;
import org.uddi.api_v2.DeleteBinding;
import org.uddi.api_v2.DeleteBusiness;
import org.uddi.api_v2.DeletePublisherAssertions;
@@ -42,6 +45,7 @@ import org.uddi.api_v2.DeleteTModel;
import org.uddi.api_v2.Description;
import org.uddi.api_v2.DiscoveryURL;
import org.uddi.api_v2.DiscoveryURLs;
+import org.uddi.api_v2.Email;
import org.uddi.api_v2.ErrInfo;
import org.uddi.api_v2.FindBinding;
import org.uddi.api_v2.FindQualifiers;
@@ -73,6 +77,7 @@ import org.uddi.api_v2.GetBusinessDetail
import org.uddi.api_v2.GetServiceDetail;
import org.uddi.api_v2.GetTModelDetail;
import org.uddi.api_v2.KeyType;
+import org.uddi.api_v2.Phone;
import org.uddi.api_v2.PublisherAssertion;
import org.uddi.api_v2.PublisherAssertions;
import org.uddi.api_v2.RegisteredInfo;
@@ -104,12 +109,19 @@ public class MapUDDIv3Tov2 {
public static final String VERSION = "2.0";
- public static org.uddi.api_v2.BusinessEntity MapBusiness(org.uddi.api_v3.BusinessEntity be) {
+ public static org.uddi.api_v2.BusinessEntity MapBusiness(org.uddi.api_v3.BusinessEntity be, String operator) {
if (be == null) {
return null;
}
BusinessEntity item = new org.uddi.api_v2.BusinessEntity();
item.setBusinessKey(be.getBusinessKey());
+ item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+ item.setContacts(MapContacts(be.getContacts()));
+ item.setDiscoveryURLs(MapDiscoveryURLs(be.getDiscoveryURLs()));
+ item.setIdentifierBag(MapIdentBag(be.getIdentifierBag()));
+ item.setOperator(operator);
+ item.getDescription().addAll(MapDescription(be.getDescription()));
+
item.getName().addAll(MapName(be.getName()));
if (be.getBusinessServices() != null && !be.getBusinessServices().getBusinessService().isEmpty()) {
item.setBusinessServices(new BusinessServices());
@@ -123,6 +135,8 @@ public class MapUDDIv3Tov2 {
return null;
}
BusinessService item = new org.uddi.api_v2.BusinessService();
+ item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+ item.getDescription().addAll(MapDescription(be.getDescription()));
item.setBusinessKey(be.getBusinessKey());
item.setServiceKey(be.getServiceKey());
item.getName().addAll(MapName(be.getName()));
@@ -149,11 +163,13 @@ public class MapUDDIv3Tov2 {
return null;
}
BindingTemplate item = new org.uddi.api_v2.BindingTemplate();
+ item.getDescription().addAll(MapDescription(be.getDescription()));
+
item.setBindingKey(be.getBindingKey());
item.setServiceKey(be.getServiceKey());
item.setAccessPoint(MapAccessPoint(be.getAccessPoint()));
item.setHostingRedirector(MapHostingRedir(be.getHostingRedirector()));
- item.getDescription().addAll(MapDescription(be.getDescription()));
+
item.setTModelInstanceDetails(MapTModelInstanceDetails(be.getTModelInstanceDetails()));
return item;
@@ -234,10 +250,12 @@ public class MapUDDIv3Tov2 {
return null;
}
OverviewDoc r = new OverviewDoc();
+
r.getDescription().addAll(MapDescription(overviewDoc.get(0).getDescription()));
- if (overviewDoc.get(0).getOverviewURL() != null) {
+ if (overviewDoc.get(0).getOverviewURL() != null && overviewDoc.get(0).getOverviewURL().getValue()!=null) {
r.setOverviewURL(overviewDoc.get(0).getOverviewURL().getValue());
}
+
return r;
}
@@ -259,7 +277,7 @@ public class MapUDDIv3Tov2 {
private static TModelInstanceDetails MapTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails tModelInstanceDetails) {
if (tModelInstanceDetails == null) {
- return null;
+ return new TModelInstanceDetails();
}
TModelInstanceDetails r = new TModelInstanceDetails();
r.getTModelInstanceInfo().addAll(MapTModelInstanceInfo(tModelInstanceDetails.getTModelInstanceInfo()));
@@ -314,7 +332,7 @@ public class MapUDDIv3Tov2 {
if (tModelInstanceInfo.get(i).getInstanceDetails() != null) {
t.setInstanceDetails(new InstanceDetails());
t.getInstanceDetails().getDescription().addAll(MapDescription(tModelInstanceInfo.get(i).getInstanceDetails().getDescription()));
- t.getInstanceDetails().setInstanceParms(tModelInstanceInfo.get(i).getInstanceDetails().getInstanceParms());
+ t.getInstanceDetails().setInstanceParms(StringEscapeUtils.escapeXml(tModelInstanceInfo.get(i).getInstanceDetails().getInstanceParms()));
t.getInstanceDetails().setOverviewDoc(MapOverviewDoc(tModelInstanceInfo.get(i).getInstanceDetails().getOverviewDoc()));
}
r.add(t);
@@ -372,7 +390,7 @@ public class MapUDDIv3Tov2 {
r.setTModelBag(MapTModelBag(body.getTModelBag()));
r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
r.setGeneric(VERSION);
-
+
r.setBusinessKey(body.getBusinessKey());
r.getName().addAll(MapName(body.getName()));
return r;
@@ -384,7 +402,7 @@ public class MapUDDIv3Tov2 {
r.setMaxRows(body.getMaxRows());
r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
r.setGeneric(VERSION);
-
+
if (body.getName() != null) {
r.setName(new Name(body.getName().getValue(), body.getName().getLang()));
}
@@ -395,7 +413,7 @@ public class MapUDDIv3Tov2 {
GetBindingDetail r = new GetBindingDetail();
r.getBindingKey().addAll(body.getBindingKey());
r.setGeneric(VERSION);
-
+
return r;
}
@@ -403,7 +421,7 @@ public class MapUDDIv3Tov2 {
GetBusinessDetail r = new GetBusinessDetail();
r.getBusinessKey().addAll(body.getBusinessKey());
r.setGeneric(VERSION);
-
+
return r;
}
@@ -411,7 +429,7 @@ public class MapUDDIv3Tov2 {
GetServiceDetail r = new GetServiceDetail();
r.getServiceKey().addAll(body.getServiceKey());
r.setGeneric(VERSION);
-
+
return r;
}
@@ -419,7 +437,7 @@ public class MapUDDIv3Tov2 {
GetTModelDetail r = new GetTModelDetail();
r.getTModelKey().addAll(body.getTModelKey());
r.setGeneric(VERSION);
-
+
return r;
}
@@ -430,7 +448,7 @@ public class MapUDDIv3Tov2 {
AddPublisherAssertions r = new AddPublisherAssertions();
r.setAuthInfo(body.getAuthInfo());
r.setGeneric(VERSION);
-
+
r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion()));
return r;
@@ -439,7 +457,7 @@ public class MapUDDIv3Tov2 {
public static DeleteBinding MapDeleteBinding(org.uddi.api_v3.DeleteBinding body) {
DeleteBinding r = new DeleteBinding();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
r.getBindingKey().addAll(body.getBindingKey());
return r;
@@ -449,7 +467,7 @@ public class MapUDDIv3Tov2 {
public static DeleteBusiness MapDeleteBusiness(org.uddi.api_v3.DeleteBusiness body) {
DeleteBusiness r = new DeleteBusiness();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
r.getBusinessKey().addAll(body.getBusinessKey());
return r;
@@ -468,7 +486,7 @@ public class MapUDDIv3Tov2 {
public static DeleteService MapDeleteService(org.uddi.api_v3.DeleteService body) {
DeleteService r = new DeleteService();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
r.getServiceKey().addAll(body.getServiceKey());
return r;
@@ -477,7 +495,7 @@ public class MapUDDIv3Tov2 {
public static DeleteTModel MapDeleteTModel(org.uddi.api_v3.DeleteTModel body) {
DeleteTModel r = new DeleteTModel();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
r.getTModelKey().addAll(body.getTModelKey());
return r;
@@ -486,7 +504,7 @@ public class MapUDDIv3Tov2 {
public static SaveBinding MapSaveBinding(org.uddi.api_v3.SaveBinding body) {
SaveBinding r = new SaveBinding();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
r.getBindingTemplate().addAll(MapBinding(body.getBindingTemplate()));
return r;
@@ -495,9 +513,9 @@ public class MapUDDIv3Tov2 {
public static SaveBusiness MapSaveBusiness(org.uddi.api_v3.SaveBusiness body) {
SaveBusiness r = new SaveBusiness();
r.setGeneric(VERSION);
-
+
r.setAuthInfo(body.getAuthInfo());
- r.getBusinessEntity().addAll(MapBusinessList(body.getBusinessEntity()));
+ r.getBusinessEntity().addAll(MapBusinessList(body.getBusinessEntity(), null));
return r;
}
@@ -522,7 +540,7 @@ public class MapUDDIv3Tov2 {
GetPublisherAssertions r = new GetPublisherAssertions();
r.setAuthInfo(authInfo);
r.setGeneric(VERSION);
-
+
return r;
}
@@ -530,7 +548,7 @@ public class MapUDDIv3Tov2 {
GetRegisteredInfo r = new GetRegisteredInfo();
r.setAuthInfo(body.getAuthInfo());
r.setGeneric(VERSION);
-
+
return r;
}
@@ -647,13 +665,13 @@ public class MapUDDIv3Tov2 {
}
- private static List<BusinessEntity> MapBusinessList(List<org.uddi.api_v3.BusinessEntity> businessEntity) {
+ private static List<BusinessEntity> MapBusinessList(List<org.uddi.api_v3.BusinessEntity> businessEntity, String operator) {
List<BusinessEntity> r = new ArrayList<BusinessEntity>();
if (businessEntity == null) {
return r;
}
for (int i = 0; i < businessEntity.size(); i++) {
- r.add(MapBusiness(businessEntity.get(i)));
+ r.add(MapBusiness(businessEntity.get(i), operator));
}
return r;
}
@@ -663,7 +681,7 @@ public class MapUDDIv3Tov2 {
if (tModel == null) {
return r;
}
-
+
for (int i = 0; i < tModel.size(); i++) {
r.add(MapTModel(tModel.get(i)));
}
@@ -676,7 +694,7 @@ public class MapUDDIv3Tov2 {
}
SetPublisherAssertions r = new SetPublisherAssertions();
r.setGeneric(VERSION);
-
+
r.getPublisherAssertion().addAll(MapPublisherAssertion(value));
return r;
@@ -702,7 +720,7 @@ public class MapUDDIv3Tov2 {
if (ex == null) {
return null;
}
- DispositionReport r = new DispositionReport("err", MapDispositionReport(ex.getFaultInfo(), operator));
+ DispositionReport r = new DispositionReport("err", MapDispositionReport(ex.getFaultInfo(), operator));
return r;
}
@@ -760,7 +778,7 @@ public class MapUDDIv3Tov2 {
r.setGeneric(VERSION);
r.setOperator(operator);
r.setBusinessInfos(MapBusinessInfos(findBusiness.getBusinessInfos()));
- if (findBusiness.isTruncated()!=null && findBusiness.isTruncated()) {
+ if (findBusiness.isTruncated() != null && findBusiness.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -774,7 +792,7 @@ public class MapUDDIv3Tov2 {
}
RelatedBusinessesList r = new RelatedBusinessesList();
r.setBusinessKey(findRelatedBusinesses.getBusinessKey());
- if (findRelatedBusinesses.isTruncated()!=null && findRelatedBusinesses.isTruncated()) {
+ if (findRelatedBusinesses.isTruncated() != null && findRelatedBusinesses.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -800,7 +818,7 @@ public class MapUDDIv3Tov2 {
r.setGeneric(VERSION);
r.setOperator(operator);
r.setServiceInfos(MapServiceInfos(findService.getServiceInfos()));
- if (findService.isTruncated()!=null && findService.isTruncated()) {
+ if (findService.isTruncated() != null && findService.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -816,7 +834,7 @@ public class MapUDDIv3Tov2 {
for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) {
BusinessEntityExt x = new BusinessEntityExt();
- x.setBusinessEntity(MapBusiness(businessDetail.getBusinessEntity().get(i)));
+ x.setBusinessEntity(MapBusiness(businessDetail.getBusinessEntity().get(i), null));
r.getBusinessEntityExt().add(x);
}
return r;
@@ -828,7 +846,7 @@ public class MapUDDIv3Tov2 {
return null;
}
ServiceDetail r = new ServiceDetail();
- if (serviceDetail.isTruncated()!=null && serviceDetail.isTruncated()) {
+ if (serviceDetail.isTruncated() != null && serviceDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -845,7 +863,7 @@ public class MapUDDIv3Tov2 {
return null;
}
TModelList r = new TModelList();
- if (findTModel.isTruncated()!=null && findTModel.isTruncated()) {
+ if (findTModel.isTruncated() != null && findTModel.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -866,13 +884,13 @@ public class MapUDDIv3Tov2 {
org.uddi.api_v2.BusinessDetail r = new org.uddi.api_v2.BusinessDetail();
r.setGeneric(VERSION);
r.setOperator(operator);
- if (businessDetail.isTruncated()!=null && businessDetail.isTruncated()) {
+ if (businessDetail.isTruncated() != null && businessDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
}
- r.getBusinessEntity().addAll(MapBusinessList(businessDetail.getBusinessEntity()));
+ r.getBusinessEntity().addAll(MapBusinessList(businessDetail.getBusinessEntity(), operator));
return r;
}
@@ -883,7 +901,7 @@ public class MapUDDIv3Tov2 {
TModelDetail r = new TModelDetail();
r.setGeneric(VERSION);
r.setOperator(operator);
- if (tModelDetail.isTruncated()!=null && tModelDetail.isTruncated()) {
+ if (tModelDetail.isTruncated() != null && tModelDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -932,6 +950,7 @@ public class MapUDDIv3Tov2 {
}
for (int i = 0; i < tModelInfo.size(); i++) {
TModelInfo x = new TModelInfo();
+
x.setTModelKey(tModelInfo.get(i).getTModelKey());
x.setName(new Name(tModelInfo.get(i).getName().getValue(), tModelInfo.get(i).getName().getValue()));
r.add(x);
@@ -946,7 +965,7 @@ public class MapUDDIv3Tov2 {
RegisteredInfo r = new RegisteredInfo();
r.setGeneric(VERSION);
r.setOperator(operator);
- if (registeredInfo.isTruncated()!=null && registeredInfo.isTruncated()) {
+ if (registeredInfo.isTruncated() != null && registeredInfo.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -1018,7 +1037,7 @@ public class MapUDDIv3Tov2 {
&& name.get(i).getLang().contains(UDDIConstants.WILDCARD)) {
return true;
}
- if (name.get(i).getLang() != null
+ if (name.get(i).getLang() != null
&& name.get(i).getLang().contains(UDDIConstants.WILDCARD_CHAR)) {
return true;
}
@@ -1027,7 +1046,115 @@ public class MapUDDIv3Tov2 {
}
public static GetAssertionStatusReport MapGetAssertionStatusReport(String authInfo, CompletionStatus completionStatus) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ GetAssertionStatusReport r = new GetAssertionStatusReport();
+ r.setAuthInfo(authInfo);
+ switch (completionStatus) {
+ case STATUS_BOTH_INCOMPLETE:
+ r.setCompletionStatus(null);
+ break;
+ case STATUS_COMPLETE:
+ r.setCompletionStatus("status:complete");
+ break;
+ case STATUS_FROM_KEY_INCOMPLETE:
+ r.setCompletionStatus("status:fromKey_incomplete");
+ break;
+ case STATUS_TO_KEY_INCOMPLETE:
+ r.setCompletionStatus("status:toKey_incomplete");
+ break;
+ }
+ r.setGeneric(VERSION);
+ return r;
+ }
+
+ private static Contacts MapContacts(org.uddi.api_v3.Contacts contacts) {
+ if (contacts == null) {
+ return null;
+ }
+ Contacts c = new Contacts();
+ c.getContact().addAll(MapContactList(contacts.getContact()));
+ return c;
+ }
+
+ private static List<Contact> MapContactList(List<org.uddi.api_v3.Contact> contact) {
+
+ List<Contact> r = new ArrayList<Contact>();
+ if (contact == null) {
+ return r;
+ }
+ for (int i = 0; i < contact.size(); i++) {
+ Contact c = new Contact();
+ c.setUseType(contact.get(i).getUseType());
+ c.setPersonName(contact.get(i).getPersonName().get(0).getValue());
+ c.getAddress().addAll(MapAddress(contact.get(i).getAddress()));
+ c.getDescription().addAll(MapDescription(contact.get(i).getDescription()));
+ c.getEmail().addAll(MapEmail(contact.get(i).getEmail()));
+ c.getPhone().addAll(MapPhone(contact.get(i).getPhone()));
+
+ r.add(c);
+ }
+ return r;
+ }
+
+ private static List<Address> MapAddress(List<org.uddi.api_v3.Address> address) {
+ List<Address> r = new ArrayList<Address>();
+ if (address == null) {
+ return r;
+ }
+ for (int i = 0; i < address.size(); i++) {
+ Address x = new Address();
+ x.setSortCode(address.get(i).getSortCode());
+ x.setTModelKey(address.get(i).getTModelKey());
+ x.setUseType(address.get(i).getUseType());
+ x.getAddressLine().addAll(MapAddressLine(address.get(i).getAddressLine()));
+ r.add(x);
+ }
+ return r;
+ }
+
+ private static List<Email> MapEmail(List<org.uddi.api_v3.Email> email) {
+ List<Email> r = new ArrayList<Email>();
+ if (email == null) {
+ return r;
+ }
+ for (int i = 0; i < email.size(); i++) {
+ Email x = new Email();
+ x.setUseType(email.get(i).getUseType());
+ x.setValue(email.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
+ }
+
+ private static List<Phone> MapPhone(List<org.uddi.api_v3.Phone> phone) {
+ List<Phone> r = new ArrayList<Phone>();
+ if (phone == null) {
+ return r;
+ }
+ for (int i = 0; i < phone.size(); i++) {
+ Phone x = new Phone();
+ x.setUseType(phone.get(i).getUseType());
+ x.setValue(phone.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
+ }
+
+ private static List<AddressLine> MapAddressLine(List<org.uddi.api_v3.AddressLine> addressLine) {
+ List<AddressLine> r = new ArrayList<AddressLine>();
+ if (addressLine == null) {
+ return r;
+ }
+ for (int i = 0; i < addressLine.size(); i++) {
+ AddressLine x = new AddressLine();
+ x.setKeyName(addressLine.get(i).getKeyName());
+ x.setKeyValue(addressLine.get(i).getKeyValue());
+ x.setValue(addressLine.get(i).getValue());
+ r.add(x);
+ }
+
+ return r;
}
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java?rev=1560885&r1=1560884&r2=1560885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java Fri Jan 24 02:04:07 2014
@@ -83,13 +83,7 @@ public class Inquiry3to2 implements UDDI
public BusinessList findBusiness(FindBusiness body) throws DispositionReportFaultMessage, RemoteException {
try {
org.uddi.api_v2.FindBusiness MapFindBusiness = MapUDDIv3Tov2.MapFindBusiness(body);
- StringWriter sw = new StringWriter();
- JAXB.marshal(MapFindBusiness, sw);
- logger.info(sw.toString());
org.uddi.api_v2.BusinessList s = inquiryService.findBusiness(MapFindBusiness);
- sw = new StringWriter();
- JAXB.marshal(s, sw);
- logger.info(sw.toString());
return MapUDDIv2Tov3.MapBusinessList(s);
} catch (DispositionReport ex) {
throw MapUDDIv2Tov3.MapException(ex);
Added: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/MapUDDI23Test.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/MapUDDI23Test.java?rev=1560885&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/MapUDDI23Test.java (added)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/MapUDDI23Test.java Fri Jan 24 02:04:07 2014
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2014 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.v3.client.mapping;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.xml.bind.JAXB;
+import org.apache.juddi.api_v3.AccessPointType;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.uddi.api_v3.AccessPoint;
+import org.uddi.api_v3.Address;
+import org.uddi.api_v3.AddressLine;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BindingTemplates;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.BusinessServices;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.Contact;
+import org.uddi.api_v3.Contacts;
+import org.uddi.api_v3.Description;
+import org.uddi.api_v3.DiscoveryURL;
+import org.uddi.api_v3.DiscoveryURLs;
+import org.uddi.api_v3.Email;
+import org.uddi.api_v3.IdentifierBag;
+import org.uddi.api_v3.InstanceDetails;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.OverviewDoc;
+import org.uddi.api_v3.OverviewURL;
+import org.uddi.api_v3.PersonName;
+import org.uddi.api_v3.TModelInstanceDetails;
+import org.uddi.api_v3.TModelInstanceInfo;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class MapUDDI23Test {
+
+ static final String domainprefix="uddi:businessdomain:";
+ static BusinessEntity getBus(){
+ BusinessEntity be = new BusinessEntity();
+ be.setBusinessKey(domainprefix+"businesskey");
+ be.setBusinessServices(getServices());
+ be.setCategoryBag(getCatbag());
+ be.setContacts(getContacts());
+ be.setDiscoveryURLs(getDisco());
+ be.setIdentifierBag(getIdentbag());
+ be.getDescription().addAll(getDescriptions());
+ be.getName().addAll(getNames());
+ return be;
+ }
+
+ private static BusinessServices getServices() {
+ BusinessServices r = new BusinessServices();
+ BusinessService x = new BusinessService();
+ x.setBusinessKey(domainprefix+"businesskey");
+ x.setServiceKey(domainprefix+"servicekey");
+ x.setCategoryBag(getCatbag());
+ x.getDescription().addAll(getDescriptions());
+ x.getName().addAll(getNames());
+ x.setBindingTemplates(getBindingTemplates());
+ r.getBusinessService().add(x);
+ return r;
+ }
+
+ private static CategoryBag getCatbag() {
+
+ CategoryBag c = new CategoryBag();
+ c.getKeyedReference().add(new KeyedReference(domainprefix+"key", "name", "value"));
+ return c;
+ }
+
+ private static Contacts getContacts() {
+ Contacts c = new Contacts();
+ Contact admin = new Contact();
+ admin.setUseType("it support");
+ admin.getEmail().add(new Email("admin@localhost", "primary"));
+ admin.getDescription().add(new Description("the guy in that keeps the lights green", "en"));
+ admin.getPersonName().add(new PersonName("admin1", "en"));
+ Address r=new Address();
+ r.setLang("en");
+ r.setSortCode("none");
+ r.setTModelKey(domainprefix + "address");
+ r.setUseType("mailing address");
+ r.getAddressLine().add(new AddressLine("keyname","keyval","1313 mockingbird lane"));
+ admin.getAddress().add(r);
+ c.getContact().add(admin);
+ return c;
+
+ }
+
+ private static DiscoveryURLs getDisco() {
+ DiscoveryURLs r = new DiscoveryURLs();
+ r.getDiscoveryURL().add(new DiscoveryURL("public website", "http://localhost"));
+ return r;
+
+ }
+
+ private static IdentifierBag getIdentbag() {
+ IdentifierBag ret = new IdentifierBag();
+ ret.getKeyedReference().add(new KeyedReference(domainprefix + "key", "keyname", "keyval"));
+ return ret;
+ }
+
+ private static Collection<? extends Description> getDescriptions() {
+
+ List<Description> r = new ArrayList<Description>();
+ r.add(new Description("description", "en"));
+ return r;
+ }
+
+ private static Collection<? extends Name> getNames() {
+ List<Name> r = new ArrayList<Name>();
+ r.add(new Name("name1", "en"));
+ return r;
+ }
+
+ private static BindingTemplates getBindingTemplates() {
+ BindingTemplates bt = new BindingTemplates();
+ BindingTemplate t = new BindingTemplate();
+ t.setAccessPoint(new AccessPoint("http://localhost", AccessPointType.END_POINT.toString()));
+ t.setBindingKey(domainprefix+"binding");
+// t.setCategoryBag(getCatbag());
+ t.getDescription().addAll(getDescriptions());
+ t.setHostingRedirector(null);
+ t.setServiceKey(domainprefix+"servicekey");
+
+ t.setTModelInstanceDetails(getTID());
+
+ bt.getBindingTemplate().add(t);
+ return bt;
+ }
+
+ private static TModelInstanceDetails getTID() {
+ TModelInstanceDetails r = new TModelInstanceDetails();
+ TModelInstanceInfo x = new TModelInstanceInfo();
+ x.getDescription().addAll(getDescriptions());
+ x.setTModelKey(domainprefix+"tid");
+ x.setInstanceDetails(new InstanceDetails());
+ x.getInstanceDetails().getDescription().addAll(getDescriptions());
+ x.getInstanceDetails().setInstanceParms("asdasdasdasdasd");
+ OverviewDoc o = new OverviewDoc();
+ // o.getDescription().addAll(getDescriptions());
+ o.setOverviewURL(new OverviewURL("http://localhost", "overview"));
+ x.getInstanceDetails().getOverviewDoc().add(o);
+ r.getTModelInstanceInfo().add(x);
+ return r;
+ }
+
+ @Test
+ @Ignore //ignoring this for now, 100% mapping is not possible, this works as of 1-23-2014
+ public void AssertCloseEnoughBusinessUDDI3to2to3(){
+ BusinessEntity before = getBus();
+ BusinessEntity after =MapUDDIv2Tov3.MapBusiness(MapUDDIv3Tov2.MapBusiness(before, "node"));
+ StringWriter sw1= new StringWriter();
+ JAXB.marshal(before, sw1);
+
+ StringWriter sw2= new StringWriter();
+ JAXB.marshal(after, sw2);
+ System.out.println(sw1.toString());
+ System.out.println(sw2.toString());
+ Assert.assertEquals("these should be the same", sw1.toString(), sw2.toString());
+
+ }
+}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java?rev=1560885&r1=1560884&r2=1560885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java Fri Jan 24 02:04:07 2014
@@ -15,7 +15,9 @@
*/
package org.apache.juddi.api.impl;
+import java.io.StringWriter;
import javax.jws.WebService;
+import javax.xml.bind.JAXB;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -138,7 +140,11 @@ public class UDDIv2InquiryImpl implement
@Override
public BusinessDetail getBusinessDetail(GetBusinessDetail body) throws DispositionReport {
try {
- return MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)), getNodeID());
+ BusinessDetail MapBusinessDetail = MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)), getNodeID());
+ StringWriter sw = new StringWriter();
+ JAXB.marshal(MapBusinessDetail, sw);
+ logger.info(sw.toString());
+ return MapBusinessDetail;
} catch (DispositionReportFaultMessage ex) {
throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1560885&r1=1560884&r2=1560885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml Fri Jan 24 02:04:07 2014
@@ -119,6 +119,47 @@
</businessService>
+
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDIv2 Inquiry Service</name>
+ <description xml:lang="en">Web Service supporting UDDIv2 Inquiry API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws" serviceKey="uddi:juddi.apache.org:services-inquiryv2">
+ <description>UDDI Inquiry API V2</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/inquiryv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws-ssl" serviceKey="uddi:juddi.apache.org:services-inquiryv2">
+ <description>UDDI Inquiry API V3 SSL</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiryv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+
+ </businessService>
+
+
+
+
<businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:businesses-asf">
<name xml:lang="en">UDDI Inquiry REST Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description>
@@ -206,7 +247,41 @@
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:businesses-asf">
+
+
+ <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDIv2 Publish Service</name>
+ <description xml:lang="en">Web Service supporting UDDIv2 Publish API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws" serviceKey="uddi:juddi.apache.org:services-publishv2">
+ <description>UDDIv2 Publication API V2</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publishv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws-ssl" serviceKey="uddi:juddi.apache.org:services-publishv2">
+ <description>UDDI Publication API V2 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publishv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ </businessService>
+
+
+
+ <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:businesses-asf">
<name xml:lang="en">UDDI Security Service</name>
<description xml:lang="en">Web Service supporting UDDI Security API</description>
<bindingTemplates>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org