Skip to content

Commit 50c54b0

Browse files
basketmcbasketmc
committed
0.11.0: Refactoring, bugfixing, Konfig plain in Datei speicherbar (in der application.yaml) einstellbar
1 parent af5bc4a commit 50c54b0

File tree

101 files changed

+357
-263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+357
-263
lines changed

‎pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.0.1</version>
8+
<version>3.0.4</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>net.sberg</groupId>
1212
<artifactId>openkim</artifactId>
13-
<version>0.10.0-dev1</version>
13+
<version>0.11.0</version>
1414
<name>openkim</name>
1515
<description>Open KIM Client Modul</description>
1616

1717
<properties>
18-
<!-- <log4j2.version>2.16.0</log4j2.version>-->
1918
<logback.version>1.4.5</logback.version>
2019
</properties>
2120

@@ -186,7 +185,6 @@
186185
<dependency>
187186
<groupId>org.webjars</groupId>
188187
<artifactId>bootstrap</artifactId>
189-
<!-- update >4.5.3 will crash GUI -->
190188
<version>4.5.3</version>
191189
</dependency>
192190
<dependency>

‎src/main/java/net/sberg/openkim/common/CommonBuilderFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package net.sberg.openkim.common;
1818

19-
import net.sberg.openkim.konfiguration.konnektor.*;
20-
import net.sberg.openkim.konfiguration.konnektor.webservice.jaxb.CMSAttribute;
19+
import net.sberg.openkim.konnektor.*;
20+
import net.sberg.openkim.konnektor.webservice.jaxb.CMSAttribute;
2121
import net.sberg.openkim.log.DefaultLogger;
2222
import org.apache.http.HttpEntity;
2323
import org.apache.http.auth.AuthScope;

‎src/main/java/net/sberg/openkim/common/ICommonConstants.java

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public interface ICommonConstants {
2929
String KONNEKTOR_TRUSTORE_JKS = KONNEKTOR_DIR + "truststore.jks";
3030
String KONNEKTOR_TRUSTORE_JKS_PWD = "changeit";
3131
String KONNEKTOR_TRUSTORE_JKS_CERT_ALIAS = "servercert";
32-
String[] ENC_KEYS = new String[]{"qwzwebnjcv5461237884", "fgjnkfnkndfk", "tgzjnbdnbjdfngj", "dkgfjgkfjgkjfgkfxccnv", "rfughnvvcnbfjgjvnxcbn"};
3332
String OPENKIM_SERVER_KEYSTORE_FILENAME = "openkimkeystore.jks";
34-
String OPENKIM_SERVER_KEYSTORE_PWD = "123!sberg!456";
3533
String OPENKIM_SERVER_KEYSTORE_ALIAS = "openkimkeystorealias_";
3634
}

‎src/main/java/net/sberg/openkim/common/x509/CMSUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package net.sberg.openkim.common.x509;
1818

19-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
19+
import net.sberg.openkim.konnektor.Konnektor;
2020
import org.bouncycastle.asn1.*;
2121
import org.bouncycastle.asn1.cms.*;
2222
import org.bouncycastle.asn1.x509.Certificate;

‎src/main/java/net/sberg/openkim/common/x509/X509CertificateResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package net.sberg.openkim.common.x509;
1818

1919
import lombok.Data;
20-
import net.sberg.openkim.konfiguration.konnektor.vzd.VzdResult;
20+
import net.sberg.openkim.konnektor.vzd.VzdResult;
2121

2222
import java.util.ArrayList;
2323
import java.util.List;

‎src/main/java/net/sberg/openkim/dashboard/DashboardController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import net.sberg.openkim.konfiguration.Konfiguration;
2020
import net.sberg.openkim.konfiguration.KonfigurationService;
21-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
21+
import net.sberg.openkim.konnektor.Konnektor;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/net/sberg/openkim/dashboard/DashboardService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717
package net.sberg.openkim.dashboard;
1818

