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 2013/05/12 16:11:32 UTC
svn commit: r1481563 [2/3] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/
juddi-...
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java Sun May 12 14:11:29 2013
@@ -31,5 +31,5 @@ public interface JUDDIApiService extends
public JUDDIApiResponse getPublishers(String authToken, String publisherId);
public JUDDIApiResponse savePublisher(String authToken, Publisher publisher);
public JUDDIApiResponse deletePublisher(String authToken, String publisherId);
- public JUDDIApiResponse restartManager(String authToken);
+ public JUDDIApiResponse restartClient(String authToken);
}
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java Sun May 12 14:11:29 2013
@@ -34,7 +34,7 @@ import org.apache.juddi.api_v3.SavePubli
import org.apache.juddi.portlets.client.model.Publisher;
import org.apache.juddi.portlets.client.service.JUDDIApiResponse;
import org.apache.juddi.portlets.client.service.JUDDIApiService;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
@@ -161,7 +161,7 @@ public class JUDDIApiServiceImpl extends
return response;
}
- public JUDDIApiResponse restartManager(String authToken) {
+ public JUDDIApiResponse restartClient(String authToken) {
JUDDIApiResponse response = new JUDDIApiResponse();
@@ -184,10 +184,10 @@ public class JUDDIApiServiceImpl extends
PublisherDetail publisherDetail = apiService.getPublisherDetail(getPublisherDetail);
org.apache.juddi.api_v3.Publisher publisher = publisherDetail.getPublisher().get(0);
if ("true".equalsIgnoreCase(publisher.getIsAdmin())) {
- UDDIClerkManager manager = WebHelper.getUDDIClerkManager(session.getServletContext());
- logger.info("managerName=" + manager.getName());
- manager.restart();
- response.setMessage("Successfull manager restart.");
+ UDDIClient client = WebHelper.getUDDIClient(session.getServletContext());
+ logger.info("clientName=" + client.getName());
+ client.restart();
+ response.setMessage("Successfull client restart.");
response.setSuccess(true);
} else {
response.setMessage("Only publishers with Admin privileges can perform a restart.");
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java Sun May 12 14:11:29 2013
@@ -32,7 +32,7 @@ import org.apache.juddi.portlets.client.
import org.apache.juddi.portlets.client.service.SecurityService;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
@@ -147,8 +147,8 @@ public class SecurityServiceImpl extends
HttpServletRequest request = getThreadLocalRequest();
HttpSession session = request.getSession();
//upon success obtain tokens from other registries
- UDDIClerkManager manager = WebHelper.getUDDIClerkManager(session.getServletContext());
- Map<String, UDDIClerk> clerks = manager.getClientConfig().getUDDIClerks();
+ UDDIClient client = WebHelper.getUDDIClient(session.getServletContext());
+ Map<String, UDDIClerk> clerks = client.getClientConfig().getUDDIClerks();
for (UDDIClerk clerk : clerks.values()) {
//only setting token for the clerks of the current user/publisher
if (username.equals(clerk.getPublisher())) {
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java Sun May 12 14:11:29 2013
@@ -44,7 +44,7 @@ import org.apache.juddi.portlets.client.
import org.apache.juddi.portlets.client.service.SubscriptionService;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.config.WebHelper;
@@ -87,9 +87,9 @@ public class SubscriptionServiceImpl ext
try {
boolean isMatchingClerk=false;
UDDIClerk toClerk = null;
- UDDIClerkManager manager = WebHelper.getUDDIClerkManager(session.getServletContext());
+ UDDIClient client = WebHelper.getUDDIClient(session.getServletContext());
UDDINode homeNode = WebHelper.getUDDIHomeNode(session.getServletContext());
- Map<String, UDDIClerk> clerks = manager.getClientConfig().getUDDIClerks();
+ Map<String, UDDIClerk> clerks = client.getClientConfig().getUDDIClerks();
for (UDDIClerk clerk : clerks.values()) {
if (publisher.equals(clerk.getPublisher())
&& homeNode.getName().equals(clerk.getUDDINode().getName())) {
@@ -123,8 +123,8 @@ public class SubscriptionServiceImpl ext
modelNode.setClerkName(clerk.getName());
modelNode.setDescription(node.getDescription());
try {
- UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(clerk.getManagerName());
- String clazz = manager.getClientConfig().getUDDINode(clerk.getUDDINode().getName()).getProxyTransport();
+ UDDIClient client = UDDIClientContainer.getUDDIClient(clerk.getManagerName());
+ String clazz = client.getClientConfig().getUDDINode(clerk.getUDDINode().getName()).getProxyTransport();
Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(clerk.getManagerName(),clerk.getUDDINode().getName());
String authToken = (String) session.getAttribute("token-" + clerk.getName());
@@ -164,13 +164,13 @@ public class SubscriptionServiceImpl ext
logger.info("Sending saveSubscriptions request..");
try {
//before sending this we need to ready the listener node
- UDDIClerkManager manager = WebHelper.getUDDIClerkManager(session.getServletContext());
+ UDDIClient client = WebHelper.getUDDIClient(session.getServletContext());
UDDINode homeNode = WebHelper.getUDDIHomeNode(session.getServletContext());
- UDDIClerk clerk = manager.getClientConfig().getUDDIClerks().get(modelSubscription.getFromClerkName());
- UDDIClerk toClerk = manager.getClientConfig().getUDDIClerks().get(modelSubscription.getToClerkName());
+ UDDIClerk clerk = client.getClientConfig().getUDDIClerks().get(modelSubscription.getFromClerkName());
+ UDDIClerk toClerk = client.getClientConfig().getUDDIClerks().get(modelSubscription.getToClerkName());
if (toClerk==null) {
String publisher = (String) session.getAttribute("UserName");
- Map<String, UDDIClerk> clerks = manager.getClientConfig().getUDDIClerks();
+ Map<String, UDDIClerk> clerks = client.getClientConfig().getUDDIClerks();
for (UDDIClerk uddiClerk : clerks.values()) {
if (publisher.equals(uddiClerk.getPublisher())
&& homeNode.getName().equals(uddiClerk.getUDDINode().getName())) {
@@ -290,8 +290,8 @@ public class SubscriptionServiceImpl ext
try {
try {
- UDDIClerkManager manager = WebHelper.getUDDIClerkManager(session.getServletContext());
- UDDIClerk clerk = manager.getClientConfig().getUDDIClerks().get(modelSubscription.getFromClerkName());
+ UDDIClient client = WebHelper.getUDDIClient(session.getServletContext());
+ UDDIClerk clerk = client.getClientConfig().getUDDIClerks().get(modelSubscription.getFromClerkName());
Transport transport = WebHelper.getTransport(session.getServletContext(), clerk.getUDDINode());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
DeleteSubscription deleteSubscription = new DeleteSubscription();
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=1481563&r1=1481562&r2=1481563&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 Sun May 12 14:11:29 2013
@@ -16,9 +16,9 @@
*
*/ -->
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="uddi-portlet-manager">
+ <client name="uddi-portlet-client">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
@@ -65,6 +65,6 @@
<clerks registerOnStartup="false">
<clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing"/>
</clerks>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing Sun May 12 14:11:29 2013
@@ -16,9 +16,10 @@
*
*/ -->
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
+
<reloadDelay>5000</reloadDelay>
- <manager name="uddi-portlet-manager">
+ <client name="uddi-portlet-manager">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
@@ -59,6 +60,6 @@
<clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing"/>
<clerk name="SalesCratchit" node="sales" publisher="marketing" password="marketing"/>
</clerks>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales Sun May 12 14:11:29 2013
@@ -16,9 +16,9 @@
*
*/ -->
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="uddi-portlet-manager">
+ <client name="uddi-portlet-manager">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
@@ -59,6 +59,6 @@
<clerk name="SalesCratchit" node="default" publisher="sales" password="sales"/>
<clerk name="MarketingCratchit" node="marketing" publisher="sales" password="sales"/>
</clerks>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="juddi-core-unittest-client">
+ <client name="juddi-core-unittest-client">
<nodes>
<node isHomeJUDDI="true">
<!-- required 'default' node -->
@@ -25,5 +24,5 @@
<clerks registerOnStartup="false">
<clerk name="joe" node="default" publisher="joepublisher" password="joepublisher"/>
</clerks>
- </manager>
+ </client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Sun May 12 14:11:29 2013
@@ -803,7 +803,7 @@ public class MappingApiToModel {
modelNode.setInquiryUrl(apiNode.getInquiryUrl());
modelNode.setJuddiApiUrl(apiNode.getJuddiApiUrl());
modelNode.setName(apiNode.getName());
- modelNode.setManagerName(apiNode.getManagerName());
+ modelNode.setClientName(apiNode.getClientName());
modelNode.setProxyTransport(apiNode.getProxyTransport());
modelNode.setPublishUrl(apiNode.getPublishUrl());
modelNode.setSecurityUrl(apiNode.getSecurityUrl());
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Sun May 12 14:11:29 2013
@@ -1090,7 +1090,7 @@ public class MappingModelToApi {
apiNode.setInquiryUrl(modelNode.getInquiryUrl());
apiNode.setJuddiApiUrl(modelNode.getJuddiApiUrl());
apiNode.setName(modelNode.getName());
- apiNode.setManagerName(modelNode.getManagerName());
+ apiNode.setClientName(modelNode.getClientName());
apiNode.setProxyTransport(modelNode.getProxyTransport());
apiNode.setPublishUrl(modelNode.getPublishUrl());
apiNode.setSecurityUrl(modelNode.getSecurityUrl());
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Node.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Node.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Node.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Node.java Sun May 12 14:11:29 2013
@@ -33,8 +33,8 @@ public class Node implements java.io.Ser
@Id
@Column(name="name", nullable = false)
private String name;
- @Column(name="manager_name", nullable = false, length=255)
- private String managerName;
+ @Column(name="client_name", nullable = false, length=255)
+ private String clientName;
@Column(name="proxy_transport", nullable = false, length=255)
private String proxyTransport;
@Column(name="security_url", nullable = false, length=255)
@@ -80,12 +80,12 @@ public class Node implements java.io.Ser
this.name = name;
}
- public String getManagerName() {
- return managerName;
+ public String getClientName() {
+ return clientName;
}
- public void setManagerName(String managerName) {
- this.managerName = managerName;
+ public void setClientName(String clientName) {
+ this.clientName = clientName;
}
public String getProxyTransport() {
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java Sun May 12 14:11:29 2013
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
import org.apache.juddi.Registry;
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizer;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
@@ -86,7 +86,7 @@ public class API_051_BindingTemplateWSDL
tckTModel.saveJoePublisherTmodel(authInfoJoe);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
- UDDIClerk clerk = new UDDIClerkManager("META-INF/uddi.xml").getClerk("joe");
+ UDDIClerk clerk = new UDDIClient("META-INF/uddi.xml").getClerk("joe");
Properties properties = clerk.getUDDINode().getProperties();
URLLocalizer urlLocalizer = new URLLocalizerDefaultImpl();
@@ -119,7 +119,7 @@ public class API_051_BindingTemplateWSDL
tckTModel.saveJoePublisherTmodel(authInfoJoe);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
- UDDIClerk clerk = new UDDIClerkManager("META-INF/uddi.xml").getClerk("joe");
+ UDDIClerk clerk = new UDDIClient("META-INF/uddi.xml").getClerk("joe");
clerk.registerWsdls();
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java Sun May 12 14:11:29 2013
@@ -54,7 +54,7 @@ public class API_091_RMISubscriptionList
private static TckSubscriptionListenerRMI tckSubscriptionListenerRMI = new TckSubscriptionListenerRMI(new UDDISubscriptionImpl(), new UDDIPublicationImpl());
private static String authInfoJoe = null;
- //private static UDDIClerkManager manager;
+ //private static UDDIClient manager;
private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
private static Registry registry;
private static String path = null;
@@ -96,7 +96,7 @@ public class API_091_RMISubscriptionList
Assert.fail();
}
- //manager = new UDDIClerkManager();
+ //manager = new UDDIClient();
//manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java Sun May 12 14:11:29 2013
@@ -83,7 +83,7 @@ public class API_100_ClientSubscriptionI
node.setProxyTransport("class");
node.setSubscriptionUrl("http://localhost:8080/services/securityUrl");
node.setName("default");
- node.setManagerName("defaultManager");
+ node.setClientName("defaultClient");
SaveNode saveNode = new SaveNode();
saveNode.setAuthInfo(authInfoJoe);
saveNode.getNode().add(node);
@@ -107,7 +107,7 @@ public class API_100_ClientSubscriptionI
node2.setProxyTransport("class2");
node2.setSubscriptionUrl("http://localhost:8080/services/securityUrl2");
node2.setName("default2");
- node2.setManagerName("default2Manager");
+ node2.setClientName("default2Client");
saveNode.getNode().add(node2);
Clerk clerk2 = new Clerk();
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java Sun May 12 14:11:29 2013
@@ -24,7 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
@@ -80,7 +80,7 @@ public class API_141_JIRATest {
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String str255 = "uddi:tmodelkey:categories:1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String strkey256 = "uddi:tmodelkey:categories:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
Modified: juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="juddi-core-unittest-client">
+ <client name="juddi-core-unittest-client">
<nodes>
<node isHomeJUDDI="true">
<!-- required 'default' node -->
@@ -29,5 +28,5 @@
</clerk>
</clerks>
- </manager>
+ </client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java (original)
+++ juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java Sun May 12 14:11:29 2013
@@ -18,7 +18,7 @@ package org.apache.juddi.example.partiti
import java.util.Properties;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.AuthToken;
@@ -52,13 +52,11 @@ public class SimpleCreateTmodelPartition
try {
// create a manager and read the config in the archive;
// you can use your config file name
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/partition-uddi.xml");
- // register the clerkManager with the client side container
- UDDIClientContainer.addClerkManager(clerkManager);
- // a ClerkManager can be a client to multiple UDDI nodes, so
+ UDDIClient uddiClient = new UDDIClient("META-INF/partition-uddi.xml");
+ // a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport("default");
+ Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
Modified: juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml (original)
+++ juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="uddi-client classpath:xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node>
<!-- required 'default' node -->
@@ -23,5 +22,5 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java (original)
+++ juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@
package org.apache.juddi.example.helloworld;
import org.uddi.api_v3.*;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -27,13 +27,13 @@ public class HelloWorld {
public HelloWorld() {
try {
- // create a manager and read the config in the archive;
+ // create a client and read the config in the archive;
// you can use your config file name
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/hello-world-uddi.xml");
- // a ClerkManager can be a client to multiple UDDI nodes, so
+ UDDIClient uddiClient = new UDDIClient("META-INF/hello-world-uddi.xml");
+ // a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport("default");
+ Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
} catch (Exception e) {
Modified: juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml (original)
+++ juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node>
<!-- required 'default' node -->
@@ -23,5 +22,5 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java (original)
+++ juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java Sun May 12 14:11:29 2013
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.AuthToken;
@@ -61,13 +61,11 @@ public class SimpleBrowse {
try {
// create a manager and read the config in the archive;
// you can use your config file name
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/simple-browse-uddi.xml");
- // register the clerkManager with the client side container
- UDDIClientContainer.addClerkManager(clerkManager);
- // a ClerkManager can be a client to multiple UDDI nodes, so
+ UDDIClient client = new UDDIClient("META-INF/simple-browse-uddi.xml");
+ // a UDDIClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport("default");
+ Transport transport = client.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
inquiry = transport.getUDDIInquiryService();
Modified: juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml (original)
+++ juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node>
<!-- required 'default' node -->
@@ -23,5 +22,6 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
- </manager>
+
+ </client>
</uddi>
Modified: juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java (original)
+++ juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java Sun May 12 14:11:29 2013
@@ -18,7 +18,7 @@ package org.apache.juddi.example.publish
import org.uddi.api_v3.*;
import org.apache.juddi.api_v3.*;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -33,15 +33,13 @@ public class SimplePublish {
public SimplePublish() {
try {
- // create a manager and read the config in the archive;
+ // create a client and read the config in the archive;
// you can use your config file name
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/simple-publish-uddi.xml");
- // register the clerkManager with the client side container
- UDDIClientContainer.addClerkManager(clerkManager);
- // a ClerkManager can be a client to multiple UDDI nodes, so
+ UDDIClient uddiClient = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ // a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport("default");
+ Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
juddiApi = transport.getJUDDIApiService();
Modified: juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml (original)
+++ juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node>
<!-- required 'default' node -->
@@ -23,5 +23,5 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml Sun May 12 14:11:29 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
@@ -27,6 +27,6 @@
<class>org.apache.juddi.example.HelloWorldImpl</class>
</clerk>
</clerks>
- </manager>
+ </client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml Sun May 12 14:11:29 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="uddi-manager">
+ <client name="uddi-client">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
@@ -27,6 +27,6 @@
<class>org.apache.juddi.example.HelloWorldImpl</class>
</clerk>
</clerks>
- </manager>
+ </client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@
package org.apache.juddi.example.wsdl2uddi;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessEntity;
@@ -27,10 +27,8 @@ public class Find {
public void find() {
try {
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/wsdl2uddi-uddi.xml");
- UDDIClerk clerk = clerkManager.getClerk("joe");
- // register the clerkManager with the client side container
- UDDIClientContainer.addClerkManager(clerkManager);
+ UDDIClient uddiClient = new UDDIClient("META-INF/wsdl2uddi-uddi.xml");
+ UDDIClerk clerk = uddiClient.getClerk("joe");
BusinessEntity businessEntity = clerk.findBusiness("uddi:uddi.joepublisher.com:business-for-wsdl");
//
Modified: juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Setup.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Setup.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Setup.java (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Setup.java Sun May 12 14:11:29 2013
@@ -22,7 +22,7 @@ import org.apache.commons.configuration.
import org.apache.juddi.api_v3.Publisher;
import org.apache.juddi.api_v3.SavePublisher;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
@@ -40,7 +40,7 @@ import org.uddi.v3_service.UDDISecurityP
public class Setup {
- static UDDIClerkManager clerkManager;
+ static UDDIClient uddiClient;
public void publishBusiness(UDDIClerk clerk) {
// Creating the parent business entity that will contain our service.
@@ -56,8 +56,8 @@ public class Setup {
Setup sp = new Setup();
try {
- clerkManager = new UDDIClerkManager("META-INF/wsdl2uddi-uddi.xml");
- UDDIClerk clerk = clerkManager.getClerk("joe");
+ uddiClient = new UDDIClient("META-INF/wsdl2uddi-uddi.xml");
+ UDDIClerk clerk = uddiClient.getClerk("joe");
//setting up the publisher
sp.setupJoePublisher(clerk);
@@ -72,7 +72,7 @@ public class Setup {
// This setup needs to be done once, either using the console or using code like this
private void setupJoePublisher(UDDIClerk clerk) throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
- UDDISecurityPortType security = clerkManager.getTransport("default").getUDDISecurityService();
+ UDDISecurityPortType security = uddiClient.getTransport("default").getUDDISecurityService();
//login as root so we can create joe publisher
GetAuthToken getAuthTokenRoot = new GetAuthToken();
@@ -82,7 +82,7 @@ public class Setup {
AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
System.out.println ("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
//Creating joe publisher
- JUDDIApiPortType juddiApi = clerkManager.getTransport("default").getJUDDIApiService();
+ JUDDIApiPortType juddiApi = uddiClient.getTransport("default").getJUDDIApiService();
Publisher p = new Publisher();
p.setAuthorizedName("joepublisher");
p.setPublisherName("Joe Publisher");
Modified: juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client" >
<nodes>
<node>
<!-- required 'default' node -->
@@ -25,8 +24,8 @@
</nodes>
<clerks registerOnStartup="true">
<clerk name="joe" node="default" publisher="joepublisher" password="joepublisher">
- <wsdl businessKey="uddi:uddi.joepublisher.com:business-for-wsdl">wsdl/helloworld.wsdl</wsdl>
+ <wsdl businessKey="uddi:uddi.joepublisher.com:business-for-wsdl">wsdl/helloworld.wsdl</wsdl>
</clerk>
</clerks>
- </manager>
+ </client>
</uddi>
Modified: juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Delete.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Delete.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Delete.java (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Delete.java Sun May 12 14:11:29 2013
@@ -17,11 +17,11 @@
package org.apache.juddi.example.wsdl2uddi;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
public class Delete {
- static UDDIClerkManager clerkManager;
+ static UDDIClient uddiClient;
public void deleteBusiness(UDDIClerk clerk) {
// Deleting the parent business entity that contains our service.
@@ -37,8 +37,8 @@ public class Delete {
Delete sp = new Delete();
try {
- clerkManager = new UDDIClerkManager("META-INF/wsdl2uddi-uddi.xml");
- UDDIClerk clerk = clerkManager.getClerk("joe");
+ uddiClient = new UDDIClient("META-INF/wsdl2uddi-uddi.xml");
+ UDDIClerk clerk = uddiClient.getClerk("joe");
sp.deleteWSDL(clerk);
sp.deleteBusiness(clerk);
Modified: juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@
package org.apache.juddi.example.wsdl2uddi;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessEntity;
@@ -27,10 +27,8 @@ public class Find {
public void find() {
try {
- UDDIClerkManager clerkManager = new UDDIClerkManager("META-INF/wsdl2uddi-uddi.xml");
- UDDIClerk clerk = clerkManager.getClerk("joe");
- // register the clerkManager with the client side container
- UDDIClientContainer.addClerkManager(clerkManager);
+ UDDIClient uddiClient = new UDDIClient("META-INF/wsdl2uddi-uddi.xml");
+ UDDIClerk clerk = uddiClient.getClerk("joe");
BusinessEntity businessEntity = clerk.findBusiness("uddi:uddi.joepublisher.com:business-for-wsdl");
//
Modified: juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Publish.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Publish.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Publish.java (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Publish.java Sun May 12 14:11:29 2013
@@ -22,7 +22,7 @@ import org.apache.commons.configuration.
import org.apache.juddi.api_v3.Publisher;
import org.apache.juddi.api_v3.SavePublisher;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
@@ -40,7 +40,7 @@ import org.uddi.v3_service.UDDISecurityP
public class Publish {
- static UDDIClerkManager clerkManager;
+ static UDDIClient uddiClient;
public void publishBusiness(UDDIClerk clerk) {
// Creating the parent business entity that will contain our service.
@@ -61,8 +61,8 @@ public class Publish {
Publish sp = new Publish();
try {
- clerkManager = new UDDIClerkManager("META-INF/wsdl2uddi-uddi.xml");
- UDDIClerk clerk = clerkManager.getClerk("joe");
+ uddiClient = new UDDIClient("META-INF/wsdl2uddi-uddi.xml");
+ UDDIClerk clerk = uddiClient.getClerk("joe");
//setting up the publisher
sp.setupJoePublisher(clerk);
@@ -79,7 +79,7 @@ public class Publish {
// This setup needs to be done once, either using the console or using code like this
private void setupJoePublisher(UDDIClerk clerk) throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
- UDDISecurityPortType security = clerkManager.getTransport("default").getUDDISecurityService();
+ UDDISecurityPortType security = uddiClient.getTransport("default").getUDDISecurityService();
//login as root so we can create joe publisher
GetAuthToken getAuthTokenRoot = new GetAuthToken();
@@ -89,7 +89,7 @@ public class Publish {
AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
System.out.println ("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
//Creating joe publisher
- JUDDIApiPortType juddiApi = clerkManager.getTransport("default").getJUDDIApiService();
+ JUDDIApiPortType juddiApi = uddiClient.getTransport("default").getJUDDIApiService();
Publisher p = new Publisher();
p.setAuthorizedName("joepublisher");
p.setPublisherName("Joe Publisher");
Modified: juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml Sun May 12 14:11:29 2013
@@ -2,7 +2,7 @@
<uddi>
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <client name="example-client">
<nodes>
<node>
<!-- required 'default' node -->
@@ -28,5 +28,5 @@
<wsdl businessKey="uddi:uddi.joepublisher.com:business-for-wsdl">wsdl/helloworld.wsdl</wsdl>
</clerk>
</clerks>
- </manager>
+ </client>
</uddi>
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=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
<reloadDelay>5000</reloadDelay>
- <manager name="test-manager">
+ <client name="test-client">
<nodes>
<node isHomeJUDDI="true">
<!-- required 'default' node -->
@@ -22,8 +22,8 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
- <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
- <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
@@ -65,15 +65,15 @@
<juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
</node>
</nodes>
- <!--
+
<clerks registerOnStartup="false">
- <clerk name="default" node="default" publisher="root" password="root"/>
+ <clerk name="default" node="default" publisher="root" password="root" />
<clerk name="medroot" node="med" publisher="root" password="root"/>
<xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
<subscription subscriptionKey=" " clerk="medroot" />
</clerks>
- -->
- </manager>
+
+ </client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.bpel;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckBusinessService;
@@ -46,13 +46,13 @@ public class BPEL_010_IntegrationTest {
private static String authInfoRiftSaw = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth token for user riftsaw/riftsaw..");
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sun May 12 14:11:29 2013
@@ -31,7 +31,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.mapping.BPEL2UDDI;
import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
@@ -59,13 +59,13 @@ private static Log logger = LogFactory.g
private static TckBusinessService tckService = null;
private static TckBusiness tckBusiness = null;
private static String authInfoRiftSaw = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
static ReadWSDL rw;
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth token for user riftsaw/riftsaw..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Sun May 12 14:11:29 2013
@@ -31,7 +31,7 @@ import org.apache.juddi.api_v3.Publisher
import org.apache.juddi.api_v3.PublisherDetail;
import org.apache.juddi.api_v3.SavePublisher;
import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.junit.AfterClass;
@@ -49,7 +49,7 @@ import org.uddi.v3_service.UDDISecurityP
public class JUDDI_010_PublisherIntegrationTest {
private static Log logger = LogFactory.getLog(JUDDI_010_PublisherIntegrationTest.class);
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
private static UDDISecurityPortType security =null;
private static JUDDIApiPortType publisher = null;
private static String authInfo = null;
@@ -57,7 +57,7 @@ public class JUDDI_010_PublisherIntegrat
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java Sun May 12 14:11:29 2013
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -48,7 +48,7 @@ public class JUDDI_091_RMISubscriptionLi
private static TckSubscriptionListenerRMI rmiSubscriptionListener = null;
private static String authInfoJoe = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
private static Registry registry;
private static Integer randomPort = null;
@@ -89,7 +89,7 @@ public class JUDDI_091_RMISubscriptionLi
Assert.fail();
}
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java Sun May 12 14:11:29 2013
@@ -24,7 +24,7 @@ import org.apache.juddi.api_v3.DeleteCli
import org.apache.juddi.api_v3.GetClientSubscriptionInfoDetail;
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.junit.AfterClass;
@@ -43,12 +43,12 @@ public class JUDDI_100_ClientSubscriptio
private static JUDDIApiPortType publisher = null;
private static Log logger = LogFactory.getLog(JUDDI_100_ClientSubscriptionInfoTest.class);
private static String authInfo = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
Modified: 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=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java Sun May 12 14:11:29 2013
@@ -6,7 +6,7 @@ import java.io.IOException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.v3.client.UDDIService;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDINode;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -27,12 +27,12 @@ import org.uddi.v3_service.UDDISubscript
*/
public class UDDI_001_UDDIServiceTest {
- static UDDIClerkManager manager;
+ static UDDIClient manager;
static UDDINode uddiServer;
@BeforeClass
public static void readClientConfig() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
uddiServer = manager.getClientConfig().getHomeNode();
}
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=1481563&r1=1481562&r2=1481563&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 Sun May 12 14:11:29 2013
@@ -15,7 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -30,11 +30,11 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class UDDI_010_PublisherIntegrationTest {
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -42,13 +42,13 @@ public class UDDI_020_TmodelIntegrationT
private static String authInfoJoe = null;
private static String authInfoSam = null;
-private static UDDIClerkManager manager;
+private static UDDIClient manager;
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -40,7 +40,7 @@ public class UDDI_030_BusinessEntityInte
protected static TckFindEntity tckFindEntity = null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -49,7 +49,7 @@ public class UDDI_030_BusinessEntityInte
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -42,7 +42,7 @@ public class UDDI_040_BusinessServiceInt
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -51,7 +51,7 @@ public class UDDI_040_BusinessServiceInt
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -41,7 +41,7 @@ public class UDDI_050_BindingTemplateInt
private static TckBindingTemplate tckBindingTemplate = null;
private static TckFindEntity tckFindEntity = null;
private static String authInfoJoe = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -50,7 +50,7 @@ public class UDDI_050_BindingTemplateInt
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Sun May 12 14:11:29 2013
@@ -21,7 +21,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -43,7 +43,7 @@ public class UDDI_060_PublisherAssertion
private static String authInfoSam = null;
private static String authInfoMary = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -52,7 +52,7 @@ public class UDDI_060_PublisherAssertion
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Sun May 12 14:11:29 2013
@@ -18,7 +18,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -43,7 +43,7 @@ public class UDDI_070_FindEntityIntegrat
private static TckBindingTemplate tckBindingTemplate = null;
private static TckFindEntity tckFindEntity = null;
private static String authInfoJoe = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -52,7 +52,7 @@ public class UDDI_070_FindEntityIntegrat
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Sun May 12 14:11:29 2013
@@ -17,7 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -44,7 +44,7 @@ public class UDDI_080_SubscriptionIntegr
private static String authInfoJoe = null;
private static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -53,7 +53,7 @@ public class UDDI_080_SubscriptionIntegr
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Sun May 12 14:11:29 2013
@@ -26,7 +26,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.Release;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -55,7 +55,7 @@ public class UDDI_090_SubscriptionListen
private static TckSubscriptionListener tckSubscriptionListener = null;
private static Endpoint endPoint;
private static String authInfoJoe = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
private static SimpleSmtpServer mailServer;
private static Integer smtpPort = 25;
private static Integer httpPort = 80;
@@ -95,7 +95,7 @@ public class UDDI_090_SubscriptionListen
System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java Sun May 12 14:11:29 2013
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -67,7 +67,7 @@ public class UDDI_110_FindBusinessIntegr
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -76,7 +76,7 @@ public class UDDI_110_FindBusinessIntegr
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java Sun May 12 14:11:29 2013
@@ -21,7 +21,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -76,7 +76,7 @@ public class UDDI_120_CombineCategoryBag
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -85,7 +85,7 @@ public class UDDI_120_CombineCategoryBag
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java Sun May 12 14:11:29 2013
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -73,7 +73,7 @@ public class UDDI_130_CombineCategoryBag
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -82,7 +82,7 @@ public class UDDI_130_CombineCategoryBag
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java Sun May 12 14:11:29 2013
@@ -24,7 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.AccessPointType;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -86,7 +86,7 @@ public class UDDI_140_NegativePublicatio
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String str255 = "uddi:tmodelkey:categories:1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String strkey256 = "uddi:tmodelkey:categories:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
@@ -111,7 +111,7 @@ public class UDDI_140_NegativePublicatio
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org