You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/07/01 03:44:52 UTC

svn commit: r790018 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/main/java/org/apache/juddi/config/ juddi-cxf/src/main/webapp/WEB-INF/ uddi-client/src/main/java/org/uddi/api_v3/client/config/ uddi-client/src/main/java/org/uddi/api_v3/clien...

Author: kstam
Date: Wed Jul  1 01:44:52 2009
New Revision: 790018

URL: http://svn.apache.org/viewvc?rev=790018&view=rev
Log:
JUDDI-188 - fixing build by making servie naming consistent.

Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
    webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
    webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/jbossws-web.xml
    webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/Property.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/InVMTransport.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/JAXWSTransport.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/RMITransport.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_010_PublisherIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_080_SubscriptionIntegrationTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Wed Jul  1 01:44:52 2009
@@ -458,6 +458,7 @@
 	    for (int n; (n = resourceStream.read(b)) != -1;) {
 	    	xml.append(new String(b, 0, n));
 	    }
+	    log.debug("inserting: " + xml.toString());
 	    StringReader reader = new StringReader(replaceTokens(xml.toString(), config));
 		
 		JAXBContext jc = JAXBContext.newInstance(packageName);

Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml Wed Jul  1 01:44:52 2009
@@ -25,63 +25,63 @@
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
   <jaxws:endpoint id="inquiry" implementor="org.apache.juddi.api.impl.UDDIInquiryImpl" address="/inquiry"
-   serviceName="a:InquiryService" endpointName="a:InquiryServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+   serviceName="a:UDDIInquiryService" endpointName="a:UDDIInquiryServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
   
   <jaxws:endpoint id="publish" implementor="org.apache.juddi.api.impl.UDDIPublicationImpl" address="/publish" 
-   serviceName="a:PublishService" endpointName="a:PublishServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+   serviceName="a:UDDIPublishService" endpointName="a:UDDIPublishServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
 
   <jaxws:endpoint id="security" implementor="org.apache.juddi.api.impl.UDDISecurityImpl" address="/security" 
-   serviceName="a:SecurityService" endpointName="a:SecurityServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+   serviceName="a:UDDISecurityService" endpointName="a:UDDISecurityServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
    
   <jaxws:endpoint id="subscription" implementor="org.apache.juddi.api.impl.UDDISubscriptionImpl" address="/subscription" 
-   serviceName="a:SubscriptionService" endpointName="a:SubscriptionServicePort" xmlns:a="urn:uddi-org:sub_v3_portType">
+   serviceName="a:UDDISubscriptionService" endpointName="a:UDDISubscriptionServicePort" xmlns:a="urn:uddi-org:sub_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
   
   <jaxws:endpoint id="subscription-listener" implementor="org.apache.juddi.api.impl.UDDISubscriptionListenerImpl" address="/subscription-listener" 
-   serviceName="a:SubscriptionListenerService" endpointName="a:SubscriptionListenerServicePort" xmlns:a="urn:uddi-org:subr_v3_portType">
+   serviceName="a:UDDISubscriptionListenerService" endpointName="a:UDDISubscriptionListenerServicePort" xmlns:a="urn:uddi-org:subr_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
 
   <jaxws:endpoint id="custody-transfer" implementor="org.apache.juddi.api.impl.UDDICustodyTransferImpl" address="/custody-transfer" 
-   serviceName="a:CustodyTransferService" endpointName="a:CustodyTransferServicePort" xmlns:a="urn:uddi-org:custody_v3_portType">
+   serviceName="a:UDDICustodyTransferService" endpointName="a:UDDICustodyTransferServicePort" xmlns:a="urn:uddi-org:custody_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
 
   <jaxws:endpoint id="replication" implementor="org.apache.juddi.api.impl.UDDIReplicationImpl" address="/replication" 
-   serviceName="a:ReplicationService" endpointName="a:ReplicationServicePort" xmlns:a="urn:uddi-org:repl_v3_portType">
+   serviceName="a:UDDIReplicationService" endpointName="a:UDDIReplicationServicePort" xmlns:a="urn:uddi-org:repl_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
 
   <jaxws:endpoint id="valueset-validation" implementor="org.apache.juddi.api.impl.UDDIValueSetValidationImpl" address="/valueset-validation" 
-   serviceName="a:ValueSetValidationService" endpointName="a:ValudSetValidationServicePort" xmlns:a="urn:uddi-org:vs_v3_portType">
+   serviceName="a:UDDIValueSetValidationService" endpointName="a:UDDIValueSetValidationServicePort" xmlns:a="urn:uddi-org:vs_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>
   </jaxws:endpoint>
 
   <jaxws:endpoint id="valueset-caching" implementor="org.apache.juddi.api.impl.UDDIValueSetCachingImpl" address="/valueset-caching"
