summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-08-31 14:34:41 -0500
committerInstrumental <jonathan.gathman@att.com>2018-08-31 14:34:48 -0500
commite0a2e0d0c79dcaf4532d0ca3aeefd3f5546af404 (patch)
treea437998bc57caa3f65c626d2717c88510bd63009 /auth
parent613f761567310ffb84f55d2136ab95fc15724020 (diff)
Relocate JavaxMail
Issue-ID: AAF-419 Change-Id: I73890b6f6db09f2f86018594bb4692a4e90a6df9 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth')
-rw-r--r--auth/auth-batch/pom.xml5
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/javax/JavaxMailer.java (renamed from auth/auth-deforg/src/main/java/org/onap/aaf/org/JavaxMailer.java)3
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/Mailer.java (renamed from auth/auth-deforg/src/main/java/org/onap/aaf/org/Mailer.java)3
-rw-r--r--auth/auth-deforg/pom.xml10
-rw-r--r--auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java1
5 files changed, 9 insertions, 13 deletions
diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index a30ccaa7..1c49d6fb 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -118,6 +118,11 @@
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cass</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/JavaxMailer.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/javax/JavaxMailer.java
index f50493dd..17921c8a 100644
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/JavaxMailer.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/javax/JavaxMailer.java
@@ -18,7 +18,7 @@
* ============LICENSE_END====================================================
*
*/
-package org.onap.aaf.org;
+package org.onap.aaf.auth.javax;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +32,7 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.onap.aaf.auth.env.AuthzTrans;
+import org.onap.aaf.auth.org.Mailer;
import org.onap.aaf.auth.org.OrganizationException;
public class JavaxMailer implements Mailer {
diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/Mailer.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Mailer.java
index 0824e1f3..86875a4a 100644
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/Mailer.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Mailer.java
@@ -18,12 +18,11 @@
* ============LICENSE_END====================================================
*
*/
-package org.onap.aaf.org;
+package org.onap.aaf.auth.org;
import java.util.List;
import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.org.OrganizationException;
public interface Mailer {
public int sendEmail(
diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index bce3199d..3420663e 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -102,16 +102,6 @@
<artifactId>aaf-auth-core</artifactId>
</dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jvnet.mock-javamail</groupId>
- <artifactId>mock-javamail</artifactId>
- <version>1.9</version>
- </dependency>
</dependencies>
<build>
diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
index f3c73216..0bfe7e2d 100644
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
+++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
import org.onap.aaf.auth.env.AuthzTrans;
import org.onap.aaf.auth.org.EmailWarnings;
import org.onap.aaf.auth.org.Executor;
+import org.onap.aaf.auth.org.Mailer;
import org.onap.aaf.auth.org.Organization;
import org.onap.aaf.auth.org.OrganizationException;
import org.onap.aaf.cadi.util.FQI;