juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1568829 [4/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/...
Date Sun, 16 Feb 2014 21:12:14 GMT
Modified: juddi/trunk/uddi-tck-runner/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-runner/uddi.xml?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-runner/uddi.xml (original)
+++ juddi/trunk/uddi-tck-runner/uddi.xml Sun Feb 16 21:12:11 2014
@@ -2,81 +2,91 @@
 <uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
     <client name="test-client">
-        <nodes>
-            <node isHomeJUDDI="true" >
-                <!-- required 'default' node -->
-                <name>default</name> 
-                <description>Main jUDDI node</description>
-                <properties>
-                    <property name="serverName" value="localhost" />
-                    <property name="serverPort" value="8080" />
-                    <!-- for UDDI nodes that use HTTP u/p, using the following 
-                    <property name="basicAuthUsername" value="root" />
-                    <property name="basicAuthPassword" value="password" />
-                    <property name="basicAuthPasswordIsEncrypted" value="false" />
-                    <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-                </properties>
-                <!-- JAX-WS Transport -->
-                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+		<nodes>
+				<!-- this is only used when uddiv3.enable=true in tck.properties -->
+				<node>
+						<name>default</name> 
+				</node>
+				<node isHomeJUDDI="true">
+						<!-- required 'default' node -->
+						<name>uddiv3</name> 
+						<description>Main jUDDI node</description>
+						<properties>
+								<property name="serverName" value="localhost" />
+								<property name="serverPort" value="8080" />
+								<!-- for UDDI nodes that use HTTP u/p, using the following 
+								<property name="basicAuthUsername" value="root" />
+								<property name="basicAuthPassword" value="password" />
+								<property name="basicAuthPasswordIsEncrypted" value="false" />
+								<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+						</properties>
+						<!-- JAX-WS Transport -->
+						<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+						<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+						<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+						<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+						<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+						<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+						<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+						<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+						<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+						<!-- this is just for juddi gui tests -->
+						<juddigui>http://${serverName}:${serverPort}/juddi-gui/</juddigui>
+				</node>
+				<!-- this is only used when uddiv2.enable=true in tck.properties -->
+				<node>
+						<name>uddiv2</name>
+						<description>jUDDI node in other Department</description>
+						 <properties>
+								<property name="serverName" value="localhost" />
+								<property name="serverPort" value="8080" />
+						</properties>
+						<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport</proxyTransport>
+						<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryv2</inquiryUrl>
+						<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publishv2</publishUrl>
+				</node>
+		</nodes>
+
+		<clerks registerOnStartup="false">
+				<!-- not used -->
+				<clerk name="default" node="default" publisher="root" password="root"  isPasswordEncrypted="false" cryptoProvider=""/>
 				
-                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
-                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
-				<!-- optional API -->
-				<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest/XML/getDetail</inquiryRESTUrl>
-                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
-                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
-                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
-                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
-				<!--<replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication?wsdl</replicationUrl>
-				<valueSetValidationUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-validation</valueSetValidationUrl>
-				<valueSetCachingUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-caching</valueSetCachingUrl>
-				-->
-				<!-- optional -->
-                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+				<!-- this is used for the subscription callback tests -->
+				<clerk name="uddiv3" node="uddiv3" publisher="root" password="root"  isPasswordEncrypted="false" cryptoProvider=""/>
+		</clerks>
+        <signature>
+                <!-- signing stuff -->
+                <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+                <signingKeyStoreType>JKS</signingKeyStoreType>
+                <signingKeyStoreFilePassword 
+                        isPasswordEncrypted="false" 
+                        cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+                <signingKeyPassword
+                        isPasswordEncrypted="false" 
+                        cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+                <signingKeyAlias>my special key</signingKeyAlias>
 
-            </node>
+                <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+                <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
+                <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
 
-        </nodes>
-		
-        <clerks registerOnStartup="false" >
-            <clerk name="default" node="default" publisher="userjoe" password="******" >
-                <!--<wsdl businessKey="" businessName="" keyDomain=""></wsdl>-->
-                <class></class>
-            </clerk>
-        </clerks>
-        <signature>
-			<!-- signing stuff -->
-			<signingKeyStorePath>keystore.jks</signingKeyStorePath>
-			<signingKeyStoreType>JKS</signingKeyStoreType>
-			<signingKeyStoreFilePassword 
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
-			<signingKeyPassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
-			<signingKeyAlias>my special key</signingKeyAlias>
-                        
-			<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
-			<signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
-			<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+                <!-- validation stuff 
+                Used whenever someone views an entity that is signed and validation is required	-->
+                <!-- if this doesn't exist or is incorrect, the client will atempt to load the standard jdk trust store-->
+                <trustStorePath>truststore.jks</trustStorePath>
+                <trustStoreType>JKS</trustStoreType>
+                <trustStorePassword
+                        isPasswordEncrypted="false" 
+                        cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
 
-			<!-- validation stuff 
-			Used whenever someone views an entity that is signed and validation is required	-->
-			<!-- if this doesn't exist or is incorrect, the client will atempt to load the standard jdk trust store-->
-			<trustStorePath>truststore.jks</trustStorePath>
-			<trustStoreType>JKS</trustStoreType>
-			<trustStorePassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
-			
-			<checkTimestamps>true</checkTimestamps>
-			<checkTrust>true</checkTrust>
-			<checkRevocationCRL>true</checkRevocationCRL>
-			<keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN>
-			<keyInfoInclusionSerial>false</keyInfoInclusionSerial>
-			<keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
-			<digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
-		</signature>
+                <checkTimestamps>true</checkTimestamps>
+                <checkTrust>true</checkTrust>
+                <checkRevocationCRL>true</checkRevocationCRL>
+                <keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN>
+                <keyInfoInclusionSerial>false</keyInfoInclusionSerial>
+                <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+                <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
+            </signature>
         <subscriptionCallbacks>
             <keyDomain>uddi:somebusiness</keyDomain>
             <listenUrl>http://MyHostname:4444/callback</listenUrl>

Copied: juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/Dummy.java (from r1564260, juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/Dummy.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/Dummy.java?p2=juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/Dummy.java&p1=juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/Dummy.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/Dummy.java (original)
+++ juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/Dummy.java Sun Feb 16 21:12:11 2014
@@ -1,4 +1,4 @@
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
 
 public class Dummy {
 

Copied: juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java (from r1564260, juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java?p2=juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java&p1=juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java (original)
+++ juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java Sun Feb 16 21:12:11 2014
@@ -17,5 +17,5 @@
 /**
  * Classes used by the UDDI TCK only.
  */
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
 
\ No newline at end of file

Modified: juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1568829&r1=1568828&r2=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Sun Feb 16 21:12:11 2014
@@ -4,9 +4,13 @@
         <reloadDelay>5000</reloadDelay>
         <client name="test-client">
                 <nodes>
+                        <!-- this is only used when uddiv3.enable=true in tck.properties -->
+                        <node>
+                                <name>default</name> 
+                        </node>
                         <node isHomeJUDDI="true">
                                 <!-- required 'default' node -->
-                                <name>default</name> 
+                                <name>uddiv3</name> 
                                 <description>Main jUDDI node</description>
                                 <properties>
                                         <property name="serverName" value="localhost" />
@@ -17,12 +21,6 @@
                                         <property name="basicAuthPasswordIsEncrypted" value="false" />
                                         <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
                                 </properties>
-                                <!-- systinet
-                                        <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-                                        <inquiryUrl>http://${serverName}:${serverPort}/registry/uddi/inquiry</inquiryUrl>
-                                        <publishUrl>http://${serverName}:${serverPort}/registry/uddi/publishing</publishUrl>
-                                        <securityUrl>http://${serverName}:${serverPort}/registry/uddi/security</securityUrl>
-                                -->
                                 <!-- JAX-WS Transport -->
                                 <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
                                 <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
@@ -35,72 +33,27 @@
                                 <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
                                 <!-- this is just for juddi gui tests -->
                                 <juddigui>http://${serverName}:${serverPort}/juddi-gui/</juddigui>
-				
-                                <!-- AXIS JAX-WS Transport 
-                                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-                                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDICustodyTransferService</custodyTransferUrl>
-                                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDIInquiryService</inquiryUrl>
-                                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDIPublicationService</publishUrl>
-                                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDISecurityService</securityUrl>
-                                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDISubscriptionService</subscriptionUrl>
-                                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDISubscriptionListenerService</subscriptionListenerUrl>
-                                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/JUDDIApiService</juddiApiUrl>
-                                -->
-                                <!-- EAP JAX-WS Transport 
-                                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-                                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-                                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/UDDIInquiryService</inquiryUrl>
-                                <publishUrl>http://${serverName}:${serverPort}/juddiv3/UDDIPublicationService</publishUrl>
-                                <securityUrl>http://${serverName}:${serverPort}/juddiv3/UDDISecurityService</securityUrl>
-                                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/UDDISubscriptionService</subscriptionUrl>
-                                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-                                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/JUDDIApiService</juddiApiUrl>
-                                -->
-                                <!-- In VM Transport Settings 
-                                <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
-                                <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
-                                <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
-                        <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
-                        <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
-                                <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
-                                <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
-                                <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
-                                -->
-                                <!-- RMI Transport Settings 
-                                <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-                                <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-                                <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-                        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-                        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-                                <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-                                <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-                                <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-                                <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-                                <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-                                <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-                                -->
                         </node>
+                        <!-- this is only used when uddiv2.enable=true in tck.properties -->
                         <node>
-                                <name>med</name>
+                                <name>uddiv2</name>
                                 <description>jUDDI node in other Department</description>
-                                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-                                <custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer/</custodyTransferUrl>
-                                <inquiryUrl>http://med:8080/juddiv3/services/inquiry/</inquiryUrl>
-                                <publishUrl>http://med:8080/juddiv3/services/publish/</publishUrl>
-                                <securityUrl>http://med:8080/juddiv3/services/security/</securityUrl>
-                                <subscriptionUrl>http://med:8080/juddiv3/services/subscription/</subscriptionUrl>
-                                <subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener/</subscriptionListenerUrl>
-                                <juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+								 <properties>
+                                        <property name="serverName" value="localhost" />
+                                        <property name="serverPort" value="8880" />
+                                </properties>
+                                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport</proxyTransport>
+                                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryv2</inquiryUrl>
+                                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publishv2</publishUrl>
                         </node>
                 </nodes>
 		
                 <clerks registerOnStartup="false">
+                        <!-- not used -->
                         <clerk name="default" node="default" publisher="root" password="root"  isPasswordEncrypted="false" cryptoProvider=""/>
-                        <clerk name="medroot" node="med"     publisher="root" password="root"  isPasswordEncrypted="false" cryptoProvider=""/>
-                        <xregister>
-                                <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
-                        </xregister>
-                        <subscription subscriptionKey="   " clerk="medroot" />
+                        
+                        <!-- this is used for the subscription callback tests -->
+                        <clerk name="uddiv3" node="uddiv3" publisher="root" password="root"  isPasswordEncrypted="false" cryptoProvider=""/>
                 </clerks>
                 <signature>
                         <!-- signing stuff -->

Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java Sun Feb 16 21:12:11 2014
@@ -12,25 +12,24 @@
  * 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 javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.transport.Transport;
-import static org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.tckTModelJoe;
+import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
 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.TModelDetail;
-import org.uddi.api_v3.TModelInfo;
-import org.uddi.api_v3.TModelList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.api_v2.TModelDetail;
+import org.uddi.api_v2.TModelInfo;
+import org.uddi.api_v2.TModelList;
+import org.uddi.v2_service.Inquire;
+import org.uddi.v2_service.Publish;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -48,31 +47,30 @@ public class UDDI_020_TmodelIntegrationT
 
         @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();
+                        JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
 
-                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        Publish security = transport.getUDDIv2PublishService();
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                         //Assert.assertNotNull(authInfoJoe);
                         //Assert.assertNotNull(authInfoSam);
 
-
-                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
-                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        Publish publication = transport.getUDDIv2PublishService();
+                        Inquire inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         }
                         tckTModelJoe = new TckTModel(publication, inquiry);
 
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
@@ -87,6 +85,7 @@ public class UDDI_020_TmodelIntegrationT
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -94,6 +93,7 @@ public class UDDI_020_TmodelIntegrationT
 
         @Test
         public void testJoePublisherTmodel() {
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelJoe.saveJoePublisherTmodel(authInfoJoe, true);
 
                 //Now if we use a finder it should be found.
@@ -108,17 +108,18 @@ public class UDDI_020_TmodelIntegrationT
 
                 //However if we use a finder it should not be found.
                 TModelList tModelList2 = tckTModelJoe.findJoeTModelDetail();
-                Assert.assertNull(tModelList2.getTModelInfos());
+                Assert.assertTrue(tModelList2.getTModelInfos()==null || tModelList2.getTModelInfos().getTModelInfo().isEmpty());
 
                 //Make sure none of the found key generators is Joe's key generator
                 TModelList tModelList3 = tckTModelJoe.findJoeTModelDetailByCategoryBag();
                 for (TModelInfo tModelInfo : tModelList3.getTModelInfos().getTModelInfo()) {
-                        Assert.assertFalse("uddi:uddi.joepublisher.com:keygenerator".equals(tModelInfo.getTModelKey()));
+                        Assert.assertFalse(TckTModel.JOE_PUBLISHER_TMODEL_KEY.equals(tModelInfo.getTModelKey()));
                 }
         }
 
         @Test
         public void testSamSyndicatorTmodelTest() {
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
                 tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
         }

Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java Sun Feb 16 21:12:11 2014
@@ -12,21 +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;
 
 import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
 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.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v2_service.*;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -42,14 +42,15 @@ public class UDDI_030_BusinessEntityInte
         protected static TckTModel tckTModelSam = null;
         protected static TckBusiness tckBusinessSam = null;
         protected static TckFindEntity tckFindEntitySam = null;
-        protected static UDDIInquiryPortType inquiryJoe = null;
-        protected static UDDIInquiryPortType inquirySam = null;
+        protected static Inquire inquiryJoe = null;
+        protected static Inquire inquirySam = null;
         protected static String authInfoJoe = null;
         protected static String authInfoSam = null;
         private static UDDIClient manager;
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -57,21 +58,21 @@ public class UDDI_030_BusinessEntityInte
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 manager = new UDDIClient();
                 manager.start();
                 logger.info("UDDI_030_BusinessEntityIntegrationTest");
                 logger.debug("Getting auth tokens..");
                 try {
-                        Transport transport = manager.getTransport();
-                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        
+                        Publish security = transport.getUDDIv2PublishService();
 
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
-                        //Assert.assertNotNull(authInfoJoe);
-                        //Assert.assertNotNull(authInfoSam);
-
-                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
-                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        
+                        Publish publication = transport.getUDDIv2PublishService();
+                        Inquire inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
@@ -81,9 +82,9 @@ public class UDDI_030_BusinessEntityInte
                         tckFindEntityJoe = new TckFindEntity(inquiry);
                         inquiryJoe = inquiry;
 
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
@@ -94,9 +95,9 @@ public class UDDI_030_BusinessEntityInte
                         inquirySam = inquiry;
 
                         String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
@@ -112,20 +113,10 @@ public class UDDI_030_BusinessEntityInte
                 }
         }
 
-        @Test
-        public void testJoePublisherBusinessEntitySignature() {
-                try {
-                        tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
-                        tckBusinessJoe.saveJoePublisherBusinessX509Signature(authInfoJoe);
-                        tckFindEntityJoe.findAllBusiness();
-                        tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
-                } finally {
-                        tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
-                }
-        }
 
         @Test
         public void testJoePublisherBusinessEntity() throws Exception{
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -138,6 +129,7 @@ public class UDDI_030_BusinessEntityInte
 
         @Test
         public void testSamSyndicatorBusiness() throws Exception{
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
                         tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);

Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java Sun Feb 16 21:12:11 2014
@@ -12,21 +12,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.v2.tck;
 
+import org.apache.juddi.v2.tck.*;
 import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
 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.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v2_service.*;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -42,14 +43,15 @@ public class UDDI_040_BusinessServiceInt
         protected static TckTModel tckTModelSam = null;
         protected static TckBusiness tckBusinessSam = null;
         protected static TckBusinessService tckBusinessServiceSam = null;
-        protected static UDDIInquiryPortType inquiryJoe=null;
-        protected static UDDIInquiryPortType inquirySam=null;
+        protected static Inquire inquiryJoe=null;
+        protected static Inquire inquirySam=null;
         protected static String authInfoJoe = null;
         protected static String authInfoSam = null;
         private static UDDIClient manager;
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -57,21 +59,23 @@ public class UDDI_040_BusinessServiceInt
 
         @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();
-                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        
+                        Publish security = transport.getUDDIv2PublishService();
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                         //Assert.assertNotNull(authInfoJoe);
                         //Assert.assertNotNull(authInfoSam);
 
 
-                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
-                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        Publish publication = transport.getUDDIv2PublishService();
+                        Inquire inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
@@ -81,9 +85,9 @@ public class UDDI_040_BusinessServiceInt
                         tckBusinessServiceJoe = new TckBusinessService(publication, inquiry);
                         inquiryJoe = inquiry;
 
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
@@ -93,9 +97,9 @@ public class UDDI_040_BusinessServiceInt
                         tckBusinessServiceSam = new TckBusinessService(publication, inquiry);
                         inquirySam = inquiry;
                         
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
@@ -113,6 +117,7 @@ public class UDDI_040_BusinessServiceInt
 
         @Test
         public void joepublisher() throws Exception {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -126,6 +131,7 @@ public class UDDI_040_BusinessServiceInt
 
         @Test
         public void samsyndicator() throws Exception {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
 
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
@@ -154,6 +160,7 @@ public class UDDI_040_BusinessServiceInt
          */
         @Test
         public void joepublisherMoveBusinessService() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);

Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java Sun Feb 16 21:12:11 2014
@@ -12,21 +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;
 
 import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
 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.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v2_service.*;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -46,6 +46,7 @@ public class UDDI_050_BindingTemplateInt
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 
                 manager.stop();
@@ -53,15 +54,16 @@ public class UDDI_050_BindingTemplateInt
 
         @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();
-                        UDDISecurityPortType security = transport.getUDDISecurityService();
-                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
-                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        Publish security = transport.getUDDIv2PublishService();
+                        Publish publication = transport.getUDDIv2PublishService();
+                        Inquire inquiry = transport.getUDDIv2InquiryService();
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         //Assert.assertNotNull(authInfoJoe);
                         if (!TckPublisher.isUDDIAuthMode()) {
@@ -77,10 +79,10 @@ public class UDDI_050_BindingTemplateInt
                         tckFindEntity = new TckFindEntity(inquiry);
 
 
-                        transport = manager.getTransport();
-                        security = transport.getUDDISecurityService();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
+                        
                         String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
                         //Assert.assertNotNull(authInfoJoe);
                         if (!TckPublisher.isUDDIAuthMode()) {
@@ -99,6 +101,7 @@ public class UDDI_050_BindingTemplateInt
 
         @Test
         public void joepublisher() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModel.saveJoePublisherTmodel(authInfoJoe);
                         tckBusiness.saveJoePublisherBusiness(authInfoJoe);
@@ -114,12 +117,13 @@ public class UDDI_050_BindingTemplateInt
 
         @Test
         public void findService() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModel.saveJoePublisherTmodel(authInfoJoe);
                         tckBusiness.saveJoePublisherBusiness(authInfoJoe);
                         tckBusinessService.saveJoePublisherService(authInfoJoe);
                         tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
-                        tckBindingTemplate.deleteBinding(authInfoJoe, "uddi:uddi.joepublisher.com:bindingone");
+                        tckBindingTemplate.deleteBinding(authInfoJoe, TckBusinessService.JOE_BINDING_KEY_1);
                         String serviceKey = tckFindEntity.findService(null);
                         tckFindEntity.findServiceDetail(serviceKey);
 

Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java Sun Feb 16 21:12:11 2014
@@ -12,11 +12,9 @@
  * 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:alexoree@apache.org">Alex O'Ree</a>
  */
 import javax.xml.ws.BindingProvider;
@@ -24,14 +22,12 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.transport.Transport;
+import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
 
 public class UDDI_060_PublisherAssertionIntegrationTest {
 
@@ -55,6 +51,7 @@ public class UDDI_060_PublisherAssertion
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 tckTModelMary.deleteCreatedTModels(authInfoMary);
@@ -63,20 +60,20 @@ public class UDDI_060_PublisherAssertion
 
         @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();
-                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        org.uddi.v2_service.Publish security = transport.getUDDIv2PublishService();
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                         authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
-                        //Assert.assertNotNull(authInfoJoe);
-
-                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
-                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        
+                        org.uddi.v2_service.Publish publication = transport.getUDDIv2PublishService();
+                        org.uddi.v2_service.Inquire inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
@@ -86,9 +83,9 @@ public class UDDI_060_PublisherAssertion
                         tckAssertionJoe = new TckPublisherAssertion(publication);
                         tckFindEntityJoe = new TckFindEntity(inquiry);
 
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
@@ -99,9 +96,9 @@ public class UDDI_060_PublisherAssertion
                         tckFindEntitySam = new TckFindEntity(inquiry);
                         
                         
-                        transport = manager.getTransport();
-                        publication = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
+                        transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2");
+                        publication = transport.getUDDIv2PublishService();
+                        inquiry = transport.getUDDIv2InquiryService();
                         if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
@@ -110,6 +107,7 @@ public class UDDI_060_PublisherAssertion
                         tckBusinessMary = new TckBusiness(publication, inquiry);
                         tckAssertionMary = new TckPublisherAssertion(publication);
                         tckFindEntityMary = new TckFindEntity(inquiry);
+                        tckTModelJoe.saveTmodels(authInfoJoe);
 
                 } catch (Exception e) {
                         logger.error(e.getMessage(), e);
@@ -119,6 +117,7 @@ public class UDDI_060_PublisherAssertion
 
         @Test
         public void testJoepublisherToSamSyndicator() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
@@ -140,6 +139,7 @@ public class UDDI_060_PublisherAssertion
          */
         @Test
         public void testFindNoAssertions() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
@@ -151,8 +151,8 @@ public class UDDI_060_PublisherAssertion
                         tckAssertionJoe.saveJoePublisherPublisherAssertion2(authInfoJoe);
 
                         tckFindEntityJoe.findRelatedBusiness_sortByName(true);
-                        tckFindEntityJoe.findRelatedBusinessToKey(true);
-                        tckFindEntityJoe.findRelatedBusinessFromKey(true);
+                        //NOT APPLICABLE TO UDDIv2 tckFindEntityJoe.findRelatedBusinessToKey(true);
+                        //NOT APPLICABLE TO UDDIv2 tckFindEntityJoe.findRelatedBusinessFromKey(true);
 
                         tckAssertionJoe.deleteJoePublisherPublisherAssertion(authInfoJoe);
                         tckAssertionJoe.deleteJoePublisherPublisherAssertion2(authInfoJoe);
@@ -171,10 +171,12 @@ public class UDDI_060_PublisherAssertion
          */
         @Test
         public void testFindAssertions() {
+             Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
                         tckTModelMary.saveMaryPublisherTmodel(authInfoMary);
+                        
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
                         tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);
                         tckBusinessMary.saveMaryPublisherBusiness(authInfoMary);
@@ -184,8 +186,9 @@ public class UDDI_060_PublisherAssertion
                         tckAssertionMary.saveMaryPublisherPublisherAssertion(authInfoMary);
 
                         tckFindEntityJoe.findRelatedBusiness_sortByName(false);
-                        tckFindEntityJoe.findRelatedBusinessToKey(false);
-                        tckFindEntityJoe.findRelatedBusinessFromKey(false);
+                        //these tests are for uddiv3 only, not supportable using v2
+                        //tckFindEntityJoe.findRelatedBusinessToKey(false);
+                        //tckFindEntityJoe.findRelatedBusinessFromKey(false);
 
                         tckAssertionJoe.deleteJoePublisherPublisherAssertion(authInfoJoe);
                         tckAssertionJoe.deleteJoePublisherPublisherAssertion2(authInfoJoe);
@@ -194,6 +197,7 @@ public class UDDI_060_PublisherAssertion
                         tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
                         tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
                         tckBusinessSam.deleteSamSyndicatorBusiness(authInfoSam);
+                        tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                         tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
                         tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
                         tckTModelMary.deleteMaryPublisherTmodel(authInfoMary);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message