JUDDI-982 deleting the client plugin module. JUDDI-977 more findbugs fixes
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/2a8bed4e Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/2a8bed4e Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/2a8bed4e Branch: refs/heads/master Commit: 2a8bed4efd34bccb11e0f97192a3e273355ad5fa Parents: e252133 Author: Alex O'Ree <[email protected]> Authored: Mon Oct 9 19:38:49 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Mon Oct 9 19:38:49 2017 -0400 ---------------------------------------------------------------------- .../apache/juddi/v3/client/cli/EntryPoint.java | 2 +- .../v3/client/cli/EntryPointSingleNode.java | 127 +---------- .../juddi/v3/client/cli/EntryPoitMultiNode.java | 20 +- .../v3/client/cli/FindBusinessBugHunt.java | 208 ------------------ .../juddi/v3/client/cli/JuddiAdminService.java | 76 ++++--- .../apache/juddi/v3/client/cli/SearchByQos.java | 19 +- .../juddi/v3/client/cli/SimpleBrowse.java | 59 +++--- .../juddi/v3/client/cli/UddiCreatebulk.java | 210 ------------------- .../v3/client/cli/UddiCustodyTransfer.java | 14 +- .../cli/UddiDigitalSignatureBusiness.java | 8 +- .../client/cli/UddiDigitalSignatureSearch.java | 5 +- .../client/cli/UddiDigitalSignatureService.java | 9 +- .../client/cli/UddiDigitalSignatureTmodel.java | 8 +- .../juddi/v3/client/cli/UddiFindBinding.java | 4 +- .../juddi/v3/client/cli/UddiFindEndpoints.java | 5 +- .../v3/client/cli/UddiGetServiceDetails.java | 4 +- .../juddi/v3/client/cli/UddiKeyGenerator.java | 4 +- .../v3/client/cli/UddiRelatedBusinesses.java | 19 +- .../juddi/v3/client/cli/UddiReplication.java | 10 +- .../juddi/v3/client/cli/UddiSubscribe.java | 45 ++-- .../cli/UddiSubscribeAssertionStatus.java | 15 +- .../v3/client/cli/UddiSubscribeValidate.java | 4 +- .../client/cli/UddiSubscriptionManagement.java | 2 +- .../apache/juddi/v3/client/cli/WadlImport.java | 9 +- .../apache/juddi/v3/client/cli/WsdlImport.java | 10 +- juddi-client-plugins/pom.xml | 58 ----- .../juddi/client/plugins/JGroupsTransport.java | 73 ------- .../client/plugins/MulticastDNSTransport.java | 71 ------- .../client/plugins/WSDiscoveryTransport.java | 71 ------- .../apache/juddi/client/plugins/AppTest.java | 54 ----- pom.xml | 1 - 31 files changed, 159 insertions(+), 1065 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 1c7f8a7..01ad0e1 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 @@ -199,7 +199,7 @@ public class EntryPoint { private static void processOffline(String input) throws Exception { if (input.equals("1")) { - CompareByTModelInstanceInfoQOS.main(null); + CompareByTModelInstanceInfoQOS.main(new String[0]); } if (input.equals("2")) { new UddiDigitalSignatureFile().fire(null, null, null); http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 3926274..b35f452 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 @@ -86,7 +86,6 @@ public class EntryPointSingleNode { System.out.println("- [ Publishing ] -"); System.out.println("20) Make a Key Generator tModel"); - System.out.println("21) UDDI Create Bulk (makes N business with N services) (create for load testing)"); System.out.println("22) WSDL2UDDI - Register a service from a WSDL document (business key required)"); System.out.println("23) WADL2UDDI - Register a service from a WADL document (business key required)"); System.out.println("24) UDDI Custody Transfer (within a single node)"); @@ -122,7 +121,6 @@ public class EntryPointSingleNode { System.out.println("43) View the replication config from the current jUDDI server"); System.out.println("44) Set the replication config on a remote jUDDI server"); System.out.println("45) Prints the current replication status of a given node"); - System.out.println("46) Periodic publisher, 1biz+1svc every 5 seconds"); //deleters System.out.println("47) Bulk delete business"); @@ -220,11 +218,11 @@ public class EntryPointSingleNode { String url = (System.console().readLine()); new SimpleBrowse(transport).printTModelList(authtoken, url, false); } else if (input.equals("13")) { - SearchByQos.doFindBinding(authtoken, transport); + new SearchByQos().doFindBinding(authtoken, transport); } else if (input.equals("14")) { - SearchByQos.doFindBusiness(authtoken, transport); + new SearchByQos().doFindBusiness(authtoken, transport); } else if (input.equals("15")) { - SearchByQos.doFindService(authtoken, transport); + new SearchByQos().doFindService(authtoken, transport); } else if (input.equals("16")) { new UddiFindBinding().fire(authtoken); } else if (input.equals("17")) { @@ -241,13 +239,6 @@ public class EntryPointSingleNode { System.out.print("Get FQDN: "); String key = (System.console().readLine()); new UddiKeyGenerator().fire(authtoken, key); - } else if (input.equals("21")) { - - System.out.print("businesses: "); - int biz = Integer.parseInt(System.console().readLine()); - System.out.print("servicesPerBusiness: "); - int svc = Integer.parseInt(System.console().readLine()); - new UddiCreatebulk(transport, false, currentNode).publishBusiness(authtoken, biz, svc, username); } else if (input.equals("22")) { System.out.print("Path or URL to WSDL file: "); String url = (System.console().readLine()); @@ -345,7 +336,7 @@ public class EntryPointSingleNode { } else if (input.equals("33")) { new UddiSubscriptionManagement(transport).deleteAllSubscriptions(authtoken); } else if (input.equals("34")) { - new UddiSubscribeAssertionStatus(transport).Fire(currentNode); + new UddiSubscribeAssertionStatus(transport).fire(currentNode); } else if (input.equals("35")) { @@ -403,23 +394,9 @@ public class EntryPointSingleNode { new JuddiAdminService(client, transport).registerLocalNodeToRemoteNode(authtoken, uddiNodeList.get(index), uddiNodeList.get(index2)); } else if (input.equals("41")) { - - // System.out.println("33) View all register remote nodes on a jUDDI server"); + new JuddiAdminService(client, transport).viewRemoteNodes(authtoken); - } /* if (input.equals("35")) { - UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml"); - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - for (int i = 0; i < uddiNodeList.size(); i++) { - System.out.println("________________________________________________________________________________"); - System.out.println("Client name: " + uddiNodeList.get(i).getClientName()); - System.out.println("Node name: " + uddiNodeList.get(i).getName()); - System.out.println("Node description: " + uddiNodeList.get(i).getDescription()); - System.out.println("Transport: " + uddiNodeList.get(i).getProxyTransport()); - System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl()); - - } - - }*/ else if (input.equals("42")) { + } else if (input.equals("42")) { new JuddiAdminService(client, transport).viewRemoveRemoteNode(authtoken); //System.out.println("35) UnRegister a node on a jUDDI server"); @@ -429,98 +406,6 @@ public class EntryPointSingleNode { new JuddiAdminService(client, transport).setReplicationConfig(authtoken); } else if (input.equals("45")) { new JuddiAdminService(client, transport).printStatus(transport, authtoken); - } else if (input.equals("46")) { - //TODO current counts - UDDIInquiryPortType uddiInquiryService = transport.getUDDIInquiryService(); - FindBusiness fb = new FindBusiness(); - fb.setAuthInfo(authtoken); - fb.getName().add(new Name(UDDIConstants.WILDCARD, null)); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.setMaxRows(1); - fb.setListHead(0); - BusinessList findBusiness = uddiInquiryService.findBusiness(fb); - System.out.println("current business counts " - + findBusiness.getListDescription().getActualCount() + " " - + findBusiness.getListDescription().getIncludeCount() + " " - + findBusiness.getListDescription().getListHead()); - FindService fs = new FindService(); - fs.setAuthInfo(authtoken); - fs.getName().add(new Name(UDDIConstants.WILDCARD, null)); - fs.setFindQualifiers(new FindQualifiers()); - fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fs.setMaxRows(1); - fs.setListHead(0); - ServiceList findService = uddiInquiryService.findService(fs); - System.out.println("current service counts " - + findService.getListDescription().getActualCount() + " " - + findService.getListDescription().getIncludeCount() + " " - + findService.getListDescription().getListHead()); - - running = true; - createdServices = 0; - createdBusinesses = 0; - - new Thread(new Runnable() { - @Override - public void run() { - UddiCreatebulk uddiCreatebulk = new UddiCreatebulk(transport, false, currentNode); - while (running) { - try { - uddiCreatebulk.publishBusiness(authtoken, 1, 1, username); - createdBusinesses++; - createdServices++; - Thread.sleep(5000); - } catch (Exception ex) { - System.out.println("eception caught, assuming it's an expired token, attempting to reauthenticate " + ex.getMessage()); - //potentially an expired token, reauthenticate - try { - UDDISecurityPortType security = null; - security = transport.getUDDISecurityService(); - - GetAuthToken getAuthTokenRoot = new GetAuthToken(); - getAuthTokenRoot.setUserID(username); - getAuthTokenRoot.setCred((password)); - authtoken = security.getAuthToken(getAuthTokenRoot).getAuthInfo(); - } catch (Exception x) { - System.out.println("unable to reauthenticate, aborting!"); - ex.printStackTrace(); - running = false; - } - - } - } - } - }).start(); - System.out.println("Started, press <Enter> to stop!"); - System.console().readLine(); - running = false; - - System.out.println("before business counts " - + findBusiness.getListDescription().getActualCount()); - - fb.setAuthInfo(authtoken); - BusinessList afterfindBusiness = uddiInquiryService.findBusiness(fb); - System.out.println("after business counts " - + afterfindBusiness.getListDescription().getActualCount()); - System.out.println("actual created " + createdBusinesses); - System.out.println("Delta = " + (afterfindBusiness.getListDescription().getActualCount() - findBusiness.getListDescription().getActualCount())); - - System.out.println("before service counts " - + findService.getListDescription().getActualCount()); - - fs.setAuthInfo(authtoken); - ServiceList afterfindService = uddiInquiryService.findService(fs); - System.out.println("after service counts " - + afterfindService.getListDescription().getActualCount()); - System.out.println("actual created " + createdServices); - System.out.println("delta = " + (afterfindService.getListDescription().getActualCount() - findService.getListDescription().getActualCount())); - if ((afterfindService.getListDescription().getActualCount() - findService.getListDescription().getActualCount()) == createdServices) { - System.out.println("success"); - } else { - System.out.println("failure!"); - } - } else if (input.equals("47")) { System.out.println("We'll run a search first, then the results will be deleted (after confirmation). Use % as a wild card"); System.out.print("Search query: "); http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 40fd7b2..a238001 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 @@ -36,10 +36,9 @@ import org.uddi.v3_service.UDDIInquiryPortType; public class EntryPoitMultiNode { static void goMultiNode() throws Exception { - + UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml"); - String input = null; do { System.out.println("1) Sets undirected replication two instances of jUDDI"); @@ -60,28 +59,11 @@ public class EntryPoitMultiNode { private static void processInput(String input, UDDIClient clerkManager) throws Exception { if (input.equals("1")) { - new JuddiAdminService(clerkManager, null).autoMagic(); - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - for (int i = 0; i < uddiNodeList.size(); i++) { - new UddiCreatebulk(uddiNodeList.get(i).getName()).publishBusiness(null, 1, 1, "root@" + uddiNodeList.get(i).getName()); - } - //new UddiCreatebulk("uddi:another.juddi.apache.org:node2").publishBusiness(null, 1, 1); } else if (input.equals("2")) { - new JuddiAdminService(clerkManager, null).autoMagic3(); - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - for (int i = 0; i < uddiNodeList.size(); i++) { - new UddiCreatebulk(uddiNodeList.get(i).getName()).publishBusiness(null, 1, 1, "root@" + uddiNodeList.get(i).getName()); - } - //new UddiCreatebulk("uddi:another.juddi.apache.org:node2").publishBusiness(null, 1, 1); } else if (input.equals("3")) { new JuddiAdminService(clerkManager, null).autoMagicDirected(); - - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - for (int i = 0; i < uddiNodeList.size(); i++) { - new UddiCreatebulk(uddiNodeList.get(i).getName()).publishBusiness(null, 1, 1, "root@" + uddiNodeList.get(i).getName()); - } } else if (input.equals("4")) { new JuddiAdminService(clerkManager, null).printStatus(); } else if (input.equals("5")) { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 deleted file mode 100644 index 55d6e5e..0000000 --- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/FindBusinessBugHunt.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright 2001-2008 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.juddi.v3.client.cli; - -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; -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.transport.Transport; -import org.apache.juddi.v3_service.JUDDIApiPortType; -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.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.FindBusiness; -import org.uddi.api_v3.GetAuthToken; -import org.uddi.api_v3.GetBusinessDetail; -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.TModel; -import org.uddi.v3_service.UDDIInquiryPortType; -import org.uddi.v3_service.UDDIPublicationPortType; -import org.uddi.v3_service.UDDISecurityPortType; - -/** - * - * @author Alex O'Ree - */ -public class FindBusinessBugHunt { - - 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 main(String[] args) throws Exception { - - // create a manager and read the config in the archive; - // you can use your config file name - UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml"); - UDDIClerk clerk = clerkManager.getClerk("default"); - // 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(); - 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 = security.getAuthToken(getAuthTokenRoot).getAuthInfo(); - - 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); - - 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); - - - System.out.println("fetching business list"); - BusinessList before = getBusinessList(uddi); - if (before.getBusinessInfos() == null) { - System.out.println("before no businesses returned!"); - before.setBusinessInfos(new BusinessInfos()); - } else { - System.out.println(before.getBusinessInfos().getBusinessInfo().size() + " businesses returned before"); - } - - System.out.println("saving mary"); - saveMary(uddi); - - BusinessList after = getBusinessList(uddi); - if (after.getBusinessInfos() == null) { - System.out.println("after no businesses returned!"); - after.setBusinessInfos(new BusinessInfos()); - } else { - System.out.println(after.getBusinessInfos().getBusinessInfo().size() + " businesses returned after"); - } - PrintUDDI<BusinessList> p = new PrintUDDI<BusinessList>(); - 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")) { - System.out.println("ok!"); - } else { - System.out.println("no good!"); - } - } else { - - System.out.println("something's not right, here's the before service listing"); - System.out.println(p.print(before)); - System.out.println(p.print(after)); - } - - } - - 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(); - fb.setAuthInfo(token); - org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers(); - fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.setFindQualifiers(fq); - fb.getName().add((new Name(UDDIConstants.WILDCARD, null))); - return inquiry.findBusiness(fb); - } - - 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); - SaveBusiness sb = new SaveBusiness(); - sb.setAuthInfo(rootAuthToken); - sb.getBusinessEntity().add(be); - publish.saveBusiness(sb); - } - - 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; - } - } - return false; - } - - 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/2a8bed4e/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 cb0480f..9a09cf1 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 @@ -63,20 +63,13 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class JuddiAdminService { - // private static UDDISecurityPortType security = null; - // private static UDDIPublicationPortType publish = null; - static JUDDIApiPortType juddi = null; - // static UDDIClerk clerk = null; - static UDDIClient clerkManager = null; + private JUDDIApiPortType juddi = null; + private UDDIClient clerkManager = null; public JuddiAdminService(UDDIClient client, Transport transport) { try { clerkManager = client; if (transport != null) // 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"); - //clerk = clerkManager.getClerk("default"); - // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml { transport = clerkManager.getTransport(); juddi = transport.getJUDDIApiService(); @@ -130,7 +123,8 @@ public class JuddiAdminService { /** * registers juddi's cloud node at another node - * @param token + * + * @param token */ public void quickRegisterRemoteCloud(String token) { try { @@ -303,7 +297,7 @@ public class JuddiAdminService { } if (input.equalsIgnoreCase("d")) { //save the changes - DispositionReport setReplicationNodes = juddiApiService.setReplicationNodes(authtoken, replicationNodes); + juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved!, dumping config from the server"); replicationNodes = juddiApiService.getReplicationNodes(authtoken); JAXB.marshal(replicationNodes, System.out); @@ -483,9 +477,6 @@ public class JuddiAdminService { void autoMagic123() throws Exception { - //1 > 2 >3 >1 - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - Transport transport = clerkManager.getTransport("default"); String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); @@ -564,9 +555,6 @@ public class JuddiAdminService { void autoMagicDirected() throws Exception { - //1 > 2 >3 >1 - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - Transport transport = clerkManager.getTransport("default"); String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); @@ -646,29 +634,34 @@ public class JuddiAdminService { juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node1"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); transport = clerkManager.getTransport("uddi:another.juddi.apache.org:node2"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); juddiApiService = transport.getJUDDIApiService(); juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node2"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); transport = clerkManager.getTransport("uddi:yet.another.juddi.apache.org:node3"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); juddiApiService = transport.getJUDDIApiService(); juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node3"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); } + /** + * sets up replication between "default" and + * "uddi:another.juddi.apache.org:node2" from the config file + * + * @throws Exception + */ void autoMagic() throws Exception { - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - Transport transport = clerkManager.getTransport("default"); + //FIXME get username/password for default node String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); JUDDIApiPortType juddiApiService = transport.getJUDDIApiService(); @@ -684,7 +677,7 @@ public class JuddiAdminService { } //if (replicationNodes.getCommunicationGraph() == null) { - replicationNodes.setCommunicationGraph(new CommunicationGraph()); + replicationNodes.setCommunicationGraph(new CommunicationGraph()); //} Operator op = new Operator(); op.setOperatorNodeID("uddi:juddi.apache.org:node1"); @@ -719,6 +712,7 @@ public class JuddiAdminService { JAXB.marshal(replicationNodes, System.out); juddiApiService.setReplicationNodes(authtoken, replicationNodes); + //FIXME get username/password for uddi:another.juddi.apache.org:node2 node transport = clerkManager.getTransport("uddi:another.juddi.apache.org:node2"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); @@ -727,11 +721,15 @@ public class JuddiAdminService { } + /** + * sets up replication between default, node2 and node3 + * + * @throws Exception + */ void autoMagic3() throws Exception { - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); - Transport transport = clerkManager.getTransport("default"); + //FIXME get username/password for uddi:another.juddi.apache.org:node2 node String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); JUDDIApiPortType juddiApiService = transport.getJUDDIApiService(); @@ -793,12 +791,14 @@ public class JuddiAdminService { JAXB.marshal(replicationNodes, System.out); juddiApiService.setReplicationNodes(authtoken, replicationNodes); + //FIXME get username/password for uddi:another.juddi.apache.org:node2 node transport = clerkManager.getTransport("uddi:another.juddi.apache.org:node2"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); juddiApiService = transport.getJUDDIApiService(); juddiApiService.setReplicationNodes(authtoken, replicationNodes); + //FIXME get username/password for uddi:another.juddi.apache.org:node2 node transport = clerkManager.getTransport("uddi:yet.another.juddi.apache.org:node3"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); @@ -809,9 +809,10 @@ public class JuddiAdminService { /** * gets replication high water mark values + * * @param transport * @param authtoken - * @throws Exception + * @throws Exception */ void printStatus(Transport transport, String authtoken) throws Exception { @@ -872,7 +873,7 @@ public class JuddiAdminService { } - private void TestEquals(ReplicationConfiguration setter, ReplicationConfiguration getter) { + private void testEquals(ReplicationConfiguration setter, ReplicationConfiguration getter) { if (getter == null) { l("null getter"); return; @@ -926,8 +927,17 @@ public class JuddiAdminService { = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); - ks.load(new FileInputStream(System.getProperty("javax.net.ssl.keyStore")), System.getProperty("javax.net.ssl.keyStorePassword").toCharArray()); - + FileInputStream fis = null; + try { + fis = new FileInputStream(System.getProperty("javax.net.ssl.keyStore")); + ks.load(fis, System.getProperty("javax.net.ssl.keyStorePassword").toCharArray()); + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + if (fis != null) { + fis.close(); + } + } kmf.init(ks, System.getProperty("javax.net.ssl.keyStorePassword").toCharArray()); sc.init(kmf.getKeyManagers(), null, null); @@ -949,8 +959,6 @@ public class JuddiAdminService { } void autoMagicDirectedSSL() throws Exception { - //1 > 2 >3 >1 - List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList(); Transport transport = clerkManager.getTransport("default"); String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); @@ -1031,21 +1039,21 @@ public class JuddiAdminService { juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node1"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); transport = clerkManager.getTransport("uddi:another.juddi.apache.org:node2"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); juddiApiService = transport.getJUDDIApiService(); juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node2"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); transport = clerkManager.getTransport("uddi:yet.another.juddi.apache.org:node3"); authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo(); juddiApiService = transport.getJUDDIApiService(); juddiApiService.setReplicationNodes(authtoken, replicationNodes); System.out.println("Saved to node3"); - TestEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); + testEquals(replicationNodes, juddiApiService.getReplicationNodes(authtoken)); } void pingAll() throws Exception { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 ccef520..6421a61 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 @@ -15,7 +15,6 @@ */ package org.apache.juddi.v3.client.cli; -import java.util.Properties; import javax.xml.bind.JAXB; import org.apache.juddi.jaxb.PrintUDDI; import org.apache.juddi.v3.client.UDDIConstants; @@ -29,7 +28,6 @@ import org.uddi.api_v3.FindQualifiers; import org.uddi.api_v3.FindService; import org.uddi.api_v3.Name; import org.uddi.api_v3.ServiceList; -import org.uddi.api_v3.TModel; import org.uddi.api_v3.TModelBag; import org.uddi.v3_service.UDDIInquiryPortType; @@ -39,12 +37,9 @@ import org.uddi.v3_service.UDDIInquiryPortType; */ public class SearchByQos { - static PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>(); - static Properties properties = new Properties(); - static String wsdlURL = null; - private static UDDIInquiryPortType inquiry; + private UDDIInquiryPortType inquiry; - public static void doFindService(String token, Transport transport) throws Exception { + public void doFindService(String token, Transport transport) throws Exception { // Now you create a reference to the UDDI API @@ -66,7 +61,7 @@ public class SearchByQos { } - public static void doFindBinding(String token, Transport transport) throws Exception { + public void doFindBinding(String token, Transport transport) throws Exception { // Now you create a reference to the UDDI API inquiry = transport.getUDDIInquiryService(); @@ -86,7 +81,7 @@ public class SearchByQos { } - public static void doFindBusiness(String token, Transport transport) throws Exception { + public void doFindBusiness(String token, Transport transport) throws Exception { // create a manager and read the config in the archive; // you can use your config file name @@ -103,7 +98,7 @@ public class SearchByQos { } - private static BusinessList getBusinessList(String token) throws Exception { + private BusinessList getBusinessList(String token) throws Exception { FindBusiness fb = new FindBusiness(); fb.setAuthInfo(token); org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers(); @@ -118,7 +113,7 @@ public class SearchByQos { return inquiry.findBusiness(fb); } - private static ServiceList getServiceList(String token) throws Exception { + private ServiceList getServiceList(String token) throws Exception { FindService fb = new FindService(); fb.setAuthInfo(token); org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers(); @@ -133,7 +128,7 @@ public class SearchByQos { return inquiry.findService(fb); } - private static BindingDetail getBindingList(String token) throws Exception { + private BindingDetail getBindingList(String token) throws Exception { FindBinding fb = new FindBinding(); fb.setAuthInfo(token); fb.setTModelBag(new TModelBag()); http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 0b30f5e..3f1f8c2 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 @@ -57,8 +57,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class SimpleBrowse { - private UDDISecurityPortType security = null; - private UDDIInquiryPortType inquiry = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; /** * This sets up the ws proxies using uddi.xml in META-INF @@ -274,8 +274,8 @@ public class SimpleBrowse { public void printBusinessList(String authtoken, String searchString, boolean rawXml) throws Exception { - int offset=0; - int maxrecords=100; + int offset = 0; + int maxrecords = 100; BusinessList findBusiness = getBusinessList(authtoken, searchString, offset, maxrecords); while (findBusiness != null && findBusiness.getBusinessInfos() != null && !findBusiness.getBusinessInfos().getBusinessInfo().isEmpty()) { @@ -287,18 +287,17 @@ public class SimpleBrowse { printServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken); } offset = offset + maxrecords; - + findBusiness = getBusinessList(authtoken, searchString, offset, maxrecords); } } - - + public void printServiceList(String authtoken, String searchString, boolean rawXml) throws Exception { - int offset=0; - int maxrecords=100; + int offset = 0; + int maxrecords = 100; ServiceList findBusiness = getServiceList(authtoken, searchString, offset, maxrecords); - while (findBusiness != null && findBusiness.getServiceInfos()!= null + while (findBusiness != null && findBusiness.getServiceInfos() != null && !findBusiness.getServiceInfos().getServiceInfo().isEmpty()) { if (rawXml) { JAXB.marshal(findBusiness, System.out); @@ -308,7 +307,7 @@ public class SimpleBrowse { //PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken); } offset = offset + maxrecords; - + findBusiness = getServiceList(authtoken, searchString, offset, maxrecords); } } @@ -318,22 +317,22 @@ public class SimpleBrowse { fs.setAuthInfo(authtoken); fs.setListHead(offset); fs.setMaxRows(maxrecords); - if (searchString!=null) - { + if (searchString != null) { fs.getName().add(new Name("%" + searchString + " %", null)); - + + } else { + fs.getName().add(new Name(UDDIConstants.WILDCARD, null)); } - else fs.getName().add(new Name(UDDIConstants.WILDCARD, null)); fs.setFindQualifiers(new FindQualifiers()); fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - return inquiry.findService(fs); + return inquiry.findService(fs); } - void printTModelList(String authtoken, String searchString, boolean rawXml) throws Exception{ - int offset=0; - int maxrecords=100; + void printTModelList(String authtoken, String searchString, boolean rawXml) throws Exception { + int offset = 0; + int maxrecords = 100; TModelList findBusiness = getTmodelList(authtoken, searchString, offset, maxrecords); - while (findBusiness != null && findBusiness.getTModelInfos()!= null + while (findBusiness != null && findBusiness.getTModelInfos() != null && !findBusiness.getTModelInfos().getTModelInfo().isEmpty()) { if (rawXml) { JAXB.marshal(findBusiness, System.out); @@ -343,40 +342,40 @@ public class SimpleBrowse { //PrintServiceDetailsByBusiness(findBusiness.getBusinessInfos(), authtoken); } offset = offset + maxrecords; - + findBusiness = getTmodelList(authtoken, searchString, offset, maxrecords); } } private void printTModelInfo(TModelInfos tModelInfos) { - if (tModelInfos==null){ + if (tModelInfos == null) { System.out.println("No data returned"); return; } for (TModelInfo tModelInfo : tModelInfos.getTModelInfo()) { System.out.println("tModel key: " + tModelInfo.getTModelKey()); System.out.println("tModel name: " + tModelInfo.getName().getLang() + " " + tModelInfo.getName().getValue()); - // PrintServiceInfo(null); - for (int k = 0; k < tModelInfo.getDescription().size(); k++) { + // PrintServiceInfo(null); + for (int k = 0; k < tModelInfo.getDescription().size(); k++) { System.out.println("Desc: " + tModelInfo.getDescription().get(k).getValue()); } } } private TModelList getTmodelList(String authtoken, String searchString, int offset, int maxrecords) throws Exception { - FindTModel fs = new FindTModel(); + FindTModel fs = new FindTModel(); fs.setAuthInfo(authtoken); fs.setListHead(offset); fs.setMaxRows(maxrecords); - if (searchString!=null) - { + if (searchString != null) { fs.setName(new Name("%" + searchString + " %", null)); - + + } else { + fs.setName(new Name(UDDIConstants.WILDCARD, null)); } - else fs.setName(new Name(UDDIConstants.WILDCARD, null)); fs.setFindQualifiers(new FindQualifiers()); fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - return inquiry.findTModel(fs); + return inquiry.findTModel(fs); } private enum AuthStyle { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCreatebulk.java ---------------------------------------------------------------------- diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCreatebulk.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCreatebulk.java deleted file mode 100644 index e97644c..0000000 --- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiCreatebulk.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright 2001-2013 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.juddi.v3.client.cli; - -import de.svenjacobs.loremipsum.LoremIpsum; -import java.util.GregorianCalendar; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.juddi.api_v3.AccessPointType; -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.*; -import org.uddi.v3_service.UDDIPublicationPortType; -import org.uddi.v3_service.UDDISecurityPortType; - -/** - * This class was used to identify performance issues when a given node has a - * large number of UDDI entities. It may not work on some commercial UDDI nodes - * due to licensing restrictions (some limit the number of business, services, - * etc) - * - * @author <a href="mailto:[email protected]";>Alex O'Ree</a> - */ -public class UddiCreatebulk { - - private static UDDISecurityPortType security = null; - private static UDDIPublicationPortType publish = null; - String curretNode = null; - public UddiCreatebulk(String node) { - try { - // create a manager and read the config in the archive; - // you can use your config file name - UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml"); - Transport transport = clerkManager.getTransport(node); - curretNode=node; - // Now you create a reference to the UDDI API - security = transport.getUDDISecurityService(); - publish = transport.getUDDIPublishService(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public UddiCreatebulk(Transport transport, boolean notused, String node) { - try { - curretNode=node; - security = transport.getUDDISecurityService(); - publish = transport.getUDDIPublishService(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * bulk creates businesses, services and binding templates - * @param token if null, root/root will be used to authenticate - * @param businesses - * @param servicesPerBusiness - * @param user purely for display purposes - */ - public void publishBusiness(String token, int businesses, int servicesPerBusiness, String user) { - try { - // Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges - // and can save other publishers). - if (token == null) { - GetAuthToken getAuthTokenRoot = new GetAuthToken(); - getAuthTokenRoot.setUserID("root"); - getAuthTokenRoot.setCred("root"); - - // 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!"); - token = rootAuthToken.getAuthInfo(); - } - - LoremIpsum textgen = new LoremIpsum(); - DatatypeFactory df = DatatypeFactory.newInstance(); - GregorianCalendar gcal = new GregorianCalendar(); - gcal.setTimeInMillis(System.currentTimeMillis()); - XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal); - for (int i = 0; i < businesses; i++) { - // Creating the parent business entity that will contain our service. - BusinessEntity myBusEntity = new BusinessEntity(); - Name myBusName = new Name(); - myBusName.setLang("en"); - myBusName.setValue(user + "'s Business " +curretNode +" " + i + " " + xcal.toString() + " " + textgen.getWords(5, 2) ); - myBusEntity.getDescription().add(new Description( textgen.getWords(10, 2), null)); - myBusEntity.getName().add(myBusName); - - // Adding the business entity to the "save" structure, using our publisher's authentication info and saving away. - SaveBusiness sb = new SaveBusiness(); - sb.getBusinessEntity().add(myBusEntity); - sb.setAuthInfo(token); - BusinessDetail bd = publish.saveBusiness(sb); - String myBusKey = bd.getBusinessEntity().get(0).getBusinessKey(); - System.out.println("saved: Business key: " + myBusKey); - for (int k = 0; k < servicesPerBusiness; k++) { - // Creating a service to save. Only adding the minimum data: the parent business key retrieved from saving the business - // above and a single name. - BusinessService myService = new BusinessService(); - myService.setBusinessKey(myBusKey); - Name myServName = new Name(); - myServName.setLang("en"); - myServName.setValue(user + "'s Service " +curretNode+" "+ i + " " + k + " " + xcal.toString()+ " " + textgen.getWords(5, 2) ); - myService.getName().add(myServName); - myService.getDescription().add(new Description( textgen.getWords(10, 2), null)); - - // Add binding templates, etc... - BindingTemplate myBindingTemplate = new BindingTemplate(); - myBindingTemplate.setCategoryBag(new CategoryBag()); - KeyedReference kr = new KeyedReference(); - kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - kr.setKeyName("keyname1"); - kr.setKeyValue("myvalue1"); - - myBindingTemplate.getCategoryBag().getKeyedReference().add(kr); - - KeyedReferenceGroup krg = new KeyedReferenceGroup(); - krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - kr = new KeyedReference(); - kr.setTModelKey(UDDIConstants.PROTOCOL_SSLv3); - kr.setKeyName("keyname1grp"); - kr.setKeyValue("myvalue1grp"); - - krg.getKeyedReference().add(kr); - myBindingTemplate.getCategoryBag().getKeyedReferenceGroup().add(krg); - - myService.setCategoryBag(new CategoryBag()); - - kr = new KeyedReference(); - kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - kr.setKeyName("Servicekeyname2grp"); - kr.setKeyValue("Servicemyvalue2grp"); - myService.getCategoryBag().getKeyedReference().add(kr); - - krg = new KeyedReferenceGroup(); - krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - kr = new KeyedReference(); - kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - kr.setKeyName("keyname1grp"); - kr.setKeyValue("myvalue1grp"); - - krg.getKeyedReference().add(kr); - myService.getCategoryBag().getKeyedReferenceGroup().add(krg); - - AccessPoint accessPoint = new AccessPoint(); - accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString()); - accessPoint.setValue("http://example.org/services/myservice"; + i + k + "?wsdl"); - myBindingTemplate.setAccessPoint(accessPoint); - myBindingTemplate.setTModelInstanceDetails(new TModelInstanceDetails()); - TModelInstanceInfo tii = new TModelInstanceInfo(); - Description d = new Description(); - d.setValue("Tmodel instance description"); - tii.getDescription().add(d); - tii.setTModelKey(UDDIConstants.TRANSPORT_HTTP); - tii.setInstanceDetails(new InstanceDetails()); - tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing this endpoint, up to 4KB of data"+ " " + textgen.getWords(20, 2) ); - tii.getInstanceDetails().getDescription().add(d); - OverviewDoc od = new OverviewDoc(); - d = new Description(); - d.setValue("ovweview doc description"+ " " + textgen.getWords(5, 2) ); - od.getDescription().add(d); - od.setOverviewURL(new OverviewURL()); - od.getOverviewURL().setUseType("www"); - od.getOverviewURL().setValue("www.apache.org"); - tii.getInstanceDetails().getOverviewDoc().add(od); - myBindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().add(tii); - - BindingTemplates myBindingTemplates = new BindingTemplates(); - myBindingTemplate = UDDIClient.addSOAPtModels(myBindingTemplate); - myBindingTemplates.getBindingTemplate().add(myBindingTemplate); - myService.setBindingTemplates(myBindingTemplates); - try { - // Adding the service to the "save" structure, using our publisher's authentication info and saving away. - SaveService ss = new SaveService(); - ss.getBusinessService().add(myService); - ss.setAuthInfo(token); - ServiceDetail sd = publish.saveService(ss); - String myServKey = sd.getBusinessService().get(0).getServiceKey(); - System.out.println("saved: service key: " + myServKey); - } catch (Exception x) { - x.printStackTrace(); - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void main(String args[]) { - UddiCreatebulk sp = new UddiCreatebulk(null); - sp.publishBusiness(null, 15, 20, "root"); - } -} http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 60b689d..1ffb858 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 @@ -39,10 +39,10 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiCustodyTransfer { - private static UDDISecurityPortType security = null; - private static UDDIPublicationPortType publish = null; - private static UDDIInquiryPortType uddiInquiryService = null; - private static UDDICustodyTransferPortType custodyTransferPortType = null; + private UDDISecurityPortType security = null; + private UDDIPublicationPortType publish = null; + private UDDIInquiryPortType uddiInquiryService = null; + private UDDICustodyTransferPortType custodyTransferPortType = null; public UddiCustodyTransfer() { try { @@ -61,7 +61,7 @@ public class UddiCustodyTransfer { } } - public static void main(String args[]) throws Exception { + public void main(String args[]) throws Exception { UddiCustodyTransfer sp = new UddiCustodyTransfer(); GetAuthToken getAuthTokenRoot = new GetAuthToken(); @@ -94,11 +94,9 @@ public class UddiCustodyTransfer { String BusinessKey) throws Exception { System.out.println("Transfering business key " + BusinessKey); - DatatypeFactory df = DatatypeFactory.newInstance(); GregorianCalendar gcal = new GregorianCalendar(); gcal.setTimeInMillis(System.currentTimeMillis()); - XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal); - + //Create a transfer token from fromUser to toUser KeyBag kb = new KeyBag(); kb.getKey().add(BusinessKey); http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 c034403..bc152c4 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 @@ -33,10 +33,10 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiDigitalSignatureBusiness { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; - private static UDDIPublicationPortType publish = null; - private static UDDIClient clerkManager = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; + private UDDIPublicationPortType publish = null; + private UDDIClient clerkManager = null; /** * This sets up the ws proxies using uddi.xml in META-INF http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 16761f2..84c8075 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 @@ -22,7 +22,6 @@ import org.apache.juddi.v3.client.config.UDDIClient; 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; /** @@ -32,8 +31,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiDigitalSignatureSearch { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; /** * This sets up the ws proxies using uddi.xml in META-INF http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 faf1075..c300ae1 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 @@ -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.*; @@ -33,10 +32,10 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiDigitalSignatureService { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; - private static UDDIPublicationPortType publish = null; - private static UDDIClient clerkManager = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; + private UDDIPublicationPortType publish = null; + private UDDIClient clerkManager = null; /** * This sets up the ws proxies using uddi.xml in META-INF http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 9f35503..7fe1862 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 @@ -32,10 +32,10 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiDigitalSignatureTmodel { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; - private static UDDIPublicationPortType publish = null; - private static UDDIClient clerkManager = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; + private UDDIPublicationPortType publish = null; + private UDDIClient clerkManager = null; /** * This sets up the ws proxies using uddi.xml in META-INF http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 3a00231..4904976 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 @@ -31,8 +31,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiFindBinding { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; public UddiFindBinding() { try { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 0afe170..d097c6d 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 @@ -19,9 +19,6 @@ package org.apache.juddi.v3.client.cli; import java.util.List; import org.apache.juddi.v3.client.config.UDDIClerk; import org.apache.juddi.v3.client.config.UDDIClient; -import org.apache.juddi.v3.client.transport.Transport; -import org.uddi.v3_service.UDDIInquiryPortType; -import org.uddi.v3_service.UDDISecurityPortType; /** * This class show you how get all available Access Points/Endpoints for a @@ -32,7 +29,7 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiFindEndpoints { - static UDDIClerk clerk = null; + private UDDIClerk clerk = null; public UddiFindEndpoints() { try { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 5f104e2..35648b3 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 @@ -31,8 +31,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiGetServiceDetails { - private static UDDISecurityPortType security = null; - private static UDDIInquiryPortType inquiry = null; + private UDDISecurityPortType security = null; + private UDDIInquiryPortType inquiry = null; public UddiGetServiceDetails() { try { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 c7290f3..b289353 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 @@ -31,8 +31,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiKeyGenerator { - private static UDDISecurityPortType security = null; - private static UDDIPublicationPortType publish = null; + private UDDISecurityPortType security = null; + private UDDIPublicationPortType publish = null; public UddiKeyGenerator() { try { http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 1b12e91..1c3e779 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 @@ -37,9 +37,8 @@ import org.uddi.v3_service.UDDISecurityPortType; */ public class UddiRelatedBusinesses { - private static UDDISecurityPortType security = null; - private static JUDDIApiPortType juddiApi = null; - private static UDDIPublicationPortType publish = null; + private UDDISecurityPortType security = null; + private UDDIPublicationPortType publish = null; public UddiRelatedBusinesses() { try { @@ -49,7 +48,6 @@ public class UddiRelatedBusinesses { Transport transport = clerkManager.getTransport(); // Now you create a reference to the UDDI API security = transport.getUDDISecurityService(); - juddiApi = transport.getJUDDIApiService(); publish = transport.getUDDIPublishService(); } catch (Exception e) { e.printStackTrace(); @@ -59,12 +57,9 @@ public class UddiRelatedBusinesses { public void fire(String businessKey, String authInfo, String businessKey1, String authInfo1, String relationship) throws Exception { try { - DatatypeFactory df = DatatypeFactory.newInstance(); GregorianCalendar gcal = new GregorianCalendar(); gcal.setTimeInMillis(System.currentTimeMillis()); - XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal); - - //ROOT creates half of the relationship + //ROOT creates half of the relationship //create a business relationship (publisher assertion) Holder<List<PublisherAssertion>> x = new Holder<List<PublisherAssertion>>(); PublisherAssertion pa = new PublisherAssertion(); @@ -116,7 +111,7 @@ public class UddiRelatedBusinesses { getAuthTokenRoot.setCred("root"); // Making API call that retrieves the authentication token for the 'root' user. - AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot); + AuthToken rootAuthToken = sp.security.getAuthToken(getAuthTokenRoot); System.out.println("root AUTHTOKEN = " + "don't log auth tokens!"); BusinessEntity rootbiz = sp.createBusiness("root"); @@ -125,7 +120,7 @@ public class UddiRelatedBusinesses { getAuthTokenRoot.setCred("uddi"); // Making API call that retrieves the authentication token for the 'root' user. - AuthToken uddiAuthToken = security.getAuthToken(getAuthTokenRoot); + AuthToken uddiAuthToken = sp.security.getAuthToken(getAuthTokenRoot); System.out.println("uddi AUTHTOKEN = " + "don't log auth tokens!"); BusinessEntity uddibiz = sp.createBusiness("uddi"); @@ -133,12 +128,12 @@ public class UddiRelatedBusinesses { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(uddiAuthToken.getAuthInfo()); sb.getBusinessEntity().add(uddibiz); - BusinessDetail uddibize = publish.saveBusiness(sb); + BusinessDetail uddibize = sp.publish.saveBusiness(sb); sb = new SaveBusiness(); sb.setAuthInfo(rootAuthToken.getAuthInfo()); sb.getBusinessEntity().add(rootbiz); - BusinessDetail rootbize = publish.saveBusiness(sb); + BusinessDetail rootbize = sp.publish.saveBusiness(sb); sp.fire(rootbize.getBusinessEntity().get(0).getBusinessKey(), rootAuthToken.getAuthInfo(), uddibize.getBusinessEntity().get(0).getBusinessKey(), uddiAuthToken.getAuthInfo(), http://git-wip-us.apache.org/repos/asf/juddi/blob/2a8bed4e/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 ac3a8f3..65e20cc 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,12 +38,12 @@ import org.uddi.v3_service.UDDIReplicationPortType; */ class UddiReplication { - 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()); + + uddiReplicationPort = new UDDIService().getUDDIReplicationPort(); + ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, client.getClientConfig().getUDDINode(nodename).getReplicationUrl()); } protected String doPing() { @@ -59,7 +59,7 @@ class UddiReplication { protected void getHighWatermarks() { try { - List<ChangeRecordIDType> highWaterMarks = uddiReplicationPort.getHighWaterMarks(); + List<ChangeRecordIDType> highWaterMarks = uddiReplicationPort.getHighWaterMarks(); System.out.println("Success...."); System.out.println("Node, USN"); for (int i = 0; i < highWaterMarks.size(); i++) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
