Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -30,6 +30,7 @@ import org.apache.juddi.v3.client.config import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.api_v3.AccessPoint; @@ -78,18 +79,20 @@ public class UDDI_150_CustodyTransferInt @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.deleteCreatedTModels(authInfoJoe); manager.stop(); } @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); @@ -109,7 +112,7 @@ public class UDDI_150_CustodyTransferInt tckTModelJoe = new TckTModel(publishJoe, inquiryJoe); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publishSam = transport.getUDDIPublishService(); inquirySam = transport.getUDDIInquiryService(); custodyTransferPortTypeSam = transport.getUDDICustodyTransferService(); @@ -119,7 +122,7 @@ public class UDDI_150_CustodyTransferInt TckSecurity.setCredentials((BindingProvider) custodyTransferPortTypeJoe, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); } - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); UDDIPublicationPortType uddiPublishService = transport.getUDDIPublishService(); UDDIInquiryPortType uddiInquiryService = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -162,6 +165,7 @@ public class UDDI_150_CustodyTransferInt */ @Test public void ValidTransfer() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); System.out.println("ValidTransfer"); DatatypeFactory df = DatatypeFactory.newInstance(); GregorianCalendar gcal = new GregorianCalendar(); @@ -259,6 +263,7 @@ public class UDDI_150_CustodyTransferInt @Test public void InvalidTransferTokenNullKeybag() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { //transfers from Joe to Sam KeyBag kb = null; @@ -276,6 +281,7 @@ public class UDDI_150_CustodyTransferInt @Test public void InvalidTransferTokenEmptyKeybag() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { //transfers from Joe to Sam KeyBag kb = new KeyBag(); @@ -295,6 +301,7 @@ public class UDDI_150_CustodyTransferInt @Test public void InvalidTransferTokenEmptyNullAuthToken() { + Assume.assumeTrue(TckPublisher.isEnabled()); String keyJoeBiz = null; try { DatatypeFactory df = DatatypeFactory.newInstance(); @@ -343,6 +350,7 @@ public class UDDI_150_CustodyTransferInt */ @Test public void InvalidTransferTokenModified() { + Assume.assumeTrue(TckPublisher.isEnabled()); String keySamBiz = null; String keyJoeBiz = null; try { @@ -418,6 +426,7 @@ public class UDDI_150_CustodyTransferInt @Test public void InvalidTransferTokenServiceDoesntExist() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); try { //transfers from Joe to Sam KeyBag kb = new KeyBag();
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java Sun Feb 16 21:12:11 2014 @@ -66,11 +66,12 @@ public class UDDI_160_RESTIntergrationTe @BeforeClass public static void startRegistry() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); inquiry = transport.getUDDIInquiryService(); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -80,6 +81,7 @@ public class UDDI_160_RESTIntergrationTe @AfterClass public static void stopRegistry() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager.stop(); } @@ -97,6 +99,7 @@ public class UDDI_160_RESTIntergrationTe }*/ @Test public void InquiryREST_GET_Business() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); FindBusiness fb = new FindBusiness(); fb.setMaxRows(1); @@ -128,6 +131,7 @@ public class UDDI_160_RESTIntergrationTe @Test public void InquiryREST_GET_TModel() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); FindTModel fb = new FindTModel(); fb.setMaxRows(1); @@ -161,6 +165,7 @@ public class UDDI_160_RESTIntergrationTe @Test public void InquiryREST_GET_Service() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); //find the first service via inquriy soap FindService fb = new FindService(); @@ -239,6 +244,7 @@ public class UDDI_160_RESTIntergrationTe @Test public void InquiryREST_GET_Binding() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); BindingTemplate bt = getFirstBindingTemplate(); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidation.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidation.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidation.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidation.java Sun Feb 16 21:12:11 2014 @@ -82,12 +82,12 @@ public class UDDI_170_ValueSetValidation @BeforeClass public static void startRegistry() throws ConfigurationException { - + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); inquiry = transport.getUDDIInquiryService(); publication = transport.getUDDIPublishService(); security = transport.getUDDISecurityService(); @@ -105,6 +105,7 @@ public class UDDI_170_ValueSetValidation @AfterClass public static void stopRegistry() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager.stop(); } final static String VSV_KEY = "uddi:juddi.apache.org:businesses-asf"; @@ -119,6 +120,7 @@ public class UDDI_170_ValueSetValidation */ @Test public void testVSV() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("testVSV"); BusinessEntity SaveBusiness = null; @@ -150,6 +152,7 @@ public class UDDI_170_ValueSetValidation @Test public void testVSVInvalid() throws Exception { Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); System.out.println("testVSVInvalid"); BusinessEntity SaveBusiness = null; BusinessEntity SaveVSVCallbackService = null; Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java Sun Feb 16 21:12:11 2014 @@ -276,7 +276,7 @@ public class DispositionReport { } public DispositionReport() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } /** Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java Sun Feb 16 21:12:11 2014 @@ -57,7 +57,7 @@ public class FindBinding { @XmlElement(required = true) protected TModelBag tModelBag; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "maxRows") protected Integer maxRows; @XmlAttribute(name = "serviceKey", required = true) Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java Sun Feb 16 21:12:11 2014 @@ -68,7 +68,7 @@ public class FindBusiness { protected TModelBag tModelBag; protected DiscoveryURLs discoveryURLs; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "maxRows") protected Integer maxRows; Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java Sun Feb 16 21:12:11 2014 @@ -59,7 +59,7 @@ public class FindRelatedBusinesses { protected String businessKey; protected KeyedReference keyedReference; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "maxRows") protected Integer maxRows; Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java Sun Feb 16 21:12:11 2014 @@ -63,7 +63,7 @@ public class FindService { protected CategoryBag categoryBag; protected TModelBag tModelBag; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "maxRows") protected Integer maxRows; @XmlAttribute(name = "businessKey") Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java Sun Feb 16 21:12:11 2014 @@ -60,7 +60,7 @@ public class FindTModel { protected IdentifierBag identifierBag; protected CategoryBag categoryBag; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "maxRows") protected Integer maxRows; Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java Sun Feb 16 21:12:11 2014 @@ -55,7 +55,7 @@ public class GetAssertionStatusReport { protected String authInfo; protected String completionStatus; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the authInfo property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java Sun Feb 16 21:12:11 2014 @@ -46,7 +46,7 @@ import javax.xml.bind.annotation.XmlType public class GetAuthToken { @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; @XmlAttribute(name = "userID", required = true) protected String userID; @XmlAttribute(name = "cred", required = true) Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java Sun Feb 16 21:12:11 2014 @@ -39,7 +39,7 @@ public class GetBindingDetail { @XmlElement(required = true) protected List<String> bindingKey; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the bindingKey property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java Sun Feb 16 21:12:11 2014 @@ -54,7 +54,7 @@ public class GetBusinessDetail { @XmlElement(required = true) protected List<String> businessKey; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the businessKey property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java Sun Feb 16 21:12:11 2014 @@ -54,7 +54,7 @@ public class GetBusinessDetailExt { @XmlElement(required = true) protected List<String> businessKey; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the businessKey property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java Sun Feb 16 21:12:11 2014 @@ -52,7 +52,7 @@ public class GetPublisherAssertions { @XmlElement(required = true) protected String authInfo; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the authInfo property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java Sun Feb 16 21:12:11 2014 @@ -52,7 +52,7 @@ public class GetRegisteredInfo { @XmlElement(required = true) protected String authInfo; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the authInfo property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java Sun Feb 16 21:12:11 2014 @@ -54,7 +54,7 @@ public class GetServiceDetail { @XmlElement(required = true) protected List<String> serviceKey; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the serviceKey property. Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java (original) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java Sun Feb 16 21:12:11 2014 @@ -54,7 +54,7 @@ public class GetTModelDetail { @XmlElement(required = true) protected List<String> tModelKey; @XmlAttribute(name = "generic", required = true) - protected String generic; + protected String generic="2.0"; /** * Gets the value of the tModelKey property. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
