Author: kstam
Date: Mon Dec 13 21:22:56 2010
New Revision: 1045379
URL: http://svn.apache.org/viewvc?rev=1045379&view=rev
Log:
JUDDI-439 the juddi-client should be using the UDDI_Service.wsdl and the
UDDIService, which is moved from the core to the client module.
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java
- copied, changed from r1035914,
juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIServiceWSDLTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
Removed:
juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
Copied:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java
(from r1035914,
juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java&p1=juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java&r1=1035914&r2=1045379&rev=1045379&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIService.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java
Mon Dec 13 21:22:56 2010
@@ -16,17 +16,26 @@
*/
-package org.uddi.v3_service;
+package org.apache.juddi.v3.client;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceFeature;
+import org.apache.log4j.helpers.Loader;
+import org.uddi.v3_service.UDDICustodyTransferPortType;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.v3_service.UDDIReplicationPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v3_service.UDDISubscriptionListenerPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
+import org.uddi.v3_service.UDDIValueSetCachingPortType;
+import org.uddi.v3_service.UDDIValueSetValidationPortType;
+
/**
* This class was generated by the JAX-WS RI.
@@ -40,24 +49,19 @@ public class UDDIService
{
private final static URL UDDISERVICE_WSDL_LOCATION;
- private final static Logger logger =
Logger.getLogger(org.uddi.v3_service.UDDIService.class.getName());
-
+
static {
- URL url = null;
- try {
- URL baseUrl;
- baseUrl = org.uddi.v3_service.UDDIService.class.getResource(".");
- url = new URL(baseUrl, "classpath:/uddi_v3_service.wsdl");
- } catch (MalformedURLException e) {
- logger.warning("Failed to create URL for the wsdl Location:
'classpath:/uddi_v3_service.wsdl', retrying as a local file");
- logger.warning(e.getMessage());
- }
+ URL url = Loader.getResource("uddi_v3_service.wsdl");
UDDISERVICE_WSDL_LOCATION = url;
}
public UDDIService(URL wsdlLocation, QName serviceName) {
super(wsdlLocation, serviceName);
}
+
+ public UDDIService(URL wsdlLocation) {
+ super(wsdlLocation, new QName("urn:uddi-org:v3_service",
"UDDI_Service"));
+ }
public UDDIService() {
super(UDDISERVICE_WSDL_LOCATION, new QName("urn:uddi-org:v3_service",
"UDDI_Service"));
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java?rev=1045379&view=auto
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
(added)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
Mon Dec 13 21:22:56 2010
@@ -0,0 +1,143 @@
+package org.apache.juddi.v3.client;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.helpers.Loader;
+
+public class UDDIServiceWSDL {
+
+ /** The WSDLEnpoint Types as defined in the UDDI v3 specification. */
+ public static enum WSDLEndPointType {SECURITY, INQUIRY, PUBLISH,
SUBSCRIPTION, SUBSCRIPTION_LISTENER, CUSTODY_TRANSFER,
+ REPLICATION, VALUESETVALIDATION, VALUESETCACHING};
+ /** The default file name of the uddi_v3_service.wsdl file. The file
will be located and read of the classpath. */
+ private String uddiV3ServiceWSDL = "uddi_v3_service.wsdl";
+ /** The default soap:address location values of the WSDLEndPointTypes
as defined in the UDDI v3 Client Specification. */
+ private final static Map<WSDLEndPointType, String> specEndPoints = new
HashMap<WSDLEndPointType, String>();
+ /** the wsdl imports */
+ private final static String[] imports = {
+ "uddi_api_v3_binding.wsdl",
+ "uddi_api_v3_portType.wsdl",
+ "uddi_custody_v3_binding.wsdl",
+ "uddi_custody_v3_portType.wsdl",
+ "uddi_repl_v3_binding.wsdl",
+ "uddi_repl_v3_portType.wsdl",
+ "uddi_sub_v3_binding.wsdl",
+ "uddi_sub_v3_portType.wsdl",
+ "uddi_subr_v3_binding.wsdl",
+ "uddi_subr_v3_portType.wsdl",
+ "uddi_v3.xsd",
+ "uddi_v3_service.wsdl",
+ "uddi_v3custody.xsd",
+ "uddi_v3policy.xsd",
+ "uddi_v3policy_instanceParms.xsd",
+ "uddi_v3replication.xsd",
+ "uddi_v3subscription.xsd",
+ "uddi_v3subscriptionListener.xsd",
+ "uddi_v3valueset.xsd",
+ "uddi_v3valuesetcaching.xsd",
+ "uddi_vs_v3_binding.wsdl",
+ "uddi_vs_v3_portType.wsdl",
+ "uddi_vscache_v3_binding.wsdl",
+ "uddi_vscache_v3_portType.wsdl"
+ };
+
+ static {
+ specEndPoints.put(WSDLEndPointType.SECURITY ,
"http://localhost/uddi/security/";);
+ specEndPoints.put(WSDLEndPointType.INQUIRY ,
"http://localhost/uddi/inquire/";);
+ specEndPoints.put(WSDLEndPointType.PUBLISH ,
"http://localhost/uddi/publish/";);
+ specEndPoints.put(WSDLEndPointType.SUBSCRIPTION ,
"http://localhost/uddi/subscription/";);
+ specEndPoints.put(WSDLEndPointType.SUBSCRIPTION_LISTENER,
"http://localhost/uddi/subscriptionlistener/";);
+ specEndPoints.put(WSDLEndPointType.CUSTODY_TRANSFER ,
"http://localhost/uddi/custody/";);
+ specEndPoints.put(WSDLEndPointType.REPLICATION ,
"http://localhost/uddi/replication/";);
+ specEndPoints.put(WSDLEndPointType.VALUESETVALIDATION ,
"http://localhost/uddi/valuesetvalidation/";);
+ specEndPoints.put(WSDLEndPointType.VALUESETCACHING ,
"http://localhost/uddi/valuesetcaching/";);
+ }
+
+ /**
+ * Returns the path to a temporary uddi_v3_service.wsdl file, where the
soap:address location
+ * of the given endPointType has been updated with the value specified
in the soapAddressLocation.
+ *
+ * @param endpointType
+ * @param soapAddressLocation
+ * @return WSDL File Path
+ * @throws IOException
+ */
+ public URL getWSDLFilePath(WSDLEndPointType endpointType, String
soapAddressLocation) throws IOException
+ {
+ String wsdlString = getServiceWSDLContent();
+ String specEndPoint = specEndPoints.get(endpointType);
+ wsdlString = wsdlString.replace(specEndPoint, soapAddressLocation);
+ File tmpWSDLFile = File.createTempFile("uddi_v3_service", ".wsdl");
+ Writer out = new OutputStreamWriter(new
FileOutputStream(tmpWSDLFile));
+ try {
+ out.write(wsdlString);
+ } finally {
+ out.close();
+ }
+ copyImportFiles();
+ URL url = new URL("file:" + tmpWSDLFile.getAbsolutePath());
+ return url;
+ }
+
+ /**
+ *
+ * @return
+ * @throws IOException
+ */
+ protected String getServiceWSDLContent() throws IOException
+ {
+ URL serviceWSDLURL = Loader.getResource(getUddiV3ServiceWSDL());
+ if (serviceWSDLURL==null) throw new IOException("Could not
locate resource " + getUddiV3ServiceWSDL());
+ return read(serviceWSDLURL);
+ }
+
+ private void copyImportFiles() throws IOException
+ {
+ URL serviceWSDLURL = Loader.getResource(getUddiV3ServiceWSDL());
+ if (serviceWSDLURL==null) throw new IOException("Could not
locate resource " + getUddiV3ServiceWSDL());
+ int endIndex = 0;
+ if (getUddiV3ServiceWSDL().contains(File.separator)) {
+ endIndex = getUddiV3ServiceWSDL().lastIndexOf(File.separator);
+ }
+ String srcDir = getUddiV3ServiceWSDL().substring(0,endIndex);
+ String destDir = System.getProperty("java.io.tmpdir");
+ for (String importFileName : imports) {
+ URL url = Loader.getResource(srcDir + importFileName);
+ String content = read(url);
+ File importFile = new File(destDir + File.separator +
importFileName);
+ Writer out = new OutputStreamWriter(new
FileOutputStream(importFile));
+ try {
+ out.write(content);
+ } finally {
+ out.close();
+ }
+ }
+ }
+
+ private String read(URL url) throws IOException {
+ InputStream resourceStream = url.openStream();
+ StringBuilder wsdl = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = resourceStream.read(b)) != -1;) {
+ wsdl.append(new String(b, 0, n));
+ }
+ return wsdl.toString();
+ }
+
+ public String getUddiV3ServiceWSDL() {
+ return uddiV3ServiceWSDL;
+ }
+
+ public void setUddiV3ServiceWSDL(String uddiV3ServiceWSDL) {
+ this.uddiV3ServiceWSDL = uddiV3ServiceWSDL;
+ }
+
+}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
Mon Dec 13 21:22:56 2010
@@ -33,7 +33,12 @@ public class UDDIClerkManager {
private static Logger log = Logger.getLogger(UDDIClerkManager.class);
private ClientConfig clientConfig = null;
+ private String CONFIG_FILE = "META-INF/uddi.xml";
+ public UDDIClerkManager() throws ConfigurationException {
+ super();
+ clientConfig = new ClientConfig(CONFIG_FILE);
+ }
/**
* Manages the clerks. Initiates reading the client configuration from
the uddi.xml.
* @throws ConfigurationException
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
Mon Dec 13 21:22:56 2010
@@ -21,6 +21,8 @@ import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import org.apache.juddi.v3.client.UDDIService;
+import org.apache.juddi.v3.client.UDDIServiceWSDL;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3_service.JUDDIApiPortType;
@@ -34,16 +36,8 @@ import org.uddi.v3_service.UDDISubscript
public class JAXWSTransport extends Transport {
- public final static String UDDI_V3_SERVICE_NAMESPACE =
"urn:uddi-org:v3_service";
public final static String JUDDI_V3_SERVICE_NAMESPACE =
"urn:juddi-apache-org:v3_service";
-
- 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";
+ public final static String PUBLISHER_SERVICE =
"JUDDIApiService";
String nodeName = null;
String managerName = null;
@@ -79,9 +73,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, INQUIRY_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- inquiryService = (UDDIInquiryPortType)
service.getPort(UDDIInquiryPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.INQUIRY,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ inquiryService = service.getUDDIInquiryPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -97,9 +91,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, SECURITY_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- securityService = (UDDISecurityPortType)
service.getPort(UDDISecurityPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SECURITY,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ securityService = service.getUDDISecurityPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -115,9 +109,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getPublishUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, PUBLISH_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- publishService = (UDDIPublicationPortType)
service.getPort(UDDIPublicationPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.PUBLISH,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ publishService =
service.getUDDIPublicationPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -133,9 +127,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, SUBSCRIPTION_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- subscriptionService =
(UDDISubscriptionPortType) service.getPort(UDDISubscriptionPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SUBSCRIPTION,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ subscriptionService =
service.getUDDISubscriptionPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -150,9 +144,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, SUBSCRIPTION_LISTENER_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- subscriptionListenerService =
(UDDISubscriptionListenerPortType)
service.getPort(UDDISubscriptionListenerPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SUBSCRIPTION_LISTENER,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ subscriptionListenerService =
service.getUDDISubscriptionListenerPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -167,9 +161,9 @@ public class JAXWSTransport extends Tran
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
endpointURL =
manager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
}
- QName qName = new
QName(UDDI_V3_SERVICE_NAMESPACE, CUSTODY_TRANSFER_SERVICE);
- Service service = Service.create(new
URL(endpointURL), qName);
- custodyTransferService =
(UDDICustodyTransferPortType)
service.getPort(UDDICustodyTransferPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.CUSTODY_TRANSFER,
endpointURL);
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+ custodyTransferService =
service.getUDDICustodyPort();
} catch (Exception e) {
throw new TransportException(e.getMessage(), e);
}
@@ -177,6 +171,9 @@ public class JAXWSTransport extends Tran
return custodyTransferService;
}
+ /**
+ * This is a jUDDI specific API
+ */
public JUDDIApiPortType getJUDDIApiService(String endpointURL) throws
TransportException {
if (publisherService == null) {
try {
@@ -201,5 +198,7 @@ public class JAXWSTransport extends Tran
public void setNodeName(String nodeName) {
this.nodeName = nodeName;
}
+
+
}
Added:
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIServiceWSDLTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIServiceWSDLTest.java?rev=1045379&view=auto
==============================================================================
---
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIServiceWSDLTest.java
(added)
+++
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIServiceWSDLTest.java
Mon Dec 13 21:22:56 2010
@@ -0,0 +1,46 @@
+package org.apache.juddi.v3.client;
+
+import java.io.IOException;
+import java.net.URL;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class UDDIServiceWSDLTest {
+
+ @Test()
+ public void canFindSpecWSDL() throws IOException {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ String wsdlContent = uddiServiceWSDL.getServiceWSDLContent();
+ assertNotNull(wsdlContent);
+ //The unaltered WSDL should contain the following string
+
assertTrue(wsdlContent.contains("http://localhost/uddi/inquire/";));
+ }
+
+ @Test(expected=IOException.class)
+ public void cannotFindSpecWSDL() throws IOException {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ uddiServiceWSDL.setUddiV3ServiceWSDL("nonExisting.wsdl");
+ uddiServiceWSDL.getServiceWSDLContent();
+ }
+
+ @Test()
+ public void getUpdatedWSDL() {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ URL wsdlPath;
+ try {
+ wsdlPath =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SECURITY,
"securityeurl");
+ assertNotNull(wsdlPath);
+
+ } catch (IOException e) {
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ Assert.fail("Could not create file in dir " + tmpDir);
+ e.printStackTrace();
+ }
+ }
+
+}
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
Mon Dec 13 21:22:56 2010
@@ -14,12 +14,12 @@
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
-
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
-
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
-
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
-
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+
<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?wsdl</juddiApiUrl>
<!-- In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
Mon Dec 13 21:22:56 2010
@@ -31,8 +31,6 @@ import javax.persistence.Query;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.api.impl.UDDISecurityImpl;
@@ -43,6 +41,8 @@ import org.apache.juddi.config.Persisten
import org.apache.juddi.config.Property;
import org.apache.juddi.model.Subscription;
import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.v3.client.UDDIService;
+import org.apache.juddi.v3.client.UDDIServiceWSDL;
import org.apache.log4j.Logger;
import org.uddi.sub_v3.CoveragePeriod;
import org.uddi.sub_v3.GetSubscriptionResults;
@@ -64,8 +64,6 @@ public class SubscriptionNotifier extend
private long interval =
AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL,
300000l); //5 min default
private long acceptableLagTime =
AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME,
500l); //500 milliseconds
private UDDISubscriptionImpl subscriptionImpl = new
UDDISubscriptionImpl();
- private static String SUBR_V3_NAMESPACE = "urn:uddi-org:v3_service";
- private static String SUBSCRIPTION_LISTENER =
"UDDI_SubscriptionListener_Port";
public SubscriptionNotifier() throws ConfigurationException {
super();
@@ -237,10 +235,10 @@ public class SubscriptionNotifier extend
if (bindingTemplate!=null) {
if
(AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType()))
{
- QName qName = new
QName(SUBR_V3_NAMESPACE, SUBSCRIPTION_LISTENER);
try {
- Service service =
Service.create(new URL(bindingTemplate.getAccessPointUrl()), qName);
-
UDDISubscriptionListenerPortType subscriptionListenerPort =
(UDDISubscriptionListenerPortType)
service.getPort(UDDISubscriptionListenerPortType.class);
+ URL tmpWSDLFile = new
UDDIServiceWSDL().getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SUBSCRIPTION_LISTENER,
bindingTemplate.getAccessPointUrl());
+ UDDIService service = new
UDDIService(tmpWSDLFile);
+
UDDISubscriptionListenerPortType subscriptionListenerPort =
service.getUDDISubscriptionListenerPort();
log.info("Sending out
notification to " + bindingTemplate.getAccessPointUrl());
subscriptionListenerPort.notifySubscriptionListener(body);
//there maybe more chunks we
have to send
Modified: juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
--- juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml (original)
+++ juddi/trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml Mon Dec 13 21:22:56
2010
@@ -26,71 +26,61 @@
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
- <jaxws:endpoint id="inquiry"
implementor="org.apache.juddi.api.impl.UDDIInquiryImpl" address="/inquiry"
- serviceName="a:UDDI_Inquiry_Port" endpointName="a:UDDIInquiryServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="inquiry"
implementor="org.apache.juddi.api.impl.UDDIInquiryImpl" address="/inquiry">
<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:UDDI_Publish_Port" endpointName="a:UDDIPublishServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="publish"
implementor="org.apache.juddi.api.impl.UDDIPublicationImpl" address="/publish">
<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:UDDI_Security_Port" endpointName="a:UDDISecurityServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="security"
implementor="org.apache.juddi.api.impl.UDDISecurityImpl" address="/security">
<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:UDDI_Subscription_Port"
endpointName="a:UDDISubscriptionServicePort" xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="subscription"
implementor="org.apache.juddi.api.impl.UDDISubscriptionImpl"
address="/subscription">
<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:UDDI_SubscriptionListener_Port"
endpointName="a:UDDISubscriptionListenerServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="subscription-listener"
implementor="org.apache.juddi.api.impl.UDDISubscriptionListenerImpl"
address="/subscription-listener">
<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:UDDI_CustodyTransfer_Port"
endpointName="a:UDDICustodyTransferServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="custody-transfer"
implementor="org.apache.juddi.api.impl.UDDICustodyTransferImpl"
address="/custody-transfer">
<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:UDDI_Replication_Port"
endpointName="a:UDDIReplicationServicePort" xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="replication"
implementor="org.apache.juddi.api.impl.UDDIReplicationImpl"
address="/replication">
<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:UDDI_ValueSetValidation_Port"
endpointName="a:UDDIValueSetValidationServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="valueset-validation"
implementor="org.apache.juddi.api.impl.UDDIValueSetValidationImpl"
address="/valueset-validation">
<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:UDDI_ValueSetCaching_Port"
endpointName="a:UDDIValueSetCachingServicePort"
xmlns:a="urn:uddi-org:v3_service">
+ <jaxws:endpoint id="valueset-caching"
implementor="org.apache.juddi.api.impl.UDDIValueSetCachingImpl"
address="/valueset-caching">
<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:JUDDI_Api_Port" endpointName="a:JUDDIApiServicePort"
xmlns:a="urn:juddi-apache-org:v3_service">
+ <jaxws:endpoint id="juddi-api"
implementor="org.apache.juddi.api.impl.JUDDIApiImpl" address="/juddi-api">
<jaxws:properties>
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
Mon Dec 13 21:22:56 2010
@@ -3,7 +3,7 @@
<description xml:lang="en">This is the endpoint for the
subscription listener</description>
<accessPoint useType="endPoint">
- http://localhost:8880/juddiv3/services/subscription-listener
+ http://localhost:8880/juddiv3/services/subscription-listener/
</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
Mon Dec 13 21:22:56 2010
@@ -22,16 +22,16 @@
<description xml:lang="en">This is the description of notifier
one.</description>
<description xml:lang="es">Ãsta es la descripción del notifier
uno.</description>
<bindingTemplates>
-<bindingTemplate xmlns="urn:uddi-org:api_v3"
bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
- <description xml:lang="en">This is the endpoint for the subscription
listener</description>
- <accessPoint
useType="endPoint">http://localhost:8880/juddiv3/services/subscription-listener?wsdl</accessPoint>
- <tModelInstanceDetails>
- <tModelInstanceInfo
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
- </tModelInstanceDetails>
- <categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:bindings"
keyName="category" keyValue="secure" />
- </categoryBag>
-</bindingTemplate>
+ <bindingTemplate xmlns="urn:uddi-org:api_v3"
bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
+ <description xml:lang="en">This is the endpoint for the subscription
listener</description>
+ <accessPoint
useType="endPoint">http://localhost:8880/juddiv3/services/subscription-listener/</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:bindings"
keyName="category" keyValue="secure" />
+ </categoryBag>
+ </bindingTemplate>
</bindingTemplates>
<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category"
keyValue="peaches" />
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=1045379&r1=1045378&r2=1045379&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 Mon Dec 13
21:22:56 2010
@@ -14,12 +14,12 @@
</properties>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
-
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
-
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
-
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
-
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+
<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?wsdl</juddiApiUrl>
<!-- In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
@@ -49,12 +49,12 @@
<name>med</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?wsdl</custodyTransferUrl>
-
<inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
-
<publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
-
<securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
-
<subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
-
<subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+
<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>
</node>
</nodes>
Added:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java?rev=1045379&view=auto
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
(added)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
Mon Dec 13 21:22:56 2010
@@ -0,0 +1,119 @@
+package org.apache.juddi.v3.tck;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.v3.client.UDDIService;
+import org.apache.juddi.v3.client.UDDIServiceWSDL;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDINode;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.v3_service.UDDIReplicationPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v3_service.UDDISubscriptionListenerPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
+
+/**
+ * Checking the UDDI Server for all the required ports specified in the UDDI
v3 spec.
+ * @author kstam
+ *
+ */
+public class UDDI_001_UDDIServiceTest {
+
+ static UDDIClerkManager manager;
+ static UDDINode uddiServer;
+
+ @BeforeClass
+ public static void readClientConfig() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+ uddiServer = manager.getClientConfig().getHomeNode();
+ }
+
+ @AfterClass
+ public static void stop() throws ConfigurationException {
+ if (manager!=null) manager.stop();
+ }
+
+ @Test
+ public void findSecurityPort() throws IOException {
+ String url = uddiServer.getSecurityUrl();
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SECURITY, url);
+ System.out.println("WSDL File: " + tmpWSDLFile);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDISecurityPortType port = uddiService.getUDDISecurityPort();
+ assertNotNull(port);
+ GetAuthToken body = new GetAuthToken();
+ body.setUserID("root");
+ body.setCred("");
+ AuthToken token = port.getAuthToken(body);
+ System.out.println("token=" + token);
+ }
+
+ @Test
+ public void findInquiryPort() throws IOException {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ String url = uddiServer.getSecurityUrl();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.INQUIRY, url);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDIInquiryPortType port = uddiService.getUDDIInquiryPort();
+ assertNotNull(port);
+ }
+
+ @Test
+ public void findPublicationPort() throws IOException {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ String url = uddiServer.getSecurityUrl();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.PUBLISH, url);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDIPublicationPortType port =
uddiService.getUDDIPublicationPort();
+ assertNotNull(port);
+ }
+
+ @Test
+ public void findSubscriptionPort() throws IOException {
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ String url = uddiServer.getSecurityUrl();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SUBSCRIPTION,
url);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDISubscriptionPortType port =
uddiService.getUDDISubscriptionPort();
+ assertNotNull(port);
+ }
+
+ @Test
+ public void findReplicationPort() throws IOException {
+ String url = uddiServer.getSecurityUrl();
+ if (url!=null) { //Replication is option, but if it is
configured in the uddi.xml then we assume it is implemented
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.REPLICATION,url);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDIReplicationPortType port =
uddiService.getUDDIReplicationPort();
+ assertNotNull(port);
+ }
+ }
+
+ @Test
+ public void findSubscriptionListenerPort() throws IOException {
+ String url = uddiServer.getSecurityUrl();
+ if (url!=null) { //Subscription Listener is client side, but if
it is configured in the uddi.xml then we assume it is implemented
+ UDDIServiceWSDL uddiServiceWSDL = new UDDIServiceWSDL();
+ URL tmpWSDLFile =
uddiServiceWSDL.getWSDLFilePath(UDDIServiceWSDL.WSDLEndPointType.SUBSCRIPTION_LISTENER,
url);
+ UDDIService uddiService = new UDDIService(tmpWSDLFile);
+ UDDISubscriptionListenerPortType port =
uddiService.getUDDISubscriptionListenerPort();
+ assertNotNull(port);
+ }
+ }
+
+
+
+}
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?rev=1045379&r1=1045378&r2=1045379&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
Mon Dec 13 21:22:56 2010
@@ -36,8 +36,9 @@ public class UDDI_010_PublisherIntegrati
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(null);
- String clazz =
manager.getClientConfig().getUDDINode("default").getProxyTransport();
+ UDDIClerkManager manager = new UDDIClerkManager();
+ manager.start();
+ String clazz =
manager.getClientConfig().getHomeNode().getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
@@ -46,7 +47,7 @@ public class UDDI_010_PublisherIntegrati
@AfterClass
public static void stopRegistry() throws ConfigurationException {
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(null);
- String clazz =
manager.getClientConfig().getUDDINode("default").getProxyTransport();
+ String clazz =
manager.getClientConfig().getHomeNode().getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
