Skip to content

Commit 4333987

Browse files
author
Greg Meyer
authored
Merge pull request #5 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents 7689557 + 371632e commit 4333987

11 files changed

Lines changed: 258 additions & 35 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
hs_err_pid*
2424
/.classpath
2525
/.project
26+
/target/

‎pom.xml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nhind</groupId>
55
<artifactId>config-manager</artifactId>
6-
<version>6.0.1</version>
6+
<version>8.0.0</version>
77
<packaging>jar</packaging>
88
<name>NHIN Direct Java configuration manager</name>
99
<description>NHIN Direct Java configuration manager</description>
1010
<url>https://github.com/DirectProjectJavaRI/config-manager</url>
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.1.6.RELEASE</version>
14+
<version>2.5.2</version>
1515
<relativePath />
1616
</parent>
1717
<scm>
@@ -28,7 +28,7 @@
2828
</developer>
2929
</developers>
3030
<prerequisites>
31-
<maven>3.0.0</maven>
31+
<maven>3.5.0</maven>
3232
</prerequisites>
3333
<licenses>
3434
<license>
@@ -38,7 +38,7 @@
3838
</licenses>
3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<spring-cloud-dependencies.version>Greenwich.SR1</spring-cloud-dependencies.version>
41+
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
4242
</properties>
4343
<dependencyManagement>
4444
<dependencies>
@@ -52,20 +52,24 @@
5252
</dependencies>
5353
</dependencyManagement>
5454
<dependencies>
55+
<dependency>
56+
<groupId>org.springframework.cloud</groupId>
57+
<artifactId>spring-cloud-starter-bootstrap</artifactId>
58+
</dependency>
5559
<dependency>
5660
<groupId>org.nhind</groupId>
5761
<artifactId>config-service-client</artifactId>
58-
<version>6.0</version>
62+
<version>8.0.0</version>
5963
</dependency>
6064
<dependency>
6165
<groupId>org.nhind</groupId>
6266
<artifactId>direct-common</artifactId>
63-
<version>6.0.1</version>
67+
<version>8.0.0</version>
6468
</dependency>
6569
<dependency>
6670
<groupId>org.nhind</groupId>
6771
<artifactId>agent</artifactId>
68-
<version>6.0.2</version>
72+
<version>8.0.0</version>
6973
</dependency>
7074
</dependencies>
7175
<build>
@@ -88,9 +92,8 @@
8892
<plugin>
8993
<groupId>org.apache.maven.plugins</groupId>
9094
<artifactId>maven-javadoc-plugin</artifactId>
91-
<version>2.9.1</version>
9295
<configuration>
93-
<additionalparam>-Xdoclint:none</additionalparam>
96+
<additionalJOption>-Xdoclint:none</additionalJOption>
9497
<charset>UTF-8</charset>
9598
<docencoding>UTF-8</docencoding>
9699
<docfilessubdirs>true</docfilessubdirs>
@@ -108,7 +111,8 @@
108111
</goals>
109112
</execution>
110113
</executions>
111-
</plugin>
114+
</plugin>
115+
<!-- for releases only
112116
<plugin>
113117
<groupId>org.apache.maven.plugins</groupId>
114118
<artifactId>maven-gpg-plugin</artifactId>
@@ -121,22 +125,22 @@
121125
</goals>
122126
</execution>
123127
</executions>
124-
</plugin>
128+
<version>3.0.1</version>
129+
</plugin>
130+
-->
125131
</plugins>
126132
</build>
127133
<reporting>
128134
<plugins>
129135
<plugin>
130136
<groupId>org.apache.maven.plugins</groupId>
131137
<artifactId>maven-project-info-reports-plugin</artifactId>
132-
<version>2.9</version>
133138
</plugin>
134139
<plugin>
135140
<groupId>org.apache.maven.plugins</groupId>
136141
<artifactId>maven-javadoc-plugin</artifactId>
137-
<version>2.9.1</version>
138142
<configuration>
139-
<additionalparam>-Xdoclint:none</additionalparam>
143+
<additionalJOption>-Xdoclint:none</additionalJOption>
140144
<charset>UTF-8</charset>
141145
<docencoding>UTF-8</docencoding>
142146
<docfilessubdirs>true</docfilessubdirs>
@@ -160,6 +164,7 @@
160164
<plugin>
161165
<groupId>org.apache.maven.plugins</groupId>
162166
<artifactId>maven-jxr-plugin</artifactId>
167+
<version>3.1.1</version>
163168
</plugin>
164169
<plugin>
165170
<groupId>org.codehaus.mojo</groupId>
@@ -181,15 +186,7 @@
181186
</configuration>
182187
</plugin>
183188
</plugins>
184-
</reporting>
185-
<repositories>
186-
<!-- Temp repository for Spring Boot Milestone -->
187-
<repository>
188-
<id>spring-milestone</id>
189-
<name>Spring Milestone Releases</name>
190-
<url>https://repo.spring.io/milestone/</url>
191-
</repository>
192-
</repositories>
189+
</reporting>
193190
<distributionManagement>
194191
<site>
195192
<id>nhind-site</id>