19-
import net.sberg.openkim.konfiguration.fachdienst.Fachdienst;
20-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
21-
import net.sberg.openkim.konfiguration.konnektor.KonnektorServiceBean;
22-
import net.sberg.openkim.konfiguration.konnektor.card.KonnektorCard;
19+
import net.sberg.openkim.fachdienst.Fachdienst;
20+
import net.sberg.openkim.konnektor.Konnektor;
21+
import net.sberg.openkim.konnektor.KonnektorServiceBean;
22+
import net.sberg.openkim.konnektor.card.KonnektorCard;
2323
import org.springframework.stereotype.Service;
2424

2525
import java.util.Iterator;

‎src/main/java/net/sberg/openkim/dashboard/KonnektorMonitoringFachdienstResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package net.sberg.openkim.dashboard;
1818

1919
import lombok.Data;
20-
import net.sberg.openkim.konfiguration.fachdienst.EnumFachdienst;
20+
import net.sberg.openkim.fachdienst.EnumFachdienst;
2121

2222
@Data
2323
public class KonnektorMonitoringFachdienstResult {

‎src/main/java/net/sberg/openkim/dashboard/KonnektorMonitoringWebserviceResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package net.sberg.openkim.dashboard;
1818

1919
import lombok.Data;
20-
import net.sberg.openkim.konfiguration.konnektor.EnumKonnektorServiceBeanType;
20+
import net.sberg.openkim.konnektor.EnumKonnektorServiceBeanType;
2121

2222
@Data
2323
public class KonnektorMonitoringWebserviceResult {

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/EnumFachdienst.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/EnumFachdienst.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
public enum EnumFachdienst {
2020
ARVATO(

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/EnumFachdienstDomainDescrId.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/EnumFachdienstDomainDescrId.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
public enum EnumFachdienstDomainDescrId {
2020
SMTP, POP3, AM, KAS

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/Fachdienst.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/Fachdienst.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
import lombok.Data;
2020

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/FachdienstDescr.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/FachdienstDescr.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
import lombok.Data;
2020
import net.sberg.openkim.konfiguration.EnumTIEnvironment;

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/FachdienstDomainDescr.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/FachdienstDomainDescr.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
import lombok.Data;
2020
import net.sberg.openkim.konfiguration.EnumTIEnvironment;

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/FachdienstService.java renamed to ‎src/main/java/net/sberg/openkim/fachdienst/FachdienstService.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* See the Licence for the specific language governing permissions and
1515
* limitations under the Licence.
1616
*/
17-
package net.sberg.openkim.konfiguration.fachdienst;
17+
package net.sberg.openkim.fachdienst;
1818

1919
import com.fasterxml.jackson.core.type.TypeReference;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
2121
import de.gematik.kim.kas.ApiClient;
2222
import de.gematik.kim.kas.api.AttachmentsApi;
2323
import net.sberg.openkim.konfiguration.EnumTIEnvironment;
2424
import net.sberg.openkim.konfiguration.Konfiguration;
25-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
26-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResult;
27-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResultContainer;
28-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
25+
import net.sberg.openkim.konnektor.Konnektor;
26+
import net.sberg.openkim.konnektor.dns.DnsResult;
27+
import net.sberg.openkim.konnektor.dns.DnsResultContainer;
28+
import net.sberg.openkim.konnektor.dns.DnsService;
2929
import net.sberg.openkim.log.DefaultLogger;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;

‎src/main/java/net/sberg/openkim/konfiguration/fachdienst/README.md renamed to ‎src/main/java/net/sberg/openkim/fachdienst/README.md

File renamed without changes.

‎src/main/java/net/sberg/openkim/gateway/GatewayKeystoreService.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.jboss.netty.handler.ssl.util.SelfSignedCertificate;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
24+
import org.springframework.beans.factory.annotation.Value;
2425
import org.springframework.stereotype.Service;
25-
import org.springframework.util.Base64Utils;
2626

2727
import java.io.ByteArrayInputStream;
2828
import java.io.File;
@@ -54,6 +54,9 @@ public class GatewayKeystoreService {
5454
private static final String BEGIN_KEY = "-----BEGIN PRIVATE KEY-----";
5555
private static final String END_KEY = "-----END PRIVATE KEY-----";
5656

57+
@Value("${gatewaykeystore.password}")
58+
private String password;
59+
5760
public void createSelfSigned() throws Exception {
5861
if (log.isInfoEnabled()) {
5962
log.info("***generateSelfSigned keys and cert - BEGIN***");
@@ -74,18 +77,18 @@ public void createSelfSigned() throws Exception {
7477
.replaceAll(System.lineSeparator(), "")
7578
.replace(END_KEY, "");
7679

77-
byte[] encoded = Base64Utils.decodeFromString(privateKeyPEM);
80+
byte[] encoded = Base64.getDecoder().decode(privateKeyPEM);
7881

7982
PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(encoded);
8083
KeyFactory kf = KeyFactory.getInstance("RSA");
8184
PrivateKey privKey = kf.generatePrivate(spec);
8285

8386
KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
8487
keyStore.load(null, null);
85-
keyStore.setKeyEntry(ICommonConstants.OPENKIM_SERVER_KEYSTORE_ALIAS, privKey, ICommonConstants.OPENKIM_SERVER_KEYSTORE_PWD.toCharArray(), chain);
88+
keyStore.setKeyEntry(ICommonConstants.OPENKIM_SERVER_KEYSTORE_ALIAS, privKey, password.toCharArray(), chain);
8689
keyStore.store(
8790
new FileOutputStream(new File(ICommonConstants.BASE_DIR + ICommonConstants.OPENKIM_SERVER_KEYSTORE_FILENAME)),
88-
ICommonConstants.OPENKIM_SERVER_KEYSTORE_PWD.toCharArray()
91+
password.toCharArray()
8992
);
9093

9194
if (log.isInfoEnabled()) {
@@ -122,10 +125,10 @@ public void create(GatewayKeystoreData eldixSmtpKeystoreData) throws Exception {
122125
//write to keystore
123126
KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
124127
keyStore.load(null, null);
125-
keyStore.setKeyEntry(ICommonConstants.OPENKIM_SERVER_KEYSTORE_ALIAS, privKey, ICommonConstants.OPENKIM_SERVER_KEYSTORE_PWD.toCharArray(), certChain);
128+
keyStore.setKeyEntry(ICommonConstants.OPENKIM_SERVER_KEYSTORE_ALIAS, privKey, password.toCharArray(), certChain);
126129
keyStore.store(
127130
new FileOutputStream(new File(ICommonConstants.BASE_DIR + ICommonConstants.OPENKIM_SERVER_KEYSTORE_FILENAME)),
128-
ICommonConstants.OPENKIM_SERVER_KEYSTORE_PWD.toCharArray()
131+
password.toCharArray()
129132
);
130133

131134
if (log.isInfoEnabled()) {

‎src/main/java/net/sberg/openkim/gateway/pop3/Pop3Gateway.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
*/
1717
package net.sberg.openkim.gateway.pop3;
1818

19-
import net.sberg.openkim.common.mail.MailService;
19+
import net.sberg.openkim.mail.MailService;
2020
import net.sberg.openkim.gateway.GatewayNettyServer;
2121
import net.sberg.openkim.kas.KasService;
2222
import net.sberg.openkim.konfiguration.Konfiguration;
2323
import net.sberg.openkim.konfiguration.KonfigurationService;
24-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
24+
import net.sberg.openkim.konnektor.dns.DnsService;
2525
import net.sberg.openkim.log.LogService;
2626
import org.apache.james.protocols.api.Encryption;
2727
import org.apache.james.protocols.api.Protocol;

‎src/main/java/net/sberg/openkim/gateway/pop3/Pop3GatewayProtocolHandlerChain.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717
package net.sberg.openkim.gateway.pop3;
1818

19-
import net.sberg.openkim.common.mail.MailService;
19+
import net.sberg.openkim.mail.MailService;
2020
import net.sberg.openkim.gateway.pop3.cmdhandler.*;
2121
import net.sberg.openkim.kas.KasService;
22-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
22+
import net.sberg.openkim.konnektor.dns.DnsService;
2323
import org.apache.james.protocols.api.handler.*;
2424
import org.apache.james.protocols.pop3.POP3Session;
2525

‎src/main/java/net/sberg/openkim/gateway/pop3/Pop3GatewaySession.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import net.sberg.openkim.common.ICommonConstants;
2020
import net.sberg.openkim.konfiguration.Konfiguration;
21-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
21+
import net.sberg.openkim.konnektor.Konnektor;
2222
import net.sberg.openkim.log.DefaultLogger;
2323
import net.sberg.openkim.log.DefaultLoggerContext;
2424
import net.sberg.openkim.log.LogService;

‎src/main/java/net/sberg/openkim/gateway/pop3/cmdhandler/Pop3GatewayAuthCmdHandler.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
package net.sberg.openkim.gateway.pop3.cmdhandler;
1818

1919
import com.google.common.collect.ImmutableSet;
20-
import net.sberg.openkim.common.mail.EnumMailAuthMethod;
21-
import net.sberg.openkim.common.mail.EnumMailConnectionSecurity;
22-
import net.sberg.openkim.common.mail.MailUtils;
20+
import net.sberg.openkim.mail.EnumMailAuthMethod;
21+
import net.sberg.openkim.mail.EnumMailConnectionSecurity;
22+
import net.sberg.openkim.mail.MailUtils;
2323
import net.sberg.openkim.common.metrics.DefaultMetricFactory;
2424
import net.sberg.openkim.gateway.pop3.EnumPop3GatewayState;
2525
import net.sberg.openkim.gateway.pop3.Pop3GatewaySession;
2626
import net.sberg.openkim.konfiguration.Konfiguration;
27-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResult;
28-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResultContainer;
29-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
27+
import net.sberg.openkim.konnektor.dns.DnsResult;
28+
import net.sberg.openkim.konnektor.dns.DnsResultContainer;
29+
import net.sberg.openkim.konnektor.dns.DnsService;
3030
import org.apache.commons.lang3.StringUtils;
3131
import org.apache.james.core.Username;
3232
import org.apache.james.metrics.api.TimeMetric;
@@ -389,7 +389,10 @@ protected Response doAuthTest(POP3Session session, Username username, String pas
389389
EnumMailAuthMethod.NORMALPWD,
390390
mailServerIpAddress,
391391
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerPort(),
392-
konfiguration
392+
konfiguration.getPop3ClientIdleTimeoutInSeconds(),
393+
konfiguration.getFachdienstCertFilename(),
394+
konfiguration.getFachdienstCertAuthPwd(),
395+
true
393396
);
394397

395398
Store store = pop3ClientSession.getStore("pop3");

‎src/main/java/net/sberg/openkim/gateway/pop3/cmdhandler/Pop3GatewayPassCmdHandler.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
package net.sberg.openkim.gateway.pop3.cmdhandler;
1818

1919
import com.google.common.collect.ImmutableSet;
20-
import net.sberg.openkim.common.mail.EnumMailAuthMethod;
21-
import net.sberg.openkim.common.mail.EnumMailConnectionSecurity;
22-
import net.sberg.openkim.common.mail.MailUtils;
20+
import net.sberg.openkim.mail.EnumMailAuthMethod;
21+
import net.sberg.openkim.mail.EnumMailConnectionSecurity;
22+
import net.sberg.openkim.mail.MailUtils;
2323
import net.sberg.openkim.common.metrics.DefaultMetricFactory;
2424
import net.sberg.openkim.gateway.pop3.EnumPop3GatewayState;
2525
import net.sberg.openkim.gateway.pop3.Pop3GatewaySession;
2626
import net.sberg.openkim.konfiguration.Konfiguration;
27-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResult;
28-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResultContainer;
29-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
27+
import net.sberg.openkim.konnektor.dns.DnsResult;
28+
import net.sberg.openkim.konnektor.dns.DnsResultContainer;
29+
import net.sberg.openkim.konnektor.dns.DnsService;
3030
import org.apache.james.core.Username;
3131
import org.apache.james.protocols.api.Request;
3232
import org.apache.james.protocols.api.Response;
@@ -114,7 +114,10 @@ protected final Response doAuth(POP3Session session, Username user, String pass)
114114
EnumMailAuthMethod.NORMALPWD,
115115
mailServerIpAddress,
116116
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerPort(),
117-
konfiguration
117+
konfiguration.getPop3ClientIdleTimeoutInSeconds(),
118+
konfiguration.getFachdienstCertFilename(),
119+
konfiguration.getFachdienstCertAuthPwd(),
120+
true
118121
);
119122

120123
Store store = pop3ClientSession.getStore("pop3");

‎src/main/java/net/sberg/openkim/gateway/pop3/cmdhandler/Pop3GatewayRetrCmdHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package net.sberg.openkim.gateway.pop3.cmdhandler;
1818

1919
import com.google.common.collect.ImmutableSet;
20-
import net.sberg.openkim.common.mail.MailService;
20+
import net.sberg.openkim.mail.MailService;
2121
import net.sberg.openkim.common.metrics.DefaultMetricFactory;
2222
import net.sberg.openkim.gateway.pop3.EnumPop3GatewayState;
2323
import net.sberg.openkim.gateway.pop3.Pop3GatewaySession;

‎src/main/java/net/sberg/openkim/gateway/smtp/SmtpGateway.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*/
1717
package net.sberg.openkim.gateway.smtp;
1818

19-
import net.sberg.openkim.common.mail.MailService;
19+
import net.sberg.openkim.mail.MailService;
2020
import net.sberg.openkim.gateway.GatewayNettyServer;
2121
import net.sberg.openkim.gateway.smtp.hook.SmtpGatewayMailHook;
2222
import net.sberg.openkim.gateway.smtp.hook.SmtpGatewayQuitHook;
2323
import net.sberg.openkim.kas.KasService;
2424
import net.sberg.openkim.konfiguration.Konfiguration;
2525
import net.sberg.openkim.konfiguration.KonfigurationService;
26-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
27-
import net.sberg.openkim.konfiguration.konnektor.vzd.VzdService;
26+
import net.sberg.openkim.konnektor.dns.DnsService;
27+
import net.sberg.openkim.konnektor.vzd.VzdService;
2828
import net.sberg.openkim.log.LogService;
2929
import org.apache.james.protocols.api.Encryption;
3030
import org.apache.james.protocols.api.Protocol;

‎src/main/java/net/sberg/openkim/gateway/smtp/SmtpGatewayProtocolHandlerChain.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package net.sberg.openkim.gateway.smtp;
1818

1919
import net.sberg.openkim.gateway.smtp.cmdhandler.*;
20-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
21-
import net.sberg.openkim.konfiguration.konnektor.vzd.VzdService;
20+
import net.sberg.openkim.konnektor.dns.DnsService;
21+
import net.sberg.openkim.konnektor.vzd.VzdService;
2222
import org.apache.james.protocols.api.handler.*;
2323
import org.apache.james.protocols.smtp.SMTPSession;
2424
import org.apache.james.protocols.smtp.core.*;

‎src/main/java/net/sberg/openkim/gateway/smtp/SmtpGatewaySession.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import net.sberg.openkim.common.ICommonConstants;
2020
import net.sberg.openkim.common.x509.X509CertificateResult;
2121
import net.sberg.openkim.konfiguration.Konfiguration;
22-
import net.sberg.openkim.konfiguration.konnektor.Konnektor;
22+
import net.sberg.openkim.konnektor.Konnektor;
2323
import net.sberg.openkim.log.DefaultLogger;
2424
import net.sberg.openkim.log.DefaultLoggerContext;
2525
import net.sberg.openkim.log.LogService;

‎src/main/java/net/sberg/openkim/gateway/smtp/cmdhandler/SmtpGatewayAuthCmdHandler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import net.sberg.openkim.gateway.smtp.EnumSmtpGatewayState;
2525
import net.sberg.openkim.gateway.smtp.SmtpGatewaySession;
2626
import net.sberg.openkim.konfiguration.Konfiguration;
27-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResult;
28-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsResultContainer;
29-
import net.sberg.openkim.konfiguration.konnektor.dns.DnsService;
27+
import net.sberg.openkim.konnektor.dns.DnsResult;
28+
import net.sberg.openkim.konnektor.dns.DnsResultContainer;
29+
import net.sberg.openkim.konnektor.dns.DnsService;
3030
import org.apache.commons.lang3.StringUtils;
3131
import org.apache.commons.net.smtp.AuthenticatingSMTPClient;
3232
import org.apache.http.ssl.SSLContextBuilder;

0 commit comments

Comments
 (0)