Author: alexoree
Date: Fri Jan 24 12:18:17 2014
New Revision: 1560966
URL: http://svn.apache.org/r1560966
Log:
JUDDI-780 resolved. added additional output to juddigui for operational info
(when it's not available and a uddiv2 mapping for op info. Also, jsp minifying.
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/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/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
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=1560966&r1=1560965&r2=1560966&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 12:18:17 2014
@@ -30,6 +30,7 @@ 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.AddPublisherAssertions;
import org.uddi.api_v3.Address;
import org.uddi.api_v3.AssertionStatusItem;
import org.uddi.api_v3.BindingTemplate;
@@ -168,7 +169,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()));
@@ -1035,15 +1036,8 @@ public class MapUDDIv2Tov3 {
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.setCompletionStatus(MapCompletionStatus(assertionStatusReport.getAssertionStatusItem().get(i).getCompletionStatus()));
+
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(),
@@ -1158,4 +1152,30 @@ public class MapUDDIv2Tov3 {
return r;
}
+ public static AddPublisherAssertions
MapAddPublisherAssertions(org.uddi.api_v2.AddPublisherAssertions body) {
+
+ if (body == null) {
+ return null;
+ }
+ AddPublisherAssertions r = new AddPublisherAssertions();
+ r.setAuthInfo(body.getAuthInfo());
+
r.getPublisherAssertion().addAll(MapListPublisherAssertion(body.getPublisherAssertion()));
+ return r;
+
+ }
+
+ public static CompletionStatus MapCompletionStatus(String
completionStatus) {
+
+ if ("status:complete".equalsIgnoreCase(completionStatus)) {
+ return (CompletionStatus.STATUS_COMPLETE);
+ } else if
("status:toKey_incomplete".equalsIgnoreCase(completionStatus)) {
+ return (CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
+ } else if
("status:fromKey_incomplete".equalsIgnoreCase(completionStatus)) {
+ return (CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
+ } else {
+ return (CompletionStatus.STATUS_BOTH_INCOMPLETE);
+ }
+
+ }
+
}
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=1560966&r1=1560965&r2=1560966&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 12:18:17 2014
@@ -23,6 +23,7 @@ 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.AssertionStatusReport;
import org.uddi.api_v2.BindingDetail;
import org.uddi.api_v2.BindingTemplate;
import org.uddi.api_v2.BindingTemplates;
@@ -77,6 +78,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.KeysOwned;
import org.uddi.api_v2.Phone;
import org.uddi.api_v2.PublisherAssertion;
import org.uddi.api_v2.PublisherAssertions;
@@ -94,6 +96,7 @@ import org.uddi.api_v2.TModelInfo;
import org.uddi.api_v2.TModelInfos;
import org.uddi.api_v2.TModelList;
import org.uddi.api_v2.Truncated;
+import org.uddi.api_v3.AssertionStatusItem;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.CompletionStatus;
import org.uddi.v2_service.DispositionReport;
@@ -250,12 +253,12 @@ public class MapUDDIv3Tov2 {
return null;
}
OverviewDoc r = new OverviewDoc();
-
+
r.getDescription().addAll(MapDescription(overviewDoc.get(0).getDescription()));
- if (overviewDoc.get(0).getOverviewURL() != null &&
overviewDoc.get(0).getOverviewURL().getValue()!=null) {
+ if (overviewDoc.get(0).getOverviewURL() != null &&
overviewDoc.get(0).getOverviewURL().getValue() != null) {
r.setOverviewURL(overviewDoc.get(0).getOverviewURL().getValue());
}
-
+
return r;
}
@@ -786,19 +789,22 @@ public class MapUDDIv3Tov2 {
return r;
}
- public static RelatedBusinessesList
MapRelatedBusinessList(org.uddi.api_v3.RelatedBusinessesList
findRelatedBusinesses) {
+ public static RelatedBusinessesList
MapRelatedBusinessList(org.uddi.api_v3.RelatedBusinessesList
findRelatedBusinesses, String operator) {
if (findRelatedBusinesses == null) {
return null;
}
RelatedBusinessesList r = new RelatedBusinessesList();
+ r.setGeneric(VERSION);
+ r.setOperator(operator);
r.setBusinessKey(findRelatedBusinesses.getBusinessKey());
if (findRelatedBusinesses.isTruncated() != null &&
findRelatedBusinesses.isTruncated()) {
r.setTruncated(Truncated.TRUE);
} else {
r.setTruncated(Truncated.FALSE);
}
+ r.setRelatedBusinessInfos(new RelatedBusinessInfos());
if (findRelatedBusinesses.getRelatedBusinessInfos() != null) {
- r.setRelatedBusinessInfos(new RelatedBusinessInfos());
+
for (int i = 0; i <
findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().size();
i++) {
RelatedBusinessInfo x = new
RelatedBusinessInfo();
x.setBusinessKey(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey());
@@ -950,7 +956,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);
@@ -1157,4 +1163,48 @@ public class MapUDDIv3Tov2 {
return r;
}
+ /**
+ * limitation, keys owned is not mapped
+ * @param assertionStatusReport
+ * @return
+ */
+ public static AssertionStatusReport
MapAssertionStatusReport(List<AssertionStatusItem> assertionStatusReport) {
+ if (assertionStatusReport == null) {
+ return null;
+ }
+ AssertionStatusReport r = new AssertionStatusReport();
+ r.setGeneric(VERSION);
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ org.uddi.api_v2.AssertionStatusItem x = new
org.uddi.api_v2.AssertionStatusItem();
+
+ switch
(assertionStatusReport.get(i).getCompletionStatus()) {
+ case STATUS_BOTH_INCOMPLETE:
+ x.setCompletionStatus(null);
+ break;
+ case STATUS_COMPLETE:
+
x.setCompletionStatus("status:complete");
+ break;
+ case STATUS_FROM_KEY_INCOMPLETE:
+
x.setCompletionStatus("status:fromKey_incomplete");
+ break;
+ case STATUS_TO_KEY_INCOMPLETE:
+
x.setCompletionStatus("status:toKey_incomplete");
+ break;
+ }
+
x.setFromKey(assertionStatusReport.get(i).getFromKey());
+ x.setToKey(assertionStatusReport.get(i).getToKey());
+ if (assertionStatusReport.get(i).getKeyedReference()
!= null) {
+ x.setKeyedReference(new
KeyedReference(assertionStatusReport.get(i).getKeyedReference().getTModelKey(),
+
assertionStatusReport.get(i).getKeyedReference().getKeyName(),
+
assertionStatusReport.get(i).getKeyedReference().getKeyValue()));
+ }
+
+ x.setKeysOwned(new KeysOwned());
+ r.getAssertionStatusItem().add(x);
+ // assertionStatusReport.get(i).
+ }
+
+ 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=1560966&r1=1560965&r2=1560966&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 12:18:17 2014
@@ -15,10 +15,8 @@
*/
package org.apache.juddi.v3.client.transport.wrapper;
-import java.io.StringWriter;
import java.rmi.RemoteException;
import java.util.Map;
-import javax.xml.bind.JAXB;
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.EndpointReference;
@@ -41,6 +39,7 @@ import org.uddi.api_v3.GetBusinessDetail
import org.uddi.api_v3.GetOperationalInfo;
import org.uddi.api_v3.GetServiceDetail;
import org.uddi.api_v3.GetTModelDetail;
+import org.uddi.api_v3.OperationalInfo;
import org.uddi.api_v3.OperationalInfos;
import org.uddi.api_v3.RelatedBusinessesList;
import org.uddi.api_v3.ServiceDetail;
@@ -147,9 +146,59 @@ public class Inquiry3to2 implements UDDI
}
}
+ public static final String VERSION = "2.0";
+
@Override
public OperationalInfos getOperationalInfo(GetOperationalInfo body)
throws DispositionReportFaultMessage, RemoteException {
- throw new UnsupportedOperationException("Not supported yet.");
//To change body of generated methods, choose Tools | Templates.
+ OperationalInfos ret = new OperationalInfos();
+
+ for (int i = 0; i < body.getEntityKey().size(); i++) {
+ OperationalInfo oi = new OperationalInfo();
+ oi.setEntityKey(body.getEntityKey().get(i));
+ try {
+ org.uddi.api_v2.GetBusinessDetail
businessDetail = new org.uddi.api_v2.GetBusinessDetail();
+ businessDetail.setGeneric(VERSION);
+
businessDetail.getBusinessKey().add(body.getEntityKey().get(i));
+ org.uddi.api_v2.BusinessDetail z =
inquiryService.getBusinessDetail(businessDetail);
+ oi.setNodeID(z.getOperator());
+
oi.setAuthorizedName(z.getBusinessEntity().get(0).getAuthorizedName());
+ } catch (Exception ex) {
+ }
+ if (oi.getAuthorizedName() != null) {
+ continue;
+ }
+ try {
+ org.uddi.api_v2.GetTModelDetail tModelDetail =
new org.uddi.api_v2.GetTModelDetail();
+ tModelDetail.setGeneric(VERSION);
+
tModelDetail.getTModelKey().add(body.getEntityKey().get(i));
+ org.uddi.api_v2.TModelDetail z =
inquiryService.getTModelDetail(tModelDetail);
+ oi.setNodeID(z.getOperator());
+
oi.setAuthorizedName(z.getTModel().get(0).getAuthorizedName());
+ } catch (Exception ex) {
+ }
+ if (oi.getAuthorizedName() != null) {
+ continue;
+ }
+ try {
+ //get the service
+ org.uddi.api_v2.GetServiceDetail serviceDetail
= new org.uddi.api_v2.GetServiceDetail();
+ serviceDetail.setGeneric(VERSION);
+
serviceDetail.getServiceKey().add(body.getEntityKey().get(i));
+ org.uddi.api_v2.ServiceDetail z =
inquiryService.getServiceDetail(serviceDetail);
+ oi.setNodeID(z.getOperator());
+
+ org.uddi.api_v2.GetBusinessDetail
businessDetail = new org.uddi.api_v2.GetBusinessDetail();
+ businessDetail.setGeneric(VERSION);
+ //its owning business
+
businessDetail.getBusinessKey().add(z.getBusinessService().get(0).getBusinessKey());
+ org.uddi.api_v2.BusinessDetail z2 =
inquiryService.getBusinessDetail(businessDetail);
+ oi.setNodeID(z.getOperator());
+
oi.setAuthorizedName(z2.getBusinessEntity().get(0).getAuthorizedName());
+ } catch (Exception ex) {
+ }
+ ret.getOperationalInfo().add(oi);
+ }
+ return ret;
}
@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=1560966&r1=1560965&r2=1560966&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 12:18:17 2014
@@ -15,9 +15,7 @@
*/
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;
@@ -25,7 +23,6 @@ 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;
import org.uddi.api_v2.BindingDetail;
import org.uddi.api_v2.BusinessDetail;
import org.uddi.api_v2.BusinessDetailExt;
@@ -104,7 +101,7 @@ public class UDDIv2InquiryImpl implement
@Override
public RelatedBusinessesList
findRelatedBusinesses(FindRelatedBusinesses body) throws DispositionReport {
try {
- return
MapUDDIv3Tov2.MapRelatedBusinessList(inquiryService.findRelatedBusinesses(MapUDDIv2Tov3.MapFindRelatedBusiness(body)));
+ return
MapUDDIv3Tov2.MapRelatedBusinessList(inquiryService.findRelatedBusinesses(MapUDDIv2Tov3.MapFindRelatedBusiness(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
@@ -141,9 +138,9 @@ public class UDDIv2InquiryImpl implement
public BusinessDetail getBusinessDetail(GetBusinessDetail body) throws
DispositionReport {
try {
BusinessDetail MapBusinessDetail =
MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)),
getNodeID());
- StringWriter sw = new StringWriter();
- JAXB.marshal(MapBusinessDetail, sw);
- logger.info(sw.toString());
+ // 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/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=1560966&r1=1560965&r2=1560966&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
Fri Jan 24 12:18:17 2014
@@ -52,6 +52,7 @@ import org.uddi.api_v2.ServiceDetail;
import org.uddi.api_v2.SetPublisherAssertions;
import org.uddi.api_v2.TModelDetail;
import org.uddi.api_v2.Truncated;
+import org.uddi.api_v3.CompletionStatus;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.v2_service.Publish;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -62,6 +63,7 @@ import org.uddi.v3_service.DispositionRe
* 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
*/
@@ -69,20 +71,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"
+ 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;
+ 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();
@@ -90,7 +93,12 @@ public class UDDIv2PublishImpl implement
@Override
public DispositionReport addPublisherAssertions(AddPublisherAssertions
body) throws org.uddi.v2_service.DispositionReport {
- throw new UnsupportedOperationException("Not supported yet.");
//To change body of generated methods, choose Tools | Templates.
+ try {
+
publishService.addPublisherAssertions(MapUDDIv2Tov3.MapAddPublisherAssertions(body));
+ } catch (DispositionReportFaultMessage ex) {
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
+ }
+ return getSuccessMessage();
}
@Override
@@ -98,7 +106,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteBinding(MapUDDIv2Tov3.MapDeleteBinding(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@@ -108,7 +116,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteBusiness(MapUDDIv2Tov3.MapDeleteBusiness(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@@ -118,7 +126,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deletePublisherAssertions(MapUDDIv2Tov3.MapDeletePublisherAssertion(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@@ -128,7 +136,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteService(MapUDDIv2Tov3.MapDeleteService(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@@ -138,7 +146,7 @@ public class UDDIv2PublishImpl implement
try {
publishService.deleteTModel(MapUDDIv2Tov3.MapDeleteTModel(body));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@@ -148,14 +156,19 @@ public class UDDIv2PublishImpl implement
try {
securityService.discardAuthToken(new
org.uddi.api_v3.DiscardAuthToken(body.getAuthInfo()));
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
return getSuccessMessage();
}
@Override
public AssertionStatusReport
getAssertionStatusReport(GetAssertionStatusReport body) throws
org.uddi.v2_service.DispositionReport {
- throw new UnsupportedOperationException("Not supported yet.");
//To change body of generated methods, choose Tools | Templates.
+ try {
+
+ return MapUDDIv3Tov2.MapAssertionStatusReport(
publishService.getAssertionStatusReport(body.getAuthInfo(),
MapUDDIv2Tov3.MapCompletionStatus(body.getCompletionStatus())));
+ } catch (DispositionReportFaultMessage ex) {
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
+ }
}
@Override
@@ -170,25 +183,25 @@ public class UDDIv2PublishImpl implement
ret.setGeneric("2.0");
return ret;
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ 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()),getNodeID());
+ return
MapUDDIv3Tov2.MapPublisherAssertions(publishService.getPublisherAssertions(body.getAuthInfo()),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ 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)),getNodeID());
+ return
MapUDDIv3Tov2.MapRegisteredInfo(publishService.getRegisteredInfo(MapUDDIv2Tov3.MapGetRegisteredInfo(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@@ -196,36 +209,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)),getNodeID());
+ return
MapUDDIv3Tov2.MapBindingDetail(publishService.saveBinding(MapUDDIv2Tov3.MapSaveBinding(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ 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)),getNodeID());
+ return
MapUDDIv3Tov2.MapBusinessDetail(publishService.saveBusiness(MapUDDIv2Tov3.MapSaveBusiness(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ 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)),getNodeID());
+ return
MapUDDIv3Tov2.MapServiceDetail(publishService.saveService(MapUDDIv2Tov3.MapSaveService(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ 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)),getNodeID());
+ return
MapUDDIv3Tov2.MapTModelDetail(publishService.saveTModel(MapUDDIv2Tov3.MapSaveTModel(body)),
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@@ -235,9 +248,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,getNodeID());
+ return MapUDDIv3Tov2.MapPublisherAssertions(req.value,
getNodeID());
} catch (DispositionReportFaultMessage ex) {
- throw MapUDDIv3Tov2.MapException(ex,getNodeID());
+ throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
}
@@ -251,5 +264,4 @@ public class UDDIv2PublishImpl implement
return r;
}
-
}
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=1560966&r1=1560965&r2=1560966&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
Fri Jan 24 12:18:17 2014
@@ -1820,7 +1820,7 @@ public class UddiHub implements Serializ
case uid:
findBusiness = new ServiceList();
-
+
BusinessService GetServiceDetail =
GetServiceDetail(parameters);
if (GetServiceDetail != null) {
findBusiness.setServiceInfos(new ServiceInfos());
@@ -1848,7 +1848,7 @@ public class UddiHub implements Serializ
}
}
- if (findBusiness!=null &&
findBusiness.getServiceInfos() != null) {
+ if (findBusiness != null &&
findBusiness.getServiceInfos() != null) {
StringBuilder sb = new StringBuilder();
sb.append("<table class=\"table\">");
for (int i = 0; i <
findBusiness.getServiceInfos().getServiceInfo().size(); i++) {
@@ -2438,10 +2438,9 @@ public class UddiHub implements Serializ
public String GetOperationalInfo(List<OperationalInfo> info) {
StringBuilder sb = new StringBuilder();
- if (info != null) {
+ if (info != null && !info.isEmpty()) {
sb.append("<table class=\"table table-hover\">");
- for (int i = 0; i < info.size(); i++) {
- sb.append("<tr><th>").
+ sb.append("<tr><th>").
append(ResourceLoader.GetResource(session, "items.nodeid")).
append("</th><th>").
append(ResourceLoader.GetResource(session, "items.authorizedname")).
@@ -2454,21 +2453,26 @@ public class UddiHub implements Serializ
append("</th><th>").
append(ResourceLoader.GetResource(session, "items.modifiedwithchildren")).
append("</th></tr>");
+
+ for (int i = 0; i < info.size(); i++) {
+ if (info.get(i)==null) continue;
sb.append("<tr><td>");
-
sb.append(StringEscapeUtils.escapeHtml(info.get(i).getNodeID()))
+ sb.append((info.get(i).getNodeID()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getNodeID()) : ""))
.append("</td><td>")
-
.append(StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()))
+
.append((info.get(i).getAuthorizedName()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()) :""))
.append("</td><td>")
-
.append(StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()))
+
.append((info.get(i).getEntityKey()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()):""))
.append("</td><td>")
-
.append(StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()))
+
.append((info.get(i).getCreated()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()):""))
.append("</td><td>")
-
.append(StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()))
+
.append((info.get(i).getModified()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()):""))
.append("</td><td>")
-
.append(StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()))
+
.append((info.get(i).getModifiedIncludingChildren()!=null ?
StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()):""))
.append("</td></tr>");
}
sb.append("</table>");
+ } else {
+ sb.append(ResourceLoader.GetResource(session,
"errors.nooperationalinfo"));
}
return sb.toString();
}
@@ -3305,13 +3309,13 @@ public class UddiHub implements Serializ
}
if (method.equalsIgnoreCase("getOperationalInfo")) {
((GetOperationalInfo)
request).setAuthInfo(GetToken());
- response =
inquiry.getOperationalInfo((GetOperationalInfo) request);
+
try {
- response =
inquiry.findBinding((FindBinding) request);
+ response =
inquiry.getOperationalInfo((GetOperationalInfo) request);
} catch (Exception ex) {
if (isExceptionExpiration(ex)) {
token = null;
- response =
inquiry.findBinding((FindBinding) request);
+ response =
inquiry.getOperationalInfo((GetOperationalInfo) request);
} else {
throw ex;
@@ -3321,13 +3325,13 @@ public class UddiHub implements Serializ
}
if (method.equalsIgnoreCase("getTModelDetail")) {
((GetTModelDetail)
request).setAuthInfo(GetToken());
- response =
inquiry.getTModelDetail((GetTModelDetail) request);
+
try {
- response =
inquiry.findBinding((FindBinding) request);
+ response =
inquiry.getTModelDetail((GetTModelDetail) request);
} catch (Exception ex) {
if (isExceptionExpiration(ex)) {
token = null;
- response =
inquiry.findBinding((FindBinding) request);
+ response =
inquiry.getTModelDetail((GetTModelDetail) request);
} else {
throw ex;
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1560966&r1=1560965&r2=1560966&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
Fri Jan 24 12:18:17 2014
@@ -405,3 +405,4 @@ error.nodeexists=The proposed node does
error.nopassword=Please enter a password
error.nousername=Please enter a username
actions.result=Results
+errors.nooperationalinfo=No operational information is available. This could
be because you're using an UDDI v2 endpoint or perhaps there's a problem at an
UDDI v3 endpoint (or it's not supported).
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1560966&r1=1560965&r2=1560966&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
Fri Jan 24 12:18:17 2014
@@ -407,3 +407,4 @@ error.nodeexists=El nodo propuesto no ex
error.nopassword=Por favor, ingrese una contrase\u00f1a
error.nousername=Por favor, introduzca un nombre de usuario
actions.result=Resultados
+errors.nooperationalinfo=No hay informaci\u00f3n operativa disponible. Esto
podr\u00eda deberse a que est\u00e1 utilizando un punto final v2 UDDI o tal vez
hay un problema en un punto final v3 UDDI (o no es compatible).
Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1560966&r1=1560965&r2=1560966&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Fri Jan 24 12:18:17
2014
@@ -5,7 +5,6 @@
<description>This is an end user web application for an implementation
of OASIS's UDDI v3 specification</description>
<!-- This may cause issues in some containers, if it complains about
a non serializable object, comment this out
<distributable /> -->
-
<filter>
<filter-name>noCacheFilter</filter-name>
<filter-class>org.apache.juddi.webconsole.NoCacheFilter</filter-class>
@@ -97,8 +96,12 @@
<security-role>
<role-name>uddiadmin</role-name>
</security-role>
-
-
+<!-- if deployment fails, try commenting this out -->
+ <init-param>
+ <param-name>trimSpaces</param-name>
+ <param-value>true</param-value>
+ </init-param>
+<!-- end -->
</web-app>
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=1560966&r1=1560965&r2=1560966&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp Fri Jan 24 12:18:17
2014
@@ -30,7 +30,7 @@
response.setStatus(406);
out.write("Not found.");
} else {
- node=x.getNodeName();
+ node=x.switchNodes(node);
out.write(ResourceLoader.GetResource(session,
"items.nowconnectedto") +"<br>");
out.write(ResourceLoader.GetResource(session, "items.nodeid")
+ ": " + StringEscapeUtils.escapeHtml(node));
out.write("<br>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
