Remove some attisms

Issue-ID: AAF-291
Change-Id: If20e87b3e1eb5738a32be448aa8219b04bd7520f
Signed-off-by: Instrumental <jonathan.gathman@att.com>

8 files changed, 8 insertions, 46 deletions

diff --git a/auth/auth-gui/src/main/config/.gitignore b/auth/auth-gui/src/main/config/.gitignore
deleted file mode 100644
index 04cdc540..00000000
--- a/auth/auth-gui/src/main/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/authGUI.props
-/log4j.properties
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java
index 05ee21b0..40d57c95 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java
@@ -96,10 +96,7 @@ public class ApiDocs extends Page {
 						.leaf(HTMLGen.LI).text("The Client must utilize HTTP/S. Non Secure HTTP is not acceptable").end()
 						.leaf(HTMLGen.LI).text("The Client MUST supply an Identity validated by one of the following mechanisms").end()
 						.incr(HTMLGen.UL)
-							.leaf(HTMLGen.LI).text("Valid Global Login Cookie (CSP)").end()
-							.leaf(HTMLGen.LI).text("BASIC AUTH protocol using CSO Registered MechID, provisioned in AAF").end()
-							.leaf(HTMLGen.LI).text("BASIC AUTH protocol using ATTUID@csp.att.com, Global Login Password").end()
-							.leaf(HTMLGen.LI).text("(Available 3rd Qtr 2015) Valid tGuard Login Cookie").end()
+							.leaf(HTMLGen.LI).text("BASIC AUTH protocol using Organization Registered AppID, provisioned in AAF").end()
 							.leaf(HTMLGen.LI).text("(Near Future) Application level Certificate").end()
 						.end()
 					.end()
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java
index 5df050bf..8c442dd7 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java
@@ -61,7 +61,6 @@ public class NsDetail extends Page {
 	
 	public static final String HREF = "/gui/nsdetail";
 	public static final String NAME = "NsDetail";
-	static final String WEBPHONE = "http://webphone.att.com/cgi-bin/webphones.pl?id=";
 	public static enum NS_FIELD { OWNERS, ADMINS, ROLES, PERMISSIONS, CREDS};
 	private static final String BLANK = "";
 	private static Slot keySlot;
@@ -91,7 +90,6 @@ public class NsDetail extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		private NsDetail nd;
 
 		public void set(NsDetail nsDetail) {
@@ -197,8 +195,7 @@ public class NsDetail extends Page {
 					for (int i=0; i< values.size(); i++) {
 						AbsCell label = (i==0?new TextCell(sentenceCase(field)+":"):AbsCell.Null);
 						String user = values.get(i);
-						AbsCell userCell = (user.endsWith(CSP_ATT_COM)?
-								new RefCell(user,WEBPHONE + user.substring(0,user.indexOf('@')),true):new TextCell(user));
+						AbsCell userCell = (new TextCell(user));
 						rv.add(new AbsCell[] {
 								label, 
 								userCell
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsHistory.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsHistory.java
index 414f992f..1bffbb6f 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsHistory.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsHistory.java
@@ -37,7 +37,6 @@ import org.onap.aaf.auth.gui.Page;
 import org.onap.aaf.auth.gui.Table;
 import org.onap.aaf.auth.gui.Table.Cells;
 import org.onap.aaf.auth.gui.table.AbsCell;
-import org.onap.aaf.auth.gui.table.RefCell;
 import org.onap.aaf.auth.gui.table.TableData;
 import org.onap.aaf.auth.gui.table.TextCell;
 import org.onap.aaf.cadi.CadiException;
@@ -146,7 +145,6 @@ public class NsHistory extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		private static final String[] headers = new String[] {"Date","User","Memo"};
 		private Slot name;
 		private Slot dates;
@@ -196,8 +194,7 @@ public class NsHistory extends Page {
 								
 								for (Item i : histItems) {
 									String user = i.getUser();
-									AbsCell userCell = (user.endsWith(CSP_ATT_COM)?
-											new RefCell(user,WEBPHONE + user.substring(0,user.indexOf('@')),true):new TextCell(user));
+									AbsCell userCell = new TextCell(user);
 									
 									rv.add(new AbsCell[] {
 											new TextCell(i.getTimestamp().toGregorianCalendar().getTime().toString()),
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java
index a42d6b0b..9d2b2cb0 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java
@@ -107,7 +107,6 @@ public class PendingRequestsShow extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;
 		private static final String[] headers = new String[] {"Request Date","Status","Memo","Approver"};
 
@@ -157,12 +156,7 @@ public class PendingRequestsShow extends Page {
 											prevTicket = ticket;
 										}
 										
-										AbsCell approverCell = null;
-										if (approver.endsWith(CSP_ATT_COM)) {
-											approverCell = new RefCell(approver, WEBPHONE + approverShort,true);
-										} else {
-											approverCell = new TextCell(approver);
-										}
+										AbsCell approverCell = new TextCell(approver);
 										AbsCell[] sa = new AbsCell[] {
 											tsCell,
 											new TextCell(a.getStatus()),
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PermHistory.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PermHistory.java
index 45f8b22e..64a0db17 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PermHistory.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PermHistory.java
@@ -38,7 +38,6 @@ import org.onap.aaf.auth.gui.Page;
 import org.onap.aaf.auth.gui.Table;
 import org.onap.aaf.auth.gui.Table.Cells;
 import org.onap.aaf.auth.gui.table.AbsCell;
-import org.onap.aaf.auth.gui.table.RefCell;
 import org.onap.aaf.auth.gui.table.TableData;
 import org.onap.aaf.auth.gui.table.TextCell;
 import org.onap.aaf.cadi.CadiException;
@@ -153,7 +152,6 @@ public class PermHistory extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		private static final String[] headers = new String[] {"Date","User","Memo"};
 		private Slot sType;
 		private Slot sDates;
@@ -208,8 +206,7 @@ public class PermHistory extends Page {
 								
 								for (Item i : histItems) {
 									String user = i.getUser();
-									AbsCell userCell = (user.endsWith(CSP_ATT_COM)?
-											new RefCell(user,WEBPHONE + user.substring(0,user.indexOf('@')),true):new TextCell(user));
+									AbsCell userCell = new TextCell(user);
 									
 									rv.add(new AbsCell[] {
 											new TextCell(i.getTimestamp().toGregorianCalendar().getTime().toString()),
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RequestDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RequestDetail.java
index 852bbd44..626b7da5 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RequestDetail.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RequestDetail.java
@@ -36,7 +36,6 @@ import org.onap.aaf.auth.gui.Page;
 import org.onap.aaf.auth.gui.Table;
 import org.onap.aaf.auth.gui.Table.Cells;
 import org.onap.aaf.auth.gui.table.AbsCell;
-import org.onap.aaf.auth.gui.table.RefCell;
 import org.onap.aaf.auth.gui.table.TableData;
 import org.onap.aaf.auth.gui.table.TextCell;
 import org.onap.aaf.cadi.CadiException;
@@ -71,8 +70,6 @@ public class RequestDetail extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		static final String WEBPHONE = "http://webphone.att.com/cgi-bin/webphones.pl?id=";
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;
 		private Slot sTicket;
 		public Model(AuthzEnv env) {
@@ -117,12 +114,7 @@ public class RequestDetail extends Page {
 											});
 											rv.add(new AbsCell[]{new TextCell("Operation:"),new TextCell(decodeOp(approval.getOperation()),"colspan=3")});
 											String user = approval.getUser();
-											if (user.endsWith(CSP_ATT_COM)) {
-												rv.add(new AbsCell[]{new TextCell("User:"),
-														new RefCell(user,WEBPHONE + user.substring(0, user.indexOf("@")),true,"colspan=3")});
-											} else {
-												rv.add(new AbsCell[]{new TextCell("User:"),new TextCell(user,"colspan=3")});
-											}
+											rv.add(new AbsCell[]{new TextCell("User:"),new TextCell(user,"colspan=3")});
 											
 											// headers for listing each approver
 											rv.add(new AbsCell[]{new TextCell(" ","colspan=4","class=blank_line")});
@@ -137,15 +129,7 @@ public class RequestDetail extends Page {
 										    approverLine[0] = AbsCell.Null;
 										}
 										
-										String approver = approval.getApprover();
-										String approverShort = approver.substring(0,approver.indexOf('@'));
-										
-										if (approver.endsWith(CSP_ATT_COM)) {
-											approverLine[1] = new RefCell(approver, WEBPHONE + approverShort,true);
-										} else {
-											approverLine[1] = new TextCell(approval.getApprover());
-										}
-										
+										approverLine[1] = new TextCell(approval.getApprover());
 										String type = approval.getType();
 										if ("owner".equalsIgnoreCase(type)) {
 											type = "resource owner";
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
index e80a5917..7b07b60d 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
@@ -146,7 +146,6 @@ public class RoleHistory extends Page {
 	 *
 	 */
 	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String CSP_ATT_COM = "@csp.att.com";
 		private static final String[] headers = new String[] {"Date","User","Memo"};
 		private Slot role;
 		private Slot dates;
@@ -195,8 +194,7 @@ public class RoleHistory extends Page {
 									
 									for (Item i : histItems) {
 										String user = i.getUser();
-										AbsCell userCell = (user.endsWith(CSP_ATT_COM)?
-												new RefCell(user,WEBPHONE + user.substring(0,user.indexOf('@')),false):new TextCell(user));
+										AbsCell userCell = new TextCell(user);
 										
 										rv.add(new AbsCell[] {
 												new TextCell(i.getTimestamp().toGregorianCalendar().getTime().toString()),