summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/onap')
-rw-r--r--src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java2
-rw-r--r--src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java1
-rw-r--r--src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java2
-rw-r--r--src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java4
4 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
index ff46ce3..fedb14f 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
@@ -54,7 +54,6 @@ public class DMaaPCambriaClientFactory {
* @param hostList
* A comma separated list of hosts to use to connect to Cambria.
* You can include port numbers (3904 is the default). For
- * example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com"
*
* @param topic
* The topic to consume
@@ -171,7 +170,6 @@ public class DMaaPCambriaClientFactory {
* @param hostList
* A comma separated list of hosts to use to connect to Cambria.
* You can include port numbers (3904 is the default). For
- * example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com"
* @param topic
* The topic to consume
* @param consumerGroup
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
index 1bd28e7..fdee82b 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
@@ -35,7 +35,6 @@ import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
/**
* Contains the logic for executing calls to the Mirror Maker agent tool.
*
- * @author <a href="mailto:kawsar.jahan@att.com">Kawsar Jahan</a>
*
* @since May 25, 2016
*/
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
index 47da903..d9559bb 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
@@ -171,7 +171,7 @@ public class ApiKeysServiceImpl implements ApiKeysService {
{
String body = "\n" + "Your email address was provided as the creator of new API key \""
+ apiKey + "\".\n" + "\n" + "If you did not make this request, please let us know."
- + " See http://sa2020.it.att.com:8888 for contact information, " + "but don't worry -"
+ + "but don't worry -"
+ " the API key is useless without the information below, which has been provided "
+ "only to you.\n" + "\n\n" + "For API key \"" + apiKey + "\", use API key secret:\n\n\t"
+ sharedSecret + "\n\n" + "Note that it's normal to share the API key"
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
index cb4fcdc..51de9e2 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
@@ -156,7 +156,7 @@ public class Emailer
makeSetting ( prop, "mail.smtp.port", kSetting_SmtpServerPort, 587 );
prop.put ( "mail.smtp.socketFactory.fallback", "false" );
prop.put ( "mail.smtp.quitwait", "false" );
- makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.att.com" );
+ makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.onap.com" );
makeSetting ( prop, "mail.smtp.auth", kSetting_SmtpServerUseAuth, true );
makeSetting ( prop, "mail.smtp.starttls.enable", kSetting_SmtpServerSsl, true );
@@ -176,7 +176,7 @@ public class Emailer
final Message msg = new MimeMessage ( session );
final InternetAddress from = new InternetAddress (
- getSetting ( kSetting_MailFromEmail, "team@sa2020.it.att.com" ),
+ getSetting ( kSetting_MailFromEmail, "team@dmaap.mr.onap.com" ),
getSetting ( kSetting_MailFromName, "The GFP/SA2020 Team" ) );
msg.setFrom ( from );
msg.setReplyTo ( new InternetAddress[] { from } );