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 2010/01/20 05:45:26 UTC
svn commit: r901059 - in /webservices/juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/
juddi-cxf/src/main/webapp/WEB-INF/ uddi-ws/src/main/java/org/uddi/v3_service/
Author: kstam
Date: Wed Jan 20 04:45:18 2010
New Revision: 901059
URL: http://svn.apache.org/viewvc?rev=901059&view=rev
Log:
JUDDI-336 fix serviceNames so that align with the spec.
Modified:
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
webservices/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=901059&r1=901058&r2=901059&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java Wed Jan 20 04:45:18 2010
@@ -33,6 +33,20 @@
public class JAXWSTransport extends Transport {
+ public final static String API_V3_NAMESPACE = "urn:uddi-org:api_v3_portType";
+ public final static String SUB_V3_NAMESPACE = "urn:uddi-org:sub_v3_portType";
+ public final static String SUBR_V3_NAMESPACE = "urn:uddi-org:subr_v3_portType";
+ public final static String CUSTODY_V3_NAMESPACE = "urn:uddi-org:custody_v3_portType";
+ public final static String JUDDI_API_V3_NAMESPACE = "urn:juddi-apache-org:api_v3_portType";
+
+ public final static String INQUIRY_SERVICE = "UDDI_Inquiry_Port";
+ public final static String SECURITY_SERVICE = "UDDI_Security_Port";
+ public final static String PUBLISH_SERVICE = "UDDI_Publish_Port";
+ public final static String SUBSCRIPTION_SERVICE = "UDDI_Subscription_Port";
+ public final static String SUBSCRIPTION_LISTENER_SERVICE = "UDDI_SubscriptionListener_Port";
+ public final static String CUSTODY_TRANSFER_SERVICE = "UDDI_CustodyTransfer_Port";
+ public final static String PUBLISHER_SERVICE = "JUDDI_Api_Port";
+
String nodeName = null;
UDDIInquiryPortType inquiryService = null;
UDDISecurityPortType securityService = null;
@@ -57,7 +71,7 @@
if (inquiryService==null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
- QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.INQUIRY_SERVICE);
+ QName qName = new QName(API_V3_NAMESPACE, INQUIRY_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
inquiryService = (UDDIInquiryPortType) service.getPort(UDDIInquiryPortType.class);
} catch (Exception e) {
@@ -72,7 +86,7 @@
if (securityService==null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
- QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.SECURITY_SERVICE);
+ QName qName = new QName(API_V3_NAMESPACE, SECURITY_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
securityService = (UDDISecurityPortType) service.getPort(UDDISecurityPortType.class);
} catch (Exception e) {
@@ -87,7 +101,7 @@
if (publishService==null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getPublishUrl();
- QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.PUBLISH_SERVICE);
+ QName qName = new QName(API_V3_NAMESPACE, PUBLISH_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
publishService = (UDDIPublicationPortType) service.getPort(UDDIPublicationPortType.class);
} catch (Exception e) {
@@ -102,7 +116,7 @@
if (subscriptionService==null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
- QName qName = new QName(Transport.SUB_V3_NAMESPACE, Transport.SUBSCRIPTION_SERVICE);
+ QName qName = new QName(SUB_V3_NAMESPACE, SUBSCRIPTION_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
subscriptionService = (UDDISubscriptionPortType) service.getPort(UDDISubscriptionPortType.class);
} catch (Exception e) {
@@ -116,7 +130,7 @@
if (subscriptionListenerService == null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
- QName qName = new QName(Transport.SUBR_V3_NAMESPACE, Transport.SUBSCRIPTION_LISTENER_SERVICE);
+ QName qName = new QName(SUBR_V3_NAMESPACE, SUBSCRIPTION_LISTENER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
subscriptionListenerService = (UDDISubscriptionListenerPortType) service.getPort(UDDISubscriptionListenerPortType.class);
} catch (Exception e) {
@@ -130,7 +144,7 @@
if (custodyTransferService == null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
- QName qName = new QName(Transport.CUSTODY_V3_NAMESPACE, Transport.CUSTODY_TRANSFER_SERVICE);
+ QName qName = new QName(CUSTODY_V3_NAMESPACE, CUSTODY_TRANSFER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
custodyTransferService = (UDDICustodyTransferPortType) service.getPort(UDDICustodyTransferPortType.class);
} catch (Exception e) {
@@ -144,7 +158,7 @@
if (publisherService == null) {
try {
if (endpointURL==null) endpointURL = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
- QName qName = new QName(Transport.JUDDI_API_V3_NAMESPACE, Transport.PUBLISHER_SERVICE);
+ QName qName = new QName(JUDDI_API_V3_NAMESPACE, PUBLISHER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
publisherService = (JUDDIApiPortType) service.getPort(JUDDIApiPortType.class);
} catch (Exception e) {
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java?rev=901059&r1=901058&r2=901059&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java Wed Jan 20 04:45:18 2010
@@ -26,21 +26,8 @@
public abstract class Transport {
- public final static String API_V3_NAMESPACE = "urn:uddi-org:api_v3_portType";
- public final static String SUB_V3_NAMESPACE = "urn:uddi-org:sub_v3_portType";
- public final static String SUBR_V3_NAMESPACE = "urn:uddi-org:subr_v3_portType";
- public final static String CUSTODY_V3_NAMESPACE = "urn:uddi-org:custody_v3_portType";
- public final static String JUDDI_API_V3_NAMESPACE = "urn:juddi-apache-org:api_v3_portType";
public final static String DEFAULT_NODE_NAME = "default";
- public final static String INQUIRY_SERVICE = "UDDIInquiryService";
- public final static String SECURITY_SERVICE = "UDDISecurityService";
- 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";
- public final static String PUBLISHER_SERVICE = "JUDDIApiService";
-
public abstract UDDIInquiryPortType getUDDIInquiryService(String enpointURL) throws TransportException;
public abstract UDDISecurityPortType getUDDISecurityService(String enpointURL) throws TransportException;
public abstract UDDIPublicationPortType getUDDIPublishService(String enpointURL) throws TransportException;
Modified: webservices/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml?rev=901059&r1=901058&r2=901059&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml (original)
+++ webservices/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml Wed Jan 20 04:45:18 2010
@@ -25,70 +25,70 @@
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint id="inquiry" implementor="org.apache.juddi.api.impl.UDDIInquiryImpl" address="/inquiry"
- serviceName="a:UDDIInquiryService" endpointName="a:UDDIInquiryServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+ serviceName="a:UDDI_Inquiry_Port" 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:UDDIPublishService" endpointName="a:UDDIPublishServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+ serviceName="a:UDDI_Publish_Port" 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:UDDISecurityService" endpointName="a:UDDISecurityServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+ serviceName="a:UDDI_Security_Port" 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:UDDISubscriptionService" endpointName="a:UDDISubscriptionServicePort" xmlns:a="urn:uddi-org:sub_v3_portType">
+ serviceName="a:UDDI_Subscription_Port" 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:UDDISubscriptionListenerService" endpointName="a:UDDISubscriptionListenerServicePort" xmlns:a="urn:uddi-org:subr_v3_portType">
+ serviceName="a:UDDI_SubscriptionListener_Port" 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:UDDICustodyTransferService" endpointName="a:UDDICustodyTransferServicePort" xmlns:a="urn:uddi-org:custody_v3_portType">
+ serviceName="a:UDDI_CustodyTransfer_Port" 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:UDDIReplicationService" endpointName="a:UDDIReplicationServicePort" xmlns:a="urn:uddi-org:repl_v3_portType">
+ serviceName="a:UDDI_Replication_Port" 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:UDDIValueSetValidationService" endpointName="a:UDDIValueSetValidationServicePort" xmlns:a="urn:uddi-org:vs_v3_portType">
+ serviceName="a:UDDI_ValueSetValidation_Port" 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:UDDIValueSetCachingService" endpointName="a:UDDIValueSetCachingServicePort" xmlns:a="urn:uddi-org:vscache_v3_portType">
+ serviceName="a:UDDI_ValueSetCaching_Port" endpointName="a:UDDIValueSetCachingServicePort" xmlns:a="urn:uddi-org:vscache_v3_portType">
<jaxws:properties>
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
<jaxws:endpoint id="juddi-api" implementor="org.apache.juddi.api.impl.JUDDIApiImpl" address="/juddi-api"
- serviceName="a:JUDDIApiService" endpointName="a:JUDDIApiServicePort" xmlns:a="urn:juddi-apache-org:api_v3_portType">
+ serviceName="a:JUDDI_Api_Port" endpointName="a:JUDDIApiServicePort" xmlns:a="urn:juddi-apache-org:api_v3_portType">
<jaxws:properties>
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java?rev=901059&r1=901058&r2=901059&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java Wed Jan 20 04:45:18 2010
@@ -34,7 +34,7 @@
* Generated source version: 2.1
*
*/
-@WebServiceClient(name = "UDDI_Service", targetNamespace = "urn:uddi-org:v3_service", wsdlLocation = "file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3_service.wsdl")
+@WebServiceClient(name = "UDDI_Service", targetNamespace = "urn:uddi-org:v3_service", wsdlLocation = "classpath:/uddi_v3_service.wsdl")
public class UDDIService
extends Service
{
@@ -47,9 +47,9 @@
try {
URL baseUrl;
baseUrl = org.uddi.v3_service.UDDIService.class.getResource(".");
- url = new URL(baseUrl, "file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3_service.wsdl");
+ url = new URL(baseUrl, "classpath:/uddi_v3_service.wsdl");
} catch (MalformedURLException e) {
- logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3_service.wsdl', retrying as a local file");
+ logger.warning("Failed to create URL for the wsdl Location: 'classpath:/uddi_v3_service.wsdl', retrying as a local file");
logger.warning(e.getMessage());
}
UDDISERVICE_WSDL_LOCATION = url;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org