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 [2/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/...
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckCommon.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckCommon.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckCommon.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckCommon.java Sun Feb 16 21:12:11 2014
@@ -13,33 +13,30 @@
* 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 java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.uddi.api_v3.BindingTemplates;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.BusinessInfos;
-import org.uddi.api_v3.BusinessList;
-import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.Contacts;
-import org.uddi.api_v3.DeleteBusiness;
-import org.uddi.api_v3.Description;
-import org.uddi.api_v3.FindBusiness;
-import org.uddi.api_v3.FindQualifiers;
-import org.uddi.api_v3.FindService;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.ServiceInfos;
-import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModelList;
-import org.uddi.sub_v3.DeleteSubscription;
-import org.uddi.sub_v3.Subscription;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
+import org.uddi.api_v2.BindingTemplates;
+import org.uddi.api_v2.BusinessEntity;
+import org.uddi.api_v2.BusinessInfos;
+import org.uddi.api_v2.BusinessList;
+import org.uddi.api_v2.CategoryBag;
+import org.uddi.api_v2.Contacts;
+import org.uddi.api_v2.DeleteBusiness;
+import org.uddi.api_v2.Description;
+import org.uddi.api_v2.FindBusiness;
+import org.uddi.api_v2.FindQualifiers;
+import org.uddi.api_v2.FindService;
+import org.uddi.api_v2.FindTModel;
+import org.uddi.api_v2.KeyedReference;
+import org.uddi.api_v2.Name;
+import org.uddi.api_v2.ServiceInfos;
+import org.uddi.api_v2.ServiceList;
+import org.uddi.api_v2.TModelList;
+import org.uddi.v2_service.*;
+
/**
* Common Utilities for TCK tests
@@ -65,12 +62,6 @@ public class TckCommon {
for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i)));
}
- for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
- sb.append("Key Ref Grp: TModelKey=");
- for (int k = 0; k < categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
- sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
- }
- }
return sb.toString();
}
@@ -92,9 +83,9 @@ public class TckCommon {
}
for (int i = 0; i < contacts.getContact().size(); i++) {
System.out.println("Contact " + i + " type:" + contacts.getContact().get(i).getUseType());
- for (int k = 0; k < contacts.getContact().get(i).getPersonName().size(); k++) {
- System.out.println("Name: " + contacts.getContact().get(i).getPersonName().get(k).getValue());
- }
+
+ System.out.println("Name: " + contacts.getContact().get(i).getPersonName());
+
for (int k = 0; k < contacts.getContact().get(i).getEmail().size(); k++) {
System.out.println("Email: " + contacts.getContact().get(i).getEmail().get(k).getValue());
}
@@ -132,7 +123,7 @@ public class TckCommon {
System.out.println("Binding Key: " + bindingTemplates.getBindingTemplate().get(i).getBindingKey());
if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint() != null) {
- System.out.println("Access Point: " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue() + " type " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType());
+ System.out.println("Access Point: " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue() + " type " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getURLType().value());
}
if (bindingTemplates.getBindingTemplate().get(i).getHostingRedirector() != null) {
@@ -201,12 +192,13 @@ public class TckCommon {
* @param authInfo
* @param publish
*/
- public static void DeleteBusiness(String key, String authInfo, UDDIPublicationPortType publish) {
+ public static void DeleteBusiness(String key, String authInfo, Publish publish) {
if (key == null) {
return;
}
try {
DeleteBusiness db = new DeleteBusiness();
+ db.setGeneric("2.0");
db.setAuthInfo(authInfo);
db.getBusinessKey().add(key);
publish.deleteBusiness(db);
@@ -216,25 +208,7 @@ public class TckCommon {
}
}
- public static void removeAllExistingSubscriptions(String authinfo, UDDISubscriptionPortType sub) {
- List<Subscription> subscriptions;
- try {
- subscriptions = sub.getSubscriptions(authinfo);
-
- DeleteSubscription ds = new DeleteSubscription();
- ds.setAuthInfo(authinfo);
- for (int i = 0; i < subscriptions.size(); i++) {
- ds.getSubscriptionKey().add(subscriptions.get(i).getSubscriptionKey());
- }
- if (!subscriptions.isEmpty()) {
- logger.info("Purging " + subscriptions.size() + " old subscriptions");
- sub.deleteSubscription(ds);
- }
- } catch (Exception ex) {
- logger.warn("error clearing subscriptions", ex);
- }
- }
-
+
/**
* returns true if the System Property "debug" is equal to "true"
* @return true/false
@@ -252,12 +226,12 @@ public class TckCommon {
}
- public static String DumpAllServices(String authinfo, UDDIInquiryPortType inquiry) {
+ public static String DumpAllServices(String authinfo, Inquire inquiry) {
StringBuilder sb = new StringBuilder();
FindService fs = new FindService();
- fs.setAuthInfo(authinfo);
- fs.setFindQualifiers(new FindQualifiers());
- fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ //fs.setAuthInfo(authinfo);
+ //fs.setFindQualifiers(new FindQualifiers());
+ //fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
fs.getName().add(new Name("%", null));
try {
ServiceList findService = inquiry.findService(fs);
@@ -276,13 +250,14 @@ public class TckCommon {
}
- public static String DumpAllTModels(String authinfo, UDDIInquiryPortType inquriy) {
+ public static String DumpAllTModels(String authinfo, Inquire inquriy) {
StringBuilder sb = new StringBuilder();
FindTModel fs = new FindTModel();
- fs.setAuthInfo(authinfo);
- fs.setFindQualifiers(new FindQualifiers());
- fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ //fs.setAuthInfo(authinfo);
+ //fs.setFindQualifiers(new FindQualifiers());
+ //fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
fs.setName(new Name("%", null));
+ fs.setGeneric("2.0");
try {
TModelList findService = inquriy.findTModel(fs);
if (findService.getTModelInfos()== null) {
@@ -300,13 +275,14 @@ public class TckCommon {
}
return sb.toString();
}
- public static String DumpAllBusinesses(String authinfo, UDDIInquiryPortType inquriy) {
+ public static String DumpAllBusinesses(String authinfo, Inquire inquriy) {
StringBuilder sb = new StringBuilder();
FindBusiness fs = new FindBusiness();
- fs.setAuthInfo(authinfo);
- fs.setFindQualifiers(new FindQualifiers());
- fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ //fs.setAuthInfo(authinfo);
+ //fs.setFindQualifiers(new FindQualifiers());
+ //fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
fs.getName().add(new Name("%", null));
+ fs.setGeneric("2.0");
try {
BusinessList findService = inquriy.findBusiness(fs);
if (findService.getBusinessInfos() == null) {
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckFindEntity.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckFindEntity.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckFindEntity.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckFindEntity.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;
import static junit.framework.Assert.assertTrue;
@@ -26,36 +26,10 @@ 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.BindingTemplates;
-import org.uddi.api_v3.BusinessDetail;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.BusinessInfo;
-import org.uddi.api_v3.BusinessInfos;
-import org.uddi.api_v3.BusinessList;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.FindBinding;
-import org.uddi.api_v3.FindBusiness;
-import org.uddi.api_v3.FindRelatedBusinesses;
-import org.uddi.api_v3.FindService;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.GetBusinessDetail;
-import org.uddi.api_v3.GetServiceDetail;
-import org.uddi.api_v3.RelatedBusinessInfo;
-import org.uddi.api_v3.RelatedBusinessInfos;
-import org.uddi.api_v3.RelatedBusinessesList;
-import org.uddi.api_v3.ServiceDetail;
-import org.uddi.api_v3.ServiceInfo;
-import org.uddi.api_v3.ServiceInfos;
-import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModel;
-import org.uddi.api_v3.TModelInfo;
-import org.uddi.api_v3.TModelInfos;
-import org.uddi.api_v3.TModelList;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDIInquiryPortType;
+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>
@@ -63,29 +37,30 @@ import org.uddi.v3_service.UDDIInquiryPo
*/
public class TckFindEntity
{
- final static String FIND_BUSINESS_XML = "uddi_data/find/findBusiness1.xml";
- final static String FIND_ALL_BUSINESSES_XML = "uddi_data/find/findAllBusinesses.xml";
- final static String FIND_ALL_SIGNED_BUSINESSES_XML= "uddi_data/find/findAllSignedBusinesses.xml";
- final static String FIND_RELATED_BUSINESS_SORT_BY_NAME_XML = "uddi_data/find/findRelatedBusinesses_sortByName.xml";
- final static String FIND_RELATED_BUSINESS_FROM_KEY= "uddi_data/find/findRelatedBusinesses_fromKey.xml";
- final static String FIND_RELATED_BUSINESS_TO_KEY = "uddi_data/find/findRelatedBusinesses_toKey.xml";
- final static String FIND_SERVICE_XML = "uddi_data/find/findService1.xml";
- final static String FIND_BINDING_XML = "uddi_data/find/findBinding1.xml";
- final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml";
- final static String COMBINE_CAT_FIND_SERVICES = "uddi_data/joepublisher/combineCatBagsFindServices.xml";
+ final static String FIND_BUSINESS_XML = "uddi_data_v2/find/findBusiness1.xml";
+ final static String FIND_ALL_BUSINESSES_XML = "uddi_data_v2/find/findAllBusinesses.xml";
+
+ final static String FIND_RELATED_BUSINESS_SORT_BY_NAME_XML = "uddi_data_v2/find/findRelatedBusinesses_sortByName.xml";
+ final static String FIND_RELATED_BUSINESS_FROM_KEY= "uddi_data_v2/find/findRelatedBusinesses_fromKey.xml";
+ final static String FIND_RELATED_BUSINESS_TO_KEY = "uddi_data_v2/find/findRelatedBusinesses_toKey.xml";
+ final static String FIND_SERVICE_XML = "uddi_data_v2/find/findService1.xml";
+ final static String FIND_BINDING_XML = "uddi_data_v2/find/findBinding1.xml";
+ final static String FIND_TMODEL_XML = "uddi_data_v2/find/findTModel1.xml";
+ final static String COMBINE_CAT_FIND_SERVICES = "uddi_data_v2/joepublisher/combineCatBagsFindServices.xml";
private Log logger = LogFactory.getLog(this.getClass());
- UDDIInquiryPortType inquiry =null;
+ Inquire inquiry =null;
- public TckFindEntity(UDDIInquiryPortType inquiry) {
+ public TckFindEntity(Inquire inquiry) {
super();
this.inquiry = inquiry;
}
public void findBusiness() {
try {
- FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_BUSINESS_XML, "org.uddi.api_v3");
+ FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_BUSINESS_XML, "org.uddi.api_v2");
+ body.setGeneric("2.0");
BusinessList result = inquiry.findBusiness(body);
if (result == null)
Assert.fail("Null result from find business operation");
@@ -97,7 +72,7 @@ public class TckFindEntity
Assert.fail("No result from find business operation");
BusinessInfo biOut = biList.get(0);
- BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(TckBusiness.JOE_BUSINESS_XML, "org.uddi.api_v3");
+ BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(TckBusiness.JOE_BUSINESS_XML, "org.uddi.api_v2");
assertEquals(beIn.getBusinessKey(), biOut.getBusinessKey());
@@ -114,6 +89,7 @@ public class TckFindEntity
String nonExistingKey = "nonexistingKey";
try {
GetBusinessDetail body = new GetBusinessDetail();
+ body.setGeneric("2.0");
body.getBusinessKey().add(nonExistingKey);
BusinessDetail result = inquiry.getBusinessDetail(body);
Assert.fail("No business should be found");
@@ -121,7 +97,7 @@ public class TckFindEntity
} catch (Exception e) {
try {
System.out.println("(Expected) Error message = " + e.getMessage());
- DispositionReport report = DispositionReportFaultMessage.getDispositionReport(e);
+ DispositionReport report = org.uddi.v2_service.DispositionReport.getDispositionReport(e);
assertNotNull(report);
assertTrue(report.countainsErrorCode(DispositionReport.E_INVALID_KEY_PASSED));
} catch (Exception e1) {
@@ -133,7 +109,8 @@ public class TckFindEntity
public void findAllBusiness() {
try {
- FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_ALL_BUSINESSES_XML, "org.uddi.api_v3");
+ FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_ALL_BUSINESSES_XML, "org.uddi.api_v2");
+ body.setGeneric("2.0");
BusinessList result = inquiry.findBusiness(body);
if (result == null)
Assert.fail("Null result from find business operation");
@@ -153,33 +130,11 @@ public class TckFindEntity
}
}
- public List<BusinessInfo> findAllSignedBusiness() {
- List<BusinessInfo> biList = null;
- try {
- FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_ALL_SIGNED_BUSINESSES_XML, "org.uddi.api_v3");
- BusinessList result = inquiry.findBusiness(body);
- if (result == null)
- Assert.fail("Null result from find business operation");
- BusinessInfos bInfos = result.getBusinessInfos();
- if (bInfos == null)
- Assert.fail("No result from find business operation");
- biList = bInfos.getBusinessInfo();
- if (biList == null || biList.size() == 0)
- Assert.fail("No result from find business operation");
- //expecting at one business
- Assert.assertTrue(biList.size()==1);
- return biList;
- }
- catch(Exception e) {
- logger.error(e.getMessage(), e);
- Assert.fail("No exception should be thrown.");
- }
- return biList;
- }
public void findRelatedBusiness_sortByName(boolean isOneSided) {
try {
- FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_SORT_BY_NAME_XML, "org.uddi.api_v3");
+ FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_SORT_BY_NAME_XML, "org.uddi.api_v2");
+ body.setGeneric("2.0");
RelatedBusinessesList result = inquiry.findRelatedBusinesses(body);
if (result == null)
Assert.fail("Null result from find related business operation");
@@ -187,7 +142,7 @@ public class TckFindEntity
//both parties need to register the assertion for it to be live.
if (isOneSided) {
- Assert.assertNull(bInfos);
+ Assert.assertTrue(bInfos==null || bInfos.getRelatedBusinessInfo().isEmpty());
} else {
if (bInfos == null)
Assert.fail("No result from find related business operation");
@@ -198,8 +153,8 @@ public class TckFindEntity
for (RelatedBusinessInfo relatedBusinessInfo : biList) {
keys.add(relatedBusinessInfo.getBusinessKey());
}
- Assert.assertTrue(keys.contains("uddi:www.samco.com:samco"));
- Assert.assertTrue(keys.contains("uddi:uddi.marypublisher.com:marybusinessone"));
+ Assert.assertTrue(keys.contains(TckBusiness.SAM_BUSINESS_KEY));
+ Assert.assertTrue(keys.contains(TckBusiness.MARY_BUSINESS_KEY));
}
}
catch(Exception e) {
@@ -210,7 +165,8 @@ public class TckFindEntity
public void findRelatedBusinessToKey(boolean isOneSided) {
try {
- FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_TO_KEY, "org.uddi.api_v3");
+ FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_TO_KEY, "org.uddi.api_v2");
+ body.setGeneric("2.0");
RelatedBusinessesList result = inquiry.findRelatedBusinesses(body);
if (result == null)
Assert.fail("Null result from find related business operation");
@@ -218,7 +174,7 @@ public class TckFindEntity
//both parties need to register the assertion for it to be live.
if (isOneSided) {
- Assert.assertNull(bInfos);
+ Assert.assertTrue(bInfos==null || bInfos.getRelatedBusinessInfo().isEmpty());
} else {
if (bInfos == null)
Assert.fail("No result from find related business operation");
@@ -229,7 +185,7 @@ public class TckFindEntity
for (RelatedBusinessInfo relatedBusinessInfo : biList) {
keys.add(relatedBusinessInfo.getBusinessKey());
}
- Assert.assertTrue(keys.contains("uddi:uddi.joepublisher.com:businessone"));
+ Assert.assertTrue(keys.contains(TckBusiness.JOE_BUSINESS_KEY));
}
}
catch(Exception e) {
@@ -240,7 +196,8 @@ public class TckFindEntity
public void findRelatedBusinessFromKey(boolean isOneSided) {
try {
- FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_FROM_KEY, "org.uddi.api_v3");
+ FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_FROM_KEY, "org.uddi.api_v2");
+ body.setGeneric("2.0");
RelatedBusinessesList result = inquiry.findRelatedBusinesses(body);
if (result == null)
Assert.fail("Null result from find related business operation");
@@ -259,7 +216,7 @@ public class TckFindEntity
for (RelatedBusinessInfo relatedBusinessInfo : biList) {
keys.add(relatedBusinessInfo.getBusinessKey());
}
- Assert.assertTrue(keys.contains("uddi:www.samco.com:samco"));
+ Assert.assertTrue(keys.contains(TckBusiness.SAM_BUSINESS_KEY));
}
}
catch(Exception e) {
@@ -271,7 +228,8 @@ public class TckFindEntity
public String findService(String findQualifier) {
String serviceKey = null;
try {
- FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
+ FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v2");
+ body.setGeneric("2.0");
if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
ServiceList result = inquiry.findService(body);
if (result == null)
@@ -284,7 +242,7 @@ public class TckFindEntity
Assert.fail("No result from find service operation");
ServiceInfo siOut = siList.get(0);
- BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v3");
+ BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v2");
assertEquals(bsIn.getServiceKey(), siOut.getServiceKey());
@@ -301,7 +259,8 @@ public class TckFindEntity
public String findService_CombinedCatBag() {
String serviceKey = null;
try {
- FindService body = (FindService)EntityCreator.buildFromDoc(COMBINE_CAT_FIND_SERVICES, "org.uddi.api_v3");
+ FindService body = (FindService)EntityCreator.buildFromDoc(COMBINE_CAT_FIND_SERVICES, "org.uddi.api_v2");
+ body.setGeneric("2.0");
ServiceList result = inquiry.findService(body);
if (result == null)
Assert.fail("Null result from find service operation");
@@ -325,6 +284,7 @@ public class TckFindEntity
public void findServiceDetail(String serviceKey) {
try {
GetServiceDetail getServiceDetail = new GetServiceDetail();
+ getServiceDetail.setGeneric("2.0");
getServiceDetail.getServiceKey().add(serviceKey);
@@ -346,7 +306,7 @@ public class TckFindEntity
// Assert.fail("No result from find service operation");
// ServiceInfo siOut = siList.get(0);
//
-// BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v3");
+// BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v2");
//
// assertEquals(bsIn.getServiceKey(), siOut.getServiceKey());
//
@@ -359,8 +319,9 @@ public class TckFindEntity
}
public void findBinding(String findQualifier) {
try {
- FindBinding body = (FindBinding)EntityCreator.buildFromDoc(FIND_BINDING_XML, "org.uddi.api_v3");
+ FindBinding body = (FindBinding)EntityCreator.buildFromDoc(FIND_BINDING_XML, "org.uddi.api_v2");
if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
+ body.setGeneric("2.0");
BindingDetail result = inquiry.findBinding(body);
if (result == null)
Assert.fail("Null result from find binding operation");
@@ -369,13 +330,12 @@ public class TckFindEntity
Assert.fail("No result from find binding operation");
BindingTemplate btOut = btList.get(0);
- BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(TckBindingTemplate.JOE_BINDING_XML, "org.uddi.api_v3");
+ BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(TckBindingTemplate.JOE_BINDING_XML, "org.uddi.api_v2");
assertEquals(btIn.getServiceKey(), btOut.getServiceKey());
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);
@@ -385,8 +345,9 @@ public class TckFindEntity
public void findTModel(String findQualifier) {
try {
- FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+ FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v2");
if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
+ body.setGeneric("2.0");
TModelList result = inquiry.findTModel(body);
if (result == null)
Assert.fail("Null result from find tModel operation");
@@ -398,13 +359,12 @@ public class TckFindEntity
Assert.fail("No result from find tModel operation");
TModelInfo tiOut = tiList.get(0);
- TModel tmIn = (TModel)EntityCreator.buildFromDoc(TckTModel.JOE_PUBLISHER_TMODEL_XML, "org.uddi.api_v3");
+ TModel tmIn = (TModel)EntityCreator.buildFromDoc(TckTModel.JOE_PUBLISHER_TMODEL_XML, "org.uddi.api_v2");
assertEquals(tmIn.getTModelKey(), tiOut.getTModelKey());
assertEquals(tmIn.getName().getLang(), tiOut.getName().getLang());
assertEquals(tmIn.getName().getValue(), tiOut.getName().getValue());
- TckValidator.checkDescriptions(tmIn.getDescription(), tiOut.getDescription());
}
catch(Exception e) {
logger.error(e.getMessage(), e);
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.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 java.io.File;
import java.io.FileInputStream;
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.tck.Property;
/**
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
@@ -30,10 +31,10 @@ import org.apache.commons.logging.LogFac
public class TckPublisher {
private static Properties tckProperties = new Properties();
- public final static String JOE_PUBLISHER_XML = "uddi_data/joepublisher/publisher.xml";
- //public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml";
- public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
- public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml";
+ public final static String JOE_PUBLISHER_XML = "uddi_data_v2/joepublisher/publisher.xml";
+ //public final static String TMODEL_PUBLISHER_XML = "uddi_data_v2/tmodels/publisher.xml";
+ public final static String SAM_SYNDICATOR_XML = "uddi_data_v2/samsyndicator/publisher.xml";
+ public final static String MARY_PUBLISHER_XML = "uddi_data_v2/marypublisher/publisher.xml";
private static Log logger = LogFactory.getLog(TckPublisher.class);
@@ -68,6 +69,14 @@ public class TckPublisher {
}
}
}
+
+ /**
+ * is enabled for UDDI v2 tests
+ * @return
+ */
+ public final static boolean isEnabled(){
+ return Boolean.parseBoolean(tckProperties.getProperty("uddiv2.enabled", "false"));
+ }
public final static String getRootPublisherId() {
return tckProperties.getProperty(Property.ROOT_PUBLISHER);
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisherAssertion.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisherAssertion.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisherAssertion.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisherAssertion.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,26 +22,29 @@ 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.AddPublisherAssertions;
-import org.uddi.api_v3.DeletePublisherAssertions;
-import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.PublisherAssertion;
-import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.api_v2.AddPublisherAssertions;
+import org.uddi.api_v2.DeletePublisherAssertions;
+import org.uddi.api_v2.GetPublisherAssertions;
+import org.uddi.api_v2.KeyedReference;
+import org.uddi.api_v2.PublisherAssertion;
+import org.uddi.api_v2.PublisherAssertions;
+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 TckPublisherAssertion
{
- final static String JOE_ASSERT_XML = "uddi_data/joepublisher/publisherAssertion.xml";
- final static String MARY_ASSERT_XML = "uddi_data/marypublisher/publisherAssertion.xml";
- final static String JOE_ASSERT2_XML = "uddi_data/joepublisher/publisherAssertion2.xml";
- final static String SAM_ASSERT_XML = "uddi_data/samsyndicator/publisherAssertion.xml";
+ final static String JOE_ASSERT_XML = "uddi_data_v2/joepublisher/publisherAssertion.xml";
+ final static String MARY_ASSERT_XML = "uddi_data_v2/marypublisher/publisherAssertion.xml";
+ final static String JOE_ASSERT2_XML = "uddi_data_v2/joepublisher/publisherAssertion2.xml";
+ final static String SAM_ASSERT_XML = "uddi_data_v2/samsyndicator/publisherAssertion.xml";
private Log logger = LogFactory.getLog(this.getClass());
- private UDDIPublicationPortType publication = null;
+ private Publish publication = null;
- public TckPublisherAssertion(UDDIPublicationPortType publication) {
+ public TckPublisherAssertion(Publish publication) {
super();
this.publication = publication;
}
@@ -83,13 +86,17 @@ public class TckPublisherAssertion
try {
AddPublisherAssertions ap = new AddPublisherAssertions();
ap.setAuthInfo(authInfo);
-
- PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v3");
+ ap.setGeneric("2.0");
+ PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v2");
ap.getPublisherAssertion().add(paIn);
publication.addPublisherAssertions(ap);
- // Now get the entity and check the values
- List<PublisherAssertion> paOutList = publication.getPublisherAssertions(authInfo);
+ GetPublisherAssertions body = new GetPublisherAssertions();
+ body.setAuthInfo(authInfo);
+ body.setGeneric("2.0");
+ // Now get the entity and check the values
+ PublisherAssertions publisherAssertions = publication.getPublisherAssertions(body);
+ List<PublisherAssertion> paOutList =publisherAssertions.getPublisherAssertion();
if (paOutList.size()==1) {
PublisherAssertion paOut = paOutList.get(0);
@@ -117,8 +124,8 @@ public class TckPublisherAssertion
// Delete the entity and make sure it is removed
DeletePublisherAssertions dp = new DeletePublisherAssertions();
dp.setAuthInfo(authInfo);
-
- PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v3");
+ dp.setGeneric("2.0");
+ PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v2");
dp.getPublisherAssertion().add(paIn);
publication.deletePublisherAssertions(dp);
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckSecurity.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckSecurity.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckSecurity.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckSecurity.java Sun Feb 16 21:12:11 2014
@@ -12,28 +12,30 @@
* 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 java.rmi.RemoteException;
import javax.xml.ws.BindingProvider;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v2_service.DispositionReport;
+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 TckSecurity {
- public static String getAuthToken(UDDISecurityPortType securityService, String pubId, String cred) throws DispositionReportFaultMessage, RemoteException {
+ public static String getAuthToken(Publish securityService, String pubId, String cred) throws DispositionReport, RemoteException {
if (!TckPublisher.isUDDIAuthMode())
return null;
- org.uddi.api_v3.GetAuthToken ga = new org.uddi.api_v3.GetAuthToken();
+ org.uddi.api_v2.GetAuthToken ga = new org.uddi.api_v2.GetAuthToken();
+ ga.setGeneric("2.0");
ga.setUserID(pubId);
ga.setCred(cred);
- org.uddi.api_v3.AuthToken token = securityService.getAuthToken(ga);
+ org.uddi.api_v2.AuthToken token = securityService.getAuthToken(ga);
return token.getAuthInfo();
}
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckTModel.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckTModel.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckTModel.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckTModel.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 java.util.HashSet;
import java.util.Iterator;
@@ -26,55 +26,49 @@ 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.DeleteTModel;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.GetTModelDetail;
-import org.uddi.api_v3.OverviewDoc;
-import org.uddi.api_v3.SaveTModel;
-import org.uddi.api_v3.TModel;
-import org.uddi.api_v3.TModelDetail;
-import org.uddi.api_v3.TModelList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.api_v2.DeleteTModel;
+import org.uddi.api_v2.FindTModel;
+import org.uddi.api_v2.GetTModelDetail;
+import org.uddi.api_v2.OverviewDoc;
+import org.uddi.api_v2.SaveTModel;
+import org.uddi.api_v2.TModel;
+import org.uddi.api_v2.TModelDetail;
+import org.uddi.api_v2.TModelList;
+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 TckTModel {
- public static final String JOE_PUBLISHER_TMODEL_XML = "uddi_data/joepublisher/tModelKeyGen.xml";
- public static final String JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3 = "uddi_data/joepublisher/FindTmodelTest.xml";
- public static final String JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY = "uddi:uddi.joepublisher.com:tmodelone";
- /**
- * "uddi:uddi.joepublisher.com:"
- */
- public final static String JOE_PUBLISHER_KEY_PREFIX = "uddi:uddi.joepublisher.com:";
- final static String JOE_PUBLISHER_TMODEL_KEY = "uddi:uddi.joepublisher.com:keygenerator";
- final static String MARY_PUBLISHER_TMODEL_XML = "uddi_data/marypublisher/tModelKeyGen.xml";
- final static String MARY_PUBLISHER_TMODEL_KEY = "uddi:uddi.marypublisher.com:keygenerator";
- final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data/samsyndicator/tModelKeyGen.xml";
- final static String SAM_SYNDICATOR_TMODEL_KEY = "uddi:www.samco.com:keygenerator";
- final static String TMODEL_PUBLISHER_TMODEL_XML = "uddi_data/tmodels/tModelKeyGen.xml";
- final static String TMODEL_PUBLISHER_TMODEL_KEY = "uddi:tmodelkey:categories:keygenerator";
- final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml";
- final static String FIND_TMODEL_XML_BY_CAT = "uddi_data/find/findTModelByCategoryBag.xml";
- public final static String TMODELS_XML = "uddi_data/tmodels/tmodels.xml";
- public final static String RIFTSAW_PUBLISHER_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelKeyGen.xml";
- public final static String RIFTSAW_PUBLISHER_TMODEL_KEY = "uddi:riftsaw.jboss.org:keygenerator";
- public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelCustomerPortType.xml";
- public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_KEY = "uddi:riftsaw.jboss.org:CustomerInterface_portType";
- public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelAgentPortType.xml";
- public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY = "uddi:riftsaw.jboss.org:TravelAgentInterface_portType";
- public final static String RIFTSAW_PROCESS_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelProcess.xml";
- public final static String RIFTSAW_PROCESS_TMODEL_KEY = "uddi:riftsaw.jboss.org:ReservationAndBookingTicketsProcess";
+ public static final String JOE_PUBLISHER_TMODEL_XML = "uddi_data_v2/joepublisher/tModelKeyGen.xml";
+
+
+ final static String JOE_PUBLISHER_TMODEL_KEY = "uuid:c537997c-e082-461d-94e6-ec7935a3b18e";
+ final static String MARY_PUBLISHER_TMODEL_XML = "uddi_data_v2/marypublisher/tModelKeyGen.xml";
+
+ final static String MARY_PUBLISHER_TMODEL_KEY = "uuid:333f6466-3de7-4532-849f-7354eb842e6a";
+ final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data_v2/samsyndicator/tModelKeyGen.xml";
+
+ final static String SAM_SYNDICATOR_TMODEL_KEY = "uuid:c1e003d3-cb43-42f0-905f-aa8a92870bf6";
+ final static String TMODEL_PUBLISHER_TMODEL_XML = "uddi_data_v2/tmodels/tModelKeyGen.xml";
+ final static String TMODEL_PUBLISHER_TMODEL_KEY = "uuid:0ebf9f1d-4b81-4554-87b0-f4af21b6b569";
+
+
+ final static String FIND_TMODEL_XML = "uddi_data_v2/find/findTModel1.xml";
+ final static String FIND_TMODEL_XML_BY_CAT = "uddi_data_v2/find/findTModelByCategoryBag.xml";
+ public final static String TMODELS_XML = "uddi_data_v2/tmodels/tmodels.xml";
+
private Log logger = LogFactory.getLog(this.getClass());
- private UDDIPublicationPortType publication = null;
- private UDDIInquiryPortType inquiry = null;
+ private Publish publication = null;
+ private Inquire inquiry = null;
private Set<String> keyscreated = new HashSet<String>();
- public TckTModel(UDDIPublicationPortType publication,
- UDDIInquiryPortType inquiry) {
+ public TckTModel(Publish publication,
+ Inquire inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
@@ -90,7 +84,8 @@ public class TckTModel {
// Add tModels
try {
- SaveTModel st = (org.uddi.api_v3.SaveTModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+ SaveTModel st = (org.uddi.api_v2.SaveTModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v2");
+ st.setGeneric("2.0");
for (int i = 0; i < st.getTModel().size(); i++) {
saveTModel(authInfo, st.getTModel().get(i), false);
@@ -107,15 +102,12 @@ public class TckTModel {
private TModel saveTModel(String authInfo, TModel tmIn, boolean force) {
boolean exists = false;
GetTModelDetail gt1 = new GetTModelDetail();
+ gt1.setGeneric("2.0");
gt1.getTModelKey().add(tmIn.getTModelKey());
try {
TModelDetail td1 = inquiry.getTModelDetail(gt1);
if (td1 != null && !td1.getTModel().isEmpty()) {
- if (!td1.getTModel().get(0).isDeleted()) {
exists = true;
- } else {
- logger.info("The tModel with key " + tmIn.getTModelKey() + " exists already, but is flagged as deleted. Overwritting");
- }
}
} catch (Exception ex) {
}
@@ -126,25 +118,27 @@ public class TckTModel {
SaveTModel st = new SaveTModel();
st.setAuthInfo(authInfo);
+ st.setGeneric("2.0");
st.getTModel().add(tmIn);
publication.saveTModel(st);
keyscreated.add(tmIn.getTModelKey());
// Now get the entity and check the values
GetTModelDetail gt = new GetTModelDetail();
+ gt.setGeneric("2.0");
gt.getTModelKey().add(tmIn.getTModelKey());
TModelDetail td = inquiry.getTModelDetail(gt);
- List<org.uddi.api_v3.TModel> tmOutList = td.getTModel();
- org.uddi.api_v3.TModel tmOut = tmOutList.get(0);
+ List<org.uddi.api_v2.TModel> tmOutList = td.getTModel();
+ org.uddi.api_v2.TModel tmOut = tmOutList.get(0);
assertEquals(tmIn.getTModelKey().toLowerCase(), tmOut.getTModelKey());
assertEquals(tmIn.getName().getLang(), tmOut.getName().getLang());
assertEquals(tmIn.getName().getValue(), tmOut.getName().getValue());
TckValidator.checkDescriptions(tmIn.getDescription(), tmOut.getDescription());
TckValidator.checkCategories(tmIn.getCategoryBag(), tmOut.getCategoryBag());
- for (OverviewDoc overviewDoc : tmIn.getOverviewDoc()) {
- TckValidator.checkOverviewDocs(overviewDoc, tmOut.getOverviewDoc());
- }
+
+ TckValidator.checkOverviewDocs(tmIn.getOverviewDoc(), tmOut.getOverviewDoc());
+
logger.info("The TModel " + tmIn.getTModelKey() + " saved");
if (TckCommon.isDebug()) {
@@ -169,9 +163,9 @@ public class TckTModel {
public TModel saveTModel(String authInfo, String tModelXml, String tModelKey, boolean force) {
logger.info("Loading tModel from " + tModelXml);
- org.uddi.api_v3.TModel tmIn = null;
+ org.uddi.api_v2.TModel tmIn = null;
try {
- tmIn = (org.uddi.api_v3.TModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+ tmIn = (org.uddi.api_v2.TModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v2");
} catch (Exception ex) {
Assert.fail("unable to load tmodel from file!");
}
@@ -188,6 +182,7 @@ public class TckTModel {
//Now deleting the TModel
// Delete the entity and make sure it is removed
DeleteTModel dt = new DeleteTModel();
+ dt.setGeneric("2.0");
dt.setAuthInfo(authInfo);
logger.info("deleting tmodel " + tModelKey);
@@ -212,7 +207,8 @@ public class TckTModel {
try {
//Try to get the TModel
GetTModelDetail tmodelDetail = new GetTModelDetail();
- tmodelDetail.setAuthInfo(authInfo);
+ tmodelDetail.setGeneric("2.0");
+ //tmodelDetail.setAuthInfo(authInfo);
tmodelDetail.getTModelKey().add(tModelKey);
return inquiry.getTModelDetail(tmodelDetail);
@@ -228,7 +224,8 @@ public class TckTModel {
public TModelList findJoeTModelDetail() {
try {
- FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+ FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v2");
+ body.setGeneric("2.0");
TModelList result = inquiry.findTModel(body);
return result;
@@ -244,7 +241,7 @@ public class TckTModel {
public TModelList findJoeTModelDetailByCategoryBag() {
try {
- FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML_BY_CAT, "org.uddi.api_v3");
+ FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML_BY_CAT, "org.uddi.api_v2");
TModelList result = inquiry.findTModel(body);
return result;
@@ -313,6 +310,7 @@ public class TckTModel {
Iterator<String> iterator = keyscreated.iterator();
while (iterator.hasNext()) {
DeleteTModel dtm = new DeleteTModel();
+ dtm.setGeneric("2.0");
dtm.setAuthInfo(authinfo);
String s = iterator.next();
logger.info("cleanup tModel " + s);
Copied: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckValidator.java (from r1564260, juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckValidator.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckValidator.java?p2=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckValidator.java&p1=juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckValidator.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckValidator.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckValidator.java Sun Feb 16 21:12:11 2014
@@ -12,58 +12,21 @@
* 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;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
-import java.util.Arrays;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBElement;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.BindingTemplates;
-import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.Contact;
-import org.uddi.api_v3.Contacts;
-import org.uddi.api_v3.Description;
-import org.uddi.api_v3.DiscoveryURL;
-import org.uddi.api_v3.DiscoveryURLs;
-import org.uddi.api_v3.HostingRedirector;
-import org.uddi.api_v3.InstanceDetails;
-import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.OverviewDoc;
-import org.uddi.api_v3.OverviewURL;
-import org.uddi.api_v3.PersonName;
-import org.uddi.api_v3.TModelInstanceDetails;
-import org.uddi.api_v3.TModelInstanceInfo;
-import org.w3._2000._09.xmldsig_.CanonicalizationMethodType;
-import org.w3._2000._09.xmldsig_.DigestMethodType;
-import org.w3._2000._09.xmldsig_.KeyInfoType;
-import org.w3._2000._09.xmldsig_.ObjectType;
-import org.w3._2000._09.xmldsig_.ReferenceType;
-import org.w3._2000._09.xmldsig_.SignatureMethodType;
-import org.w3._2000._09.xmldsig_.SignatureType;
-import org.w3._2000._09.xmldsig_.SignatureValueType;
-import org.w3._2000._09.xmldsig_.SignedInfoType;
-import org.w3._2000._09.xmldsig_.TransformType;
-import org.w3._2000._09.xmldsig_.TransformsType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import org.uddi.api_v2.*;
public class TckValidator {
@@ -125,197 +88,6 @@ public class TckValidator {
}
}
- public static void checkSignatures(List<SignatureType> sigs1, List<SignatureType> sigs2) {
- if (sigs1 == null || sigs2 == null) {
- assertEquals(sigs1, sigs2);
- return;
- }
- assertEquals(sigs1.size(), sigs2.size());
- Iterator<SignatureType> sigsList1Itr = sigs1.iterator();
- Iterator<SignatureType> sigsList2Itr = sigs2.iterator();
- while (sigsList1Itr.hasNext()) {
- SignatureType sig1 = sigsList1Itr.next();
- SignatureType sig2 = sigsList2Itr.next();
-
- assertEquals(sig1.getId(), sig2.getId());
- checkKeyInfo(sig1.getKeyInfo(), sig2.getKeyInfo());
- checkObjectType(sig1.getObject(), sig2.getObject());
- checkSignatureValue(sig1.getSignatureValue(), sig2.getSignatureValue());
- checkSignedInfo(sig1.getSignedInfo(), sig2.getSignedInfo());
- }
- }
-
- public static void checkKeyInfo(KeyInfoType kit1, KeyInfoType kit2) {
- if (kit1 == null || kit2 == null) {
- assertEquals(kit1, kit2);
- return;
- }
- assertEquals(kit1.getId(), kit2.getId());
-
- DOMResult domResult1 = new DOMResult();
- DOMResult domResult2 = new DOMResult();
- JAXB.marshal(kit1, domResult1);
- JAXB.marshal(kit2, domResult2);
-
- Document doc1 = (Document)domResult1.getNode();
- DOMSource domSource1 = new DOMSource(doc1.getDocumentElement());
- Document doc2 = (Document)domResult2.getNode();
- DOMSource domSource2 = new DOMSource(doc2.getDocumentElement());
- XMLUnit.setIgnoreAttributeOrder(true);
- XMLUnit.setIgnoreComments(true);
- XMLUnit.setIgnoreWhitespace(true);
- Diff diff = new Diff(domSource1, domSource2);
- assertTrue("Key info elements should match", diff.similar());
- }
-
- public static void checkObjectType(List<ObjectType> obj1List, List<ObjectType> obj2List) {
- if (obj1List == null || obj2List == null) {
- assertEquals(obj1List, obj2List);
- return;
- }
- assertEquals(obj1List.size(), obj2List.size());
- Iterator<ObjectType> objList1Itr = obj1List.iterator();
- Iterator<ObjectType> objList2Itr = obj2List.iterator();
- while (objList1Itr.hasNext()) {
- ObjectType obj1 = objList1Itr.next();
- ObjectType obj2 = objList2Itr.next();
- assertEquals(obj1.getEncoding(), obj2.getEncoding());
- assertEquals(obj1.getId(), obj2.getId());
- assertEquals(obj1.getMimeType(), obj2.getMimeType());
- }
- }
-
- public static void checkSignatureValue(SignatureValueType sv1, SignatureValueType sv2) {
- if (sv1 == null || sv2 == null) {
- assertEquals(sv1, sv2);
- return;
- }
- assertEquals(sv1.getId(), sv2.getId());
- assertTrue(Arrays.equals(sv1.getValue(), sv2.getValue()));
- }
-
- public static void checkSignedInfo(SignedInfoType si1, SignedInfoType si2) {
- if (si1 == null || si2 == null) {
- assertEquals(si1, si2);
- return;
- }
- assertEquals(si1.getId(), si2.getId());
- checkCanonicalizationMethod(si1.getCanonicalizationMethod(), si2.getCanonicalizationMethod());
- checkReference(si1.getReference(), si2.getReference());
- checkSignatureMethod(si1.getSignatureMethod(), si2.getSignatureMethod());
- }
-
- public static void checkCanonicalizationMethod(CanonicalizationMethodType cm1, CanonicalizationMethodType cm2) {
- if (cm1 == null || cm2 == null) {
- assertEquals(cm1, cm2);
- return;
- }
- assertEquals(cm1.getAlgorithm(), cm2.getAlgorithm());
- }
-
- public static void checkReference(List<ReferenceType> r1List, List<ReferenceType> r2List) {
- if (r1List == null || r2List == null) {
- assertEquals(r1List, r2List);
- return;
- }
- assertEquals(r1List.size(), r2List.size());
-
- Iterator<ReferenceType> rList1Itr = r1List.iterator();
- Iterator<ReferenceType> rList2Itr = r2List.iterator();
- while (rList1Itr.hasNext()) {
- ReferenceType r1 = rList1Itr.next();
- ReferenceType r2 = rList2Itr.next();
- checkReference(r1, r2);
- }
- }
-
- public static void checkReference(ReferenceType r1, ReferenceType r2) {
- assertTrue(Arrays.equals(r1.getDigestValue(), r2.getDigestValue()));
- assertEquals(r1.getId(), r2.getId());
- assertEquals(r1.getType(), r2.getType());
- assertEquals(r1.getURI(), r2.getURI());
-
- checkDigestMethod(r1.getDigestMethod(), r2.getDigestMethod());
- checkTransforms(r1.getTransforms(), r2.getTransforms());
- }
-
- public static void checkDigestMethod(DigestMethodType dm1, DigestMethodType dm2) {
- if (dm1 == null || dm2 == null) {
- assertEquals(dm1, dm2);
- return;
- }
- assertEquals(dm1.getAlgorithm(), dm2.getAlgorithm());
- }
-
- public static void checkTransforms(TransformsType tTypes1, TransformsType tTypes2) {
- if (tTypes1 == null || tTypes2 == null) {
- assertEquals(tTypes1, tTypes2);
- return;
- }
- List<TransformType> tt1List = tTypes1.getTransform();
- List<TransformType> tt2List = tTypes2.getTransform();
- if (tt1List == null || tt2List == null) {
- assertEquals(tt1List, tt2List);
- return;
- }
- assertEquals(tt1List.size(), tt2List.size());
-
- Iterator<TransformType> ttList1Itr = tt1List.iterator();
- Iterator<TransformType> ttList2Itr = tt2List.iterator();
- while (ttList1Itr.hasNext()) {
- TransformType tx1 = ttList1Itr.next();
- TransformType tx2 = ttList2Itr.next();
-
- assertEquals(tx1.getAlgorithm(), tx2.getAlgorithm());
- checkTransformContentList(tx1.getContent(), tx2.getContent());
- }
- }
-
- public static void checkTransformContentList(List<Object> list1, List<Object> list2) {
- if (list1 == null || list2 == null) {
- assertEquals(list1, list2);
- return;
- }
- assertEquals(list1.size(), list2.size());
-
- Iterator<Object> list1Itr = list1.iterator();
- Iterator<Object> list2Itr = list2.iterator();
- while (list1Itr.hasNext()) {
- Object obj1 = list1Itr.next();
- Object obj2 = list2Itr.next();
-
- if (obj1 instanceof String) {
- assertEquals((String)obj1, obj2);
- } else if (obj1 instanceof Element || obj1 instanceof JAXBElement) {
- if (obj1 instanceof JAXBElement) {
- DOMResult domResult = new DOMResult();
- JAXB.marshal(obj1, domResult);
- obj1 = ((Document)domResult.getNode()).getDocumentElement();
- }
- if (obj2 instanceof JAXBElement) {
- DOMResult domResult = new DOMResult();
- JAXB.marshal(obj2, domResult);
- obj2 = ((Document)domResult.getNode()).getDocumentElement();
- }
- XMLUnit.setIgnoreAttributeOrder(true);
- XMLUnit.setIgnoreComments(true);
- DOMSource domSrc1 = new DOMSource((Element)obj1);
- DOMSource domSrc2 = new DOMSource((Element)obj2);
- Diff diff = new Diff(domSrc1, domSrc2);
- assertTrue("Element should be the same", diff.similar());
- } else {
- throw new RuntimeException("Unrecognized type: " + obj1.getClass());
- }
- }
- }
-
- public static void checkSignatureMethod(SignatureMethodType smt1, SignatureMethodType smt2) {
- if (smt1 == null || smt2 == null) {
- assertEquals(smt1, smt2);
- return;
- }
- assertEquals(smt1.getAlgorithm(), smt2.getAlgorithm());
- }
public static void checkContacts(Contacts contacts1, Contacts contacts2) {
if (contacts1 == null || contacts2 == null) {
@@ -335,28 +107,10 @@ public class TckValidator {
Contact contact1 = contactList1Itr.next();
Contact contact2 = contactList2Itr.next();
assertEquals(contact1.getUseType(), contact2.getUseType());
-
- checkPersonNames(contact1.getPersonName(), contact2.getPersonName());
+ assertEquals(contact1.getPersonName(), contact2.getPersonName());
checkDescriptions(contact1.getDescription(), contact2.getDescription());
}
}
-
- public static void checkPersonNames(List<PersonName> names1, List<PersonName> names2) {
- if (names1 == null || names2 == null) {
- assertEquals(names1, names2);
- return;
- }
- assertEquals(names1.size(), names2.size());
- Iterator<PersonName> names1Itr = names1.iterator();
- Iterator<PersonName> names2Itr = names2.iterator();
- while (names1Itr.hasNext()) {
- PersonName name1 = names1Itr.next();
- PersonName name2 = names2Itr.next();
- assertEquals(name1.getLang(), name2.getLang());
- assertEquals(name1.getValue(), name2.getValue());
- }
- }
-
public static void checkCategories(CategoryBag cbag1, CategoryBag cbag2) {
if (cbag1 == null || cbag2 == null) {
assertEquals(cbag1, cbag2);
@@ -374,7 +128,7 @@ public class TckValidator {
Iterator<KeyedReference> elemList2Itr = elemList2.iterator();
while (elemList1Itr.hasNext()) {
KeyedReference elem1 = elemList1Itr.next();
- if (elem1 instanceof org.uddi.api_v3.KeyedReference) {
+ if (elem1 instanceof KeyedReference) {
KeyedReference elem2 = elemList2Itr.next();
assertEquals(elem1.getTModelKey(), elem2.getTModelKey());
assertEquals(elem1.getKeyName(), elem2.getKeyName());
@@ -396,9 +150,8 @@ public class TckValidator {
BindingTemplate bt1 = bt1Iter.next();
BindingTemplate bt2 = bt2Iter.next();
assertEquals(bt1.getAccessPoint().getValue(),bt2.getAccessPoint().getValue());
- assertEquals(bt1.getAccessPoint().getUseType(),bt2.getAccessPoint().getUseType());
+ assertEquals(bt1.getAccessPoint().getURLType(),bt2.getAccessPoint().getURLType());
assertEquals(bt1.getBindingKey().toLowerCase(),bt2.getBindingKey());
- checkCategories(bt1.getCategoryBag(), bt2.getCategoryBag());
checkDescriptions(bt1.getDescription(),bt2.getDescription());
checkHostingRedirector(bt1.getHostingRedirector(),bt2.getHostingRedirector());
//the inbound apiBindingTemplate can have a null serviceKey
@@ -428,95 +181,51 @@ public class TckValidator {
public static void checkInstanceDetails(InstanceDetails ids1, InstanceDetails ids2) {
if (ids1 == null || ids2 == null) {
- assertEquals(ids1, ids2);
return;
}
List<Description> elem1s = ids1.getDescription();
List<Description> elem2s = ids2.getDescription();
Iterator<Description> elem1 = elem1s.iterator();
-
- boolean isMatch=false;
-
- if (elem1s.size() == 0 && elem2s.size() == 0) {
- isMatch = true;
- }
-
- while (elem1.hasNext()) {
- Description desc1 = elem1.next();
-
- if (desc1 instanceof org.uddi.api_v3.Description) {
- //Descriptions
- Iterator<Description> elem2 = elem2s.iterator();
- while (elem2.hasNext()) {
- Description desc2 = elem2.next();
- if (desc2 instanceof org.uddi.api_v3.Description) {
- if (desc1.getLang().equals(desc2.getLang()) && desc1.getValue().equals(desc2.getValue())) {
- isMatch=true;
- break;
- }
- }
- }
- }
- }
- assertTrue(isMatch);
-
-
- List<OverviewDoc> odoc1s = ids1.getOverviewDoc();
- List<OverviewDoc> odoc2s = ids2.getOverviewDoc();
- Iterator<OverviewDoc> docelem1 = odoc1s.iterator();
- isMatch = false;
- if (odoc1s.size() == 0 && odoc2s.size() == 0) {
- isMatch = true;
- }
-
- while (docelem1.hasNext()) {
- OverviewDoc odoc1 = docelem1.next();
- if (odoc1 instanceof org.uddi.api_v3.OverviewDoc) {
- //OverviewDocs
- checkOverviewDocs(odoc1, odoc2s);
- isMatch=true;
- }
- }
+
+ checkDescriptions(elem2s, elem2s);
+
+ OverviewDoc odoc1s = ids1.getOverviewDoc();
+ OverviewDoc odoc2s = ids2.getOverviewDoc();
- assertEquals((String)ids1.getInstanceParms(),(String)ids2.getInstanceParms());
- assertTrue(isMatch);
+ if (odoc1s==null&& odoc2s == null) {
+ }else if (odoc1s!=null && odoc2s!=null)
+ {
+ checkDescriptions(odoc1s.getDescription(), odoc2s.getDescription());
+ assertEquals("overview doc mismatch",odoc1s.getOverviewURL(), odoc2s.getOverviewURL());
+ }else
+ {
+ assertTrue("overview doc missing one one item", false);
+ }
+ assertEquals("instance params mismatch",ids1.getInstanceParms(),ids2.getInstanceParms());
}
- public static void checkOverviewDocs(OverviewDoc doc1, List<OverviewDoc> elem2s) {
+ public static void checkOverviewDocs(OverviewDoc doc1, OverviewDoc elem2s) {
boolean isMatch=false;
- Iterator<OverviewDoc> elem2 = elem2s.iterator();
+
//Match against any OverviewDocs in the elem2 list
- while (elem2.hasNext()) {
- OverviewDoc doc2 = elem2.next();
- if (doc2 instanceof org.uddi.api_v3.OverviewDoc) {
- //match doc1 against this doc2
- isMatch = compareOverviewDocs(doc1, doc2);
- if (isMatch) break;
- }
- }
+ isMatch = compareOverviewDocs(doc1, elem2s);
+
+
assertTrue(isMatch);
}
- public static void checkOverviewDocs(OverviewDoc doc1, Collection<OverviewDoc> doc2s) {
- boolean isMatch=false;
- Iterator<OverviewDoc> docIter = doc2s.iterator();
- while (docIter.hasNext()) {
- OverviewDoc doc2 = docIter.next();
- //match doc1 against this doc2
- isMatch = compareOverviewDocs(doc1, doc2);
- if (isMatch) break;
- }
- assertTrue(isMatch);
- }
public static boolean compareOverviewDocs(OverviewDoc doc1, OverviewDoc doc2)
{
+ if (doc1==null && doc2==null) return true;
+ if (doc1!=null && doc2==null) return false;
+ if (doc1==null && doc2!=null) return false;
boolean descMatch=false;
boolean urlMatch =false;
- OverviewURL url1 = (OverviewURL) doc1.getOverviewURL();
- OverviewURL url2 = (OverviewURL) doc2.getOverviewURL();
- if (url1.getUseType().equals(url2.getUseType()) && url1.getValue().trim().equals(url2.getValue().trim())) {
+ String url1 = doc1.getOverviewURL();
+ String url2 = doc2.getOverviewURL();
+ if (url1.equals(url2) ) {
urlMatch=true;
}
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Sun Feb 16 21:12:11 2014
@@ -68,6 +68,14 @@ public class TckPublisher {
}
}
}
+
+ /**
+ * is enabled for UDDI v3 tests
+ * @return
+ */
+ public final static boolean isEnabled(){
+ return Boolean.parseBoolean(tckProperties.getProperty("uddiv3.enabled", "false"));
+ }
public final static String getRootPublisherId() {
return tckProperties.getProperty(Property.ROOT_PUBLISHER);
Modified: juddi/trunk/uddi-tck-base/src/main/resources/tck.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/tck.properties?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/tck.properties (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/tck.properties Sun Feb 16 21:12:11 2014
@@ -75,4 +75,8 @@ keyPassword=Test
keyAlias=Test
trustStorePath=../uddi-tck-base/src/main/resources/truststore.jks
trustStoreType=JKS
-trustStorePassword=Test
\ No newline at end of file
+trustStorePassword=Test
+
+# the TCK now has tests for uddiv2 and uddiv3
+uddiv2.enabled=true
+uddiv3.enabled=true
\ No newline at end of file
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllBusinesses.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllBusinesses.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllBusinesses.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllBusinesses.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_business xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace" listHead="0">
+ <findQualifiers>
+ </findQualifiers>
+ <name>%</name>
+
+</find_business>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllSignedBusinesses.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllSignedBusinesses.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllSignedBusinesses.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findAllSignedBusinesses.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_business xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace" listHead="0">
+ <findQualifiers>
+ <findQualifier>orLikeKeys</findQualifier>
+ <findQualifier>caseInsensitiveMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>signaturePresent</findQualifier>
+ </findQualifiers>
+ <name>%</name>
+
+</find_business>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBinding1.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBinding1.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBinding1.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBinding1.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_binding xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace" serviceKey="">
+ <findQualifiers>
+ <findQualifier>orAllKeys</findQualifier>
+ </findQualifiers>
+ <tModelBag>
+ <tModelKey>uddi:uddi.org:protocol:serverauthenticatedssl3</tModelKey>
+ </tModelBag>
+ <categoryBag>
+ <keyedReference tModelKey="uuid:f85a1fb1-2be1-4197-9a3f-fc310222cd34" keyName="category" keyValue="secure" />
+ </categoryBag>
+</find_binding>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBusiness1.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBusiness1.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBusiness1.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findBusiness1.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_business xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace" maxRows="1" listHead="0">
+ <findQualifiers>
+ <findQualifier>orLikeKeys</findQualifier>
+ </findQualifiers>
+ <name xml:lang="en">john%</name>
+ <name xml:lang="en">A-1%</name>
+ <identifierBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identity%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identityX%" />
+ </identifierBag>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="apples%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="blues%" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank%" />
+ </keyedReferenceGroup>
+ </categoryBag>
+ <discoveryURLs>
+ <discoveryURL useType="home">http://www.businessone.com</discoveryURL>
+ <discoveryURL useType="serviceList">http://www.businessone.com/services</discoveryURL>
+ </discoveryURLs>
+ <find_tModel xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ <findQualifier>caseInsensitiveMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>andAllKeys</findQualifier>
+ </findQualifiers>
+ <name>uddi-org:serverAuthenticatedSSL3%</name>
+ </find_tModel>
+</find_business>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findRelatedBusinesses_sortByName.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findRelatedBusinesses_sortByName.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findRelatedBusinesses_sortByName.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findRelatedBusinesses_sortByName.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_relatedBusinesses xmlns="urn:uddi-org:api_v2">
+ <findQualifiers>
+ <findQualifier>sortByNameDesc</findQualifier>
+ </findQualifiers>
+ <businessKey>920465ac-07dd-4756-8212-5c4c300faf36</businessKey>
+</find_relatedBusinesses>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findService1.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findService1.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findService1.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findService1.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_service xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ <findQualifier>exactNameMatch</findQualifier>
+ </findQualifiers>
+ <name xml:lang="en">Service One</name>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
+ </keyedReferenceGroup>
+ </categoryBag>
+</find_service>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModel1.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModel1.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModel1.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModel1.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_tModel xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ </findQualifiers>
+ <name>Joe Publisher%</name>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator%"
+ keyValue="keyGenerator%" />
+ </categoryBag>
+</find_tModel>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModelByCategoryBag.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModelByCategoryBag.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModelByCategoryBag.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/find/findTModelByCategoryBag.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<find_tModel xmlns="urn:uddi-org:api_v2" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ <findQualifier>caseInsensitiveMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>andAllKeys</findQualifier>
+ </findQualifiers>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator%"
+ keyValue="keyGenerator%" />
+ </categoryBag>
+</find_tModel>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/FindTmodelTest.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/FindTmodelTest.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/FindTmodelTest.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/FindTmodelTest.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+ <save_tModel xmlns="urn:uddi-org:api_v2">
+ <tModel tModelKey="uuid:7305c870-df19-4eca-8d92-9d16ce03a80b" >
+ <name>tModel One</name>
+ <description>This is a test of find_tmodel for subscriptions</description>
+</tModel>
+
+ </save_tModel>
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/bindingTemplate.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/bindingTemplate.xml?rev=1568829&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/bindingTemplate.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data_v2/joepublisher/bindingTemplate.xml Sun Feb 16 21:12:11 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<bindingTemplate xmlns="urn:uddi-org:api_v2" serviceKey="b82739a9-f35c-4331-999a-6bfb2968ca5e" bindingKey="afc4954d-3f0e-4e33-a1c2-30bd6bb04175">
+ <description xml:lang="en">This is the secure access point for service one</description>
+ <accessPoint URLType="http">https://businessone.com/services/serviceone</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference tModelKey="uuid:f85a1fb1-2be1-4197-9a3f-fc310222cd34" keyName="category" keyValue="secure" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types"
+ keyName="HTTP protocol" keyValue="uddi:uddi.org:protocol:http"/>
+ </categoryBag>
+</bindingTemplate>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org