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/22 18:15:46 UTC
svn commit: r1560423 - 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-core/src/main/java/org/apache/juddi/api/impl/
juddi-gui/src/main/java/...
Author: alexoree
Date: Wed Jan 22 17:15:45 2014
New Revision: 1560423
URL: http://svn.apache.org/r1560423
Log:
JUDDI-780 adding logging warning, BETA implementation
JUDDI-800 adding additional null checks. adding uddiv2 endpoints and the cloud instance to the default uddi.xml for the gui. Fixing the setCookie functions so that the connected node name persists
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/Publish3to2.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2InquiryImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2PublishImpl.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
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=1560423&r1=1560422&r2=1560423&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 Wed Jan 22 17:15:45 2014
@@ -25,12 +25,14 @@ import org.apache.commons.logging.LogFac
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.AssertionStatusItem;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
import org.uddi.api_v3.BusinessDetail;
@@ -41,6 +43,7 @@ import org.uddi.api_v3.BusinessList;
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.DeleteBinding;
import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.DeletePublisherAssertions;
@@ -67,6 +70,7 @@ import org.uddi.api_v3.InfoSelection;
import org.uddi.api_v3.InstanceDetails;
import org.uddi.api_v3.KeyType;
import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.KeysOwned;
import org.uddi.api_v3.ListDescription;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.OverviewDoc;
@@ -588,16 +592,18 @@ public class MapUDDIv2Tov3 {
if (result == null) {
return r;
}
- while (result.getDetail().getDetailEntries().hasNext()) {
- Object next = result.getDetail().getDetailEntries().next();
- if (next instanceof DispositionReport) {
-
- DispositionReport z = (DispositionReport) next;
- Result x = new Result();
- r.addAll(MapResult(z.getFaultInfo().getResult()));
+ if (result.getDetail() != null) {
+ while (result.getDetail().getDetailEntries().hasNext()) {
+ Object next = result.getDetail().getDetailEntries().next();
+ if (next instanceof DispositionReport) {
+
+ DispositionReport z = (DispositionReport) next;
+ Result x = new Result();
+ r.addAll(MapResult(z.getFaultInfo().getResult()));
+ }
+ logger.warn("unable to parse fault detail, type:" + next.getClass().getCanonicalName() + " " + next.toString());
}
- logger.warn("unable to parse fault detail, type:" + next.getClass().getCanonicalName() + " " + next.toString());
}
return r;
}
@@ -616,7 +622,7 @@ public class MapUDDIv2Tov3 {
}
private static TModelBag MapTModelBag(org.uddi.api_v2.TModelBag tModelBag) {
- if (tModelBag == null) {
+ if (tModelBag == null || tModelBag.getTModelKey().isEmpty()) {
return null;
}
TModelBag r = new TModelBag();
@@ -625,7 +631,7 @@ public class MapUDDIv2Tov3 {
}
private static FindQualifiers MapFindQualifiers(org.uddi.api_v2.FindQualifiers findQualifiers) {
- if (findQualifiers == null) {
+ if (findQualifiers == null || findQualifiers.getFindQualifier().isEmpty()) {
return null;
}
FindQualifiers r = new FindQualifiers();
@@ -712,9 +718,40 @@ public class MapUDDIv2Tov3 {
r.setTModelBag(MapTModelBag(body.getTModelBag()));
r.setMaxRows(body.getMaxRows());
r.getName().addAll(MapName(body.getName()));
+ if (ContainsWildCard(r.getName())) {
+ r.setFindQualifiers(AddApproximateMatch(r.getFindQualifiers()));
+ }
return r;
}
+ private static org.uddi.api_v3.FindQualifiers AddApproximateMatch(org.uddi.api_v3.FindQualifiers findQualifiers) {
+ if (findQualifiers == null) {
+ findQualifiers = new org.uddi.api_v3.FindQualifiers();
+ }
+ findQualifiers.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ return findQualifiers;
+ }
+
+ private static boolean ContainsWildCard(List<org.uddi.api_v3.Name> name) {
+ for (int i = 0; i < name.size(); i++) {
+ if (name.get(i).getValue() != null && name.get(i).getValue().contains(UDDIConstants.WILDCARD)) {
+ return true;
+ }
+ if (name.get(i).getValue() != null && name.get(i).getValue().contains(UDDIConstants.WILDCARD_CHAR)) {
+ return true;
+ }
+ if (name.get(i).getLang() != null
+ && name.get(i).getLang().contains(UDDIConstants.WILDCARD)) {
+ return true;
+ }
+ if (name.get(i).getLang() != null
+ && name.get(i).getLang().contains(UDDIConstants.WILDCARD_CHAR)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private static DiscoveryURLs MapDiscoveryURLs(org.uddi.api_v2.DiscoveryURLs discoveryURLs) {
if (discoveryURLs == null) {
return null;
@@ -752,6 +789,9 @@ public class MapUDDIv2Tov3 {
r.setMaxRows(body.getMaxRows());
r.setTModelBag(MapTModelBag(body.getTModelBag()));
r.getName().addAll(MapName(body.getName()));
+ if (ContainsWildCard(r.getName())) {
+ r.setFindQualifiers(AddApproximateMatch(r.getFindQualifiers()));
+ }
return r;
}
@@ -767,6 +807,9 @@ public class MapUDDIv2Tov3 {
if (body.getName() != null) {
r.setName(new Name(body.getName().getValue(), body.getName().getLang()));
}
+ if (ContainsWildCardSingle(r.getName())) {
+ r.setFindQualifiers(AddApproximateMatch(r.getFindQualifiers()));
+ }
return r;
}
@@ -952,4 +995,50 @@ public class MapUDDIv2Tov3 {
return MapListPublisherAssertion(body.getPublisherAssertion());
}
+ private static boolean ContainsWildCardSingle(Name name) {
+ if (name!=null){
+ if (name.getValue()!=null && name.getValue().contains(UDDIConstants.WILDCARD))
+ return true;
+ if (name.getValue()!=null && name.getValue().contains(UDDIConstants.WILDCARD_CHAR))
+ return true;
+ if (name.getLang()!=null && name.getLang().contains(UDDIConstants.WILDCARD))
+ return true;
+ 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++){
+ 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()))
+ x.setCompletionStatus(CompletionStatus.STATUS_COMPLETE);
+ 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()))
+ x.setCompletionStatus(CompletionStatus.STATUS_FROM_KEY_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()));
+ }
+ return r;
+ }
+
+ private static KeysOwned MapKeysOwned(org.uddi.api_v2.KeysOwned keysOwned) {
+ if (keysOwned==null)return null;
+ KeysOwned r = new KeysOwned();
+ r.setFromKey(keysOwned.getFromKey());
+ r.setToKey(keysOwned.getToKey());
+ 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=1560423&r1=1560422&r2=1560423&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 Wed Jan 22 17:15:45 2014
@@ -67,6 +67,7 @@ import org.uddi.api_v2.TModelInstanceInf
import org.uddi.api_v2.URLType;
import org.uddi.api_v2.FindBusiness;
import org.uddi.api_v2.FindTModel;
+import org.uddi.api_v2.GetAssertionStatusReport;
import org.uddi.api_v2.GetBindingDetail;
import org.uddi.api_v2.GetBusinessDetail;
import org.uddi.api_v2.GetServiceDetail;
@@ -89,6 +90,7 @@ import org.uddi.api_v2.TModelInfos;
import org.uddi.api_v2.TModelList;
import org.uddi.api_v2.Truncated;
import org.uddi.api_v3.BusinessDetail;
+import org.uddi.api_v3.CompletionStatus;
import org.uddi.v2_service.DispositionReport;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -341,6 +343,9 @@ public class MapUDDIv3Tov2 {
r.setDiscoveryURLs(MapDiscoveryURLs(body.getDiscoveryURLs()));
r.setIdentifierBag(MapIdentBag(body.getIdentifierBag()));
r.getName().addAll(MapName(body.getName()));
+ if (ContainsWildCard(r.getName())) {
+ r.setFindQualifiers(AddApproximateMatch(r.getFindQualifiers()));
+ }
return r;
}
@@ -367,6 +372,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;
@@ -378,6 +384,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()));
}
@@ -388,6 +395,7 @@ public class MapUDDIv3Tov2 {
GetBindingDetail r = new GetBindingDetail();
r.getBindingKey().addAll(body.getBindingKey());
r.setGeneric(VERSION);
+
return r;
}
@@ -395,6 +403,7 @@ public class MapUDDIv3Tov2 {
GetBusinessDetail r = new GetBusinessDetail();
r.getBusinessKey().addAll(body.getBusinessKey());
r.setGeneric(VERSION);
+
return r;
}
@@ -402,6 +411,7 @@ public class MapUDDIv3Tov2 {
GetServiceDetail r = new GetServiceDetail();
r.getServiceKey().addAll(body.getServiceKey());
r.setGeneric(VERSION);
+
return r;
}
@@ -409,6 +419,7 @@ public class MapUDDIv3Tov2 {
GetTModelDetail r = new GetTModelDetail();
r.getTModelKey().addAll(body.getTModelKey());
r.setGeneric(VERSION);
+
return r;
}
@@ -419,6 +430,7 @@ public class MapUDDIv3Tov2 {
AddPublisherAssertions r = new AddPublisherAssertions();
r.setAuthInfo(body.getAuthInfo());
r.setGeneric(VERSION);
+
r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion()));
return r;
@@ -427,6 +439,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;
@@ -436,14 +449,17 @@ 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;
}
public static DeletePublisherAssertions MapDeletePublisherAssertions(org.uddi.api_v3.DeletePublisherAssertions body) {
- if (body==null)return null;
- DeletePublisherAssertions r = new DeletePublisherAssertions();
+ if (body == null) {
+ return null;
+ }
+ DeletePublisherAssertions r = new DeletePublisherAssertions();
r.setAuthInfo(body.getAuthInfo());
r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion()));
return r;
@@ -452,6 +468,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;
@@ -460,6 +477,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;
@@ -468,6 +486,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;
@@ -476,6 +495,7 @@ 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()));
return r;
@@ -484,6 +504,7 @@ public class MapUDDIv3Tov2 {
public static SaveService MapSaveService(org.uddi.api_v3.SaveService body) {
SaveService r = new SaveService();
r.setGeneric(VERSION);
+
r.setAuthInfo(body.getAuthInfo());
r.getBusinessService().addAll(MapService(body.getBusinessService()));
return r;
@@ -501,6 +522,7 @@ public class MapUDDIv3Tov2 {
GetPublisherAssertions r = new GetPublisherAssertions();
r.setAuthInfo(authInfo);
r.setGeneric(VERSION);
+
return r;
}
@@ -508,11 +530,12 @@ public class MapUDDIv3Tov2 {
GetRegisteredInfo r = new GetRegisteredInfo();
r.setAuthInfo(body.getAuthInfo());
r.setGeneric(VERSION);
+
return r;
}
private static FindQualifiers MapFindQualifiers(org.uddi.api_v3.FindQualifiers findQualifiers) {
- if (findQualifiers == null) {
+ if (findQualifiers == null || findQualifiers.getFindQualifier().isEmpty()) {
return null;
}
FindQualifiers r = new FindQualifiers();
@@ -600,11 +623,11 @@ public class MapUDDIv3Tov2 {
}
private static TModelBag MapTModelBag(org.uddi.api_v3.TModelBag tModelBag) {
-
- TModelBag r = new TModelBag();
- if (tModelBag != null) {
- r.getTModelKey().addAll(tModelBag.getTModelKey());
+ if (tModelBag == null || tModelBag.getTModelKey().isEmpty()) {
+ return null;
}
+ TModelBag r = new TModelBag();
+ r.getTModelKey().addAll(tModelBag.getTModelKey());
return r;
}
@@ -636,10 +659,11 @@ public class MapUDDIv3Tov2 {
}
private static List<TModel> MapTModelList(List<org.uddi.api_v3.TModel> tModel) {
+ List<TModel> r = new ArrayList<TModel>();
if (tModel == null) {
- return null;
+ return r;
}
- List<TModel> r = new ArrayList<TModel>();
+
for (int i = 0; i < tModel.size(); i++) {
r.add(MapTModel(tModel.get(i)));
}
@@ -647,20 +671,24 @@ public class MapUDDIv3Tov2 {
}
public static SetPublisherAssertions MapSetPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> value) {
- if (value==null)return null;
+ if (value == null) {
+ return null;
+ }
SetPublisherAssertions r = new SetPublisherAssertions();
r.setGeneric(VERSION);
+
r.getPublisherAssertion().addAll(MapPublisherAssertion(value));
return r;
-
+
}
- public static BindingDetail MapBindingDetail(org.uddi.api_v3.BindingDetail findBinding) {
+ public static BindingDetail MapBindingDetail(org.uddi.api_v3.BindingDetail findBinding, String operator) {
if (findBinding == null) {
return null;
}
BindingDetail r = new BindingDetail();
r.setGeneric(VERSION);
+ r.setOperator(operator);
if (findBinding.getListDescription().getActualCount() == findBinding.getListDescription().getIncludeCount()) {
r.setTruncated(Truncated.FALSE);
} else {
@@ -670,20 +698,21 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static DispositionReport MapException(DispositionReportFaultMessage ex) {
+ public static DispositionReport MapException(DispositionReportFaultMessage ex, String operator) {
if (ex == null) {
return null;
}
- DispositionReport r = new DispositionReport("err", MapDispositionReport(ex.getFaultInfo()));
+ DispositionReport r = new DispositionReport("err", MapDispositionReport(ex.getFaultInfo(), operator));
return r;
}
- private static org.uddi.api_v2.DispositionReport MapDispositionReport(org.uddi.api_v3.DispositionReport faultInfo) {
+ private static org.uddi.api_v2.DispositionReport MapDispositionReport(org.uddi.api_v3.DispositionReport faultInfo, String operator) {
if (faultInfo == null) {
return null;
}
org.uddi.api_v2.DispositionReport r = new org.uddi.api_v2.DispositionReport();
r.setGeneric(VERSION);
+ r.setOperator(operator);
r.setTruncated(Truncated.FALSE);
r.getResult().addAll(MapResults(faultInfo.getResult()));
return r;
@@ -722,15 +751,16 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static BusinessList MapBusinessListEntity(org.uddi.api_v3.BusinessList findBusiness) {
+ public static BusinessList MapBusinessListEntity(org.uddi.api_v3.BusinessList findBusiness, String operator) {
if (findBusiness == null) {
return null;
}
BusinessList r = new BusinessList();
r.setGeneric(VERSION);
+ r.setOperator(operator);
r.setBusinessInfos(MapBusinessInfos(findBusiness.getBusinessInfos()));
- if (findBusiness.isTruncated()) {
+ if (findBusiness.isTruncated()!=null && findBusiness.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -744,7 +774,7 @@ public class MapUDDIv3Tov2 {
}
RelatedBusinessesList r = new RelatedBusinessesList();
r.setBusinessKey(findRelatedBusinesses.getBusinessKey());
- if (findRelatedBusinesses.isTruncated()) {
+ if (findRelatedBusinesses.isTruncated()!=null && findRelatedBusinesses.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -762,14 +792,15 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static ServiceList MapServiceList(org.uddi.api_v3.ServiceList findService) {
+ public static ServiceList MapServiceList(org.uddi.api_v3.ServiceList findService, String operator) {
if (findService == null) {
return null;
}
ServiceList r = new ServiceList();
r.setGeneric(VERSION);
+ r.setOperator(operator);
r.setServiceInfos(MapServiceInfos(findService.getServiceInfos()));
- if (findService.isTruncated()) {
+ if (findService.isTruncated()!=null && findService.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -792,28 +823,29 @@ public class MapUDDIv3Tov2 {
}
- public static ServiceDetail MapServiceDetail(org.uddi.api_v3.ServiceDetail serviceDetail) {
+ public static ServiceDetail MapServiceDetail(org.uddi.api_v3.ServiceDetail serviceDetail, String operator) {
if (serviceDetail == null) {
return null;
}
ServiceDetail r = new ServiceDetail();
- if (serviceDetail.isTruncated()) {
+ if (serviceDetail.isTruncated()!=null && serviceDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
}
r.setGeneric(VERSION);
+ r.setOperator(operator);
r.getBusinessService().addAll(MapService(serviceDetail.getBusinessService()));
return r;
}
- public static TModelList MapTModelListElement(org.uddi.api_v3.TModelList findTModel) {
+ public static TModelList MapTModelListElement(org.uddi.api_v3.TModelList findTModel, String operator) {
if (findTModel == null) {
return null;
}
TModelList r = new TModelList();
- if (findTModel.isTruncated()) {
+ if (findTModel.isTruncated()!=null && findTModel.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -823,16 +855,18 @@ public class MapUDDIv3Tov2 {
r.getTModelInfos().getTModelInfo().addAll(MapTModelInfo(findTModel.getTModelInfos().getTModelInfo()));
}
r.setGeneric(VERSION);
+ r.setOperator(operator);
return r;
}
- public static org.uddi.api_v2.BusinessDetail MapBusinessDetail(BusinessDetail businessDetail) {
+ public static org.uddi.api_v2.BusinessDetail MapBusinessDetail(BusinessDetail businessDetail, String operator) {
if (businessDetail == null) {
return null;
}
org.uddi.api_v2.BusinessDetail r = new org.uddi.api_v2.BusinessDetail();
r.setGeneric(VERSION);
- if (businessDetail.isTruncated()) {
+ r.setOperator(operator);
+ if (businessDetail.isTruncated()!=null && businessDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -842,13 +876,14 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static TModelDetail MapTModelDetail(org.uddi.api_v3.TModelDetail tModelDetail) {
+ public static TModelDetail MapTModelDetail(org.uddi.api_v3.TModelDetail tModelDetail, String operator) {
if (tModelDetail == null) {
return null;
}
TModelDetail r = new TModelDetail();
r.setGeneric(VERSION);
- if (tModelDetail.isTruncated()) {
+ r.setOperator(operator);
+ if (tModelDetail.isTruncated()!=null && tModelDetail.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -868,6 +903,7 @@ public class MapUDDIv3Tov2 {
x.setBusinessKey(businessInfos.getBusinessInfo().get(i).getBusinessKey());
x.setServiceInfos(MapServiceInfos(businessInfos.getBusinessInfo().get(i).getServiceInfos()));
x.getDescription().addAll(MapDescription(businessInfos.getBusinessInfo().get(i).getDescription()));
+ x.getName().addAll(MapName(businessInfos.getBusinessInfo().get(i).getName()));
r.getBusinessInfo().add(x);
}
@@ -903,13 +939,14 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static RegisteredInfo MapRegisteredInfo(org.uddi.api_v3.RegisteredInfo registeredInfo) {
+ public static RegisteredInfo MapRegisteredInfo(org.uddi.api_v3.RegisteredInfo registeredInfo, String operator) {
if (registeredInfo == null) {
return null;
}
RegisteredInfo r = new RegisteredInfo();
r.setGeneric(VERSION);
- if (registeredInfo.isTruncated()) {
+ r.setOperator(operator);
+ if (registeredInfo.isTruncated()!=null && registeredInfo.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
@@ -924,22 +961,23 @@ public class MapUDDIv3Tov2 {
x.setServiceInfos(MapServiceInfos(registeredInfo.getBusinessInfos().getBusinessInfo().get(i).getServiceInfos()));
}
}
- if (registeredInfo.getTModelInfos()!=null){
+ if (registeredInfo.getTModelInfos() != null) {
r.setTModelInfos(new TModelInfos());
r.getTModelInfos().getTModelInfo().addAll(MapTModelInfo(registeredInfo.getTModelInfos().getTModelInfo()));
}
-
+
return r;
}
- public static PublisherAssertions MapPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> publisherAssertions) {
+ public static PublisherAssertions MapPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> publisherAssertions, String operator) {
if (publisherAssertions == null) {
return null;
}
PublisherAssertions r = new PublisherAssertions();
r.getPublisherAssertion().addAll(MapPublisherAssertion(publisherAssertions));
r.setGeneric(VERSION);
+ r.setOperator(operator);
return r;
}
@@ -960,4 +998,36 @@ public class MapUDDIv3Tov2 {
return r;
}
+ private static FindQualifiers AddApproximateMatch(FindQualifiers findQualifiers) {
+ if (findQualifiers == null) {
+ findQualifiers = new FindQualifiers();
+ }
+ findQualifiers.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ return findQualifiers;
+ }
+
+ private static boolean ContainsWildCard(List<Name> name) {
+ for (int i = 0; i < name.size(); i++) {
+ if (name.get(i).getValue() != null && name.get(i).getValue().contains(UDDIConstants.WILDCARD)) {
+ return true;
+ }
+ if (name.get(i).getValue() != null && name.get(i).getValue().contains(UDDIConstants.WILDCARD_CHAR)) {
+ return true;
+ }
+ if (name.get(i).getLang() != null
+ && name.get(i).getLang().contains(UDDIConstants.WILDCARD)) {
+ return true;
+ }
+ if (name.get(i).getLang() != null
+ && name.get(i).getLang().contains(UDDIConstants.WILDCARD_CHAR)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static GetAssertionStatusReport MapGetAssertionStatusReport(String authInfo, CompletionStatus completionStatus) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Publish3to2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Publish3to2.java?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Publish3to2.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Publish3to2.java Wed Jan 22 17:15:45 2014
@@ -26,6 +26,7 @@ import javax.xml.ws.soap.SOAPFaultExcept
import org.apache.juddi.v3.client.UDDIServiceV2;
import org.apache.juddi.v3.client.mapping.MapUDDIv2Tov3;
import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2;
+import org.uddi.api_v2.AssertionStatusReport;
import org.uddi.api_v2.PublisherAssertions;
import org.uddi.api_v2.SetPublisherAssertions;
import org.uddi.api_v3.AddPublisherAssertions;
@@ -133,7 +134,14 @@ public class Publish3to2 implements UDDI
@Override
public List<AssertionStatusItem> getAssertionStatusReport(String authInfo, CompletionStatus completionStatus) throws DispositionReportFaultMessage, RemoteException {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ try {
+ AssertionStatusReport assertionStatusReport = publishService.getAssertionStatusReport(MapUDDIv3Tov2.MapGetAssertionStatusReport(authInfo, completionStatus));
+ return MapUDDIv2Tov3.MapAssertionStatusItems(assertionStatusReport);
+ } catch (DispositionReport ex) {
+ throw MapUDDIv2Tov3.MapException(ex);
+ } catch (SOAPFaultException ex) {
+ throw MapUDDIv2Tov3.MapException(ex);
+ }
}
@Override
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=1560423&r1=1560422&r2=1560423&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 Wed Jan 22 17:15:45 2014
@@ -16,8 +16,11 @@
package org.apache.juddi.api.impl;
import javax.jws.WebService;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.v3.client.mapping.MapUDDIv2Tov3;
import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2;
import org.apache.juddi.v3.client.transport.wrapper.Inquiry3to2;
@@ -47,7 +50,9 @@ import org.uddi.v3_service.DispositionRe
/**
* UDDI v2 Implementation for the Inquiry service. This implementation is
* basically a wrapper and API translator that translates and forwards the
- * request to our UDDIv3 Inquiry implementation
+ * request to our UDDIv3 Inquiry implementation.<br><br>
+ * This class is a BETA feature and is largely untested. Please report any
+ * issues
*
* @author <a href="mailto:alexoree.apache.org">Alex O'Ree</a>
* @since 3.2
@@ -59,95 +64,110 @@ public class UDDIv2InquiryImpl implement
private static Log logger = LogFactory.getLog(UDDIv2InquiryImpl.class);
static UDDIInquiryImpl inquiryService = new UDDIInquiryImpl();
+ public UDDIv2InquiryImpl() {
+ logger.warn("This implementation of UDDIv2 Inquire service " + UDDIv2InquiryImpl.class.getCanonicalName() + " is considered BETA. Please"
+ + " report any issues to https://issues.apache.org/jira/browse/JUDDI");
+ }
+
+ static String nodeId=null;
+ private static String getNodeID(){
+ try {
+ nodeId=AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ex) {
+ logger.warn(ex.getMessage());
+ nodeId="JUDDI_v3";
+ }
+ return nodeId;
+ }
@Override
public BindingDetail findBinding(FindBinding body) throws DispositionReport {
try {
- return MapUDDIv3Tov2.MapBindingDetail(inquiryService.findBinding(MapUDDIv2Tov3.MapFindBinding(body)));
+ return MapUDDIv3Tov2.MapBindingDetail(inquiryService.findBinding(MapUDDIv2Tov3.MapFindBinding(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public BusinessList findBusiness(FindBusiness body) throws DispositionReport {
try {
- return MapUDDIv3Tov2.MapBusinessListEntity(inquiryService.findBusiness(MapUDDIv2Tov3.MapFindBusiness(body)));
+ return MapUDDIv3Tov2.MapBusinessListEntity(inquiryService.findBusiness(MapUDDIv2Tov3.MapFindBusiness(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
-
+
}
@Override
public RelatedBusinessesList findRelatedBusinesses(FindRelatedBusinesses body) throws DispositionReport {
- try {
+ try {
return MapUDDIv3Tov2.MapRelatedBusinessList(inquiryService.findRelatedBusinesses(MapUDDIv2Tov3.MapFindRelatedBusiness(body)));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public ServiceList findService(FindService body) throws DispositionReport {
- try {
- return MapUDDIv3Tov2.MapServiceList(inquiryService.findService(MapUDDIv2Tov3.MapFindService(body)));
+ try {
+ return MapUDDIv3Tov2.MapServiceList(inquiryService.findService(MapUDDIv2Tov3.MapFindService(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public TModelList findTModel(FindTModel body) throws DispositionReport {
- try {
- return MapUDDIv3Tov2.MapTModelListElement(inquiryService.findTModel(MapUDDIv2Tov3.MapFindTModel(body)));
+ try {
+ return MapUDDIv3Tov2.MapTModelListElement(inquiryService.findTModel(MapUDDIv2Tov3.MapFindTModel(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public BindingDetail getBindingDetail(GetBindingDetail body) throws DispositionReport {
- try {
- return MapUDDIv3Tov2.MapBindingDetail(inquiryService.getBindingDetail(MapUDDIv2Tov3.MapGetBindingDetail(body)));
+ try {
+ return MapUDDIv3Tov2.MapBindingDetail(inquiryService.getBindingDetail(MapUDDIv2Tov3.MapGetBindingDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public BusinessDetail getBusinessDetail(GetBusinessDetail body) throws DispositionReport {
- try {
- return MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)));
+ try {
+ return MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public BusinessDetailExt getBusinessDetailExt(GetBusinessDetailExt body) throws DispositionReport {
- try {
+ try {
return MapUDDIv3Tov2.MapBusinessDetailExt(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetailExt(body)));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public ServiceDetail getServiceDetail(GetServiceDetail body) throws DispositionReport {
try {
- return MapUDDIv3Tov2.MapServiceDetail(inquiryService.getServiceDetail(MapUDDIv2Tov3.MapGetServiceDetail(body)));
+ return MapUDDIv3Tov2.MapServiceDetail(inquiryService.getServiceDetail(MapUDDIv2Tov3.MapGetServiceDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@Override
public TModelDetail getTModelDetail(GetTModelDetail body) throws DispositionReport {
- try {
- return MapUDDIv3Tov2.MapTModelDetail(inquiryService.getTModelDetail(MapUDDIv2Tov3.MapGetTModelDetail(body)));
+ try {
+ return MapUDDIv3Tov2.MapTModelDetail(inquiryService.getTModelDetail(MapUDDIv2Tov3.MapGetTModelDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2PublishImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2PublishImpl.java?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2PublishImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIv2PublishImpl.java Wed Jan 22 17:15:45 2014
@@ -15,12 +15,14 @@
*/
package org.apache.juddi.api.impl;
-import java.util.ArrayList;
import java.util.List;
import javax.jws.WebService;
import javax.xml.ws.Holder;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.v3.client.mapping.MapUDDIv2Tov3;
import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2;
import org.uddi.api_v2.AddPublisherAssertions;
@@ -57,8 +59,9 @@ import org.uddi.v3_service.DispositionRe
/**
* UDDI v2 Implementation for the Publish service. This implementation is
* basically a wrapper and API translator that translates and forwards the
- * request to our UDDIv3 Publish implementation
- *
+ * request to our UDDIv3 Publish implementation<br><br>
+ * This class is a BETA feature and is largely untested. Please report any
+ * issues
* @author <a href="mailto:alexoree.apache.org">Alex O'Ree</a>
* @since 3.2
*/
@@ -66,6 +69,21 @@ import org.uddi.v3_service.DispositionRe
endpointInterface = "org.uddi.v2_service.Publish")
public class UDDIv2PublishImpl implements Publish {
+ public UDDIv2PublishImpl(){
+ logger.warn("This implementation of UDDIv2 Inquire service " + UDDIv2PublishImpl.class.getCanonicalName() +" is considered BETA. Please"
+ + " report any issues to https://issues.apache.org/jira/browse/JUDDI");
+ }
+
+ static String nodeId=null;
+ private static String getNodeID(){
+ try {
+ nodeId=AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ex) {
+ logger.warn(ex.getMessage());
+ nodeId="JUDDI_v3";
+ }
+ return nodeId;
+ }
private static Log logger = LogFactory.getLog(UDDIv2PublishImpl.class);
static UDDIPublicationImpl publishService = new UDDIPublicationImpl();
static UDDISecurityImpl securityService = new UDDISecurityImpl();
@@ -80,7 +98,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteBinding(MapUDDIv2Tov3.MapDeleteBinding(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -90,7 +108,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteBusiness(MapUDDIv2Tov3.MapDeleteBusiness(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -100,7 +118,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deletePublisherAssertions(MapUDDIv2Tov3.MapDeletePublisherAssertion(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -110,7 +128,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteService(MapUDDIv2Tov3.MapDeleteService(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -120,7 +138,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteTModel(MapUDDIv2Tov3.MapDeleteTModel(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -130,7 +148,7 @@ public class UDDIv2PublishImpl implement
try {
securityService.discardAuthToken(new org.uddi.api_v3.DiscardAuthToken(body.getAuthInfo()));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
return getSuccessMessage();
}
@@ -152,25 +170,25 @@ public class UDDIv2PublishImpl implement
ret.setGeneric("2.0");
return ret;
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@Override
public PublisherAssertions getPublisherAssertions(GetPublisherAssertions body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapPublisherAssertions(publishService.getPublisherAssertions(body.getAuthInfo()));
+ return MapUDDIv3Tov2.MapPublisherAssertions(publishService.getPublisherAssertions(body.getAuthInfo()),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@Override
public RegisteredInfo getRegisteredInfo(GetRegisteredInfo body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapRegisteredInfo(publishService.getRegisteredInfo(MapUDDIv2Tov3.MapGetRegisteredInfo(body)));
+ return MapUDDIv3Tov2.MapRegisteredInfo(publishService.getRegisteredInfo(MapUDDIv2Tov3.MapGetRegisteredInfo(body)),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@@ -178,36 +196,36 @@ public class UDDIv2PublishImpl implement
@Override
public BindingDetail saveBinding(SaveBinding body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapBindingDetail(publishService.saveBinding(MapUDDIv2Tov3.MapSaveBinding(body)));
+ return MapUDDIv3Tov2.MapBindingDetail(publishService.saveBinding(MapUDDIv2Tov3.MapSaveBinding(body)),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@Override
public BusinessDetail saveBusiness(SaveBusiness body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapBusinessDetail(publishService.saveBusiness(MapUDDIv2Tov3.MapSaveBusiness(body)));
+ return MapUDDIv3Tov2.MapBusinessDetail(publishService.saveBusiness(MapUDDIv2Tov3.MapSaveBusiness(body)),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@Override
public ServiceDetail saveService(SaveService body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapServiceDetail(publishService.saveService(MapUDDIv2Tov3.MapSaveService(body)));
+ return MapUDDIv3Tov2.MapServiceDetail(publishService.saveService(MapUDDIv2Tov3.MapSaveService(body)),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@Override
public TModelDetail saveTModel(SaveTModel body) throws org.uddi.v2_service.DispositionReport {
try {
- return MapUDDIv3Tov2.MapTModelDetail(publishService.saveTModel(MapUDDIv2Tov3.MapSaveTModel(body)));
+ return MapUDDIv3Tov2.MapTModelDetail(publishService.saveTModel(MapUDDIv2Tov3.MapSaveTModel(body)),getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
@@ -217,9 +235,9 @@ public class UDDIv2PublishImpl implement
Holder<List<PublisherAssertion>> req = new Holder<List<PublisherAssertion>>();
req.value = MapUDDIv2Tov3.MapSetPublisherAssertions(body);
publishService.setPublisherAssertions(body.getAuthInfo(), req);
- return MapUDDIv3Tov2.MapPublisherAssertions(req.value);
+ return MapUDDIv3Tov2.MapPublisherAssertions(req.value,getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex);
+ throw MapUDDIv3Tov2.MapException(ex,getNodeID());
}
}
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Wed Jan 22 17:15:45 2014
@@ -29,6 +29,7 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.Arrays;
import java.util.GregorianCalendar;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -534,7 +535,7 @@ public class UddiHub implements Serializ
} catch (Exception ex) {
log.error(ex);
}
- if (session.getAttribute("username") != null
+ if (session!=null && session.getAttribute("username") != null
&& session.getAttribute("password") != null) {
req.setUserID((String) session.getAttribute("username"));
req.setCred(AES.Decrypt((String) session.getAttribute("password"), (String) properties.get("key")));
@@ -1208,7 +1209,7 @@ public class UddiHub implements Serializ
return ResourceLoader.GetResource(session, "errors.tmodel.prefix");
}
- if (!partitionName.endsWith(":keyGenerator")) {
+ if (!partitionName.endsWith(":keygenerator")) {
return ResourceLoader.GetResource(session, "errors.tmodel.postfix");
}
@@ -1273,8 +1274,9 @@ public class UddiHub implements Serializ
String err = null;
if (x.getFault() != null
&& x.getFault().getDetail() != null) {
- while (x.getFault().getDetail().getDetailEntries().hasNext()) {
- err += x.getFault().getDetail().getDetailEntries().next().toString();
+ Iterator detailEntries = x.getFault().getDetail().getDetailEntries();
+ while (detailEntries.hasNext()) {
+ err += detailEntries.next().toString();
}
}
return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage() + " " + err) + " " + ex.getClass().getCanonicalName();
Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Wed Jan 22 17:15:45 2014
@@ -12,7 +12,7 @@ It currently does not use the ValueSet,
<node>
<!-- required 'default' node -->
<name>default</name>
- <description>Main UDDI Node</description>
+ <description>Main UDDI Node v3</description>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://localhost:8080/juddiv3/services/custody-transfer</custodyTransferUrl>
@@ -27,13 +27,13 @@ It currently does not use the ValueSet,
<description>UDDIv2 Node</description>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport</proxyTransport>
- <inquiryUrl>http://localhost:9080/juddi/inquiry</inquiryUrl>
- <publishUrl>http://localhost:9080/juddi/publish</publishUrl>
+ <inquiryUrl>http://localhost:9080/juddiv3/services/inquiryv2</inquiryUrl>
+ <publishUrl>http://localhost:9080/juddiv3/services/publishv2</publishUrl>
</node>
<node>
<name>default-ssl</name>
- <description>Main UDDI Node using SSL</description>
+ <description>Main UDDI Node v3 using SSL</description>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://localhost:8443/juddiv3/services/custody-transfer</custodyTransferUrl>
@@ -44,7 +44,7 @@ It currently does not use the ValueSet,
</node>
<node>
<name>jboss7</name>
- <description>Main UDDI node running on Jboss EAP6 or AS7</description>
+ <description>UDDI node running on Jboss EAP6 or AS7</description>
<!--
Jboss users, note that the url is typically different, here's an example for Jboss EAP 6.x-->
<custodyTransferUrl>http://localhost:8080/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
@@ -65,6 +65,18 @@ It currently does not use the ValueSet,
<securityUrl>https://localhost:8443/juddiv3/UDDISecurityService</securityUrl>
<subscriptionUrl>https://localhost:8443/juddiv3/UDDISubscriptionService</subscriptionUrl>
</node>
+ <node>
+ <!-- required 'default' node -->
+ <name>cloud</name>
+ <description>jUDDI Cloud Sandbox</description>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://uddi-jbossoverlord.rhcloud.com/services/custody-transfer</custodyTransferUrl>
+ <inquiryUrl>http://uddi-jbossoverlord.rhcloud.com/services/inquiry</inquiryUrl>
+ <publishUrl>http://uddi-jbossoverlord.rhcloud.com/services/publish</publishUrl>
+ <securityUrl>http://uddi-jbossoverlord.rhcloud.com/services/security</securityUrl>
+ <subscriptionUrl>http://uddi-jbossoverlord.rhcloud.com/services/subscription</subscriptionUrl>
+ </node>
</nodes>
<signature>
<!-- signing stuff, is NOT used by juddi-gui -->
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp Wed Jan 22 17:15:45 2014
@@ -37,6 +37,7 @@
out.write(ResourceLoader.GetResource(session, "items.description") + ": " + StringEscapeUtils.escapeHtml(description));
Cookie cookie = new Cookie("current_node", node);
cookie.setMaxAge(Integer.MAX_VALUE);
+ cookie.setPath("/juddi-gui");
response.addCookie(cookie);
}
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js?rev=1560423&r1=1560422&r2=1560423&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js Wed Jan 22 17:15:45 2014
@@ -17,7 +17,7 @@
var offsetBusiness=0; //start at the begining
-var maxrecordsBusiness=10; //record 20 at a time
+var maxrecordsBusiness=20; //record 20 at a time
var totalrecordsBusiness=0;
RenderBusinessListBySearch('%', offsetBusiness, maxrecordsBusiness);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org