-   serviceName="a:ValueSetCachingService" endpointName="a:ValudSetCachingServicePort" xmlns:a="urn:uddi-org:vscache_v3_portType">
+   serviceName="a:UDDIValueSetCachingService" endpointName="a:UDDIValueSetCachingServicePort" xmlns:a="urn:uddi-org:vscache_v3_portType">
     <jaxws:properties>
       <entry key="schema-validation-enabled" value="true"/>
     </jaxws:properties>

Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/jbossws-web.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/jbossws-web.xml?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/jbossws-web.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/jbossws-web.xml Wed Jul  1 01:44:52 2009
@@ -43,7 +43,7 @@
     <url-pattern>/services/security/*</url-pattern>
   </servlet-mapping>
   <servlet>
-    <servlet-name>UDDIPublicationWS</servlet-name>
+    <servlet-name>UDDIPublishWS</servlet-name>
     <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class>
     <init-param>
       <param-name>jboss.ws.endpoint</param-name>
@@ -51,7 +51,7 @@
     </init-param>
   </servlet>
   <servlet-mapping>
-    <servlet-name>UDDIPublicationWS</servlet-name>
+    <servlet-name>UDDIPublishWS</servlet-name>
     <url-pattern>/services/publish/*</url-pattern>
   </servlet-mapping>
   <servlet>

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/Property.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/Property.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/Property.java Wed Jul  1 01:44:52 2009
@@ -25,7 +25,7 @@
 	public final static String UDDI_SUBSCRIPTION_URL            ="uddi.subscription.url";
 	public final static String UDDI_SUBSCRIPTION_LISTENER_URL	="uddi.subscription.listener.url";
 	public final static String UDDI_PROXY_TRANSPORT             ="uddi.proxy.transport";
-	public final static String UDDI_CUSTODY_TRANSFER_URL       ="uddi.custodytransfer.url";
+	public final static String UDDI_CUSTODY_TRANSFER_URL        ="uddi.custodytransfer.url";
 	
 	public final static String UDDI_PROXY_FACTORY_INITIAL       ="java.naming.factory.initial";
 	public final static String UDDI_PROXY_PROVIDER_URL          ="java.naming.provider.url";

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/InVMTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/InVMTransport.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/InVMTransport.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/InVMTransport.java Wed Jul  1 01:44:52 2009
@@ -35,7 +35,7 @@
 	UDDISubscriptionListenerPortType subscriptionListenerService = null;
 	UDDICustodyTransferPortType custodyTransferService = null;
 
-	public UDDIInquiryPortType getInquiryService() throws TransportException {
+	public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
 		if (inquiryService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_INQUIRY_URL);
@@ -48,7 +48,7 @@
 		return inquiryService;
 	}
 	
-	public UDDISecurityPortType getSecurityService() throws TransportException {
+	public UDDISecurityPortType getUDDISecurityService() throws TransportException {
 		if (securityService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
@@ -61,7 +61,7 @@
 		return securityService;
 	}
 	
-	public UDDIPublicationPortType getPublishService() throws TransportException {
+	public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
 		if (publishService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_PUBLISH_URL);
@@ -74,7 +74,7 @@
 		return publishService;
 	}
 	
-	public UDDISubscriptionPortType getSubscriptionService() throws TransportException {
+	public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
 		if (subscriptionService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_URL);
@@ -87,7 +87,7 @@
 		return subscriptionService;
 	}
 	
-	public UDDISubscriptionListenerPortType getSubscriptionListenerService() throws TransportException {
+	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
@@ -100,7 +100,7 @@
 		return subscriptionListenerService;
 	}
 	
-	public UDDICustodyTransferPortType getCustodyTransferService() throws TransportException {
+	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/JAXWSTransport.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/JAXWSTransport.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/JAXWSTransport.java Wed Jul  1 01:44:52 2009
@@ -34,13 +34,13 @@
 public class JAXWSTransport implements Transport {
 
 	UDDIInquiryPortType inquiryService = null;
-	UDDISecurityPortType securityService = null;
+	UDDISecurityPortType uddiSecurityService = null;
 	UDDIPublicationPortType publishService = null;
 	UDDISubscriptionPortType subscriptionService = null;
 	UDDISubscriptionListenerPortType subscriptionListenerService = null;
 	UDDICustodyTransferPortType custodyTransferService = null;
 
-	public UDDIInquiryPortType getInquiryService() throws TransportException {
+	public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
 
 		if (inquiryService==null) {
 			try {
@@ -55,22 +55,22 @@
 		return inquiryService;
 	}
 	
-	public UDDISecurityPortType getSecurityService() throws TransportException {
+	public UDDISecurityPortType getUDDISecurityService() throws TransportException {
 
-		if (securityService==null) {
+		if (uddiSecurityService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
 				QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.SECURITY_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
-				securityService = (UDDISecurityPortType) service.getPort(UDDISecurityPortType.class);
+				uddiSecurityService = (UDDISecurityPortType) service.getPort(UDDISecurityPortType.class);
 			} catch (Exception e) {
 				throw new TransportException(e.getMessage(), e);
 			}
 		}
-		return securityService;
+		return uddiSecurityService;
 	}
 	
-	public UDDIPublicationPortType getPublishService() throws TransportException {
+	public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
 
 		if (publishService==null) {
 			try {
@@ -85,7 +85,7 @@
 		return publishService;
 	}
 	
-	public UDDISubscriptionPortType getSubscriptionService() throws TransportException {
+	public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
 
 		if (subscriptionService==null) {
 			try {
@@ -100,7 +100,7 @@
 		return subscriptionService;
 	}
 	
-	public UDDISubscriptionListenerPortType getSubscriptionListenerService() throws TransportException {
+	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService == null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
@@ -114,7 +114,7 @@
 		return subscriptionListenerService;
 	}
 	
-	public UDDICustodyTransferPortType getCustodyTransferService() throws TransportException {
+	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService == null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/RMITransport.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/RMITransport.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/RMITransport.java Wed Jul  1 01:44:52 2009
@@ -59,7 +59,7 @@
 	UDDISubscriptionListenerPortType subscriptionListenerService = null;
 	UDDICustodyTransferPortType custodyTransferService = null;
 
-	public UDDIInquiryPortType getInquiryService() throws TransportException {
+	public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
 		if (inquiryService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_INQUIRY_URL);
@@ -75,7 +75,7 @@
 		return inquiryService;
 	}
 	
-	public UDDISecurityPortType getSecurityService() throws TransportException {
+	public UDDISecurityPortType getUDDISecurityService() throws TransportException {
 		if (securityService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
@@ -91,7 +91,7 @@
 		return securityService;
 	}
 	
-	public UDDIPublicationPortType getPublishService() throws TransportException {
+	public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
 		if (publishService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_PUBLISH_URL);
@@ -107,7 +107,7 @@
 		return publishService;
 	}
 	
-	public UDDISubscriptionPortType getSubscriptionService() throws TransportException {
+	public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
 		if (subscriptionService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_URL);
@@ -123,7 +123,7 @@
 		return subscriptionService;
 	}
 	
-	public UDDISubscriptionListenerPortType getSubscriptionListenerService() throws TransportException {
+	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
@@ -139,7 +139,7 @@
 		return subscriptionListenerService;
 	}
 	
-	public UDDICustodyTransferPortType getCustodyTransferService() throws TransportException {
+	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService==null) {
 			try {
 				String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java Wed Jul  1 01:44:52 2009
@@ -31,15 +31,15 @@
 	
 	public final static String INQUIRY_SERVICE               = "UDDIInquiryService";
 	public final static String SECURITY_SERVICE              = "UDDISecurityService";
-	public final static String PUBLISH_SERVICE               = "UDDIPublicationService";
+	public final static String PUBLISH_SERVICE               = "UDDIPublishService";
 	public final static String SUBSCRIPTION_SERVICE          = "UDDISubscriptionService";
 	public final static String SUBSCRIPTION_LISTENER_SERVICE = "UDDISubscriptionListenerService";
 	public final static String CUSTODY_TRANSFER_SERVICE      = "UDDICustodyTransferService";
 	
-	UDDIInquiryPortType getInquiryService()           throws TransportException;
-	UDDISecurityPortType getSecurityService()         throws TransportException;
-	UDDIPublicationPortType getPublishService()       throws TransportException;
-	UDDISubscriptionPortType getSubscriptionService() throws TransportException;
-	UDDICustodyTransferPortType getCustodyTransferService() throws TransportException;
-	UDDISubscriptionListenerPortType getSubscriptionListenerService() throws TransportException;
+	UDDIInquiryPortType getUDDIInquiryService()           throws TransportException;
+	UDDISecurityPortType getUDDISecurityService()         throws TransportException;
+	UDDIPublicationPortType getUDDIPublishService()       throws TransportException;
+	UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException;
+	UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException;
+	UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException;
 }

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_010_PublisherIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_010_PublisherIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -58,7 +58,7 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType securityService = transport.getSecurityService();
+	        	 UDDISecurityPortType securityService = transport.getUDDISecurityService();
 	        	 GetAuthToken getAuthToken = new GetAuthToken();
 	        	 getAuthToken.setUserID("root");
 	        	 getAuthToken.setCred("");

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -57,14 +57,14 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	 			 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID,  TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	         } else {
 	        	 Assert.fail();

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -60,14 +60,14 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	 			 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID,  TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);
 	         } else {

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -64,14 +64,14 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	 			 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID,  TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -66,12 +66,12 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -62,14 +62,14 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	        	 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID,  TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -67,12 +67,12 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 	        	 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_080_SubscriptionIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_080_SubscriptionIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -68,15 +68,15 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 UDDIPublicationPortType publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
-	        	 UDDISubscriptionPortType subscription = transport.getSubscriptionService();
+	        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+	        	 UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=790018&r1=790017&r2=790018&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java Wed Jul  1 01:44:52 2009
@@ -71,15 +71,15 @@
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
 	        	 
-	        	 UDDISecurityPortType security = transport.getSecurityService();
+	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
 	        	 Assert.assertNotNull(authInfoJoe);
 	        	 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
 	        	 Assert.assertNotNull(authInfoSam);
 	        	 
-	        	 publication = transport.getPublishService();
-	        	 UDDIInquiryPortType inquiry = transport.getInquiryService();
-	        	 UDDISubscriptionPortType subscription = transport.getSubscriptionService();
+	        	 publication = transport.getUDDIPublishService();
+	        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+	        	 UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
 	        	 
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);



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