Merge pull request #471 from dcarella/task/remove-some-public-web-old…

…-traces/8.2.0

Task: Remove some Public Web GUI old traces

conf/web.properties.sample

@@ -31,7 +31,7 @@ superadmin.dn=CN=${superadmin.cn}
 # Choose a good password here.
 superadmin.password=ejbca
 
-# Set this to false if you want to fetch the certificate from the EJBCA public web pages, instead of
+# Set this to false if you want to enroll the certificate from the EJBCA RA GUI pages, instead of
 # importing the P12-keystore. This can be used to put the initial superadmin-certificate on a smart card.
 superadmin.batch=true
 
@@ -125,11 +125,6 @@ httpsserver.tokentype=JKS
 # Default: true
 #(Read the warning!)web.reqauth=true
 
-# Deploy the request browser certificate renewal web application and show a
-# link to it from the EJBCA public web.
-# Default = false
-#web.renewalenabled=false
-
 # Whether it should be possible to manually specify a custom class name in
 # the admin web (e.g. for a custom Publisher or Service), or if the choice
 # of class should be constrained to auto-detected classes only.

modules/ejbca-common/src/org/ejbca/config/WebConfiguration.java

@@ -183,13 +183,6 @@ public static boolean getRequireAdminCertificateInDatabase() {
 	public static String getWebContentEncoding() {
 	   	return EjbcaConfigurationHolder.getString("web.contentencoding");
 	}
-
-	/**
-	 * The request browser certificate renewal web application is deployed
-	 */
-	public static boolean getRenewalEnabled() {
-		return Boolean.valueOf(EjbcaConfigurationHolder.getExpandedString("web.renewalenabled"));
-	}
 
     public static boolean doShowStackTraceOnErrorPage(){
         final String s=EjbcaConfigurationHolder.getString ("web.errorpage.stacktrace");

propertyDefaults.xml

@@ -213,7 +213,6 @@ httpsserver.hostname     = ${httpsserver.hostname}
 httpsserver.password     = ***
 httpserver.external.fqdn = ${httpserver.external.fqdn}
 web.contentencoding      = ${web.contentencoding}
-web.renewalenabled       = ${web.renewalenabled}
 ejbcaws.enabled          = ${ejbcaws.enabled}
 unidfnr.enabled          = ${unidfnr.enabled}
 

src/java/defaultvalues.properties

@@ -167,7 +167,6 @@ httpserver.external.privhttps=8443
 httpserver.pubhttps=8442
 httpserver.pubhttp=8080
 web.openvpn.createInstallerScript=/usr/local/ejbca/bin/mk_openvpn_windows_installer.sh
-web.renewalenabled=false
 web.reqcertindb=true
 # Web, known PKCS#11 crypto libraries
 cryptotoken.p11.lib.10.name=Thales ProtectServer 2 Emulator