X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2Fpages%2FCMArtiChangeForm.java;h=7cd79dab390d31bcbb2a03cda5697ce184f8a611;hb=9ec2895301056a9e8967eadb139e56f03776fe26;hp=c65e7db5edbaf1dbd09f502abd681c2d1535383e;hpb=d37b5467a3b8b375b603579d2888a4443a8b06a7;p=aaf%2Fauthz.git

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
index c65e7db5..7cd79dab 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
@@ -61,7 +61,7 @@ public class CMArtiChangeForm extends Page {
 	static final String NAME = "ArtifactChange";
 	static final String fields[] = {"id","machine","ns","directory","ca","osuser","renewal","notify","cmd","others","types[]","sans"};
 	
-	static final String types[] = {"jks","file","script"};
+	static final String types[] = {"pkcs12","jks","file","script"};
 	static final String UPDATE = "Update";
 	static final String CREATE = "Create";
 	static final String COPY = "Copy";
@@ -169,7 +169,7 @@ public class CMArtiChangeForm extends Page {
 								arti.setRenewDays(30);
 								arti.setNotification("mailto:"+user.email());
 								arti.getType().add(types[0]);
-								arti.getType().add(types[2]);
+								arti.getType().add(types[3]);
 								submitText = CREATE;
 								delete = false;
 							} else {
@@ -179,24 +179,14 @@ public class CMArtiChangeForm extends Page {
 									arti.setNotification("mailto:"+user.email());
 								}
 							}
-							// CSO Approval no longer required for SAN use
-//							final String mechID = arti.getMechid();
-//							boolean maySans=gui.lur.fish(new Principal() {
-//								@Override
-//								public String getName() {
-//									return mechID;
-//								}},getPerm(arti.getCa(),"san"));
-//							if(!maySans) {
-//								arti.getSans().clear();
-//							}
 							Mark table = new Mark(TABLE);
 							hgen.incr(table)
-								.input(fields[0],"MechID*",true,"value="+arti.getMechid())
+								.input(fields[0],"AppID*",true,"value="+arti.getMechid())
 								.input("sponsor", "Sponsor",false,"value="+arti.getSponsor(),"readonly","style=border:none;background-color:white;")
-								.input(fields[1],"Machine*",true,"value="+arti.getMachine(),"style=width:130%;");
+								.input(fields[1],"FQDN*",true,"value="+arti.getMachine(),"style=width:130%;");
 //							if(maySans) {
 								hgen.incr(HTMLGen.TR).incr(HTMLGen.TD).end()
-									.incr(HTMLGen.TD,"class=subtext").text("Use full machine names, ");
+									.incr(HTMLGen.TD,"class=subtext").text("Use Fully Qualified Domain Names (that will be in DNS), ");
 									if(!trans.fish(getPerm(arti.getCa(),"ip"))) {
 										hgen.text("NO ");
 									}