You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2017/09/23 13:06:48 UTC
[2/2] juddi git commit: JUDDI-973 code cleanup on the cli client.
This includes some minor refactoring of method names. Projects depending on
this will require updates
JUDDI-973 code cleanup on the cli client. This includes some minor refactoring of method names. Projects depending on this will require updates
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/716e5fe1
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/716e5fe1
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/716e5fe1
Branch: refs/heads/master
Commit: 716e5fe1994bb0be1ae7daf00ee09f9e0e11ca76
Parents: 95a3d58
Author: Alex O'Ree <al...@apache.org>
Authored: Sat Sep 23 09:06:48 2017 -0400
Committer: Alex O'Ree <al...@apache.org>
Committed: Sat Sep 23 09:06:48 2017 -0400
----------------------------------------------------------------------
.../apache/juddi/v3/client/cli/EntryPoint.java | 2 +-
.../v3/client/cli/EntryPointSingleNode.java | 39 +++---
.../juddi/v3/client/cli/EntryPoitMultiNode.java | 5 +-
.../v3/client/cli/FindBusinessBugHunt.java | 16 +--
.../juddi/v3/client/cli/JuddiAdminService.java | 3 -
.../apache/juddi/v3/client/cli/SearchByQos.java | 131 +------------------
.../juddi/v3/client/cli/SimpleBrowse.java | 96 +++++++-------
.../v3/client/cli/UddiCustodyTransfer.java | 8 +-
.../cli/UddiDigitalSignatureBusiness.java | 9 +-
.../v3/client/cli/UddiDigitalSignatureFile.java | 19 +--
.../client/cli/UddiDigitalSignatureSearch.java | 11 +-
.../client/cli/UddiDigitalSignatureService.java | 14 +-
.../client/cli/UddiDigitalSignatureTmodel.java | 15 +--
.../juddi/v3/client/cli/UddiFindBinding.java | 11 +-
.../juddi/v3/client/cli/UddiFindEndpoints.java | 10 +-
.../v3/client/cli/UddiGetServiceDetails.java | 11 +-
.../juddi/v3/client/cli/UddiKeyGenerator.java | 11 +-
.../v3/client/cli/UddiRelatedBusinesses.java | 10 +-
.../juddi/v3/client/cli/UddiReplication.java | 22 ++--
.../juddi/v3/client/cli/UddiSubscribe.java | 66 ++++------
.../cli/UddiSubscribeAssertionStatus.java | 31 +----
.../v3/client/cli/UddiSubscribeValidate.java | 19 +--
.../client/cli/UddiSubscriptionManagement.java | 40 +-----
.../apache/juddi/v3/client/cli/WadlImport.java | 5 +-
.../apache/juddi/v3/client/cli/WsdlImport.java | 6 +-
.../apache/juddi/v3/client/cli/testStrings.java | 73 -----------
26 files changed, 173 insertions(+), 510 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoint.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoint.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoint.java
index 0fbd720..1c7f8a7 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoint.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoint.java
@@ -202,7 +202,7 @@ public class EntryPoint {
CompareByTModelInstanceInfoQOS.main(null);
}
if (input.equals("2")) {
- new UddiDigitalSignatureFile().Fire(null, null, null);
+ new UddiDigitalSignatureFile().fire(null, null, null);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPointSingleNode.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPointSingleNode.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPointSingleNode.java
index 309e525..3926274 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPointSingleNode.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPointSingleNode.java
@@ -19,7 +19,6 @@ import java.util.List;
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.DeleteBusiness;
@@ -227,21 +226,21 @@ public class EntryPointSingleNode {
} else if (input.equals("15")) {
SearchByQos.doFindService(authtoken, transport);
} else if (input.equals("16")) {
- new UddiFindBinding().Fire(authtoken);
+ new UddiFindBinding().fire(authtoken);
} else if (input.equals("17")) {
System.out.print("Service key to parse the endpoints: ");
String key = (System.console().readLine());
- new UddiFindEndpoints().Fire(authtoken, key);
+ new UddiFindEndpoints().fire(authtoken, key);
} else if (input.equals("18")) {
System.out.print("Service key: ");
String key = (System.console().readLine());
- new UddiGetServiceDetails().Fire(authtoken, key);
+ new UddiGetServiceDetails().fire(authtoken, key);
} else if (input.equals("19")) {
- new UddiDigitalSignatureSearch().Fire(authtoken);
+ new UddiDigitalSignatureSearch().fire(authtoken);
} else if (input.equals("20")) {
System.out.print("Get FQDN: ");
String key = (System.console().readLine());
- new UddiKeyGenerator().Fire(authtoken, key);
+ new UddiKeyGenerator().fire(authtoken, key);
} else if (input.equals("21")) {
System.out.print("businesses: ");
@@ -254,13 +253,13 @@ public class EntryPointSingleNode {
String url = (System.console().readLine());
System.out.print("Business key to attach to: ");
String key = (System.console().readLine());
- new WsdlImport().Fire(url, key, authtoken, transport);
+ new WsdlImport().fire(url, key, authtoken, transport);
} else if (input.equals("23")) {
System.out.print("Path or URL to WADL file: ");
String url = (System.console().readLine());
System.out.print("Business key to attach to: ");
String key = (System.console().readLine());
- new WadlImport().Fire(url, key, authtoken, transport);
+ new WadlImport().fire(url, key, authtoken, transport);
} else if (input.equals("24")) {
UDDISecurityPortType security = null;
security = transport.getUDDISecurityService();
@@ -284,19 +283,19 @@ public class EntryPointSingleNode {
System.out.println("Success!");
System.out.print("business/tModel key to transfer: ");
String key = (System.console().readLine());
- new UddiCustodyTransfer().TransferBusiness(uname, authtokenFrom, uname2, authtokenFrom2, key);
+ new UddiCustodyTransfer().transferBusiness(uname, authtokenFrom, uname2, authtokenFrom2, key);
} else if (input.equals("25")) {
System.out.print("Business key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureBusiness().Fire(authtoken, key);
+ new UddiDigitalSignatureBusiness().fire(authtoken, key);
} else if (input.equals("26")) {
System.out.print("Service key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureService().Fire(authtoken, key);
+ new UddiDigitalSignatureService().fire(authtoken, key);
} else if (input.equals("27")) {
System.out.print("tModel key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureTmodel().Fire(authtoken, key);
+ new UddiDigitalSignatureTmodel().fire(authtoken, key);
} else if (input.equals("28")) {
UDDISecurityPortType security = null;
@@ -328,9 +327,9 @@ public class EntryPointSingleNode {
System.out.print("relationship (parent-child, peer-peer,or identity) : ");
String relationship = (System.console().readLine());
- new UddiRelatedBusinesses().Fire(key, authtokenFrom, key2, authtokenFrom2, relationship);
+ new UddiRelatedBusinesses().fire(key, authtokenFrom, key2, authtokenFrom2, relationship);
} else if (input.equals("29")) {
- new UddiSubscribe(client, currentNode, transport).Fire();
+ new UddiSubscribe(client, currentNode, transport).fire();
} else if (input.equals("30")) {
System.out.print("Subscription key: ");
@@ -338,23 +337,23 @@ public class EntryPointSingleNode {
System.out.println("Fetching results for the past 30 days...");
new UddiSubscribeValidate(transport).go(authtoken, input);
} else if (input.equals("31")) {
- new UddiSubscriptionManagement(transport).PrintSubscriptions(authtoken);
+ new UddiSubscriptionManagement(transport).printSubscriptions(authtoken);
} else if (input.equals("32")) {
System.out.print("Subscription key: ");
String key2 = (System.console().readLine());
- new UddiSubscriptionManagement(transport).DeleteSubscription(authtoken, key2);
+ new UddiSubscriptionManagement(transport).deleteSubscription(authtoken, key2);
} else if (input.equals("33")) {
- new UddiSubscriptionManagement(transport).DeleteAllSubscriptions(authtoken);
+ new UddiSubscriptionManagement(transport).deleteAllSubscriptions(authtoken);
} else if (input.equals("34")) {
new UddiSubscribeAssertionStatus(transport).Fire(currentNode);
} else if (input.equals("35")) {
- new UddiReplication(client, currentNode).DoPing();
+ new UddiReplication(client, currentNode).doPing();
} else if (input.equals("36")) {
//System.out.println("28) Replication - get high watermarks");
- new UddiReplication(client, currentNode).GetHighWatermarks();
+ new UddiReplication(client, currentNode).getHighWatermarks();
} else if (input.equals("37")) {
//System.out.println("29) Replication - get change records");
@@ -365,7 +364,7 @@ public class EntryPointSingleNode {
System.out.print("Node id of something in the replication graph: ");
String src = (System.console().readLine());
- new UddiReplication(client, currentNode).GetChangeRecords(Long.parseLong(id), src);
+ new UddiReplication(client, currentNode).getChangeRecords(Long.parseLong(id), src);
} else if ("38".equals(input)) {
new JuddiAdminService(client, transport).dumpFailedReplicationRecords(authtoken);
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoitMultiNode.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoitMultiNode.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoitMultiNode.java
index fbb5808..40fd7b2 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoitMultiNode.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/EntryPoitMultiNode.java
@@ -19,7 +19,6 @@ import java.util.List;
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
@@ -37,10 +36,10 @@ import org.uddi.v3_service.UDDIInquiryPortType;
public class EntryPoitMultiNode {
static void goMultiNode() throws Exception {
- String currentNode = "default";
+
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+
String input = null;
do {
System.out.println("1) Sets undirected replication two instances of jUDDI");
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java
index 834b4b1..55d6e5e 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java
@@ -85,14 +85,14 @@ public class FindBusinessBugHunt {
System.out.println("killing mary's business if it exists");
//first check is Mary's business exists and delete
- DeleteIfExists("uddi:uddi.marypublisher.com:marybusinessone", uddi);
+ deleteIfExists("uddi:uddi.marypublisher.com:marybusinessone", uddi);
System.out.println("making mary's tmodel key gen");
//make the key gen since our test case uses some custom keys
TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi.marypublisher.com", "mary key gen", "en");
//clerk.register(createKeyGenator);
System.out.println("saving...");
- SaveTM(createKeyGenator, uddi);
+ saveTM(createKeyGenator, uddi);
System.out.println("fetching business list");
@@ -105,7 +105,7 @@ public class FindBusinessBugHunt {
}
System.out.println("saving mary");
- SaveMary(uddi);
+ saveMary(uddi);
BusinessList after = getBusinessList(uddi);
if (after.getBusinessInfos() == null) {
@@ -118,7 +118,7 @@ public class FindBusinessBugHunt {
if (before.getBusinessInfos().getBusinessInfo().size()
< after.getBusinessInfos().getBusinessInfo().size()) {
System.out.println("hey it worked as advertised, double checking");
- if (CheckFor(after, "uddi:uddi.marypublisher.com:marybusinessone")) {
+ if (checkFor(after, "uddi:uddi.marypublisher.com:marybusinessone")) {
System.out.println("ok!");
} else {
System.out.println("no good!");
@@ -132,7 +132,7 @@ public class FindBusinessBugHunt {
}
- private static void DeleteIfExists(String key, String authInfo) {
+ private static void deleteIfExists(String key, String authInfo) {
GetBusinessDetail gbd = new GetBusinessDetail();
gbd.setAuthInfo(authInfo);
gbd.getBusinessKey().add(key);
@@ -168,7 +168,7 @@ public class FindBusinessBugHunt {
return inquiry.findBusiness(fb);
}
- private static void SaveMary(String rootAuthToken) throws Exception {
+ private static void saveMary(String rootAuthToken) throws Exception {
BusinessEntity be = new BusinessEntity();
be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
be.setDiscoveryURLs(new DiscoveryURLs());
@@ -190,7 +190,7 @@ public class FindBusinessBugHunt {
publish.saveBusiness(sb);
}
- private static boolean CheckFor(BusinessList list, String key) {
+ private static boolean checkFor(BusinessList list, String key) {
for (int i = 0; i < list.getBusinessInfos().getBusinessInfo().size(); i++) {
if (list.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey().equalsIgnoreCase(key)) {
return true;
@@ -199,7 +199,7 @@ public class FindBusinessBugHunt {
return false;
}
- private static void SaveTM(TModel createKeyGenator, String uddi) throws Exception {
+ private static void saveTM(TModel createKeyGenator, String uddi) throws Exception {
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(uddi);
stm.getTModel().add(createKeyGenator);
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/JuddiAdminService.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/JuddiAdminService.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/JuddiAdminService.java
index b317a4c..cb0480f 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/JuddiAdminService.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/JuddiAdminService.java
@@ -15,7 +15,6 @@
*/
package org.apache.juddi.v3.client.cli;
-import java.io.File;
import java.io.FileInputStream;
import java.math.BigInteger;
import java.rmi.RemoteException;
@@ -83,8 +82,6 @@ public class JuddiAdminService {
juddi = transport.getJUDDIApiService();
}
// Now you create a reference to the UDDI API
- //security = transport.getUDDISecurityService();
- //publish = transport.getUDDIPublishService();
} catch (Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SearchByQos.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SearchByQos.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SearchByQos.java
index c31623f..ccef520 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SearchByQos.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SearchByQos.java
@@ -16,58 +16,22 @@
package org.apache.juddi.v3.client.cli;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.xml.bind.JAXB;
-import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.ext.wsdm.WSDMQosConstants;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingDetail;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.BindingTemplates;
-import org.uddi.api_v3.BusinessDetail;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.BusinessInfos;
import org.uddi.api_v3.BusinessList;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.BusinessServices;
-import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.Contact;
-import org.uddi.api_v3.Contacts;
-import org.uddi.api_v3.DeleteBusiness;
-import org.uddi.api_v3.Description;
-import org.uddi.api_v3.DiscoveryURL;
-import org.uddi.api_v3.DiscoveryURLs;
import org.uddi.api_v3.FindBinding;
import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
import org.uddi.api_v3.FindService;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.GetAuthToken;
-import org.uddi.api_v3.GetBusinessDetail;
-import org.uddi.api_v3.IdentifierBag;
-import org.uddi.api_v3.InstanceDetails;
-import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.Name;
-import org.uddi.api_v3.PersonName;
-import org.uddi.api_v3.SaveBusiness;
-import org.uddi.api_v3.SaveTModel;
-import org.uddi.api_v3.ServiceInfos;
import org.uddi.api_v3.ServiceList;
import org.uddi.api_v3.TModel;
import org.uddi.api_v3.TModelBag;
-import org.uddi.api_v3.TModelInstanceDetails;
-import org.uddi.api_v3.TModelInstanceInfo;
import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
/**
*
@@ -78,22 +42,14 @@ public class SearchByQos {
static PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>();
static Properties properties = new Properties();
static String wsdlURL = null;
- private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
- private static UDDIPublicationPortType publish = null;
private static UDDIInquiryPortType inquiry;
public static void doFindService(String token, Transport transport) throws Exception {
// Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- publish = transport.getUDDIPublishService();
+
inquiry = transport.getUDDIInquiryService();
- //step one, get a token
- //GetAuthToken getAuthTokenRoot = new GetAuthToken();
- //getAuthTokenRoot.setUserID("uddi");
- //getAuthTokenRoot.setCred("uddi");
-
+
// Making API call that retrieves the authentication token for the 'root' user.
//String rootAuthToken = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
String uddi = token;// security.getAuthToken(getAuthTokenRoot).getAuthInfo();
@@ -113,8 +69,6 @@ public class SearchByQos {
public static void doFindBinding(String token, Transport transport) throws Exception {
// Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
// Making API call that retrieves the authentication token for the 'root' user.
@@ -137,8 +91,6 @@ public class SearchByQos {
// you can use your config file name
// Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
String uddi = token;//security.getAuthToken(getAuthTokenRoot).getAuthInfo();
@@ -150,31 +102,6 @@ public class SearchByQos {
}
- private static void DeleteIfExists(String key, String authInfo) {
- GetBusinessDetail gbd = new GetBusinessDetail();
- gbd.setAuthInfo(authInfo);
- gbd.getBusinessKey().add(key);
- boolean found = false;
- try {
- BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
- if (businessDetail != null
- && !businessDetail.getBusinessEntity().isEmpty()
- && businessDetail.getBusinessEntity().get(0).getBusinessKey().equals(key)) {
- found = true;
- }
- } catch (Exception ex) {
- }
- if (found) {
- DeleteBusiness db = new DeleteBusiness();
- db.setAuthInfo(authInfo);
- db.getBusinessKey().add(key);
- try {
- publish.deleteBusiness(db);
- } catch (Exception ex) {
- Logger.getLogger(FindBusinessBugHunt.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
private static BusinessList getBusinessList(String token) throws Exception {
FindBusiness fb = new FindBusiness();
@@ -216,57 +143,5 @@ public class SearchByQos {
return inquiry.findBinding(fb);
}
- /**
- * -
- * adds a business, service, bt with tmodel instance details with qos
- * parameters
- *
- * @param rootAuthToken
- * @throws Exception
- */
- private static void SaveMary(String rootAuthToken) throws Exception {
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
- be.setDiscoveryURLs(new DiscoveryURLs());
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("home", "http://www.marybusinessone.com"));
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("serviceList", "http://www.marybusinessone.com/services"));
- be.getName().add(new Name("Mary Doe Enterprises", "en"));
- be.getName().add(new Name("Maria Negocio Uno", "es"));
- be.getDescription().add(new Description("This is the description for Mary Business One.", "en"));
- be.setContacts(new Contacts());
- Contact c = new Contact();
- c.setUseType("administrator");
- c.getPersonName().add(new PersonName("Mary Doe", "en"));
- c.getPersonName().add(new PersonName("Juan Doe", "es"));
- c.getDescription().add(new Description("This is the administrator of the service offerings.", "en"));
- be.getContacts().getContact().add(c);
- be.setBusinessServices(new BusinessServices());
- BusinessService bs = new BusinessService();
- bs.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
- bs.setServiceKey("uddi:uddi.marypublisher.com:marybusinessoneservice");
- bs.getName().add(new Name("name!", "en"));
- bs.setBindingTemplates(new BindingTemplates());
- BindingTemplate bt = new BindingTemplate();
- bt.setAccessPoint(new AccessPoint("http://localhost", AccessPointType.WSDL_DEPLOYMENT.toString()));
- bt.setTModelInstanceDetails(new TModelInstanceDetails());
- TModelInstanceInfo tii = new TModelInstanceInfo();
- tii.setTModelKey(WSDMQosConstants.METRIC_FAULT_COUNT_KEY);
- tii.setInstanceDetails(new InstanceDetails());
- tii.getInstanceDetails().setInstanceParms("400");
- bt = UDDIClient.addSOAPtModels(bt);
- bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
- bs.getBindingTemplates().getBindingTemplate().add(bt);
- be.getBusinessServices().getBusinessService().add(bs);
- SaveBusiness sb = new SaveBusiness();
- sb.setAuthInfo(rootAuthToken);
- sb.getBusinessEntity().add(be);
- publish.saveBusiness(sb);
- }
-
- private static void SaveTM(TModel createKeyGenator, String uddi) throws Exception {
- SaveTModel stm = new SaveTModel();
- stm.setAuthInfo(uddi);
- stm.getTModel().add(createKeyGenator);
- publish.saveTModel(stm);
- }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SimpleBrowse.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SimpleBrowse.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SimpleBrowse.java
index a933d56..0b30f5e 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SimpleBrowse.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/SimpleBrowse.java
@@ -88,7 +88,7 @@ public class SimpleBrowse {
public static void main(String args[]) {
SimpleBrowse sp = new SimpleBrowse();
- sp.Browse(args);
+ sp.browse(args);
}
public SimpleBrowse(Transport transport) {
@@ -102,14 +102,14 @@ public class SimpleBrowse {
}
}
- public void Browse(String[] args) {
+ public void browse(String[] args) {
try {
- String token = GetAuthKey("uddi", "uddi");
- BusinessList findBusiness = GetBusinessList(token, null, 0, 100);
- PrintBusinessInfo(findBusiness.getBusinessInfos());
- PrintBusinessDetails(findBusiness.getBusinessInfos(), token);
- PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), token);
+ String token = getAuthKey("uddi", "uddi");
+ BusinessList findBusiness = getBusinessList(token, null, 0, 100);
+ printBusinessInfo(findBusiness.getBusinessInfos());
+ printBusinessDetails(findBusiness.getBusinessInfos(), token);
+ printServiceDetailsByBusiness(findBusiness.getBusinessInfos(), token);
security.discardAuthToken(new DiscardAuthToken(token));
@@ -126,7 +126,7 @@ public class SimpleBrowse {
* @return
* @throws Exception
*/
- private BusinessList GetBusinessList(String token, String query, int offset, int maxrecords) throws Exception {
+ private BusinessList getBusinessList(String token, String query, int offset, int maxrecords) throws Exception {
FindBusiness fb = new FindBusiness();
fb.setAuthInfo(token);
org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
@@ -153,24 +153,24 @@ public class SimpleBrowse {
* @param categoryBag
* @return
*/
- private String CatBagToString(CategoryBag categoryBag) {
+ private String catBagToString(CategoryBag categoryBag) {
StringBuilder sb = new StringBuilder();
if (categoryBag == null) {
return "no data";
}
for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
- sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i)));
+ sb.append(keyedReferenceToString(categoryBag.getKeyedReference().get(i)));
}
for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
sb.append("Key Ref Grp: TModelKey=");
for (int k = 0; k < categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
- sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
+ sb.append(keyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
}
}
return sb.toString();
}
- private String KeyedReferenceToString(KeyedReference item) {
+ private String keyedReferenceToString(KeyedReference item) {
StringBuilder sb = new StringBuilder();
sb.append("Key Ref: Name=").
append(item.getKeyName()).
@@ -182,7 +182,7 @@ public class SimpleBrowse {
return sb.toString();
}
- private void PrintContacts(Contacts contacts) {
+ private void printContacts(Contacts contacts) {
if (contacts == null) {
return;
}
@@ -214,20 +214,20 @@ public class SimpleBrowse {
}
- private void PrintServiceDetail(BusinessService get) {
+ private void printServiceDetail(BusinessService get) {
if (get == null) {
return;
}
- System.out.println("Name " + ListToString(get.getName()));
- System.out.println("Desc " + ListToDescString(get.getDescription()));
+ System.out.println("Name " + listToString(get.getName()));
+ System.out.println("Desc " + listToDescString(get.getDescription()));
System.out.println("Key " + (get.getServiceKey()));
- System.out.println("Cat bag " + CatBagToString(get.getCategoryBag()));
+ System.out.println("Cat bag " + catBagToString(get.getCategoryBag()));
if (!get.getSignature().isEmpty()) {
System.out.println("Item is digitally signed");
} else {
System.out.println("Item is not digitally signed");
}
- PrintBindingTemplates(get.getBindingTemplates());
+ printBindingTemplates(get.getBindingTemplates());
}
/**
@@ -236,7 +236,7 @@ public class SimpleBrowse {
*
* @param bindingTemplates
*/
- private void PrintBindingTemplates(BindingTemplates bindingTemplates) {
+ private void printBindingTemplates(BindingTemplates bindingTemplates) {
if (bindingTemplates == null) {
return;
}
@@ -276,19 +276,19 @@ public class SimpleBrowse {
int offset=0;
int maxrecords=100;
- BusinessList findBusiness = GetBusinessList(authtoken, searchString, offset, maxrecords);
+ BusinessList findBusiness = getBusinessList(authtoken, searchString, offset, maxrecords);
while (findBusiness != null && findBusiness.getBusinessInfos() != null
&& !findBusiness.getBusinessInfos().getBusinessInfo().isEmpty()) {
if (rawXml) {
JAXB.marshal(findBusiness, System.out);
} else {
- PrintBusinessInfo(findBusiness.getBusinessInfos());
- PrintBusinessDetails(findBusiness.getBusinessInfos(), authtoken);
- PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken);
+ printBusinessInfo(findBusiness.getBusinessInfos());
+ printBusinessDetails(findBusiness.getBusinessInfos(), authtoken);
+ printServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken);
}
offset = offset + maxrecords;
- findBusiness = GetBusinessList(authtoken, searchString, offset, maxrecords);
+ findBusiness = getBusinessList(authtoken, searchString, offset, maxrecords);
}
}
@@ -297,23 +297,23 @@ public class SimpleBrowse {
int offset=0;
int maxrecords=100;
- ServiceList findBusiness = GetServiceList(authtoken, searchString, offset, maxrecords);
+ ServiceList findBusiness = getServiceList(authtoken, searchString, offset, maxrecords);
while (findBusiness != null && findBusiness.getServiceInfos()!= null
&& !findBusiness.getServiceInfos().getServiceInfo().isEmpty()) {
if (rawXml) {
JAXB.marshal(findBusiness, System.out);
} else {
- PrintServiceInfo(findBusiness.getServiceInfos());
+ printServiceInfo(findBusiness.getServiceInfos());
//PrintBusinessDetails(findBusiness.getBusinessInfos(), authtoken);
//PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken);
}
offset = offset + maxrecords;
- findBusiness = GetServiceList(authtoken, searchString, offset, maxrecords);
+ findBusiness = getServiceList(authtoken, searchString, offset, maxrecords);
}
}
- private ServiceList GetServiceList(String authtoken, String searchString, int offset, int maxrecords) throws Exception {
+ private ServiceList getServiceList(String authtoken, String searchString, int offset, int maxrecords) throws Exception {
FindService fs = new FindService();
fs.setAuthInfo(authtoken);
fs.setListHead(offset);
@@ -332,23 +332,23 @@ public class SimpleBrowse {
void printTModelList(String authtoken, String searchString, boolean rawXml) throws Exception{
int offset=0;
int maxrecords=100;
- TModelList findBusiness = GetTmodelList(authtoken, searchString, offset, maxrecords);
+ TModelList findBusiness = getTmodelList(authtoken, searchString, offset, maxrecords);
while (findBusiness != null && findBusiness.getTModelInfos()!= null
&& !findBusiness.getTModelInfos().getTModelInfo().isEmpty()) {
if (rawXml) {
JAXB.marshal(findBusiness, System.out);
} else {
- PrintTModelInfo(findBusiness.getTModelInfos());
+ printTModelInfo(findBusiness.getTModelInfos());
//PrintBusinessDetails(findBusiness.getBusinessInfos(), authtoken);
//PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken);
}
offset = offset + maxrecords;
- findBusiness = GetTmodelList(authtoken, searchString, offset, maxrecords);
+ findBusiness = getTmodelList(authtoken, searchString, offset, maxrecords);
}
}
- private void PrintTModelInfo(TModelInfos tModelInfos) {
+ private void printTModelInfo(TModelInfos tModelInfos) {
if (tModelInfos==null){
System.out.println("No data returned");
return;
@@ -363,7 +363,7 @@ public class SimpleBrowse {
}
}
- private TModelList GetTmodelList(String authtoken, String searchString, int offset, int maxrecords) throws Exception {
+ private TModelList getTmodelList(String authtoken, String searchString, int offset, int maxrecords) throws Exception {
FindTModel fs = new FindTModel();
fs.setAuthInfo(authtoken);
fs.setListHead(offset);
@@ -397,7 +397,7 @@ public class SimpleBrowse {
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
@@ -414,23 +414,23 @@ public class SimpleBrowse {
return null;
}
- private void PrintBusinessInfo(BusinessInfos businessInfos) {
+ private void printBusinessInfo(BusinessInfos businessInfos) {
if (businessInfos == null) {
System.out.println("No data returned");
} else {
for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) {
System.out.println("===============================================");
System.out.println("Business Key: " + businessInfos.getBusinessInfo().get(i).getBusinessKey());
- System.out.println("Name: " + ListToString(businessInfos.getBusinessInfo().get(i).getName()));
+ System.out.println("Name: " + listToString(businessInfos.getBusinessInfo().get(i).getName()));
- System.out.println("Description: " + ListToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
+ System.out.println("Description: " + listToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
System.out.println("Services:");
- PrintServiceInfo(businessInfos.getBusinessInfo().get(i).getServiceInfos());
+ printServiceInfo(businessInfos.getBusinessInfo().get(i).getServiceInfos());
}
}
}
- private String ListToString(List<Name> name) {
+ private String listToString(List<Name> name) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < name.size(); i++) {
sb.append(name.get(i).getValue()).append(" ");
@@ -438,7 +438,7 @@ public class SimpleBrowse {
return sb.toString();
}
- private String ListToDescString(List<Description> name) {
+ private String listToDescString(List<Description> name) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < name.size(); i++) {
sb.append(name.get(i).getValue()).append(" ");
@@ -446,16 +446,16 @@ public class SimpleBrowse {
return sb.toString();
}
- private void PrintServiceInfo(ServiceInfos serviceInfos) {
+ private void printServiceInfo(ServiceInfos serviceInfos) {
for (int i = 0; i < serviceInfos.getServiceInfo().size(); i++) {
System.out.println("-------------------------------------------");
System.out.println("Service Key: " + serviceInfos.getServiceInfo().get(i).getServiceKey());
System.out.println("Owning Business Key: " + serviceInfos.getServiceInfo().get(i).getBusinessKey());
- System.out.println("Name: " + ListToString(serviceInfos.getServiceInfo().get(i).getName()));
+ System.out.println("Name: " + listToString(serviceInfos.getServiceInfo().get(i).getName()));
}
}
- private void PrintBusinessDetails(BusinessInfos businessInfos, String token) throws Exception {
+ private void printBusinessDetails(BusinessInfos businessInfos, String token) throws Exception {
GetBusinessDetail gbd = new GetBusinessDetail();
gbd.setAuthInfo(token);
for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) {
@@ -464,13 +464,13 @@ public class SimpleBrowse {
BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) {
System.out.println("Business Detail - key: " + businessDetail.getBusinessEntity().get(i).getBusinessKey());
- System.out.println("Name: " + ListToString(businessDetail.getBusinessEntity().get(i).getName()));
- System.out.println("CategoryBag: " + CatBagToString(businessDetail.getBusinessEntity().get(i).getCategoryBag()));
- PrintContacts(businessDetail.getBusinessEntity().get(i).getContacts());
+ System.out.println("Name: " + listToString(businessDetail.getBusinessEntity().get(i).getName()));
+ System.out.println("CategoryBag: " + catBagToString(businessDetail.getBusinessEntity().get(i).getCategoryBag()));
+ printContacts(businessDetail.getBusinessEntity().get(i).getContacts());
}
}
- private void PrintServiceDetailsByBusiness(BusinessInfos businessInfos, String token) throws Exception {
+ private void printServiceDetailsByBusiness(BusinessInfos businessInfos, String token) throws Exception {
for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) {
GetServiceDetail gsd = new GetServiceDetail();
for (int k = 0; k < businessInfos.getBusinessInfo().get(i).getServiceInfos().getServiceInfo().size(); k++) {
@@ -480,7 +480,7 @@ public class SimpleBrowse {
System.out.println("Fetching data for business " + businessInfos.getBusinessInfo().get(i).getBusinessKey());
ServiceDetail serviceDetail = inquiry.getServiceDetail(gsd);
for (int k = 0; k < serviceDetail.getBusinessService().size(); k++) {
- PrintServiceDetail(serviceDetail.getBusinessService().get(k));
+ printServiceDetail(serviceDetail.getBusinessService().get(k));
}
System.out.println("................");
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCustodyTransfer.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCustodyTransfer.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCustodyTransfer.java
index e77c6ea..60b689d 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCustodyTransfer.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCustodyTransfer.java
@@ -79,7 +79,7 @@ public class UddiCustodyTransfer {
// Making API call that retrieves the authentication token for the 'root' user.
AuthToken uddiAuthToken = security.getAuthToken(getAuthTokenRoot);
System.out.println("uddi AUTHTOKEN = " + "don't log auth tokens!");
- BusinessEntity biz = sp.CreateBusiness("uddi");
+ BusinessEntity biz = sp.createBusiness("uddi");
//save user uddi's business
SaveBusiness sb = new SaveBusiness();
@@ -87,10 +87,10 @@ public class UddiCustodyTransfer {
sb.getBusinessEntity().add(biz);
BusinessDetail saveBusiness = publish.saveBusiness(sb);
- sp.TransferBusiness(uddiAuthToken.getAuthInfo(), "uddi", rootAuthToken.getAuthInfo(), "root", saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+ sp.transferBusiness(uddiAuthToken.getAuthInfo(), "uddi", rootAuthToken.getAuthInfo(), "root", saveBusiness.getBusinessEntity().get(0).getBusinessKey());
}
- public void TransferBusiness(String fromUser, String fromUserAuthToken, String toUser, String toUserAuthToken,
+ public void transferBusiness(String fromUser, String fromUserAuthToken, String toUser, String toUserAuthToken,
String BusinessKey) throws Exception {
System.out.println("Transfering business key " + BusinessKey);
@@ -157,7 +157,7 @@ public class UddiCustodyTransfer {
System.out.println("Transfer " + (ok ? "success" : " failed"));
}
- private BusinessEntity CreateBusiness(String user) {
+ private BusinessEntity createBusiness(String user) {
BusinessEntity be = new BusinessEntity();
be.getName().add(new Name(user + "'s business", null));
return be;
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureBusiness.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureBusiness.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureBusiness.java
index b6829a4..c034403 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureBusiness.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureBusiness.java
@@ -19,7 +19,6 @@ package org.apache.juddi.v3.client.cli;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.cryptor.DigSigUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
@@ -77,10 +76,10 @@ public class UddiDigitalSignatureBusiness {
public static void main(String args[]) {
UddiDigitalSignatureBusiness sp = new UddiDigitalSignatureBusiness();
- sp.Fire(null, null);
+ sp.fire(null, null);
}
- public void Fire(String token, String key) {
+ public void fire(String token, String key) {
try {
DigSigUtil ds = null;
@@ -104,7 +103,7 @@ public class UddiDigitalSignatureBusiness {
//login
if (token == null) //option, load from juddi config
{
- token = GetAuthKey(clerkManager.getClerk("default").getPublisher(),
+ token = getAuthKey(clerkManager.getClerk("default").getPublisher(),
clerkManager.getClerk("default").getPassword());
}
@@ -177,7 +176,7 @@ public class UddiDigitalSignatureBusiness {
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureFile.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureFile.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureFile.java
index eed0e72..3803a46 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureFile.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureFile.java
@@ -18,17 +18,11 @@ package org.apache.juddi.v3.client.cli;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.util.Scanner;
import java.util.concurrent.atomic.AtomicReference;
import javax.xml.bind.JAXB;
-import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.cryptor.DigSigUtil;
-import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
/**
* This class shows you how to digital sign a business and save to file
@@ -37,20 +31,13 @@ import org.uddi.v3_service.UDDISecurityPortType;
*/
public class UddiDigitalSignatureFile {
- private static UDDIClient clerkManager = null;
+
/**
* This sets up the ws proxies using uddi.xml in META-INF
*/
public UddiDigitalSignatureFile() {
- try {
- // create a manager and read the config in the archive;
- // you can use your config file name
- clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+
}
public enum UddiType {
@@ -58,7 +45,7 @@ public class UddiDigitalSignatureFile {
Business, Service, Binding, TModel, PublisherAssertion
}
- public void Fire(String fileIn, String fileOut, UddiType type) {
+ public void fire(String fileIn, String fileOut, UddiType type) {
try {
System.out.println("WARN - All previous signatures will be removed!");
if (fileIn == null || fileOut == null || type == null) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureSearch.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureSearch.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureSearch.java
index b844d26..16761f2 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureSearch.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureSearch.java
@@ -19,7 +19,6 @@ package org.apache.juddi.v3.client.cli;
import java.util.List;
import org.apache.juddi.v3.client.UDDIConstants;
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.*;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -35,7 +34,6 @@ public class UddiDigitalSignatureSearch {
private static UDDISecurityPortType security = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIPublicationPortType publish = null;
/**
* This sets up the ws proxies using uddi.xml in META-INF
@@ -49,7 +47,6 @@ public class UddiDigitalSignatureSearch {
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
inquiry = transport.getUDDIInquiryService();
- publish = transport.getUDDIPublishService();
} catch (Exception e) {
e.printStackTrace();
}
@@ -63,10 +60,10 @@ public class UddiDigitalSignatureSearch {
public static void main(String args[]) {
UddiDigitalSignatureSearch sp = new UddiDigitalSignatureSearch();
- sp.Fire(null);
+ sp.fire(null);
}
- public void Fire(String token) {
+ public void fire(String token) {
try {
FindService fs = new FindService();
@@ -85,7 +82,7 @@ public class UddiDigitalSignatureSearch {
ServiceList findService = inquiry.findService(fs);
if (findService != null && findService.getServiceInfos() != null) {
for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
- System.out.println(ListToString(findService.getServiceInfos().getServiceInfo().get(i).getName()));
+ System.out.println(listToString(findService.getServiceInfos().getServiceInfo().get(i).getName()));
}
} else
System.out.println("no results found.");
@@ -120,7 +117,7 @@ public class UddiDigitalSignatureSearch {
return null;
}
- private String ListToString(List<Name> name) {
+ private String listToString(List<Name> name) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < name.size(); i++) {
sb.append(name.get(i).getValue()).append(" ");
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureService.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureService.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureService.java
index d8410d4..faf1075 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureService.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureService.java
@@ -64,10 +64,10 @@ public class UddiDigitalSignatureService {
public static void main(String args[]) {
UddiDigitalSignatureService sp = new UddiDigitalSignatureService();
- sp.Fire(null, null);
+ sp.fire(null, null);
}
- public void Fire(String token, String key) {
+ public void fire(String token, String key) {
try {
DigSigUtil ds = null;
@@ -92,7 +92,7 @@ public class UddiDigitalSignatureService {
//login
if (token == null) //option, load from juddi config
{
- token = GetAuthKey(clerkManager.getClerk("default").getPublisher(),
+ token = getAuthKey(clerkManager.getClerk("default").getPublisher(),
clerkManager.getClerk("default").getPassword());
}
@@ -117,7 +117,7 @@ public class UddiDigitalSignatureService {
}
BusinessService be = null;
- be = GetServiceDetails(key);
+ be = getServiceDetails(key);
if (!be.getSignature().isEmpty())
{
System.out.println("WARN, the entity with the key " + key + " is already signed! aborting");
@@ -136,7 +136,7 @@ public class UddiDigitalSignatureService {
publish.saveService(sb);
System.out.println("saved, fetching");
- be = GetServiceDetails(key);
+ be = getServiceDetails(key);
DigSigUtil.JAXB_ToStdOut(be);
System.out.println("verifing");
AtomicReference<String> msg = new AtomicReference<String>();
@@ -153,7 +153,7 @@ public class UddiDigitalSignatureService {
}
}
- private BusinessService GetServiceDetails(String key) throws Exception {
+ private BusinessService getServiceDetails(String key) throws Exception {
// BusinessInfo get
GetServiceDetail r = new GetServiceDetail();
//GetBusinessDetail r = new GetBusinessDetail();
@@ -170,7 +170,7 @@ public class UddiDigitalSignatureService {
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureTmodel.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureTmodel.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureTmodel.java
index 608e8f4..9f35503 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureTmodel.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiDigitalSignatureTmodel.java
@@ -18,7 +18,6 @@ package org.apache.juddi.v3.client.cli;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.cryptor.DigSigUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
@@ -63,10 +62,10 @@ public class UddiDigitalSignatureTmodel {
*/
public static void main(String args[]) {
UddiDigitalSignatureTmodel sp = new UddiDigitalSignatureTmodel();
- sp.Fire(null, null);
+ sp.fire(null, null);
}
- public void Fire(String token, String key) {
+ public void fire(String token, String key) {
try {
DigSigUtil ds = null;
@@ -89,7 +88,7 @@ public class UddiDigitalSignatureTmodel {
//login
if (token == null) //option, load from juddi config
{
- token = GetAuthKey(clerkManager.getClerk("default").getPublisher(),
+ token = getAuthKey(clerkManager.getClerk("default").getPublisher(),
clerkManager.getClerk("default").getPassword());
}
if (key==null){
@@ -102,7 +101,7 @@ public class UddiDigitalSignatureTmodel {
key = saveTModel.getTModel().get(0).getTModelKey();
}
- TModel be = GetTmodelDetails(key);
+ TModel be = getTmodelDetails(key);
if (!be.getSignature().isEmpty())
{
System.out.println("WARN, the entity with the key " + key + " is already signed! aborting");
@@ -121,7 +120,7 @@ public class UddiDigitalSignatureTmodel {
publish.saveTModel(sb);
System.out.println("saved, fetching");
- be = GetTmodelDetails(key);
+ be = getTmodelDetails(key);
DigSigUtil.JAXB_ToStdOut(be);
System.out.println("verifing");
AtomicReference<String> msg = new AtomicReference<String>();
@@ -138,7 +137,7 @@ public class UddiDigitalSignatureTmodel {
}
}
- private TModel GetTmodelDetails(String key) throws Exception {
+ private TModel getTmodelDetails(String key) throws Exception {
// BusinessInfo get
GetTModelDetail r = new GetTModelDetail();
r.getTModelKey().add(key);
@@ -154,7 +153,7 @@ public class UddiDigitalSignatureTmodel {
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindBinding.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindBinding.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindBinding.java
index e257499..3a00231 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindBinding.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindBinding.java
@@ -18,12 +18,9 @@ package org.apache.juddi.v3.client.cli;
import org.apache.juddi.v3.client.UDDIConstants;
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.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
/**
@@ -35,8 +32,6 @@ import org.uddi.v3_service.UDDISecurityPortType;
public class UddiFindBinding {
private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
- private static UDDIPublicationPortType publish = null;
private static UDDIInquiryPortType inquiry = null;
public UddiFindBinding() {
@@ -47,15 +42,13 @@ public class UddiFindBinding {
Transport transport = clerkManager.getTransport();
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
- juddiApi = transport.getJUDDIApiService();
- publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
} catch (Exception e) {
e.printStackTrace();
}
}
- public void Fire(String token) {
+ public void fire(String token) {
try {
// Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
// and can save other publishers).
@@ -101,6 +94,6 @@ public class UddiFindBinding {
public static void main(String args[]) {
UddiFindBinding sp = new UddiFindBinding();
- sp.Fire(null);
+ sp.fire(null);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindEndpoints.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindEndpoints.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindEndpoints.java
index 41fe7f9..0afe170 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindEndpoints.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiFindEndpoints.java
@@ -32,8 +32,6 @@ import org.uddi.v3_service.UDDISecurityPortType;
*/
public class UddiFindEndpoints {
- private static UDDISecurityPortType security = null;
- private static UDDIInquiryPortType inquiry = null;
static UDDIClerk clerk = null;
public UddiFindEndpoints() {
@@ -45,16 +43,12 @@ public class UddiFindEndpoints {
// a ClerkManager 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();
- // Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- inquiry = transport.getUDDIInquiryService();
} catch (Exception e) {
e.printStackTrace();
}
}
- public void Fire(String authtoken, String key) {
+ public void fire(String authtoken, String key) {
try {
if (key == null) {
key = "uddi:juddi.apache.org:services-inquiry";
@@ -73,6 +67,6 @@ public class UddiFindEndpoints {
public static void main(String args[]) {
UddiFindEndpoints sp = new UddiFindEndpoints();
- sp.Fire(null, null);
+ sp.fire(null, null);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiGetServiceDetails.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiGetServiceDetails.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiGetServiceDetails.java
index fccb9be..5f104e2 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiGetServiceDetails.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiGetServiceDetails.java
@@ -18,12 +18,9 @@ package org.apache.juddi.v3.client.cli;
import javax.xml.bind.JAXB;
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.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
/**
@@ -35,8 +32,6 @@ import org.uddi.v3_service.UDDISecurityPortType;
public class UddiGetServiceDetails {
private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
- private static UDDIPublicationPortType publish = null;
private static UDDIInquiryPortType inquiry = null;
public UddiGetServiceDetails() {
@@ -47,15 +42,13 @@ public class UddiGetServiceDetails {
Transport transport = clerkManager.getTransport();
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
- juddiApi = transport.getJUDDIApiService();
- publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
} catch (Exception e) {
e.printStackTrace();
}
}
- public void Fire(String token, String key) {
+ public void fire(String token, String key) {
if (key == null) {
System.out.println("No key provided!");
return;
@@ -90,6 +83,6 @@ public class UddiGetServiceDetails {
public static void main(String args[]) {
UddiGetServiceDetails sp = new UddiGetServiceDetails();
- sp.Fire(null, "uddi:juddi.apache.org:services-inquiry");
+ sp.fire(null, "uddi:juddi.apache.org:services-inquiry");
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiKeyGenerator.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiKeyGenerator.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiKeyGenerator.java
index 9350e0b..c7290f3 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiKeyGenerator.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiKeyGenerator.java
@@ -18,11 +18,8 @@ package org.apache.juddi.v3.client.cli;
import org.apache.juddi.v3.client.config.UDDIClerk;
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.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.*;
-import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -35,9 +32,7 @@ import org.uddi.v3_service.UDDISecurityPortType;
public class UddiKeyGenerator {
private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
private static UDDIPublicationPortType publish = null;
- private static UDDIInquiryPortType inquiry = null;
public UddiKeyGenerator() {
try {
@@ -47,15 +42,13 @@ public class UddiKeyGenerator {
Transport transport = clerkManager.getTransport();
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
- juddiApi = transport.getJUDDIApiService();
publish = transport.getUDDIPublishService();
- inquiry = transport.getUDDIInquiryService();
} catch (Exception e) {
e.printStackTrace();
}
}
- public void Fire(String token, String domain) {
+ public void fire(String token, String domain) {
try {
// Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
// and can save other publishers).
@@ -99,6 +92,6 @@ public class UddiKeyGenerator {
public static void main(String args[]) {
UddiKeyGenerator sp = new UddiKeyGenerator();
- sp.Fire(null, "www.juddi.is.cool.org");
+ sp.fire(null, "www.juddi.is.cool.org");
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiRelatedBusinesses.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiRelatedBusinesses.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiRelatedBusinesses.java
index a1ca4d5..1b12e91 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiRelatedBusinesses.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiRelatedBusinesses.java
@@ -56,7 +56,7 @@ public class UddiRelatedBusinesses {
}
}
- public void Fire(String businessKey, String authInfo, String businessKey1, String authInfo1, String relationship) throws Exception {
+ public void fire(String businessKey, String authInfo, String businessKey1, String authInfo1, String relationship) throws Exception {
try {
DatatypeFactory df = DatatypeFactory.newInstance();
@@ -118,7 +118,7 @@ public class UddiRelatedBusinesses {
// Making API call that retrieves the authentication token for the 'root' user.
AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
System.out.println("root AUTHTOKEN = " + "don't log auth tokens!");
- BusinessEntity rootbiz = sp.CreateBusiness("root");
+ BusinessEntity rootbiz = sp.createBusiness("root");
getAuthTokenRoot = new GetAuthToken();
getAuthTokenRoot.setUserID("uddi");
@@ -127,7 +127,7 @@ public class UddiRelatedBusinesses {
// Making API call that retrieves the authentication token for the 'root' user.
AuthToken uddiAuthToken = security.getAuthToken(getAuthTokenRoot);
System.out.println("uddi AUTHTOKEN = " + "don't log auth tokens!");
- BusinessEntity uddibiz = sp.CreateBusiness("uddi");
+ BusinessEntity uddibiz = sp.createBusiness("uddi");
//save user uddi's business
SaveBusiness sb = new SaveBusiness();
@@ -140,12 +140,12 @@ public class UddiRelatedBusinesses {
sb.getBusinessEntity().add(rootbiz);
BusinessDetail rootbize = publish.saveBusiness(sb);
- sp.Fire(rootbize.getBusinessEntity().get(0).getBusinessKey(), rootAuthToken.getAuthInfo(),
+ sp.fire(rootbize.getBusinessEntity().get(0).getBusinessKey(), rootAuthToken.getAuthInfo(),
uddibize.getBusinessEntity().get(0).getBusinessKey(), uddiAuthToken.getAuthInfo(),
"parent-child");
}
- private BusinessEntity CreateBusiness(String user) {
+ private BusinessEntity createBusiness(String user) {
BusinessEntity be = new BusinessEntity();
be.getName().add(new Name(user + "'s business", null));
return be;
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiReplication.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiReplication.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiReplication.java
index 3e5175c..ac3a8f3 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiReplication.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiReplication.java
@@ -38,15 +38,15 @@ import org.uddi.v3_service.UDDIReplicationPortType;
*/
class UddiReplication {
- public UddiReplication(UDDIClient client, String nodename) throws ConfigurationException {
- uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
- ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, client.getClientConfig().getUDDINode(nodename).getReplicationUrl());
+ private UDDIReplicationPortType uddiReplicationPort = null;
+ public UddiReplication(UDDIClient client, String nodename) throws ConfigurationException {
+
+ uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, client.getClientConfig().getUDDINode(nodename).getReplicationUrl());
}
- UDDIReplicationPortType uddiReplicationPort = null;
-
- String DoPing() {
+ protected String doPing() {
try {
String doPing = uddiReplicationPort.doPing(new DoPing());
System.out.println("Ping Success, remote node's id is " + doPing);
@@ -57,7 +57,7 @@ class UddiReplication {
return null;
}
- void GetHighWatermarks() {
+ protected void getHighWatermarks() {
try {
List<ChangeRecordIDType> highWaterMarks = uddiReplicationPort.getHighWaterMarks();
System.out.println("Success....");
@@ -72,11 +72,11 @@ class UddiReplication {
}
}
- void GetChangeRecords(Long record, String sourcenode) {
+ protected void getChangeRecords(Long record, String sourcenode) {
try {
HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
- highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(DoPing(), record));
+ highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(doPing(), record));
GetChangeRecords req = new GetChangeRecords();
req.setRequestingNode(sourcenode);
req.setChangesAlreadySeen(highWaterMarkVectorType);
@@ -89,7 +89,7 @@ class UddiReplication {
System.out.println(
changeRecords.get(i).getChangeID().getNodeID() + ", "
+ changeRecords.get(i).getChangeID().getOriginatingUSN() + ": "
- + GetChangeType(changeRecords.get(i)));
+ + getChangeType(changeRecords.get(i)));
JAXB.marshal(changeRecords.get(i), System.out);
}
} catch (Exception ex) {
@@ -97,7 +97,7 @@ class UddiReplication {
}
}
- private String GetChangeType(ChangeRecord get) {
+ protected String getChangeType(ChangeRecord get) {
if (get.getChangeRecordAcknowledgement() != null) {
return "ACK";
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/716e5fe1/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
----------------------------------------------------------------------
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
index 20d2907..2d4d72f 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
@@ -24,15 +24,10 @@ import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.subscription.ISubscriptionCallback;
import org.apache.juddi.v3.client.subscription.SubscriptionCallbackListener;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.*;
import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionFilter;
import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
/**
* Thie class shows you how to create a business and a subscription using UDDI
@@ -40,35 +35,32 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
*
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
-public class UddiSubscribe implements ISubscriptionCallback, Runnable {
+public class UddiSubscribe implements ISubscriptionCallback {
+ public static void main(String args[]) throws Exception {
+ UddiSubscribe sp = new UddiSubscribe();
+ sp.fire();
+ }
- private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
- private static UDDIPublicationPortType publish = null;
- private static UDDIInquiryPortType uddiInquiryService = null;
- private static UDDISubscriptionPortType uddiSubscriptionService = null;
+
boolean callbackRecieved = false;
private UDDIClerk clerk = null;
private UDDIClient client = null;
+ String nodename = "default";
+ PrintUDDI<SubscriptionResultsList> p = new PrintUDDI<SubscriptionResultsList>();
public UddiSubscribe() {
- try {
- // create a manager and read the config in the archive;
- // you can use your config file name
- client = new UDDIClient("META-INF/simple-publish-uddi.xml");
- clerk = client.getClerk("default");
- Transport transport = client.getTransport();
- // Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- juddiApi = transport.getJUDDIApiService();
- publish = transport.getUDDIPublishService();
- uddiInquiryService = transport.getUDDIInquiryService();
- uddiSubscriptionService = transport.getUDDISubscriptionService();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ try {
+ // create a manager and read the config in the archive;
+ // you can use your config file name
+ client = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ clerk = client.getClerk("default");
+ Transport transport = client.getTransport();
+ // Now you create a reference to the UDDI API
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- String nodename = "default";
public UddiSubscribe(UDDIClient client, String nodename, Transport transport) {
try {
// create a manager and read the config in the archive;
@@ -77,22 +69,14 @@ public class UddiSubscribe implements ISubscriptionCallback, Runnable {
clerk = client.getClerk(nodename);
this.nodename = nodename;
// Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- juddiApi = transport.getJUDDIApiService();
- publish = transport.getUDDIPublishService();
- uddiInquiryService = transport.getUDDIInquiryService();
- uddiSubscriptionService = transport.getUDDISubscriptionService();
+
} catch (Exception e) {
e.printStackTrace();
}
}
- public static void main(String args[]) throws Exception {
- UddiSubscribe sp = new UddiSubscribe();
- sp.Fire();
- }
- public void Fire() throws Exception {
+ public void fire() throws Exception {
TModel createKeyGenator = UDDIClerk.createKeyGenator("somebusiness", "A test key domain SubscriptionCallbackTest1", "SubscriptionCallbackTest1");
@@ -223,8 +207,7 @@ public class UddiSubscribe implements ISubscriptionCallback, Runnable {
//Runtime.getRuntime().removeShutdownHook(hook);
}
- private boolean running = true;
- PrintUDDI<SubscriptionResultsList> p = new PrintUDDI<SubscriptionResultsList>();
+
@Override
public void HandleCallback(SubscriptionResultsList body) {
@@ -237,8 +220,5 @@ public class UddiSubscribe implements ISubscriptionCallback, Runnable {
System.out.println("The endpoint was stopped!");
}
- @Override
- public void run() {
- running = false;
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org