‎src/main/java/org/nhindirect/config/manager/AddressCommands.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public AddressCommands(AddressService addressService)
2525
}
2626

2727
@Command(name = "ListAddressesByDomain", usage = LIST_ADDRESSES_BY_DOMAIN)
28-
public void listCerts(String[] args)
28+
public void listAddresesByDomain(String[] args)
2929
{
3030

3131
String domain = StringArrayUtil.getRequiredValue(args, 0);

‎src/main/java/org/nhindirect/config/manager/CertCommands.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,11 @@ public void removeCertByTP(String[] args)
294294

295295
try
296296
{
297-
298-
final Certificate cert = certService.getCertificatesByOwnerAndThumbprint("", tp);
297+
final Certificate cert = certService.getCertificatesByOwnerAndThumbprint(" ", tp);
299298

300299
if (cert == null)
301300
{
302-
System.out.println("Certificate with thumbprint." + tp + " cannot be found in the system");
301+
System.out.println("Certificate with thumbprint " + tp + " cannot be found in the system");
303302
return;
304303
}
305304

‎src/main/java/org/nhindirect/config/manager/ConfigManager.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
import org.nhindirect.common.tooling.Commands;
1414
import org.springframework.beans.factory.annotation.Autowired;
1515
import org.springframework.boot.CommandLineRunner;
16-
import org.springframework.boot.SpringApplication;
16+
import org.springframework.boot.WebApplicationType;
1717
import org.springframework.boot.autoconfigure.SpringBootApplication;
18+
import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
19+
import org.springframework.boot.builder.SpringApplicationBuilder;
1820

19-
@SpringBootApplication
21+
@SpringBootApplication(exclude= {R2dbcAutoConfiguration.class})
2022
public class ConfigManager implements CommandLineRunner
2123
{
2224
@Autowired
@@ -55,7 +57,7 @@ public class ConfigManager implements CommandLineRunner
5557
*/
5658
public static void main(String[] args)
5759
{
58-
SpringApplication.run(ConfigManager.class, args);
60+
new SpringApplicationBuilder(ConfigManager.class).web(WebApplicationType.NONE).run(args);
5961
}
6062

6163
public void run(String... args)
@@ -121,6 +123,9 @@ public boolean runApp(String[] args)
121123

122124
commands.register(new AddressCommands(addressService));
123125

126+
commands.register(new PerformanceCommands(anchorService, domainService, certService,
127+
certPolicyService, settingService, dnsService, addressService, bundleService));
128+
124129
if (args != null && args.length > 0)
125130
{
126131
return commands.run(args);

‎src/main/java/org/nhindirect/config/manager/DomainCommands.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.nhindirect.config.manager;
22

3+
import java.util.Arrays;
34
import java.util.Collection;
45

56
import org.nhind.config.rest.DomainService;
@@ -14,6 +15,8 @@ public class DomainCommands
1415
{
1516
private static final String LIST_DOMAINS_USAGE = "Lists domains in the system";
1617

18+
private static final String GET_DOMAINS_USAGE = "Gets domain's infomation on the system. The domain name must be an exact match";
19+
1720
private static final String ADD_DOMAIN_USAGE = "Adds a domain to the system." +
1821
"\r\n domainName postmasterEmail " +
1922
"\r\n\t domainName: The name of the new domain." +
@@ -57,6 +60,33 @@ public void listDomains(String[] args)
5760

5861
}
5962

63+
64+
@Command(name = "GetDomain", usage = GET_DOMAINS_USAGE)
65+
public void getDomain(String[] args)
66+
{
67+
final String domainName = StringArrayUtil.getRequiredValue(args, 0);
68+
69+
// get them all
70+
try
71+
{
72+
final Domain domain = domainService.getDomain(domainName);
73+
if (domain == null)
74+
{
75+
System.out.println("Domain " + domainName + " is not in the system.");
76+
return;
77+
}
78+
79+
domainPrinter.printRecords(Arrays.asList(domain));
80+
}
81+
catch (Exception e)
82+
{
83+
e.printStackTrace();
84+
System.err.println("Failed to retrieve domains: " + e.getMessage());
85+
}
86+
87+
}
88+
89+
6090
@Command(name = "AddDomain", usage = ADD_DOMAIN_USAGE)
6191
public void addDomain(String[] args)
6292
{

0 commit comments

Comments
 (0)