github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Move Let's Encrypt provider to main module. 

There is no good reason to place providers in separate modules.
pull/17/merge
Richard Körber 2015-12-16 00:45:32 +01:00
parent c45c29226e
commit a775cf868f
19 changed files with 11 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -31,7 +31,6 @@ How to Use
_acme4j_ consists of a few modules:
* _acme4j-client_: This is the main module. It contains the ACME client and everything needed for communication with an ACME server.
* _acme4j-letsencrypt_: A _Let's Encrypt_ service. Just add it as dependency, it will neatly plug into the client.
* _acme4j-utils_: Some utility classes that may be helpful for creating key pairs, certificates, and certificate signing requests. Requires [Bouncy Castle](https://www.bouncycastle.org/java.html).
* _acme4j-example_: An example tool that performs all steps for registering a new account at _Let's Encrypt_ and getting a certificate for a set of domain names. This is a good starting point to find out how _acme4j_ is used.

4
acme4j-letsencrypt/src/main/java/org/shredzone/acme4j/provider/LetsEncryptAcmeClientProvider.java → acme4j-client/src/main/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeClientProvider.java
View File

@ -11,12 +11,14 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j.provider;
package org.shredzone.acme4j.provider.letsencrypt;
import java.net.URI;
import java.net.URISyntaxException;
import org.shredzone.acme4j.connector.HttpConnector;
import org.shredzone.acme4j.provider.AbstractAcmeClientProvider;
import org.shredzone.acme4j.provider.AcmeClientProvider;
/**
* An {@link AcmeClientProvider} for <em>Let's Encrypt</em>.

2
acme4j-letsencrypt/src/main/java/org/shredzone/acme4j/provider/LetsEncryptHttpConnector.java → acme4j-client/src/main/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptHttpConnector.java
View File

@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j.provider;
package org.shredzone.acme4j.provider.letsencrypt;
import java.io.IOException;
import java.net.HttpURLConnection;

3
acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeClientProvider
View File

@ -1,2 +1,5 @@
# Generic
org.shredzone.acme4j.provider.GenericAcmeClientProvider
# Let's Encrypt: https://letsencrypt.org
org.shredzone.acme4j.provider.letsencrypt.LetsEncryptAcmeClientProvider

0
acme4j-letsencrypt/src/main/resources/org/shredzone/acme4j/letsencrypt.truststore → acme4j-client/src/main/resources/org/shredzone/acme4j/letsencrypt.truststore
View File

3
acme4j-letsencrypt/src/test/java/org/shredzone/acme4j/provider/LetsEncryptAcmeClientProviderTest.java → acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeClientProviderTest.java
View File

@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j.provider;
package org.shredzone.acme4j.provider.letsencrypt;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*;
@ -20,6 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.junit.Test;
import org.shredzone.acme4j.provider.letsencrypt.LetsEncryptAcmeClientProvider;
/**
* Unit tests for {@link LetsEncryptAcmeClientProvider}.

3
acme4j-letsencrypt/src/test/java/org/shredzone/acme4j/provider/LetsEncryptHttpConnectorTest.java → acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptHttpConnectorTest.java
View File

@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j.provider;
package org.shredzone.acme4j.provider.letsencrypt;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
@ -27,6 +27,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.shredzone.acme4j.provider.letsencrypt.LetsEncryptHttpConnector;
/**
* Unit test for {@link LetsEncryptHttpConnector}.

5
acme4j-example/pom.xml
View File

@ -54,11 +54,6 @@
<artifactId>acme4j-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.shredzone.acme4j</groupId>
<artifactId>acme4j-letsencrypt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.shredzone.acme4j</groupId>
<artifactId>acme4j-utils</artifactId>

23
acme4j-letsencrypt/.project
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>acme4j-letsencrypt</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

38
acme4j-letsencrypt/pom.xml
View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
* acme4j - ACME Java client
*
* Copyright (C) 2015 Richard "Shred" Körber
* http://acme4j.shredzone.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.shredzone.acme4j</groupId>
<artifactId>acme4j</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
<artifactId>acme4j-letsencrypt</artifactId>
<name>acme4j Let's Encrypt</name>
<description>Let's Encrypt service provider for acme4j</description>
<dependencies>
<dependency>
<groupId>org.shredzone.acme4j</groupId>
<artifactId>acme4j-client</artifactId>
<version>${parent.version}</version>
</dependency>
</dependencies>
</project>

0
acme4j-letsencrypt/src/main/java/.gitignore vendored
View File

0
acme4j-letsencrypt/src/main/resources/.gitignore vendored
View File

2
acme4j-letsencrypt/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeClientProvider
View File

@ -1,2 +0,0 @@
# Let's Encrypt: https://letsencrypt.org
org.shredzone.acme4j.provider.LetsEncryptAcmeClientProvider

1
acme4j-letsencrypt/src/site/apt/index.apt
View File

@ -1 +0,0 @@
Let's Encrypt service provider for the Java ACME client.

6
acme4j-letsencrypt/src/site/resources/css/site.css
View File

@ -1,6 +0,0 @@
a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
background: none;
padding-right: 0;
}

38
acme4j-letsencrypt/src/site/site.xml
View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
* acme4j - ACME Java client
*
* Copyright (C) 2015 Richard "Shred" Körber
* http://acme4j.shredzone.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.
*
-->
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate position="right"/>
<version position="right"/>
<body>
<links>
<item name="Home" href="index.html"/>
<item name="Project Management" href="http://acme4j.shredzone.org"/>
</links>
<breadcrumbs>
<item name="shredzone.org" href="http://www.shredzone.org"/>
<item name="acme4j" href="../index.html"/>
<item name="acme4j-letsencrypt" href="index.html"/>
</breadcrumbs>
<menu name="Main">
<item name="Introduction" href="index.html"/>
<item name="Project Management" href="http://acme4j.shredzone.org"/>
</menu>
<menu ref="modules"/>
<menu ref="reports"/>
</body>
</project>

0
acme4j-letsencrypt/src/test/java/.gitignore vendored
View File

0
acme4j-letsencrypt/src/test/resources/.gitignore vendored
View File

1
pom.xml
View File

@ -59,7 +59,6 @@
<modules>
<module>acme4j-client</module>
<module>acme4j-letsencrypt</module>
<module>acme4j-utils</module>
<module>acme4j-example</module>
</modules>