diff options
Diffstat (limited to 'base/java-tools/src')
15 files changed, 129 insertions, 55 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java index 7c2361da3..45c2acf16 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java @@ -76,9 +76,10 @@ public class GroupFindCLI extends CLI { GroupCollection response = groupCLI.groupClient.findGroups(filter, start, size); - Collection<GroupData> entries = response.getGroups(); + Collection<GroupData> entries = response.getEntries(); - MainCLI.printMessage(entries.size()+" group(s) matched"); + MainCLI.printMessage(response.getTotal() + " group(s) matched"); + if (response.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java index b9c9ac76d..ee694912d 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java @@ -82,9 +82,10 @@ public class GroupMemberFindCLI extends CLI { GroupMemberCollection response = groupMemberCLI.groupClient.findGroupMembers(groupID, start, size); - Collection<GroupMemberData> entries = response.getMembers(); + Collection<GroupMemberData> entries = response.getEntries(); - MainCLI.printMessage(entries.size()+" group member(s) matched"); + MainCLI.printMessage(response.getTotal() + " group member(s) matched"); + if (response.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java index 0808a0a70..08c8496ca 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java @@ -74,7 +74,8 @@ public class ActivityFindCLI extends CLI { ActivityCollection result = activityCLI.activityClient.findActivities(start, size); Collection<ActivityData> activities = result.getEntries(); - MainCLI.printMessage(activities.size() + " activity(s) matched"); + MainCLI.printMessage(result.getTotal() + " activity(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java b/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java index 245c9a61e..4570d9a91 100644 --- a/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java @@ -74,7 +74,8 @@ public class SelfTestFindCLI extends CLI { SelfTestCollection result = selfTestCLI.selfTestClient.findSelfTests(start, size); Collection<SelfTestData> selfTests = result.getEntries(); - MainCLI.printMessage(selfTests.size() + " connection(s) matched"); + MainCLI.printMessage(result.getTotal() + " self test(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java index 4caab729f..737851704 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java @@ -22,7 +22,6 @@ import java.util.Collection; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; -import com.netscape.certsrv.base.ResourceNotFoundException; import com.netscape.certsrv.system.TPSConnectorCollection; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; @@ -32,10 +31,11 @@ import com.netscape.cmstools.cli.MainCLI; * @author Ade Lee */ public class TPSConnectorFindCLI extends CLI { + public TPSConnectorCLI tpsConnectorCLI; public TPSConnectorFindCLI(TPSConnectorCLI tpsConnectorCLI) { - super("find", "Find TPS connector details on TKS", tpsConnectorCLI); + super("find", "Find TPS connectors on TKS", tpsConnectorCLI); this.tpsConnectorCLI = tpsConnectorCLI; } @@ -44,12 +44,13 @@ public class TPSConnectorFindCLI extends CLI { } public void execute(String[] args) throws Exception { - Option option = new Option(null, "host", true, "TPS host"); - option.setArgName("host"); + + Option option = new Option(null, "start", true, "Page start"); + option.setArgName("start"); options.addOption(option); - option = new Option(null, "port", true, "TPS port"); - option.setArgName("port"); + option = new Option(null, "size", true, "Page size"); + option.setArgName("size"); options.addOption(option); CommandLine cmd = null; @@ -63,42 +64,29 @@ public class TPSConnectorFindCLI extends CLI { System.exit(1); } - String tpsHost = cmd.getOptionValue("host"); - String tpsPort = cmd.getOptionValue("port"); - - if (tpsHost != null) { - if (tpsPort == null) - tpsPort = "443"; - try { - TPSConnectorData data = tpsConnectorCLI.tpsConnectorClient.getConnector( - tpsHost, tpsPort); - TPSConnectorCLI.printConnectorInfo(data); - } catch (ResourceNotFoundException e) { - System.out.println(" TPS connector not found."); - return; - } - } else { - TPSConnectorCollection result = tpsConnectorCLI.tpsConnectorClient.listConnectors(); - Collection<TPSConnectorData> conns = result.getEntries(); + String s = cmd.getOptionValue("start"); + Integer start = s == null ? null : Integer.valueOf(s); - if (conns.isEmpty()) { - System.out.println(" No TPS connectors found."); - return; - } + s = cmd.getOptionValue("size"); + Integer size = s == null ? null : Integer.valueOf(s); + + TPSConnectorCollection result = tpsConnectorCLI.tpsConnectorClient.findConnectors(start, size); - MainCLI.printMessage(conns.size() + " TPS connector(s) matched"); - boolean first = true; - for (TPSConnectorData data: conns) { - if (first) { - first = false; - } else { - System.out.println(); - } + MainCLI.printMessage(result.getTotal() + " TPS connector(s) matched"); + if (result.getTotal() == 0) return; - TPSConnectorCLI.printConnectorInfo(data); + Collection<TPSConnectorData> conns = result.getEntries(); + boolean first = true; + for (TPSConnectorData data: conns) { + if (first) { + first = false; + } else { + System.out.println(); } - MainCLI.printMessage("Number of entries returned " + conns.size()); + TPSConnectorCLI.printConnectorInfo(data); } + + MainCLI.printMessage("Number of entries returned " + conns.size()); } } diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java new file mode 100644 index 000000000..43d28c839 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorShowCLI.java @@ -0,0 +1,73 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2013 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- +package com.netscape.cmstools.system; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import com.netscape.certsrv.system.TPSConnectorData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Ade Lee + */ +public class TPSConnectorShowCLI extends CLI { + + public TPSConnectorCLI tpsConnectorCLI; + + public TPSConnectorShowCLI(TPSConnectorCLI tpsConnectorCLI) { + super("show", "Show TPS connector details on TKS", tpsConnectorCLI); + this.tpsConnectorCLI = tpsConnectorCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + Option option = new Option(null, "host", true, "TPS host"); + option.setArgName("host"); + option.setRequired(true); + options.addOption(option); + + option = new Option(null, "port", true, "TPS port"); + option.setArgName("port"); + options.addOption(option); + + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); + + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); + printHelp(); + System.exit(1); + } + + String tpsHost = cmd.getOptionValue("host"); + String tpsPort = cmd.getOptionValue("port", "443"); + + TPSConnectorData data = tpsConnectorCLI.tpsConnectorClient.getConnector(tpsHost, tpsPort); + + MainCLI.printMessage("TPS Connector \"" + tpsHost + ":" + tpsPort + "\""); + TPSConnectorCLI.printConnectorInfo(data); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java index 2ff8288a0..81724bb31 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java @@ -74,7 +74,8 @@ public class AuthenticatorFindCLI extends CLI { AuthenticatorCollection result = authenticatorCLI.authenticatorClient.findAuthenticators(start, size); Collection<AuthenticatorData> authenticators = result.getEntries(); - MainCLI.printMessage(authenticators.size() + " authenticator(s) matched"); + MainCLI.printMessage(result.getTotal() + " authenticator(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java index 4d0827cb3..9ba66a62a 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java @@ -74,7 +74,8 @@ public class TPSCertFindCLI extends CLI { TPSCertCollection result = certCLI.certClient.findCerts(start, size); Collection<TPSCertData> certs = result.getEntries(); - MainCLI.printMessage(certs.size() + " certificate(s) matched"); + MainCLI.printMessage(result.getTotal() + " certificate(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java index 6112db4ff..7cb4c1b16 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java @@ -74,7 +74,8 @@ public class ConnectionFindCLI extends CLI { ConnectionCollection result = connectionCLI.connectionClient.findConnections(start, size); Collection<ConnectionData> connections = result.getEntries(); - MainCLI.printMessage(connections.size() + " connection(s) matched"); + MainCLI.printMessage(result.getTotal() + " connection(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java index 9f822f6ba..907641462 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java @@ -74,7 +74,8 @@ public class ProfileFindCLI extends CLI { ProfileCollection result = profileCLI.profileClient.findProfiles(start, size); Collection<ProfileData> profiles = result.getEntries(); - MainCLI.printMessage(profiles.size() + " profile(s) matched"); + MainCLI.printMessage(result.getTotal() + " profile(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java index d96268be7..6e101a049 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java @@ -74,7 +74,8 @@ public class ProfileMappingFindCLI extends CLI { ProfileMappingCollection result = profileMappingCLI.profileMappingClient.findProfileMappings(start, size); Collection<ProfileMappingData> profileMappings = result.getEntries(); - MainCLI.printMessage(profileMappings.size() + " profile mapping(s) matched"); + MainCLI.printMessage(result.getTotal() + " profile mapping(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java index 3ade40bb9..2e43f3cdd 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java @@ -74,7 +74,8 @@ public class TokenFindCLI extends CLI { TokenCollection result = tokenCLI.tokenClient.findTokens(start, size); Collection<TokenData> tokens = result.getEntries(); - MainCLI.printMessage(tokens.size() + " token(s) matched"); + MainCLI.printMessage(result.getTotal() + " token(s) matched"); + if (result.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java index 680b6b362..db7c0304b 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java @@ -82,9 +82,10 @@ public class UserCertFindCLI extends CLI { UserCertCollection response = userCertCLI.userClient.findUserCerts(userID, start, size); - Collection<UserCertData> entries = response.getCerts(); + Collection<UserCertData> entries = response.getEntries(); - MainCLI.printMessage(entries.size() + " user cert(s) matched"); + MainCLI.printMessage(response.getTotal() + " user cert(s) matched"); + if (response.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java index 4b081920e..ed49d1c65 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java @@ -76,9 +76,10 @@ public class UserFindCLI extends CLI { UserCollection response = userCLI.userClient.findUsers(filter, start, size); - Collection<UserData> entries = response.getUsers(); + Collection<UserData> entries = response.getEntries(); - MainCLI.printMessage(entries.size() + " user(s) matched"); + MainCLI.printMessage(response.getTotal() + " user(s) matched"); + if (response.getTotal() == 0) return; boolean first = true; diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java index 129aa6dc8..66b8f36bb 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java @@ -82,9 +82,10 @@ public class UserMembershipFindCLI extends CLI { UserMembershipCollection response = userMembershipCLI.userClient.findUserMemberships(userID, start, size); - Collection<UserMembershipData> entries = response.getMemberships(); + Collection<UserMembershipData> entries = response.getEntries(); - MainCLI.printMessage(entries.size()+" membership(s) matched"); + MainCLI.printMessage(response.getTotal() + " membership(s) matched"); + if (response.getTotal() == 0) return; boolean first = true; |