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/02/16 22:12:14 UTC
svn commit: r1568829 [1/9] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/...
Author: alexoree
Date: Sun Feb 16 21:12:11 2014
New Revision: 1568829
URL: http://svn.apache.org/r1568829
Log:
JUDDI-831 done, port of v3 tck tests
Added:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIv2Inquiry.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBindingTemplate.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusiness.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusinessService.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckCommon.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckFindEntity.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisherAssertion.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckSecurity.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckTModel.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckValidator.java
- copied, changed from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckValidator.java
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllBusinesses.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllSignedBusinesses.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBinding1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBusiness1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findRelatedBusinesses_sortByName.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findService1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModel1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModelByCategoryBag.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/FindTmodelTest.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/bindingTemplate.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/businessEntity.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/businessEntity3.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/businessService.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/businessService2.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/combineCatBagsBusinessServices.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/combineCatBagsFindServices.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/moveBusinessService1to3.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/publisher.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/publisherAssertion.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/publisherAssertion2.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/tModelKeyGen.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/marypublisher/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/marypublisher/businessEntity.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/marypublisher/publisher.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/marypublisher/publisherAssertion.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/marypublisher/tModelKeyGen.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/businessEntity.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/businessEntity_withProjection.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/businessService.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/publisher.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/publisherAssertion.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/samsyndicator/tModelKeyGen.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tmodels/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tmodels/tModelKeyGen.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tmodels/tmodels.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/businessEntity.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi456-business1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi456-business2.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi456-business3.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi456-business4.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi456-business5.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/juddi545-business.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/publisher.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/tModel01.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/tModel02.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/tompublisher/tModelKeyGen.xml
juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/
juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/
juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/Dummy.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/Dummy.java
juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java
- copied, changed from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
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-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-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
juddi/trunk/uddi-tck-base/src/main/resources/tck.properties
juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
juddi/trunk/uddi-tck-runner/tck.properties
juddi/trunk/uddi-tck-runner/uddi.xml
juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidation.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Sun Feb 16 21:12:11 2014
@@ -107,12 +107,13 @@ public class UDDINode implements Seriali
public Transport getTransport() throws TransportException {
if (transport==null) {
+ String clazz = getProxyTransport();
try {
- String clazz = getProxyTransport();
+
Class<?> transportClass = ClassUtil.forName(clazz,this.getClass());
transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(clientName,name);
} catch (Exception e) {
- throw new TransportException(e.getMessage(),e);
+ throw new TransportException(e.getMessage() + " node " + name + " transport class: " + clazz,e);
}
}
return transport;
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=1568829&r1=1568828&r2=1568829&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 Sun Feb 16 21:12:11 2014
@@ -17,13 +17,16 @@ package org.apache.juddi.v3.client.mappi
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.xml.soap.SOAPFault;
import javax.xml.ws.soap.SOAPFaultException;
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.UDDIv2Constants;
import org.uddi.api_v2.AssertionStatusReport;
import org.uddi.api_v2.GetBusinessDetailExt;
import org.uddi.api_v2.GetTModelDetail;
@@ -458,7 +461,7 @@ public class MapUDDIv2Tov3 {
r.getListDescription().setIncludeCount(0);
r.getListDescription().setListHead(0);
- if (findTModel.getTModelInfos() != null) {
+ if (findTModel.getTModelInfos() != null && !findTModel.getTModelInfos().getTModelInfo().isEmpty()) {
r.setTModelInfos(new TModelInfos());
r.getListDescription().setIncludeCount(findTModel.getTModelInfos().getTModelInfo().size());
r.getListDescription().setActualCount(findTModel.getTModelInfos().getTModelInfo().size());
@@ -632,7 +635,7 @@ public class MapUDDIv2Tov3 {
}
FindBinding r = new FindBinding();
r.setServiceKey(body.getServiceKey());
- r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+ r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers(), true));
r.setMaxRows(body.getMaxRows());
r.setTModelBag(MapTModelBag(body.getTModelBag()));
return r;
@@ -648,7 +651,7 @@ public class MapUDDIv2Tov3 {
return r;
}
- private static FindQualifiers MapFindQualifiers(org.uddi.api_v2.FindQualifiers findQualifiers) {
+ private static FindQualifiers MapFindQualifiers(org.uddi.api_v2.FindQualifiers findQualifiers, boolean isBinding) {
if (findQualifiers == null || findQualifiers.getFindQualifier().isEmpty()) {
return null;
}
@@ -687,8 +690,11 @@ public class MapUDDIv2Tov3 {
if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4")) {
r.getFindQualifier().add("uddi:uddi.org:categorization:types");
}
+ if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("exactNameMatch")) {
+ r.getFindQualifier().add(UDDIConstants.EXACT_MATCH);
+ }
if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH)) {
- r.getFindQualifier().add("exactNameMatch");
+ r.getFindQualifier().add(UDDIConstants.EXACT_MATCH);
}
if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_SENSITIVE_MATCH)) {
r.getFindQualifier().add("caseSensitiveMatch");
@@ -721,7 +727,35 @@ public class MapUDDIv2Tov3 {
if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.COMBINE_CATEGORY_BAGS)) {
r.getFindQualifier().add(UDDIConstants.COMBINE_CATEGORY_BAGS);
}
- }
+ if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIv2Constants.exactNameMatch)) {
+ r.getFindQualifier().add(UDDIConstants.EXACT_MATCH);
+ }
+ if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.APPROXIMATE_MATCH)) {
+ r.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ }
+ if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.APPROXIMATE_MATCH_TMODEL)) {
+ r.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ }
+
+ }
+ //default behavior of v2, caseInsensitive, sortByNameAsc or sortByDateAsc, approximateMatch
+ if (!r.getFindQualifier().contains(UDDIConstants.CASE_INSENSITIVE_MATCH) &&
+ !r.getFindQualifier().contains(UDDIConstants.CASE_INSENSITIVE_MATCH_TMODEL) &&
+ !r.getFindQualifier().contains(UDDIConstants.CASE_SENSITIVE_MATCH) &&
+ !r.getFindQualifier().contains(UDDIConstants.EXACT_MATCH) &&
+ !isBinding)
+
+ r.getFindQualifier().add(UDDIConstants.CASE_INSENSITIVE_MATCH);
+
+ if (!r.getFindQualifier().contains(UDDIConstants.APPROXIMATE_MATCH) &&
+ !r.getFindQualifier().contains(UDDIConstants.APPROXIMATE_MATCH_TMODEL) &&
+ !r.getFindQualifier().contains(UDDIConstants.EXACT_MATCH) &&
+ !isBinding)
+ r.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ //dedup
+ HashSet<String> s = new HashSet<String>(r.getFindQualifier());
+ r.getFindQualifier().clear();
+ r.getFindQualifier().addAll(s);
return r;
}
@@ -732,7 +766,7 @@ public class MapUDDIv2Tov3 {
FindBusiness r = new FindBusiness();
r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
r.setDiscoveryURLs(MapDiscoveryURLs(body.getDiscoveryURLs()));
- r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+ r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers(), false));
r.setTModelBag(MapTModelBag(body.getTModelBag()));
r.setMaxRows(body.getMaxRows());
r.getName().addAll(MapName(body.getName()));
@@ -746,7 +780,10 @@ public class MapUDDIv2Tov3 {
if (findQualifiers == null) {
findQualifiers = new org.uddi.api_v3.FindQualifiers();
}
- findQualifiers.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ Set<String> s = new HashSet<String>(findQualifiers.getFindQualifier());
+ s.add(UDDIConstants.APPROXIMATE_MATCH);
+ findQualifiers.getFindQualifier().clear();
+ findQualifiers.getFindQualifier().addAll(s);
return findQualifiers;
}
@@ -788,7 +825,7 @@ public class MapUDDIv2Tov3 {
}
FindRelatedBusinesses r = new FindRelatedBusinesses();
r.setBusinessKey(body.getBusinessKey());
- r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+ r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers(),false));
if (body.getKeyedReference() != null) {
r.setKeyedReference(new KeyedReference(body.getKeyedReference().getTModelKey(), body.getKeyedReference().getKeyName(), body.getKeyedReference().getKeyValue()));
}
@@ -803,7 +840,7 @@ public class MapUDDIv2Tov3 {
FindService r = new FindService();
r.setBusinessKey(body.getBusinessKey());
r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
- r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+ r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers(),false));
r.setMaxRows(body.getMaxRows());
r.setTModelBag(MapTModelBag(body.getTModelBag()));
r.getName().addAll(MapName(body.getName()));
@@ -820,7 +857,7 @@ public class MapUDDIv2Tov3 {
}
FindTModel r = new FindTModel();
r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
- r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+ r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers(),false));
r.setMaxRows(body.getMaxRows());
if (body.getName() != null) {
r.setName(new Name(body.getName().getValue(), body.getName().getLang()));
@@ -924,7 +961,7 @@ public class MapUDDIv2Tov3 {
}
DeletePublisherAssertions r = new DeletePublisherAssertions();
r.setAuthInfo(body.getAuthInfo());
- //r.getPublisherAssertion().addAll(Map));
+ r.getPublisherAssertion().addAll(MapListPublisherAssertion(body.getPublisherAssertion()));
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=1568829&r1=1568828&r2=1568829&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 Sun Feb 16 21:12:11 2014
@@ -16,6 +16,7 @@
package org.apache.juddi.v3.client.mapping;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.juddi.v3.client.UDDIConstants;
@@ -44,6 +45,7 @@ import org.uddi.api_v2.DeletePublisherAs
import org.uddi.api_v2.DeleteService;
import org.uddi.api_v2.DeleteTModel;
import org.uddi.api_v2.Description;
+import org.uddi.api_v2.Direction;
import org.uddi.api_v2.DiscoveryURL;
import org.uddi.api_v2.DiscoveryURLs;
import org.uddi.api_v2.Email;
@@ -91,6 +93,7 @@ import org.uddi.api_v2.ServiceDetail;
import org.uddi.api_v2.ServiceInfo;
import org.uddi.api_v2.ServiceInfos;
import org.uddi.api_v2.ServiceList;
+import org.uddi.api_v2.SharedRelationships;
import org.uddi.api_v2.TModelDetail;
import org.uddi.api_v2.TModelInfo;
import org.uddi.api_v2.TModelInfos;
@@ -493,6 +496,7 @@ public class MapUDDIv3Tov2 {
}
DeletePublisherAssertions r = new DeletePublisherAssertions();
r.setAuthInfo(body.getAuthInfo());
+ r.setGeneric(VERSION);
r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion()));
return r;
}
@@ -573,28 +577,28 @@ public class MapUDDIv3Tov2 {
FindQualifiers r = new FindQualifiers();
for (int i = 0; i < findQualifiers.getFindQualifier().size(); i++) {
/*if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_HTTP)) {
- r.getFindQualifier().add("uuid:68DE9E80-AD09-469D-8A37-088422BFBC36");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_EMAIL)) {
- r.getFindQualifier().add("uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FTP)) {
- r.getFindQualifier().add("uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FAX)) {
- r.getFindQualifier().add("uuid:1A2B00BE-6E2C-42F5-875B-56F32686E0E7");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_POTS)) {
- r.getFindQualifier().add("uuid:38E12427-5536-4260-A6F9-B5B530E63A07");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.IS_REPLACED_BY)) {
- r.getFindQualifier().add("uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OWNING_BUSINESS)) {
- r.getFindQualifier().add("uuid:4064C064-6D14-4F35-8953-9652106476A9");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.RELATIONSHIPS)) {
- r.getFindQualifier().add("uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) {
- r.getFindQualifier().add("uuid:327A56F0-3299-4461-BC23-5CD513E95C55");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:general_keywords")) {
- r.getFindQualifier().add("uuid:A035A07C-F362-44dd-8F95-E2B134BF43B4");
- } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:types")) {
- r.getFindQualifier().add("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4");
- }*/
+ r.getFindQualifier().add("uuid:68DE9E80-AD09-469D-8A37-088422BFBC36");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_EMAIL)) {
+ r.getFindQualifier().add("uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FTP)) {
+ r.getFindQualifier().add("uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FAX)) {
+ r.getFindQualifier().add("uuid:1A2B00BE-6E2C-42F5-875B-56F32686E0E7");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_POTS)) {
+ r.getFindQualifier().add("uuid:38E12427-5536-4260-A6F9-B5B530E63A07");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.IS_REPLACED_BY)) {
+ r.getFindQualifier().add("uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OWNING_BUSINESS)) {
+ r.getFindQualifier().add("uuid:4064C064-6D14-4F35-8953-9652106476A9");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.RELATIONSHIPS)) {
+ r.getFindQualifier().add("uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) {
+ r.getFindQualifier().add("uuid:327A56F0-3299-4461-BC23-5CD513E95C55");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:general_keywords")) {
+ r.getFindQualifier().add("uuid:A035A07C-F362-44dd-8F95-E2B134BF43B4");
+ } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:types")) {
+ r.getFindQualifier().add("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4");
+ }*/
if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH)
|| findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH_TMODEL)) {
r.getFindQualifier().add("exactNameMatch");
@@ -631,7 +635,7 @@ public class MapUDDIv3Tov2 {
} else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.APPROXIMATE_MATCH)
|| findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.APPROXIMATE_MATCH_TMODEL)) {
//ignore it, not supported by UDDI v2
-
+
} else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_INSENSITIVE_MATCH)
|| findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_INSENSITIVE_MATCH_TMODEL)) {
//ignore it, not supported by UDDI v2
@@ -697,7 +701,6 @@ public class MapUDDIv3Tov2 {
}
SetPublisherAssertions r = new SetPublisherAssertions();
r.setGeneric(VERSION);
-
r.getPublisherAssertion().addAll(MapPublisherAssertion(value));
return r;
@@ -710,10 +713,14 @@ public class MapUDDIv3Tov2 {
BindingDetail r = new BindingDetail();
r.setGeneric(VERSION);
r.setOperator(operator);
- if (findBinding.getListDescription().getActualCount() == findBinding.getListDescription().getIncludeCount()) {
- r.setTruncated(Truncated.FALSE);
- } else {
+ if (findBinding.getListDescription() == null) {
r.setTruncated(Truncated.TRUE);
+ } else {
+ if (findBinding.getListDescription().getActualCount() == findBinding.getListDescription().getIncludeCount()) {
+ r.setTruncated(Truncated.FALSE);
+ } else {
+ r.setTruncated(Truncated.TRUE);
+ }
}
r.getBindingTemplate().addAll(MapBinding(findBinding.getBindingTemplate()));
return r;
@@ -811,6 +818,7 @@ public class MapUDDIv3Tov2 {
x.setBusinessKey(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey());
x.getDescription().addAll(MapDescription(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getDescription()));
x.getName().addAll(MapName(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getName()));
+ x.getSharedRelationships().addAll(MapSharedRelationships(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getSharedRelationships()));
r.getRelatedBusinessInfos().getRelatedBusinessInfo().add(x);
}
}
@@ -972,7 +980,7 @@ public class MapUDDIv3Tov2 {
TModelInfo x = new TModelInfo();
x.setTModelKey(tModelInfo.get(i).getTModelKey());
- x.setName(new Name(tModelInfo.get(i).getName().getValue(), tModelInfo.get(i).getName().getValue()));
+ x.setName(new Name(tModelInfo.get(i).getName().getValue(), tModelInfo.get(i).getName().getLang()));
r.add(x);
}
return r;
@@ -1009,13 +1017,14 @@ public class MapUDDIv3Tov2 {
}
- public static PublisherAssertions MapPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> publisherAssertions, String operator) {
+ public static PublisherAssertions MapPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> publisherAssertions, String operator, String user) {
if (publisherAssertions == null) {
return null;
}
PublisherAssertions r = new PublisherAssertions();
r.getPublisherAssertion().addAll(MapPublisherAssertion(publisherAssertions));
r.setGeneric(VERSION);
+ r.setAuthorizedName(user);
r.setOperator(operator);
return r;
}
@@ -1037,7 +1046,6 @@ public class MapUDDIv3Tov2 {
return r;
}
-
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)) {
@@ -1215,4 +1223,24 @@ public class MapUDDIv3Tov2 {
return r;
}
+ private static List<SharedRelationships> MapSharedRelationships(List<org.uddi.api_v3.SharedRelationships> sharedRelationships) {
+ List<SharedRelationships> r = new ArrayList<SharedRelationships>();
+ if (sharedRelationships==null) return r;
+ for (int i=0; i < sharedRelationships.size(); i++){
+ SharedRelationships x = new SharedRelationships();
+ x.getKeyedReference().addAll(MapKeyedReference(sharedRelationships.get(i).getKeyedReference()));
+ if (sharedRelationships.get(i).getDirection()!=null)
+ switch (sharedRelationships.get(i).getDirection()){
+ case FROM_KEY:
+ x.setDirection(Direction.FROM_KEY);
+ break;
+ case TO_KEY:
+ x.setDirection(Direction.TO_KEY);
+ break;
+ }
+ r.add(x);
+ }
+ return r;
+ }
+
}
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=1568829&r1=1568828&r2=1568829&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 Sun Feb 16 21:12:11 2014
@@ -29,6 +29,7 @@ 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.validation.ValidateUDDIv2Inquiry;
import org.uddi.api_v2.BindingDetail;
import org.uddi.api_v2.BusinessDetail;
import org.uddi.api_v2.BusinessDetailExt;
@@ -75,7 +76,7 @@ public class UDDIv2InquiryImpl implement
}
static String nodeId=null;
- private static String getNodeID(){
+ public static String getNodeID(){
try {
nodeId=AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
} catch (ConfigurationException ex) {
@@ -87,6 +88,7 @@ public class UDDIv2InquiryImpl implement
@Override
public BindingDetail findBinding(FindBinding body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateFindBinding(body);
try {
return MapUDDIv3Tov2.MapBindingDetail(inquiryService.findBinding(MapUDDIv2Tov3.MapFindBinding(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -96,6 +98,7 @@ public class UDDIv2InquiryImpl implement
@Override
public BusinessList findBusiness(FindBusiness body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateFindBusiness(body);
try {
return MapUDDIv3Tov2.MapBusinessListEntity(inquiryService.findBusiness(MapUDDIv2Tov3.MapFindBusiness(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -106,6 +109,7 @@ public class UDDIv2InquiryImpl implement
@Override
public RelatedBusinessesList findRelatedBusinesses(FindRelatedBusinesses body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateFindRelatedBusinesses(body);
try {
return MapUDDIv3Tov2.MapRelatedBusinessList(inquiryService.findRelatedBusinesses(MapUDDIv2Tov3.MapFindRelatedBusiness(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -115,6 +119,7 @@ public class UDDIv2InquiryImpl implement
@Override
public ServiceList findService(FindService body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateFindService(body);
try {
return MapUDDIv3Tov2.MapServiceList(inquiryService.findService(MapUDDIv2Tov3.MapFindService(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -124,6 +129,7 @@ public class UDDIv2InquiryImpl implement
@Override
public TModelList findTModel(FindTModel body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateFindTModel(body);
try {
return MapUDDIv3Tov2.MapTModelListElement(inquiryService.findTModel(MapUDDIv2Tov3.MapFindTModel(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -133,6 +139,7 @@ public class UDDIv2InquiryImpl implement
@Override
public BindingDetail getBindingDetail(GetBindingDetail body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateGetBindingDetail(body);
try {
return MapUDDIv3Tov2.MapBindingDetail(inquiryService.getBindingDetail(MapUDDIv2Tov3.MapGetBindingDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -142,6 +149,7 @@ public class UDDIv2InquiryImpl implement
@Override
public BusinessDetail getBusinessDetail(GetBusinessDetail body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateGetBusinessDetail(body);
try {
BusinessDetail MapBusinessDetail = MapUDDIv3Tov2.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetail(body)), getNodeID());
// StringWriter sw = new StringWriter();
@@ -155,6 +163,7 @@ public class UDDIv2InquiryImpl implement
@Override
public BusinessDetailExt getBusinessDetailExt(GetBusinessDetailExt body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateBusinessDetailExt(body);
try {
return MapUDDIv3Tov2.MapBusinessDetailExt(inquiryService.getBusinessDetail(MapUDDIv2Tov3.MapGetBusinessDetailExt(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -164,6 +173,7 @@ public class UDDIv2InquiryImpl implement
@Override
public ServiceDetail getServiceDetail(GetServiceDetail body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateGetServiceDetail(body);
try {
return MapUDDIv3Tov2.MapServiceDetail(inquiryService.getServiceDetail(MapUDDIv2Tov3.MapGetServiceDetail(body)), getNodeID());
} catch (DispositionReportFaultMessage ex) {
@@ -173,6 +183,7 @@ public class UDDIv2InquiryImpl implement
@Override
public TModelDetail getTModelDetail(GetTModelDetail body) throws DispositionReport {
+ ValidateUDDIv2Inquiry.validateGetTModelDetail(body);
try {
//remove duplicates using a set
Set<String> keyList = new HashSet(body.getTModelKey());
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=1568829&r1=1568828&r2=1568829&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 Sun Feb 16 21:12:11 2014
@@ -17,11 +17,14 @@ package org.apache.juddi.api.impl;
import java.util.List;
import javax.jws.WebService;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
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.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.v3.client.mapping.MapUDDIv2Tov3;
import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2;
@@ -68,12 +71,12 @@ import org.uddi.v3_service.DispositionRe
* @since 3.2
*/
@WebService(serviceName = "Publish", targetNamespace = "urn:uddi-org:publication_v2",
- endpointInterface = "org.uddi.v2_service.Publish")
+ endpointInterface = "org.uddi.v2_service.Publish")
public class UDDIv2PublishImpl implements Publish {
public UDDIv2PublishImpl() {
logger.warn("This implementation of UDDIv2 Publish service " + UDDIv2PublishImpl.class.getCanonicalName() + " is considered BETA. Please"
- + " report any issues to https://issues.apache.org/jira/browse/JUDDI");
+ + " report any issues to https://issues.apache.org/jira/browse/JUDDI");
}
static String nodeId = null;
@@ -164,8 +167,8 @@ public class UDDIv2PublishImpl implement
@Override
public AssertionStatusReport getAssertionStatusReport(GetAssertionStatusReport body) throws org.uddi.v2_service.DispositionReport {
try {
-
- return MapUDDIv3Tov2.MapAssertionStatusReport( publishService.getAssertionStatusReport(body.getAuthInfo(), MapUDDIv2Tov3.MapCompletionStatus(body.getCompletionStatus())));
+
+ return MapUDDIv3Tov2.MapAssertionStatusReport(publishService.getAssertionStatusReport(body.getAuthInfo(), MapUDDIv2Tov3.MapCompletionStatus(body.getCompletionStatus())));
} catch (DispositionReportFaultMessage ex) {
throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
@@ -191,7 +194,7 @@ public class UDDIv2PublishImpl implement
@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(),getUsername(body.getAuthInfo()));
} catch (DispositionReportFaultMessage ex) {
throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
@@ -243,13 +246,35 @@ public class UDDIv2PublishImpl implement
}
}
+ private String getUsername(String authinfo) {
+ String user = "N/A";
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+
+ tx.begin();
+ user = publishService.getEntityPublisher(em, authinfo).getAuthorizedName();
+ tx.commit();
+ } catch (Exception ex) {
+ logger.error(ex);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ return user;
+ }
+
@Override
public PublisherAssertions setPublisherAssertions(SetPublisherAssertions body) throws org.uddi.v2_service.DispositionReport {
try {
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(), getUsername(body.getAuthInfo()));
} catch (DispositionReportFaultMessage ex) {
throw MapUDDIv3Tov2.MapException(ex, getNodeID());
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Sun Feb 16 21:12:11 2014
@@ -403,8 +403,8 @@ public class SubscriptionNotifier extend
//} else {
//log.warn("Unexpected WebServiceException " + e.getMessage() + e.getCause());
}
- log.warn("Unexpected notification exception:" + e.getMessage() + e.getCause());
- log.debug("Unexpected notification exception:" + e.getMessage() + e.getCause(),e);
+ log.error("Unexpected notification exception:" +e.getClass().getCanonicalName() + " " + e.getMessage() +" "+ e.getCause());
+ log.debug("Unexpected notification exception:" +e.getClass().getCanonicalName() + " "+ e.getMessage() + " "+e.getCause(),e);
}
} else {
log.info("Binding " + bindingTemplate.getEntityKey() + " has an unsupported binding type of "
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIv2Inquiry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIv2Inquiry.java?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIv2Inquiry.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIv2Inquiry.java Sun Feb 16 21:12:11 2014
@@ -0,0 +1,89 @@
+/*
+ * 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.validation;
+
+import org.apache.juddi.api.impl.UDDIv2InquiryImpl;
+import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.UnsupportedException;
+import org.uddi.api_v2.FindBinding;
+import org.uddi.api_v2.FindBusiness;
+import org.uddi.api_v2.FindRelatedBusinesses;
+import org.uddi.api_v2.FindService;
+import org.uddi.api_v2.FindTModel;
+import org.uddi.api_v2.GetBindingDetail;
+import org.uddi.api_v2.GetBusinessDetail;
+import org.uddi.api_v2.GetBusinessDetailExt;
+import org.uddi.api_v2.GetServiceDetail;
+import org.uddi.api_v2.GetTModelDetail;
+import org.uddi.v2_service.DispositionReport;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class ValidateUDDIv2Inquiry {
+
+ public static final String VER = "2.0";
+
+ public static void validateFindBinding(FindBinding body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+
+ }
+
+ public static void validateFindBusiness(FindBusiness body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateFindRelatedBusinesses(FindRelatedBusinesses body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateFindService(FindService body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateFindTModel(FindTModel body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateGetBindingDetail(GetBindingDetail body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateGetBusinessDetail(GetBusinessDetail body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateBusinessDetailExt(GetBusinessDetailExt body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateGetServiceDetail(GetServiceDetail body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ public static void validateGetTModelDetail(GetTModelDetail body) throws DispositionReport {
+ validateVersion(body.getGeneric());
+ }
+
+ private static void validateVersion(String generic) throws DispositionReport {
+ if (!VER.equalsIgnoreCase(generic)) {
+ throw MapUDDIv3Tov2.MapException(new UnsupportedException(new ErrorMessage("E_unrecognizedVersion", generic)), UDDIv2InquiryImpl.getNodeID());
+ }
+ }
+
+}
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBindingTemplate.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBindingTemplate.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBindingTemplate.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBindingTemplate.java Sun Feb 16 21:12:11 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
import static junit.framework.Assert.assertEquals;
@@ -22,28 +22,25 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.EntityCreator;
import org.junit.Assert;
-import org.uddi.api_v3.BindingDetail;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.DeleteBinding;
-import org.uddi.api_v3.GetBindingDetail;
-import org.uddi.api_v3.SaveBinding;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.api_v2.*;
+import org.uddi.v2_service.Inquire;
+import org.uddi.v2_service.Publish;
/**
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class TckBindingTemplate
{
- final static String JOE_BINDING_XML = "uddi_data/joepublisher/bindingTemplate.xml";
- final static String JOE_BINDING_KEY = "uddi:uddi.joepublisher.com:bindingtwo";
+ final static String JOE_BINDING_XML = "uddi_data_v2/joepublisher/bindingTemplate.xml";
+ final static String JOE_BINDING_KEY = "afc4954d-3f0e-4e33-a1c2-30bd6bb04175";
private Log logger = LogFactory.getLog(this.getClass());
- private UDDIPublicationPortType publication = null;
- private UDDIInquiryPortType inquiry = null;
+ private Publish publication = null;
+ private Inquire inquiry = null;
- public TckBindingTemplate(UDDIPublicationPortType publication,
- UDDIInquiryPortType inquiry) {
+ public TckBindingTemplate(Publish publication,
+ Inquire inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
@@ -62,13 +59,15 @@ public class TckBindingTemplate
// First save the entity
SaveBinding sb = new SaveBinding();
sb.setAuthInfo(authInfo);
+ sb.setGeneric("2.0");
- BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v3");
+ BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v2");
sb.getBindingTemplate().add(btIn);
publication.saveBinding(sb);
// Now get the entity and check the values
GetBindingDetail gb = new GetBindingDetail();
+ gb.setGeneric("2.0");
gb.getBindingKey().add(bindingKey);
BindingDetail bd = inquiry.getBindingDetail(gb);
List<BindingTemplate> btOutList = bd.getBindingTemplate();
@@ -78,7 +77,7 @@ public class TckBindingTemplate
assertEquals(btIn.getBindingKey(), btOut.getBindingKey());
TckValidator.checkDescriptions(btIn.getDescription(), btOut.getDescription());
- TckValidator.checkCategories(btIn.getCategoryBag(), btOut.getCategoryBag());
+
}
catch(Exception e) {
logger.error(e.getMessage(), e);
@@ -92,7 +91,7 @@ public class TckBindingTemplate
// Delete the entity and make sure it is removed
DeleteBinding db = new DeleteBinding();
db.setAuthInfo(authInfo);
-
+ db.setGeneric("2.0");
db.getBindingKey().add(bindingKey);
publication.deleteBinding(db);
}
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusiness.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusiness.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusiness.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusiness.java Sun Feb 16 21:12:11 2014
@@ -12,69 +12,58 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
+import org.apache.juddi.v2.tck.*;
import java.io.File;
-import java.net.URL;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
-import java.rmi.RemoteException;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
import java.util.List;
import javax.xml.bind.JAXB;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.EntityCreator;
import org.junit.Assert;
-import org.uddi.api_v3.BusinessDetail;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.DeleteBusiness;
-import org.uddi.api_v3.Description;
-import org.uddi.api_v3.GetBusinessDetail;
-import org.uddi.api_v3.SaveBusiness;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.uddi.api_v2.BusinessDetail;
+import org.uddi.api_v2.BusinessEntity;
+import org.uddi.api_v2.DeleteBusiness;
+import org.uddi.api_v2.Description;
+import org.uddi.api_v2.GetBusinessDetail;
+import org.uddi.api_v2.SaveBusiness;
+import org.uddi.v2_service.Inquire;
+import org.uddi.v2_service.Publish;
/**
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class TckBusiness {
- public final static String JOE_BUSINESS_XML = "uddi_data/joepublisher/businessEntity.xml";
- public final static String JOE_BUSINESS_KEY = "uddi:uddi.joepublisher.com:businessone";
- public final static String JOE_BUSINESS3_XML = "uddi_data/joepublisher/businessEntity3.xml";
- public final static String JOE_BUSINESS3_KEY = "uddi:uddi.joepublisher.com:businessthree.com";
- public final static String JOE_BUSINESS_MOVE_XML = "uddi_data/joepublisher/moveBusinessService1to3.xml";
- public final static String MARY_BUSINESS_XML = "uddi_data/marypublisher/businessEntity.xml";
- public final static String MARY_BUSINESS_KEY = "uddi:uddi.marypublisher.com:marybusinessone";
- public final static String SAM_BUSINESS_XML = "uddi_data/samsyndicator/businessEntity.xml";
- public final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
- public final static String SAM_BUSINESS_KEY = "uddi:www.samco.com:samco";
- public final static String COMBINE_CATBAGS_BIZ_XML = "uddi_data/joepublisher/combineCatBagsBusinessServices.xml";
- public final static String COMBINE_CATBAGS_BIZ_KEY = "uddi:uddi.joepublisher.com:business01";
- public final static String RIFTSAW_BUSINESS_KEY = "uddi:riftsaw.jboss.org:business_redhat-jboss";
- public final static String RIFTSAW_BUSINESS_XML = "uddi_data/bpel/riftsaw/businessEntity.xml";
- final static String SIGNATURE_KEYSTORE = "uddi_data/signature/signature.jks";
- final static String SIGNATURE_KEYSTORE_TYPE = "JKS";
- final static String SIGNATURE_KEYSTORE_PASSWORD = "changeit";
- final static String SIGNATURE_KEYSTORE_ALIAS = "mykey";
+ public final static String JOE_BUSINESS_XML = "uddi_data_v2/joepublisher/businessEntity.xml";
+ public final static String JOE_BUSINESS_KEY = "920465ac-07dd-4756-8212-5c4c300faf36";
+ public final static String JOE_BUSINESS3_XML = "uddi_data_v2/joepublisher/businessEntity3.xml";
+
+ public final static String JOE_BUSINESS3_KEY = "d04d1a31-bce1-46dc-8da9-8c7c16c46932";
+ public final static String JOE_BUSINESS_MOVE_XML = "uddi_data_v2/joepublisher/moveBusinessService1to3.xml";
+ public final static String MARY_BUSINESS_XML = "uddi_data_v2/marypublisher/businessEntity.xml";
+
+ public final static String MARY_BUSINESS_KEY = "e509bb52-daeb-46b1-abb7-d488b10baf19";
+ public final static String SAM_BUSINESS_XML = "uddi_data_v2/samsyndicator/businessEntity.xml";
+ public final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data_v2/samsyndicator/businessEntity_withProjection.xml";
+
+ public final static String SAM_BUSINESS_KEY = "49417f41-d2b5-4749-b459-55bd785a00d2";
+ public final static String COMBINE_CATBAGS_BIZ_XML = "uddi_data_v2/joepublisher/combineCatBagsBusinessServices.xml";
+
+ public final static String COMBINE_CATBAGS_BIZ_KEY = "26dcd995-b5be-4050-8cdc-453d62c7fcaa";
+
private Log logger = LogFactory.getLog(this.getClass());
- private UDDIPublicationPortType publication = null;
- private UDDIInquiryPortType inquiry = null;
+ private Publish publication = null;
+ private Inquire inquiry = null;
- public TckBusiness(UDDIPublicationPortType publication,
- UDDIInquiryPortType inquiry) {
+ public TckBusiness(Publish publication,
+ Inquire inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
@@ -100,11 +89,6 @@ public class TckBusiness {
deleteBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
}
- public void saveJoePublisherBusinessX509Signature(String authInfoJoe) {
- saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
- signBusiness(authInfoJoe, JOE_BUSINESS_KEY);
- verifyBusinessSignature(authInfoJoe, JOE_BUSINESS_KEY);
- }
public void saveJoePublisherBusiness(String authInfoJoe) {
saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, TckCommon.isDebug());
@@ -160,10 +144,11 @@ public class TckBusiness {
public void saveBusinesses(String authInfo, String businessXML, String businessKey, int numberOfCopies) {
try {
- BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
+ BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v2");
String businessName = beIn.getName().get(0).getValue();
for (int i = 0; i < numberOfCopies; i++) {
SaveBusiness sb = new SaveBusiness();
+ sb.setGeneric("2.0");
sb.setAuthInfo(authInfo);
beIn.getName().get(0).setValue(businessName + "-" + i);
beIn.setBusinessKey(businessKey + "-" + i);
@@ -182,6 +167,7 @@ public class TckBusiness {
try {
GetBusinessDetail gb = new GetBusinessDetail();
+ gb.setGeneric("2.0");
gb.getBusinessKey().add(businessKey);
BusinessDetail bd;
bd = inquiry.getBusinessDetail(gb);
@@ -192,92 +178,11 @@ public class TckBusiness {
} else {
Assert.assertNull(beOut.getBusinessServices());
}
- } catch (RemoteException e) {
- logger.error(e.getMessage(), e);
- Assert.fail("No exception should be thrown");
- }
- }
-
- public void signBusiness(String authInfo, String businessKey) {
- try {
- GetBusinessDetail gb = new GetBusinessDetail();
- gb.getBusinessKey().add(businessKey);
- BusinessDetail bd = inquiry.getBusinessDetail(gb);
- List<BusinessEntity> beOutList = bd.getBusinessEntity();
- BusinessEntity bizEntity = beOutList.get(0);
- bizEntity.getSignature().clear();
- BusinessEntity bizEntitySigned = signJAXBObject(bizEntity);
-
- SaveBusiness sb = new SaveBusiness();
- sb.setAuthInfo(authInfo);
- sb.getBusinessEntity().add(bizEntitySigned);
- publication.saveBusiness(sb);
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- Assert.fail("No exception should be thrown");
- }
- }
-
- public void verifyBusinessSignature(String authInfo, String businessKey) {
- try {
- GetBusinessDetail gb = new GetBusinessDetail();
- gb.getBusinessKey().add(businessKey);
- BusinessDetail bd = inquiry.getBusinessDetail(gb);
- List<BusinessEntity> beOutList = bd.getBusinessEntity();
- BusinessEntity bizEntity = beOutList.get(0);
-
- boolean sigOk = verifySignedJAXBObject(bizEntity);
- assertTrue("Signature invalid!", sigOk);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown");
}
}
-
- private <T> T signJAXBObject(T jaxbObj) {
- DOMResult domResult = new DOMResult();
- JAXB.marshal(jaxbObj, domResult);
- Document doc = ((Document) domResult.getNode());
- Element docElement = doc.getDocumentElement();
-
- try {
- KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
- URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
- ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
- KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry) ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
- PrivateKey privateKey = keyEntry.getPrivateKey();
- Certificate origCert = keyEntry.getCertificate();
- PublicKey validatingKey = origCert.getPublicKey();
- TckSigningUtil.signDOM(docElement, privateKey, origCert);
-
- DOMSource domSource = new DOMSource(doc);
- T result = (T) JAXB.unmarshal(domSource, jaxbObj.getClass());
- return result;
- } catch (Exception e) {
- throw new RuntimeException("Signature failure due to: " + e.getMessage(), e);
- }
- }
-
- private boolean verifySignedJAXBObject(Object obj) {
- try {
- DOMResult domResult = new DOMResult();
- JAXB.marshal(obj, domResult);
- Document doc = ((Document) domResult.getNode());
- Element docElement = doc.getDocumentElement();
-
- KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
- URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
- ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
- KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry) ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
- PrivateKey privateKey = keyEntry.getPrivateKey();
- Certificate origCert = keyEntry.getCertificate();
- PublicKey validatingKey = origCert.getPublicKey();
- return TckSigningUtil.verifySignature(docElement, validatingKey);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
public BusinessEntity saveBusiness(String authInfo, String businessXML, String businessKey) {
return saveBusiness(authInfo, businessXML, businessKey, false);
}
@@ -286,13 +191,15 @@ public class TckBusiness {
logger.info("attempting to save business " + businessKey + " from " + businessXML);
try {
SaveBusiness sb = new SaveBusiness();
+ sb.setGeneric("2.0");
sb.setAuthInfo(authInfo);
- BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
+ BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v2");
if (beIn == null) {
throw new Exception("Unload to load source xml document from " + businessXML);
}
sb.getBusinessEntity().add(beIn);
+ sb.setGeneric("2.0");
BusinessDetail saveBusiness = publication.saveBusiness(sb);
logger.info("Business saved with key " + saveBusiness.getBusinessEntity().get(0).getBusinessKey());
if (serialize) {
@@ -301,6 +208,7 @@ public class TckBusiness {
// Now get the entity and check the values
GetBusinessDetail gb = new GetBusinessDetail();
+ gb.setGeneric("2.0");
gb.getBusinessKey().add(businessKey);
BusinessDetail bd = inquiry.getBusinessDetail(gb);
List<BusinessEntity> beOutList = bd.getBusinessEntity();
@@ -317,7 +225,7 @@ public class TckBusiness {
TckValidator.checkDiscoveryUrls(beIn.getDiscoveryURLs(), beOut.getDiscoveryURLs());
TckValidator.checkContacts(beIn.getContacts(), beOut.getContacts());
TckValidator.checkCategories(beIn.getCategoryBag(), beOut.getCategoryBag());
- TckValidator.checkSignatures(beIn.getSignature(), beOut.getSignature());
+
return beOut;
} catch (Throwable e) {
logger.error(e.getMessage(), e);
@@ -332,6 +240,7 @@ public class TckBusiness {
// Now get the entity and check the values
GetBusinessDetail gb = new GetBusinessDetail();
+ gb.setGeneric("2.0");
gb.getBusinessKey().add(businessKey);
BusinessDetail bd = inquiry.getBusinessDetail(gb);
List<BusinessEntity> beOutList = bd.getBusinessEntity();
@@ -341,6 +250,7 @@ public class TckBusiness {
//Now updating the business by adding another description
SaveBusiness sb = new SaveBusiness();
+ sb.setGeneric("2.0");
sb.setAuthInfo(authInfo);
BusinessEntity beIn = beOut;
Description desc2 = new Description();
@@ -348,6 +258,7 @@ public class TckBusiness {
desc2.setValue("Omschrijving");
beIn.getDescription().add(desc2);
sb.getBusinessEntity().add(beIn);
+ sb.setGeneric("2.0");
publication.saveBusiness(sb);
// Now get the entity and check the values
@@ -373,6 +284,7 @@ public class TckBusiness {
// Delete the entity and make sure it is removed
String key = businessKey + "-" + i;
DeleteBusiness db = new DeleteBusiness();
+ db.setGeneric("2.0");
db.setAuthInfo(authInfo);
db.getBusinessKey().add(key);
publication.deleteBusiness(db);
@@ -389,6 +301,7 @@ public class TckBusiness {
try {
// Delete the entity and make sure it is removed
DeleteBusiness db = new DeleteBusiness();
+ db.setGeneric("2.0");
db.setAuthInfo(authInfo);
db.getBusinessKey().add(businessKey);
publication.deleteBusiness(db);
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusinessService.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusinessService.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusinessService.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckBusinessService.java Sun Feb 16 21:12:11 2014
@@ -12,7 +12,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
+
import static junit.framework.Assert.assertEquals;
@@ -22,14 +23,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.EntityCreator;
import org.junit.Assert;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.DeleteService;
-import org.uddi.api_v3.GetServiceDetail;
-import org.uddi.api_v3.SaveService;
-import org.uddi.api_v3.ServiceDetail;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.api_v2.*;
+import org.uddi.v2_service.Inquire;
+import org.uddi.v2_service.Publish;
/**
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -37,23 +33,19 @@ import org.uddi.v3_service.UDDIPublicati
public class TckBusinessService
{
- public final static String NOTIFIER_SERVICE_XML = "uddi_data/subscriptionnotifier/businessService.xml";
- public final static String NOTIFIER_SERVICE_KEY = "uddi:uddi.joepublisher.com:notifierone";
- public final static String JOE_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
- public final static String JOE_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
- public final static String JOE_SERVICE_XML_2 = "uddi_data/joepublisher/businessService2.xml";
- public final static String JOE_SERVICE_KEY_2 = "uddi:uddi.joepublisher.com:servicetwo";
- public final static String SAM_SERVICE_XML = "uddi_data/samsyndicator/businessService.xml";
- public final static String SAM_SERVICE_KEY = "uddi:www.samco.com:listingservice";
- public final static String RIFTSAW_PROCESS_XML = "uddi_data/bpel/riftsaw/WSDLPort.xml";
- public final static String RIFTSAW_PROCESS_KEY = "uddi:riftsaw.jboss.org:ticket-service";
- public final static String JOE_BINDING_KEY_1="uddi:uddi.joepublisher.com:bindingone";
+ public final static String JOE_SERVICE_XML = "uddi_data_v2/joepublisher/businessService.xml";
+ public final static String JOE_SERVICE_KEY = "b82739a9-f35c-4331-999a-6bfb2968ca5e";
+ public final static String JOE_SERVICE_XML_2 = "uddi_data_v2/joepublisher/businessService2.xml";
+ public final static String JOE_SERVICE_KEY_2 = "6687b480-c526-4175-b6bf-32a2a8734cec";
+ public final static String SAM_SERVICE_XML = "uddi_data_v2/samsyndicator/businessService.xml";
+ public final static String SAM_SERVICE_KEY = "bc9f7399-bb91-4693-8dc4-67ca38a4734f";
+ public final static String JOE_BINDING_KEY_1="c0af9342-f4f1-4625-b1f4-810fa35ae346";
private Log logger = LogFactory.getLog(this.getClass());
- private UDDIPublicationPortType publication = null;
- private UDDIInquiryPortType inquiry = null;
+ private Publish publication = null;
+ private Inquire inquiry = null;
- public TckBusinessService(UDDIPublicationPortType publication,
- UDDIInquiryPortType inquiry) {
+ public TckBusinessService(Publish publication,
+ Inquire inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
@@ -83,14 +75,7 @@ public class TckBusinessService
deleteService(authInfoJoe, JOE_SERVICE_KEY_2);
}
- public void saveNotifierService(String authInfoJoe) {
- saveService(authInfoJoe, NOTIFIER_SERVICE_XML, NOTIFIER_SERVICE_KEY);
- }
- public void deleteNotifierService(String authInfoJoe) {
- deleteService(authInfoJoe, NOTIFIER_SERVICE_KEY);
- }
-
public void deleteJoePublisherServices(String authInfoJoe, int businessInt, int numberOfCopies) {
deleteServices(authInfoJoe, businessInt,JOE_SERVICE_KEY, numberOfCopies);
@@ -115,12 +100,13 @@ public class TckBusinessService
public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies, String parentBusinessKey) {
SaveService ss = null;
try {
- org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v3");
+ org.uddi.api_v2.BusinessService bsIn = (org.uddi.api_v2.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_2");
String serviceName = bsIn.getName().get(0).getValue();
String bindingKey = bsIn.getBindingTemplates().getBindingTemplate().get(0).getBindingKey();
for (int i=0; i<numberOfCopies; i++) {
// save the entity
ss = new SaveService();
+ ss.setGeneric("2.0");
ss.setAuthInfo(authInfo);
bsIn.getName().get(0).setValue(serviceName + "-" + i);
bsIn.setBusinessKey(parentBusinessKey);
@@ -154,8 +140,8 @@ public class TckBusinessService
// First save the entity
SaveService ss = new SaveService();
ss.setAuthInfo(authInfo);
-
- org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v3");
+ ss.setGeneric("2.0");
+ org.uddi.api_v2.BusinessService bsIn = (org.uddi.api_v2.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v2");
if (description!=null) bsIn.getDescription().get(0).setValue("updated description");
ss.getBusinessService().add(bsIn);
@@ -190,8 +176,9 @@ public class TckBusinessService
SaveService ss = new SaveService();
ss.setAuthInfo(authInfo);
- org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML2, "org.uddi.api_v3");
+ org.uddi.api_v2.BusinessService bsIn = (org.uddi.api_v2.BusinessService)EntityCreator.buildFromDoc(serviceXML2, "org.uddi.api_v2");
ss.getBusinessService().add(bsIn);
+ ss.setGeneric("2.0");
publication.saveService(ss);
// Now get the entity and check the values
@@ -218,7 +205,7 @@ public class TckBusinessService
// Delete the entity and make sure it is removed
DeleteService ds = new DeleteService();
ds.setAuthInfo(authInfo);
-
+ ds.setGeneric("2.0");
ds.getServiceKey().add(serviceKey);
publication.deleteService(ds);
}
@@ -233,6 +220,7 @@ public class TckBusinessService
for (int i=0; i<numberOfCopies; i++) {
// Delete the entity and make sure it is removed
DeleteService ds = new DeleteService();
+ ds.setGeneric("2.0");
ds.setAuthInfo(authInfo);
ds.getServiceKey().add(serviceKey + "-" + businessInt + "-" + i);
publication.deleteService(ds);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org