summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java')
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java2008
1 files changed, 1052 insertions, 956 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 2842542e..32e610fa 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -17,7 +17,6 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.admin;
-
import java.io.IOException;
import java.util.Enumeration;
import java.util.Locale;
@@ -68,12 +67,11 @@ import com.netscape.certsrv.publish.RulePlugin;
import com.netscape.certsrv.security.ICryptoSubsystem;
import com.netscape.cmsutil.password.IPasswordStore;
-
/**
- * A class representing an publishing servlet for the
- * Publishing subsystem. This servlet is responsible
- * to serve configuration requests for the Publishing subsystem.
- *
+ * A class representing an publishing servlet for the Publishing subsystem. This
+ * servlet is responsible to serve configuration requests for the Publishing
+ * subsystem.
+ *
* @version $Revision$, $Date$
*/
public class PublisherAdminServlet extends AdminServlet {
@@ -85,8 +83,7 @@ public class PublisherAdminServlet extends AdminServlet {
public final static String PROP_AUTHORITY = "authority";
private final static String INFO = "PublisherAdminServlet";
- private final static String PW_TAG_CA_LDAP_PUBLISHING =
- "CA LDAP Publishing";
+ private final static String PW_TAG_CA_LDAP_PUBLISHING = "CA LDAP Publishing";
public final static String NOMAPPER = "<NONE>";
private IPublisherProcessor mProcessor = null;
private IAuthority mAuth = null;
@@ -109,23 +106,25 @@ public class PublisherAdminServlet extends AdminServlet {
mAuth = (IAuthority) CMS.getSubsystem(authority);
if (mAuth != null)
if (mAuth instanceof ICertificateAuthority) {
- mProcessor = ((ICertificateAuthority) mAuth).getPublisherProcessor();
- } else
- throw new ServletException(authority + " does not have publishing processor!");
+ mProcessor = ((ICertificateAuthority) mAuth)
+ .getPublisherProcessor();
+ } else
+ throw new ServletException(authority
+ + " does not have publishing processor!");
}
/**
* Returns serlvet information.
*/
- public String getServletInfo() {
- return INFO;
+ public String getServletInfo() {
+ return INFO;
}
/**
* Serves HTTP admin request.
*/
public void service(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ throws ServletException, IOException {
super.service(req, resp);
CMS.debug("PublisherAdminServlet: in service");
@@ -133,14 +132,13 @@ public class PublisherAdminServlet extends AdminServlet {
String op = req.getParameter(Constants.OP_TYPE);
if (op == null) {
- //System.out.println("SRVLT_INVALID_PROTOCOL");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_INVALID_PROTOCOL"),
- null, resp);
+ // System.out.println("SRVLT_INVALID_PROTOCOL");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_INVALID_PROTOCOL"), null, resp);
return;
}
- // for the rest
+ // for the rest
try {
super.authenticate(req);
@@ -149,8 +147,8 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
} catch (IOException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req),"CMS_ADMIN_SRVLT_AUTHS_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHS_FAILED"), null, resp);
return;
}
try {
@@ -159,9 +157,8 @@ public class PublisherAdminServlet extends AdminServlet {
if (op.equals(OpDef.OP_READ)) {
mOp = "read";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_LDAP)) {
@@ -188,13 +185,12 @@ public class PublisherAdminServlet extends AdminServlet {
} else if (scope.equals(ScopeDef.SC_RULE_RULES)) {
getRuleInstConfig(req, resp);
return;
- }
+ }
} else if (op.equals(OpDef.OP_MODIFY)) {
mOp = "modify";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_LDAP)) {
@@ -213,21 +209,19 @@ public class PublisherAdminServlet extends AdminServlet {
} else if (op.equals(OpDef.OP_PROCESS)) {
mOp = "modify";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_LDAP)) {
testSetLDAPDest(req, resp);
return;
- }
+ }
} else if (op.equals(OpDef.OP_SEARCH)) {
mOp = "read";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_PUBLISHER_IMPLS)) {
@@ -242,7 +236,7 @@ public class PublisherAdminServlet extends AdminServlet {
} else if (scope.equals(ScopeDef.SC_MAPPER_RULES)) {
listMapperInsts(req, resp);
return;
- } else if (scope.equals(ScopeDef.SC_RULE_IMPLS)) {
+ } else if (scope.equals(ScopeDef.SC_RULE_IMPLS)) {
listRulePlugins(req, resp);
return;
} else if (scope.equals(ScopeDef.SC_RULE_RULES)) {
@@ -252,9 +246,8 @@ public class PublisherAdminServlet extends AdminServlet {
} else if (op.equals(OpDef.OP_ADD)) {
mOp = "modify";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_PUBLISHER_IMPLS)) {
@@ -275,13 +268,12 @@ public class PublisherAdminServlet extends AdminServlet {
} else if (scope.equals(ScopeDef.SC_RULE_RULES)) {
addRuleInst(req, resp, scope);
return;
- }
+ }
} else if (op.equals(OpDef.OP_DELETE)) {
mOp = "modify";
if ((mToken = super.authorize(req)) == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
return;
}
if (scope.equals(ScopeDef.SC_PUBLISHER_IMPLS)) {
@@ -304,31 +296,27 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
} else {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_INVALID_OP_TYPE", op),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_INVALID_OP_TYPE", op), null, resp);
return;
}
} else {
- //System.out.println("SRVLT_INVALID_OP_SCOPE");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_INVALID_OP_SCOPE"),
- null, resp);
+ // System.out.println("SRVLT_INVALID_OP_SCOPE");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_INVALID_OP_SCOPE"), null, resp);
return;
}
} catch (EBaseException e) {
sendResponse(ERROR, e.toString(getLocale(req)), null, resp);
return;
- }
- //System.out.println("SRVLT_FAIL_PERFORM 2");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_PERFORM_FAILED"),
- null, resp);
+ }
+ // System.out.println("SRVLT_FAIL_PERFORM 2");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_PERFORM_FAILED"), null, resp);
return;
}
- private IExtendedPluginInfo getExtendedPluginInfo(IPublisherProcessor
- p) {
+ private IExtendedPluginInfo getExtendedPluginInfo(IPublisherProcessor p) {
Enumeration mappers = p.getMapperInsts().keys();
Enumeration publishers = p.getPublisherInsts().keys();
@@ -337,11 +325,11 @@ public class PublisherAdminServlet extends AdminServlet {
for (; mappers.hasMoreElements();) {
String name = (String) mappers.nextElement();
- if (map.length()== 0) {
- map.append(name);
+ if (map.length() == 0) {
+ map.append(name);
} else {
- map.append(",");
- map.append(name);
+ map.append(",");
+ map.append(name);
}
}
StringBuffer publish = new StringBuffer();
@@ -355,16 +343,19 @@ public class PublisherAdminServlet extends AdminServlet {
String epi[] = new String[] {
"type;choice(cacert,crl,certs,xcert);The certType of the request",
- "mapper;choice(" + map.toString() + ");Use the mapper to find the ldap dn to publish the certificate or crl",
- "publisher;choice(" + publish.toString() + ");Use the publisher to publish the certificate or crl a directory etc",
- "enable;boolean;",
- "predicate;string;"
- };
+ "mapper;choice("
+ + map.toString()
+ + ");Use the mapper to find the ldap dn to publish the certificate or crl",
+ "publisher;choice("
+ + publish.toString()
+ + ");Use the publisher to publish the certificate or crl a directory etc",
+ "enable;boolean;", "predicate;string;" };
return new ExtendedPluginInfo(epi);
}
- private NameValuePairs getExtendedPluginInfo(Locale locale, String implType, String implName) {
+ private NameValuePairs getExtendedPluginInfo(Locale locale,
+ String implType, String implName) {
IExtendedPluginInfo ext_info = null;
Object impl = null;
@@ -374,19 +365,20 @@ public class PublisherAdminServlet extends AdminServlet {
// Should get the registered rules from processor
// instead of plugin
- // OLD: impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
+ // OLD: impl =
+ // getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
impl = getExtendedPluginInfo(p_processor);
} else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_MAPPER)) {
IPublisherProcessor p_processor = mProcessor;
- Plugin plugin = (Plugin) p_processor.getMapperPlugins().get(implName
- );
+ Plugin plugin = (Plugin) p_processor.getMapperPlugins().get(
+ implName);
impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
- } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER)
- ) {
+ } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER)) {
IPublisherProcessor p_processor = mProcessor;
- Plugin plugin = (Plugin) p_processor.getPublisherPlugins().get(implName);
+ Plugin plugin = (Plugin) p_processor.getPublisherPlugins().get(
+ implName);
impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
}
@@ -401,21 +393,22 @@ public class PublisherAdminServlet extends AdminServlet {
if (ext_info == null) {
nvps = new NameValuePairs();
} else {
- nvps = convertStringArrayToNVPairs(ext_info.getExtendedPluginInfo(locale));
+ nvps = convertStringArrayToNVPairs(ext_info
+ .getExtendedPluginInfo(locale));
}
return nvps;
}
- /**
- * retrieve extended plugin info such as brief description, type info
- * from policy, authentication,
- * need to add: listener, mapper and publishing plugins
+ /**
+ * retrieve extended plugin info such as brief description, type info from
+ * policy, authentication, need to add: listener, mapper and publishing
+ * plugins
*/
private void getExtendedPluginInfo(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String id = req.getParameter(Constants.RS_ID);
int colon = id.indexOf(':');
@@ -423,19 +416,20 @@ public class PublisherAdminServlet extends AdminServlet {
String implType = id.substring(0, colon);
String implName = id.substring(colon + 1);
- NameValuePairs params =
- getExtendedPluginInfo(getLocale(req), implType, implName);
+ NameValuePairs params = getExtendedPluginInfo(getLocale(req), implType,
+ implName);
sendResponse(SUCCESS, null, params, resp);
}
-
- private void getLDAPDest(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+
+ private void getLDAPDest(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
IConfigStore config = mAuth.getConfigStore();
- IConfigStore publishcfg = config.getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
- IConfigStore ldapcfg = publishcfg.getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
+ IConfigStore publishcfg = config
+ .getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
+ IConfigStore ldapcfg = publishcfg
+ .getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
IConfigStore ldap = ldapcfg.getSubStore(IPublisherProcessor.PROP_LDAP);
Enumeration e = req.getParameterNames();
@@ -464,53 +458,63 @@ public class PublisherAdminServlet extends AdminServlet {
if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS))
continue;
if (name.equals(Constants.PR_CERT_NAMES)) {
- ICryptoSubsystem jss = (ICryptoSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_CRYPTO);
+ ICryptoSubsystem jss = (ICryptoSubsystem) CMS
+ .getSubsystem(CMS.SUBSYSTEM_CRYPTO);
params.add(name, jss.getAllCerts());
} else {
String value = ldap.getString(name, "");
if (value == null || value.equals("")) {
- if (name.equals(ILdapBoundConnFactory.PROP_LDAPCONNINFO + "." + ILdapConnInfo.PROP_HOST)) {
- value = mConfig.getString(ConfigConstants.PR_MACHINE_NAME, null);
- } else if (name.equals(ILdapBoundConnFactory.PROP_LDAPCONNINFO + "." + ILdapConnInfo.PROP_PORT)) {
+ if (name.equals(ILdapBoundConnFactory.PROP_LDAPCONNINFO
+ + "." + ILdapConnInfo.PROP_HOST)) {
+ value = mConfig.getString(
+ ConfigConstants.PR_MACHINE_NAME, null);
+ } else if (name
+ .equals(ILdapBoundConnFactory.PROP_LDAPCONNINFO
+ + "." + ILdapConnInfo.PROP_PORT)) {
value = ILdapConnInfo.PROP_PORT_DEFAULT;
- } else if (name.equals(ILdapBoundConnFactory.PROP_LDAPAUTHINFO + "." + ILdapAuthInfo.PROP_BINDDN)) {
+ } else if (name
+ .equals(ILdapBoundConnFactory.PROP_LDAPAUTHINFO
+ + "." + ILdapAuthInfo.PROP_BINDDN)) {
value = ILdapAuthInfo.PROP_BINDDN_DEFAULT;
}
}
params.add(name, value);
}
}
- params.add(Constants.PR_PUBLISHING_ENABLE,
- publishcfg.getString(IPublisherProcessor.PROP_ENABLE, Constants.FALSE));
- params.add(Constants.PR_PUBLISHING_QUEUE_ENABLE,
- publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.TRUE));
- params.add(Constants.PR_PUBLISHING_QUEUE_THREADS,
- publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_THREADS, "3"));
- params.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE,
- publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "40"));
- params.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY,
- publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "0"));
- params.add(Constants.PR_PUBLISHING_QUEUE_STATUS,
- publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_STATUS, "200"));
- params.add(Constants.PR_ENABLE,
- ldapcfg.getString(IPublisherProcessor.PROP_ENABLE, Constants.FALSE));
+ params.add(Constants.PR_PUBLISHING_ENABLE, publishcfg.getString(
+ IPublisherProcessor.PROP_ENABLE, Constants.FALSE));
+ params.add(Constants.PR_PUBLISHING_QUEUE_ENABLE, publishcfg.getString(
+ Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.TRUE));
+ params.add(Constants.PR_PUBLISHING_QUEUE_THREADS, publishcfg.getString(
+ Constants.PR_PUBLISHING_QUEUE_THREADS, "3"));
+ params.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, publishcfg
+ .getString(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "40"));
+ params.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, publishcfg
+ .getString(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "0"));
+ params.add(Constants.PR_PUBLISHING_QUEUE_STATUS, publishcfg.getString(
+ Constants.PR_PUBLISHING_QUEUE_STATUS, "200"));
+ params.add(Constants.PR_ENABLE, ldapcfg.getString(
+ IPublisherProcessor.PROP_ENABLE, Constants.FALSE));
sendResponse(SUCCESS, null, params, resp);
}
private void setLDAPDest(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException, EBaseException {
+ throws ServletException, IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
- //Save New Settings to the config file
+ // Save New Settings to the config file
IConfigStore config = mAuth.getConfigStore();
- IConfigStore publishcfg = config.getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
- IConfigStore ldapcfg = publishcfg.getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
+ IConfigStore publishcfg = config
+ .getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
+ IConfigStore ldapcfg = publishcfg
+ .getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
IConfigStore ldap = ldapcfg.getSubStore(IPublisherProcessor.PROP_LDAP);
- //set enable flag
- publishcfg.putString(IPublisherProcessor.PROP_ENABLE, req.getParameter(Constants.PR_PUBLISHING_ENABLE));
+ // set enable flag
+ publishcfg.putString(IPublisherProcessor.PROP_ENABLE,
+ req.getParameter(Constants.PR_PUBLISHING_ENABLE));
String enable = req.getParameter(Constants.PR_ENABLE);
ldapcfg.putString(IPublisherProcessor.PROP_ENABLE, enable);
@@ -518,8 +522,8 @@ public class PublisherAdminServlet extends AdminServlet {
// need to disable the ldap module here
mProcessor.setLdapConnModule(null);
}
-
- //set reset of the parameters
+
+ // set reset of the parameters
Enumeration e = req.getParameterNames();
String pwd = null;
@@ -536,9 +540,9 @@ public class PublisherAdminServlet extends AdminServlet {
continue;
if (name.equals(Constants.PR_PUBLISHING_ENABLE))
continue;
- // don't store password in the config file.
- if (name.equals(Constants.PR_BIND_PASSWD))
- continue; // old style password read from config.
+ // don't store password in the config file.
+ if (name.equals(Constants.PR_BIND_PASSWD))
+ continue; // old style password read from config.
if (name.equals(Constants.PR_DIRECTORY_MANAGER_PWD)) {
pwd = req.getParameter(name);
continue;
@@ -567,40 +571,37 @@ public class PublisherAdminServlet extends AdminServlet {
/* Don't enter the publishing pw into the config store */
ldap.putString(name, req.getParameter(name));
}
-
+
commit(true);
- /* Do a "PUT" of the new pw to the watchdog"
- ** do not remove - cfu
- if (pwd != null)
- CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd);
+ /*
+ * Do a "PUT" of the new pw to the watchdog"* do not remove - cfu if
+ * (pwd != null) CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd);
*/
// support publishing dirsrv with different pwd than internaldb
// update passwordFile
String prompt = ldap.getString(Constants.PR_BINDPWD_PROMPT);
IPasswordStore pwdStore = CMS.getPasswordStore();
- CMS.debug("PublisherAdminServlet: setLDAPDest(): saving password for "+ prompt + " to password file");
+ CMS.debug("PublisherAdminServlet: setLDAPDest(): saving password for "
+ + prompt + " to password file");
pwdStore.putPassword(prompt, pwd);
pwdStore.commit();
CMS.debug("PublisherAdminServlet: setLDAPDest(): password saved");
-/* we'll shut down and restart the PublisherProcessor instead
- // what a hack to do this without require restart server
-// ILdapAuthInfo authInfo = CMS.getLdapAuthInfo();
- ILdapConnModule connModule = mProcessor.getLdapConnModule();
- ILdapAuthInfo authInfo = null;
- if (connModule != null) {
- authInfo = connModule.getLdapAuthInfo();
- }
-
-// authInfo.addPassword(PW_TAG_CA_LDAP_PUBLISHING, pwd);
- if (authInfo != null) {
- CMS.debug("PublisherAdminServlet: setLDAPDest(): adding password to memory cache");
- authInfo.addPassword(prompt, pwd);
- } else
- CMS.debug("PublisherAdminServlet: setLDAPDest(): authInfo null");
-*/
+ /*
+ * we'll shut down and restart the PublisherProcessor instead // what a
+ * hack to do this without require restart server // ILdapAuthInfo
+ * authInfo = CMS.getLdapAuthInfo(); ILdapConnModule connModule =
+ * mProcessor.getLdapConnModule(); ILdapAuthInfo authInfo = null; if
+ * (connModule != null) { authInfo = connModule.getLdapAuthInfo(); }
+ *
+ * // authInfo.addPassword(PW_TAG_CA_LDAP_PUBLISHING, pwd); if (authInfo
+ * != null) { CMS.debug(
+ * "PublisherAdminServlet: setLDAPDest(): adding password to memory cache"
+ * ); authInfo.addPassword(prompt, pwd); } else
+ * CMS.debug("PublisherAdminServlet: setLDAPDest(): authInfo null");
+ */
try {
CMS.debug("PublisherAdminServlet: setLDAPDest(): restarting publishing processor");
@@ -610,27 +611,32 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (Exception ex) {
// force to save the config even there is error
// ignore any exception
- log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_FAIL_RES_LDAP", ex.toString()));
+ log(ILogger.LL_FAILURE,
+ CMS.getLogMessage("ADMIN_SRVLT_FAIL_RES_LDAP",
+ ex.toString()));
}
- //XXX See if we can dynamically in B2
+ // XXX See if we can dynamically in B2
sendResponse(SUCCESS, null, null, resp);
}
- private void testSetLDAPDest(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException, EBaseException {
+ private void testSetLDAPDest(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
CMS.debug("PublisherAdmineServlet: in testSetLDAPDest");
- //Save New Settings to the config file
+ // Save New Settings to the config file
IConfigStore config = mAuth.getConfigStore();
- IConfigStore publishcfg = config.getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
- IConfigStore ldapcfg = publishcfg.getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
+ IConfigStore publishcfg = config
+ .getSubStore(IPublisherProcessor.PROP_PUBLISH_SUBSTORE);
+ IConfigStore ldapcfg = publishcfg
+ .getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
IConfigStore ldap = ldapcfg.getSubStore(IPublisherProcessor.PROP_LDAP);
- //set enable flag
- publishcfg.putString(IPublisherProcessor.PROP_ENABLE,
- req.getParameter(Constants.PR_PUBLISHING_ENABLE));
+ // set enable flag
+ publishcfg.putString(IPublisherProcessor.PROP_ENABLE,
+ req.getParameter(Constants.PR_PUBLISHING_ENABLE));
String ldapPublish = req.getParameter(Constants.PR_ENABLE);
ldapcfg.putString(IPublisherProcessor.PROP_ENABLE, ldapPublish);
@@ -639,7 +645,7 @@ public class PublisherAdminServlet extends AdminServlet {
mProcessor.setLdapConnModule(null);
}
- //set reset of the parameters
+ // set reset of the parameters
Enumeration e = req.getParameterNames();
String pwd = null;
@@ -656,9 +662,9 @@ public class PublisherAdminServlet extends AdminServlet {
continue;
if (name.equals(Constants.PR_PUBLISHING_ENABLE))
continue;
- // don't store password in the config file.
- if (name.equals(Constants.PR_BIND_PASSWD))
- continue; // old style password read from config.
+ // don't store password in the config file.
+ if (name.equals(Constants.PR_BIND_PASSWD))
+ continue; // old style password read from config.
if (name.equals(Constants.PR_DIRECTORY_MANAGER_PWD)) {
pwd = req.getParameter(name);
continue;
@@ -687,84 +693,112 @@ public class PublisherAdminServlet extends AdminServlet {
/* Don't enter the publishing pw into the config store */
ldap.putString(name, req.getParameter(name));
}
-
+
// test before commit
- if (publishcfg.getBoolean(IPublisherProcessor.PROP_ENABLE) &&
- ldapcfg.getBoolean(IPublisherProcessor.PROP_ENABLE)) {
- params.add("title",
- "You've attempted to configure CMS to connect" +
- " to a LDAP directory. The connection status is" +
- " as follows:\n \n");
+ if (publishcfg.getBoolean(IPublisherProcessor.PROP_ENABLE)
+ && ldapcfg.getBoolean(IPublisherProcessor.PROP_ENABLE)) {
+ params.add("title", "You've attempted to configure CMS to connect"
+ + " to a LDAP directory. The connection status is"
+ + " as follows:\n \n");
LDAPConnection conn = null;
- ILdapConnInfo connInfo =
- CMS.getLdapConnInfo(ldap.getSubStore(
- ILdapBoundConnFactory.PROP_LDAPCONNINFO));
- //LdapAuthInfo authInfo =
- //new LdapAuthInfo(ldap.getSubStore(
- // ILdapBoundConnFactory.PROP_LDAPAUTHINFO));
- String host = connInfo.getHost();
+ ILdapConnInfo connInfo = CMS.getLdapConnInfo(ldap
+ .getSubStore(ILdapBoundConnFactory.PROP_LDAPCONNINFO));
+ // LdapAuthInfo authInfo =
+ // new LdapAuthInfo(ldap.getSubStore(
+ // ILdapBoundConnFactory.PROP_LDAPAUTHINFO));
+ String host = connInfo.getHost();
int port = connInfo.getPort();
boolean secure = connInfo.getSecure();
- //int authType = authInfo.getAuthType();
+ // int authType = authInfo.getAuthType();
String authType = ldap.getSubStore(
- ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(ILdapAuthInfo.PROP_LDAPAUTHTYPE);
+ ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(
+ ILdapAuthInfo.PROP_LDAPAUTHTYPE);
int version = connInfo.getVersion();
String bindAs = null;
String certNickName = null;
if (authType.equals(ILdapAuthInfo.LDAP_SSLCLIENTAUTH_STR)) {
try {
- //certNickName = authInfo.getParms()[0];
+ // certNickName = authInfo.getParms()[0];
certNickName = ldap.getSubStore(
- ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(ILdapAuthInfo.PROP_CLIENTCERTNICKNAME);
- conn = new LDAPConnection(CMS.getLdapJssSSLSocketFactory(
- certNickName));
+ ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(
+ ILdapAuthInfo.PROP_CLIENTCERTNICKNAME);
+ conn = new LDAPConnection(
+ CMS.getLdapJssSSLSocketFactory(certNickName));
CMS.debug("Publishing Test certNickName=" + certNickName);
- params.add(Constants.PR_CONN_INITED,
- "Create ssl LDAPConnection with certificate: " +
- certNickName + dashes(70 - 44 - certNickName.length()) + " Success");
+ params.add(Constants.PR_CONN_INITED,
+ "Create ssl LDAPConnection with certificate: "
+ + certNickName
+ + dashes(70 - 44 - certNickName.length())
+ + " Success");
} catch (Exception ex) {
- params.add(Constants.PR_CONN_INIT_FAIL,
- "Create ssl LDAPConnection with certificate: " +
- certNickName + dashes(70 - 44 - certNickName.length()) + " failure\n" + " exception: " + ex);
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then LDAP publishing will fail.\n" +
- "Do you want to save the configuration anyway?");
+ params.add(Constants.PR_CONN_INIT_FAIL,
+ "Create ssl LDAPConnection with certificate: "
+ + certNickName
+ + dashes(70 - 44 - certNickName.length())
+ + " failure\n" + " exception: " + ex);
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then LDAP publishing will fail.\n"
+ + "Do you want to save the configuration anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
try {
conn.connect(host, port);
- params.add(Constants.PR_CONN_OK,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) + " Success");
- params.add(Constants.PR_AUTH_OK,
- "Authentication: SSL client authentication" +
- dashes(70 - 41) + " Success" +
- "\nBind to the directory as: " + certNickName +
- dashes(70 - 26 - certNickName.length()) + " Success");
+ params.add(
+ Constants.PR_CONN_OK,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Success");
+ params.add(Constants.PR_AUTH_OK,
+ "Authentication: SSL client authentication"
+ + dashes(70 - 41) + " Success"
+ + "\nBind to the directory as: "
+ + certNickName
+ + dashes(70 - 26 - certNickName.length())
+ + " Success");
} catch (LDAPException ex) {
if (ex.getLDAPResultCode() == LDAPException.UNAVAILABLE) {
// need to intercept this because message from LDAP is
// "DSA is unavailable" which confuses with DSA PKI.
- params.add(Constants.PR_CONN_FAIL,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) +
- " Failure\n" +
- " error: server unavailable");
+ params.add(Constants.PR_CONN_FAIL,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Failure\n"
+ + " error: server unavailable");
} else {
- params.add(Constants.PR_CONN_FAIL,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) +
- " Failure");
+ params.add(Constants.PR_CONN_FAIL,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Failure");
}
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "LDAP publishing will fail.\n" +
- "Do you want to save the configuration anyway?");
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "LDAP publishing will fail.\n"
+ + "Do you want to save the configuration anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
@@ -772,100 +806,133 @@ public class PublisherAdminServlet extends AdminServlet {
try {
if (secure) {
conn = new LDAPConnection(
- CMS.getLdapJssSSLSocketFactory());
- params.add(Constants.PR_CONN_INITED,
- "Create ssl LDAPConnection" +
- dashes(70 - 25) + " Success");
+ CMS.getLdapJssSSLSocketFactory());
+ params.add(Constants.PR_CONN_INITED,
+ "Create ssl LDAPConnection" + dashes(70 - 25)
+ + " Success");
} else {
conn = new LDAPConnection();
- params.add(Constants.PR_CONN_INITED,
- "Create LDAPConnection" +
- dashes(70 - 21) + " Success");
+ params.add(Constants.PR_CONN_INITED,
+ "Create LDAPConnection" + dashes(70 - 21)
+ + " Success");
}
} catch (Exception ex) {
- params.add(Constants.PR_CONN_INIT_FAIL,
- "Create LDAPConnection" +
- dashes(70 - 21) + " Failure\n" +
- "exception: " + ex);
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "LDAP publishing will fail.\n" +
- "Do you want to save the configuration anyway?");
+ params.add(Constants.PR_CONN_INIT_FAIL,
+ "Create LDAPConnection" + dashes(70 - 21)
+ + " Failure\n" + "exception: " + ex);
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "LDAP publishing will fail.\n"
+ + "Do you want to save the configuration anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
try {
conn.connect(host, port);
- params.add(Constants.PR_CONN_OK,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) + " Success");
+ params.add(
+ Constants.PR_CONN_OK,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Success");
} catch (LDAPException ex) {
if (ex.getLDAPResultCode() == LDAPException.UNAVAILABLE) {
// need to intercept this because message from LDAP is
// "DSA is unavailable" which confuses with DSA PKI.
- params.add(Constants.PR_CONN_FAIL,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) + " Failure" +
- "\nerror: server unavailable");
+ params.add(Constants.PR_CONN_FAIL,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Failure"
+ + "\nerror: server unavailable");
} else {
- params.add(Constants.PR_CONN_FAIL,
- "Connect to directory server " +
- host + " at port " + port +
- dashes(70 - 37 - host.length() - (Integer.valueOf(port)).toString().length()) + " Failure" +
- "\nexception: " + ex);
+ params.add(Constants.PR_CONN_FAIL,
+ "Connect to directory server "
+ + host
+ + " at port "
+ + port
+ + dashes(70
+ - 37
+ - host.length()
+ - (Integer.valueOf(port))
+ .toString().length())
+ + " Failure" + "\nexception: " + ex);
}
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "LDAP publishing will fail.\n" +
- "Do you want to save the configuration anyway?");
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "LDAP publishing will fail.\n"
+ + "Do you want to save the configuration anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
try {
- //bindAs = authInfo.getParms()[0];
+ // bindAs = authInfo.getParms()[0];
bindAs = ldap.getSubStore(
- ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(ILdapAuthInfo.PROP_BINDDN);
+ ILdapBoundConnFactory.PROP_LDAPAUTHINFO).getString(
+ ILdapAuthInfo.PROP_BINDDN);
conn.authenticate(version, bindAs, pwd);
- params.add(Constants.PR_AUTH_OK,
- "Authentication: Basic authentication" +
- dashes(70 - 36) + " Success" +
- "\nBind to the directory as: " + bindAs +
- dashes(70 - 26 - bindAs.length()) + " Success");
+ params.add(Constants.PR_AUTH_OK,
+ "Authentication: Basic authentication"
+ + dashes(70 - 36) + " Success"
+ + "\nBind to the directory as: " + bindAs
+ + dashes(70 - 26 - bindAs.length())
+ + " Success");
} catch (LDAPException ex) {
- if (ex.getLDAPResultCode() ==
- LDAPException.NO_SUCH_OBJECT) {
- params.add(Constants.PR_AUTH_FAIL,
- "Authentication: Basic authentication" +
- dashes(70 - 36) + "Failure" +
- "\nBind to the directory as: " + bindAs +
- dashes(70 - 26 - bindAs.length()) +
- "Failure" + "\nThe object doesn't exist. " +
- "Please correct the value assigned in the" +
- " \"Directory manager DN\" field.");
- } else if (ex.getLDAPResultCode() ==
- LDAPException.INVALID_CREDENTIALS) {
- params.add(Constants.PR_AUTH_FAIL,
- "Authentication: Basic authentication" +
- dashes(70 - 36) + " Failure" +
- "\nBind to the directory as: " + bindAs +
- dashes(70 - 26 - bindAs.length()) +
- " Failure" + "\nInvalid password. " +
- "Please correct the value assigned in the" +
- " \"Password\" field.");
+ if (ex.getLDAPResultCode() == LDAPException.NO_SUCH_OBJECT) {
+ params.add(
+ Constants.PR_AUTH_FAIL,
+ "Authentication: Basic authentication"
+ + dashes(70 - 36)
+ + "Failure"
+ + "\nBind to the directory as: "
+ + bindAs
+ + dashes(70 - 26 - bindAs.length())
+ + "Failure"
+ + "\nThe object doesn't exist. "
+ + "Please correct the value assigned in the"
+ + " \"Directory manager DN\" field.");
+ } else if (ex.getLDAPResultCode() == LDAPException.INVALID_CREDENTIALS) {
+ params.add(
+ Constants.PR_AUTH_FAIL,
+ "Authentication: Basic authentication"
+ + dashes(70 - 36)
+ + " Failure"
+ + "\nBind to the directory as: "
+ + bindAs
+ + dashes(70 - 26 - bindAs.length())
+ + " Failure"
+ + "\nInvalid password. "
+ + "Please correct the value assigned in the"
+ + " \"Password\" field.");
} else {
- params.add(Constants.PR_AUTH_FAIL,
- "Authentication: Basic authentication" +
- dashes(70 - 36) + " Failure" +
- "\nBind to the directory as: " + bindAs +
- dashes(70 - 26 - bindAs.length()) +
- " Failure");
+ params.add(
+ Constants.PR_AUTH_FAIL,
+ "Authentication: Basic authentication"
+ + dashes(70 - 36) + " Failure"
+ + "\nBind to the directory as: "
+ + bindAs
+ + dashes(70 - 26 - bindAs.length())
+ + " Failure");
}
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "LDAP publishing will fail.\n" +
- "Do you want to save the configuration anyway?");
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "LDAP publishing will fail.\n"
+ + "Do you want to save the configuration anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
@@ -873,82 +940,83 @@ public class PublisherAdminServlet extends AdminServlet {
}
- //commit(true);
- if (ldapcfg.getBoolean(IPublisherProcessor.PROP_ENABLE) &&
- pwd != null) {
+ // commit(true);
+ if (ldapcfg.getBoolean(IPublisherProcessor.PROP_ENABLE) && pwd != null) {
- /* Do a "PUT" of the new pw to the watchdog"
- ** do not remove - cfu
- CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd);
+ /*
+ * Do a "PUT" of the new pw to the watchdog"* do not remove - cfu
+ * CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd);
*/
// support publishing dirsrv with different pwd than internaldb
// update passwordFile
String prompt = ldap.getString(Constants.PR_BINDPWD_PROMPT);
IPasswordStore pwdStore = CMS.getPasswordStore();
- CMS.debug("PublisherAdminServlet: testSetLDAPDest(): saving password for "+
- prompt + " to password file");
+ CMS.debug("PublisherAdminServlet: testSetLDAPDest(): saving password for "
+ + prompt + " to password file");
pwdStore.putPassword(prompt, pwd);
pwdStore.commit();
CMS.debug("PublisherAdminServlet: testSetLDAPDest(): password saved");
-/* we'll shut down and restart the PublisherProcessor instead
- // what a hack to do this without require restart server
-// ILdapAuthInfo authInfo = CMS.getLdapAuthInfo();
- ILdapConnModule connModule = mProcessor.getLdapConnModule();
- ILdapAuthInfo authInfo = null;
- if (connModule != null) {
- authInfo = connModule.getLdapAuthInfo();
- } else
- CMS.debug("PublisherAdminServlet: testSetLDAPDest(): connModule null");
-
-// authInfo.addPassword(PW_TAG_CA_LDAP_PUBLISHING, pwd);
- if (authInfo != null) {
- CMS.debug("PublisherAdminServlet: testSetLDAPDest(): adding password to memory cache");
- authInfo.addPassword(prompt, pwd);
- } else
- CMS.debug("PublisherAdminServlet: testSetLDAPDest(): authInfo null");
-*/
+ /*
+ * we'll shut down and restart the PublisherProcessor instead //
+ * what a hack to do this without require restart server //
+ * ILdapAuthInfo authInfo = CMS.getLdapAuthInfo(); ILdapConnModule
+ * connModule = mProcessor.getLdapConnModule(); ILdapAuthInfo
+ * authInfo = null; if (connModule != null) { authInfo =
+ * connModule.getLdapAuthInfo(); } else
+ * CMS.debug("PublisherAdminServlet: testSetLDAPDest(): connModule null"
+ * );
+ *
+ * // authInfo.addPassword(PW_TAG_CA_LDAP_PUBLISHING, pwd); if
+ * (authInfo != null) { CMS.debug(
+ * "PublisherAdminServlet: testSetLDAPDest(): adding password to memory cache"
+ * ); authInfo.addPassword(prompt, pwd); } else
+ * CMS.debug("PublisherAdminServlet: testSetLDAPDest(): authInfo null"
+ * );
+ */
}
- //params.add(Constants.PR_SAVE_OK,
- // "\n \nConfiguration changes are now committed.");
+ // params.add(Constants.PR_SAVE_OK,
+ // "\n \nConfiguration changes are now committed.");
mProcessor.shutdown();
if (publishcfg.getBoolean(IPublisherProcessor.PROP_ENABLE)) {
mProcessor.startup();
- //params.add("restarted", "Publishing is restarted.");
+ // params.add("restarted", "Publishing is restarted.");
if (ldapcfg.getBoolean(IPublisherProcessor.PROP_ENABLE)) {
- ICertAuthority authority = (ICertAuthority) mProcessor.getAuthority();
+ ICertAuthority authority = (ICertAuthority) mProcessor
+ .getAuthority();
- if (!(authority instanceof ICertificateAuthority))
+ if (!(authority instanceof ICertificateAuthority))
return;
ICertificateAuthority ca = (ICertificateAuthority) authority;
// publish ca cert
try {
mProcessor.publishCACert(ca.getCACert());
- CMS.debug("PublisherAdminServlet: " + CMS.getLogMessage("ADMIN_SRVLT_PUB_CA_CERT"));
- params.add("publishCA",
- "CA certificate is published.");
+ CMS.debug("PublisherAdminServlet: "
+ + CMS.getLogMessage("ADMIN_SRVLT_PUB_CA_CERT"));
+ params.add("publishCA", "CA certificate is published.");
} catch (Exception ex) {
// exception not thrown - not seen as a fatal error.
- log(ILogger.LL_FAILURE,
- CMS.getLogMessage("ADMIN_SRVLT_NO_PUB_CA_CERT", ex.toString()));
- params.add("publishCA",
- "Failed to publish CA certificate.");
+ log(ILogger.LL_FAILURE,
+ CMS.getLogMessage("ADMIN_SRVLT_NO_PUB_CA_CERT",
+ ex.toString()));
+ params.add("publishCA", "Failed to publish CA certificate.");
int index = ex.toString().indexOf("Failed to create CA");
if (index > -1) {
- params.add("createError",
- ex.toString().substring(index));
+ params.add("createError", ex.toString()
+ .substring(index));
}
mProcessor.shutdown();
// Do you want to enable LDAP publishing anyway
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "the CA certificate won't be published.\n" +
- "Do you want to enable LDAP publishing anyway?");
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "the CA certificate won't be published.\n"
+ + "Do you want to enable LDAP publishing anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
@@ -958,65 +1026,65 @@ public class PublisherAdminServlet extends AdminServlet {
CMS.debug("PublisherAdminServlet: about to update CRL");
ca.publishCRLNow();
CMS.debug(CMS.getLogMessage("ADMIN_SRVLT_PUB_CRL"));
- params.add("publishCRL",
- "CRL is published.");
+ params.add("publishCRL", "CRL is published.");
} catch (Exception ex) {
// exception not thrown - not seen as a fatal error.
- log(ILogger.LL_FAILURE,
- "Could not publish crl " + ex.toString());
- params.add("publishCRL",
- "Failed to publish CRL.");
+ log(ILogger.LL_FAILURE,
+ "Could not publish crl " + ex.toString());
+ params.add("publishCRL", "Failed to publish CRL.");
mProcessor.shutdown();
// Do you want to enable LDAP publishing anyway
- params.add(Constants.PR_SAVE_NOT,
- "\n \nIf the problem is not fixed then " +
- "the CRL won't be published.\n" +
- "Do you want to enable LDAP publishing anyway?");
+ params.add(
+ Constants.PR_SAVE_NOT,
+ "\n \nIf the problem is not fixed then "
+ + "the CRL won't be published.\n"
+ + "Do you want to enable LDAP publishing anyway?");
sendResponse(SUCCESS, null, params, resp);
return;
}
}
commit(true);
- params.add(Constants.PR_SAVE_OK,
- "\n \nConfiguration changes are now committed.");
+ params.add(Constants.PR_SAVE_OK,
+ "\n \nConfiguration changes are now committed.");
params.add("restarted", "Publishing is restarted.");
} else {
commit(true);
- params.add(Constants.PR_SAVE_OK,
- "\n \nConfiguration changes are now committed.");
- params.add("stopped",
- "Publishing is stopped.");
+ params.add(Constants.PR_SAVE_OK,
+ "\n \nConfiguration changes are now committed.");
+ params.add("stopped", "Publishing is stopped.");
}
- //XXX See if we can dynamically in B2
+ // XXX See if we can dynamically in B2
sendResponse(SUCCESS, null, params, resp);
}
- private synchronized void addMapperPlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addMapperPlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// is the manager id unique?
if (mProcessor.getMapperPlugins().containsKey((Object) id)) {
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req),"CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(),
+ null, resp);
return;
}
String classPath = req.getParameter(Constants.PR_MAPPER_CLASS);
if (classPath == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req),"CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
return;
}
@@ -1031,21 +1099,25 @@ public class PublisherAdminServlet extends AdminServlet {
try {
newImpl = Class.forName(classPath);
} catch (ClassNotFoundException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
} catch (IllegalArgumentException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
}
// is the class an ILdapMapper?
try {
if (ILdapMapper.class.isAssignableFrom(newImpl) == false) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
} catch (NullPointerException e) { // unlikely, only if newImpl null.
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
@@ -1057,10 +1129,9 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -1068,8 +1139,8 @@ public class PublisherAdminServlet extends AdminServlet {
MapperPlugin plugin = new MapperPlugin(id, classPath);
mProcessor.getMapperPlugins().put(id, plugin);
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_MAPPER_ADDED", ""));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_MAPPER_ADDED", ""));
NameValuePairs params = new NameValuePairs();
@@ -1087,54 +1158,54 @@ public class PublisherAdminServlet extends AdminServlet {
return true;
}
- private synchronized void addMapperInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addMapperInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
if (!isValidID(id)) {
- sendResponse(ERROR, "Invalid ID '" + id + "'",
- null, resp);
+ sendResponse(ERROR, "Invalid ID '" + id + "'", null, resp);
return;
}
if (mProcessor.getMapperInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
// get required parameters
- String implname = req.getParameter(
- Constants.PR_MAPPER_IMPL_NAME);
+ String implname = req.getParameter(Constants.PR_MAPPER_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
// check if implementation exists.
- MapperPlugin plugin =
- (MapperPlugin) mProcessor.getMapperPlugins().get(
+ MapperPlugin plugin = (MapperPlugin) mProcessor.getMapperPlugins().get(
implname);
if (plugin == null) {
- sendResponse(ERROR,
- new EMapperPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND", implname)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EMapperPluginNotFound(CMS.getUserMessage(
+ getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND",
+ implname)).toString(), null, resp);
return;
}
Vector configParams = mProcessor.getMapperDefaultParams(implname);
- IConfigStore destStore = mConfig.getSubStore(mAuth.getId() + ".publish.mapper");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.mapper");
IConfigStore instancesConfig = destStore.getSubStore("instance");
IConfigStore substore = instancesConfig.makeSubStore(id);
@@ -1145,11 +1216,10 @@ public class PublisherAdminServlet extends AdminServlet {
String val = req.getParameter(kv.substring(0, index));
if (val == null) {
- substore.put(kv.substring(0, index),
- kv.substring(index + 1));
+ substore.put(kv.substring(0, index),
+ kv.substring(index + 1));
} else {
- substore.put(kv.substring(0, index),
- val);
+ substore.put(kv.substring(0, index), val);
}
}
}
@@ -1164,21 +1234,27 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (ClassNotFoundException e) {
// cleanup
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
@@ -1202,47 +1278,44 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (EBaseException e) {
// clean up.
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
// inited and commited ok. now add mapper instance to list.
mProcessor.getMapperInsts().put(id, new MapperProxy(true, mapperInst));
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_MAPPER_INST_ADDED", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_MAPPER_INST_ADDED", id));
NameValuePairs params = new NameValuePairs();
params.add(Constants.PR_MAPPER_IMPL_NAME, implname);
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void listMapperPlugins(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listMapperPlugins(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
Enumeration e = mProcessor.getMapperPlugins().keys();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
- MapperPlugin value = (MapperPlugin)
- mProcessor.getMapperPlugins().get(name);
+ MapperPlugin value = (MapperPlugin) mProcessor.getMapperPlugins()
+ .get(name);
// get Description
- String c = value.getClassPath();
+ String c = value.getClassPath();
String desc = "unknown";
try {
- ILdapMapper lp = (ILdapMapper)
- Class.forName(c).newInstance();
+ ILdapMapper lp = (ILdapMapper) Class.forName(c).newInstance();
desc = lp.getDescription();
} catch (Exception exp) {
- sendResponse(ERROR, exp.toString(), null,
- resp);
+ sendResponse(ERROR, exp.toString(), null, resp);
return;
}
params.add(name, value.getClassPath() + "," + desc);
@@ -1261,9 +1334,9 @@ public class PublisherAdminServlet extends AdminServlet {
}
}
- private synchronized void listMapperInsts(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listMapperInsts(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
Enumeration e = mProcessor.getMapperInsts().keys();
@@ -1278,40 +1351,39 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void delMapperInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void delMapperInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does a`mapper instance exist?
if (mProcessor.getMapperInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new EMapperNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_MAPPER_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EMapperNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_MAPPER_NOT_FOUND", id)).toString(), null,
+ resp);
return;
}
// only remove from memory
// cannot shutdown because we don't keep track of whether it's
- // being used.
- ILdapMapper mapperInst = (ILdapMapper)
- mProcessor.getMapperInstance(id);
+ // being used.
+ ILdapMapper mapperInst = (ILdapMapper) mProcessor.getMapperInstance(id);
mProcessor.getMapperInsts().remove((Object) id);
// remove the configuration.
- IConfigStore destStore =
- mConfig.getSubStore(
- mAuth.getId() + ".publish.mapper");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.mapper");
IConfigStore instancesConfig = destStore.getSubStore("instance");
instancesConfig.removeSubStore(id);
@@ -1319,85 +1391,82 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void delMapperPlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void delMapperPlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
if (mProcessor.getMapperPlugins().containsKey(id) == false) {
- sendResponse(ERROR,
- new EMapperPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EMapperPluginNotFound(CMS.getUserMessage(
+ getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND",
+ id)).toString(), null, resp);
return;
}
// first check if any instances from this mapper
// DON'T remove mapper if any instance
- for (Enumeration e = mProcessor.getMapperInsts().keys();
- e.hasMoreElements();) {
+ for (Enumeration e = mProcessor.getMapperInsts().keys(); e
+ .hasMoreElements();) {
String name = (String) e.nextElement();
ILdapMapper mapper = mProcessor.getMapperInstance(name);
if (id.equals(getMapperPluginName(mapper))) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_IN_USE"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_IN_USE"), null, resp);
return;
}
}
-
+
// then delete this mapper
mProcessor.getMapperPlugins().remove((Object) id);
- IConfigStore destStore =
- mConfig.getSubStore(
- mAuth.getId() + ".publish.mapper");
- IConfigStore instancesConfig =
- destStore.getSubStore("impl");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.mapper");
+ IConfigStore instancesConfig = destStore.getSubStore("impl");
instancesConfig.removeSubStore(id);
// commiting
try {
mConfig.commit(true);
} catch (EBaseException e) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void getMapperConfig(HttpServletRequest req,
- HttpServletResponse resp)
- throws ServletException, IOException, EBaseException {
+ private synchronized void getMapperConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String implname = req.getParameter(Constants.RS_ID);
if (implname == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
@@ -1411,50 +1480,48 @@ public class PublisherAdminServlet extends AdminServlet {
String kv = (String) configParams.elementAt(i);
int index = kv.indexOf('=');
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
sendResponse(0, null, params, resp);
return;
}
- private synchronized void getMapperInstConfig(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void getMapperInstConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does mapper instance exist?
if (mProcessor.getMapperInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new EMapperNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_MAPPER_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EMapperNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_MAPPER_NOT_FOUND", id)).toString(), null,
+ resp);
return;
}
- ILdapMapper mapperInst = (ILdapMapper)
- mProcessor.getMapperInstance(id);
+ ILdapMapper mapperInst = (ILdapMapper) mProcessor.getMapperInstance(id);
Vector configParams = mapperInst.getInstanceParams();
NameValuePairs params = new NameValuePairs();
- params.add(Constants.PR_MAPPER_IMPL_NAME,
- getMapperPluginName(mapperInst));
+ params.add(Constants.PR_MAPPER_IMPL_NAME,
+ getMapperPluginName(mapperInst));
// implName is always required so always send it.
if (configParams != null) {
for (int i = 0; i < configParams.size(); i++) {
String kv = (String) configParams.elementAt(i);
int index = kv.indexOf('=');
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
@@ -1462,24 +1529,23 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void modMapperInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void modMapperInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// Does the manager instance exist?
if (!mProcessor.getMapperInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
@@ -1487,24 +1553,26 @@ public class PublisherAdminServlet extends AdminServlet {
String implname = req.getParameter(Constants.PR_MAPPER_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
// get plugin for implementation
- MapperPlugin plugin =
- (MapperPlugin) mProcessor.getMapperPlugins().get(implname);
+ MapperPlugin plugin = (MapperPlugin) mProcessor.getMapperPlugins().get(
+ implname);
if (plugin == null) {
- sendResponse(ERROR,
- new EMapperPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND", implname)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EMapperPluginNotFound(CMS.getUserMessage(
+ getLocale(req), "CMS_LDAP_MAPPER_PLUGIN_NOT_FOUND",
+ implname)).toString(), null, resp);
return;
}
// save old instance substore params in case new one fails.
- ILdapMapper oldinst =
- (ILdapMapper) mProcessor.getMapperInstance(id);
+ ILdapMapper oldinst = (ILdapMapper) mProcessor.getMapperInstance(id);
Vector oldConfigParms = oldinst.getInstanceParams();
NameValuePairs saveParams = new NameValuePairs();
@@ -1515,8 +1583,7 @@ public class PublisherAdminServlet extends AdminServlet {
String kv = (String) oldConfigParms.elementAt(i);
int index = kv.indexOf('=');
- saveParams.add(kv.substring(0, index),
- kv.substring(index + 1));
+ saveParams.add(kv.substring(0, index), kv.substring(index + 1));
}
}
@@ -1524,9 +1591,8 @@ public class PublisherAdminServlet extends AdminServlet {
// remove old substore.
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId() +
- ".publish.mapper");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.mapper");
IConfigStore instancesConfig = destStore.getSubStore("instance");
// create new substore.
@@ -1557,26 +1623,31 @@ public class PublisherAdminServlet extends AdminServlet {
ILdapMapper newMgrInst = null;
try {
- newMgrInst = (ILdapMapper)
- Class.forName(className).newInstance();
+ newMgrInst = (ILdapMapper) Class.forName(className).newInstance();
} catch (ClassNotFoundException e) {
// cleanup
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
// initialize the mapper
@@ -1586,26 +1657,23 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (EBaseException e) {
// don't commit in this case and cleanup the new substore.
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR, e.toString(getLocale(req)), null,
- resp);
+ sendResponse(ERROR, e.toString(getLocale(req)), null, resp);
return;
} catch (Throwable e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR, e.toString(), null,
- resp);
+ sendResponse(ERROR, e.toString(), null, resp);
return;
}
- // initialized ok. commiting
+ // initialized ok. commiting
try {
mConfig.commit(true);
} catch (EBaseException e) {
// clean up.
restore(instancesConfig, id, saveParams);
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -1614,45 +1682,46 @@ public class PublisherAdminServlet extends AdminServlet {
mProcessor.getMapperInsts().put(id, new MapperProxy(true, newMgrInst));
mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_MAPPER_REPLACED", id));
+ CMS.getLogMessage("ADMIN_SRVLT_MAPPER_REPLACED", id));
NameValuePairs params = new NameValuePairs();
sendResponse(SUCCESS, null, params, resp);
return;
}
- private synchronized void addRulePlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addRulePlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// is the rule id unique?
if (mProcessor.getRulePlugins().containsKey((Object) id)) {
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage("CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(getLocale(req)),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(
+ "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id))
+ .toString(getLocale(req)), null, resp);
return;
}
String classPath = req.getParameter(Constants.PR_RULE_CLASS);
if (classPath == null) {
- sendResponse(ERROR, CMS.getUserMessage("CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
+ sendResponse(ERROR,
+ CMS.getUserMessage("CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
return;
}
IConfigStore destStore = null;
- destStore = mConfig.getSubStore(
- mAuth.getId() + ".publish.rule");
+ destStore = mConfig.getSubStore(mAuth.getId() + ".publish.rule");
IConfigStore instancesConfig = destStore.getSubStore("impl");
// Does the class exist?
@@ -1661,21 +1730,25 @@ public class PublisherAdminServlet extends AdminServlet {
try {
newImpl = Class.forName(classPath);
} catch (ClassNotFoundException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
} catch (IllegalArgumentException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
}
// is the class an ILdapRule?
try {
if (ILdapRule.class.isAssignableFrom(newImpl) == false) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
} catch (NullPointerException e) { // unlikely, only if newImpl null.
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
@@ -1687,10 +1760,9 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -1698,8 +1770,8 @@ public class PublisherAdminServlet extends AdminServlet {
RulePlugin plugin = new RulePlugin(id, classPath);
mProcessor.getRulePlugins().put(id, plugin);
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_RULE_PLUG_ADDED", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_RULE_PLUG_ADDED", id));
NameValuePairs params = new NameValuePairs();
@@ -1707,57 +1779,55 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void addRuleInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addRuleInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
if (!isValidID(id)) {
- sendResponse(ERROR, "Invalid ID '" + id + "'",
- null, resp);
+ sendResponse(ERROR, "Invalid ID '" + id + "'", null, resp);
return;
}
if (mProcessor.getRuleInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
// get required parameters
- String implname = req.getParameter(
- Constants.PR_RULE_IMPL_NAME);
+ String implname = req.getParameter(Constants.PR_RULE_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
// check if implementation exists.
- RulePlugin plugin =
- (RulePlugin) mProcessor.getRulePlugins().get(
+ RulePlugin plugin = (RulePlugin) mProcessor.getRulePlugins().get(
implname);
if (plugin == null) {
- sendResponse(ERROR,
- new EPublisherPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherPluginNotFound(CMS.getUserMessage(
+ getLocale(req),
+ "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname))
+ .toString(), null, resp);
return;
}
Vector configParams = mProcessor.getRuleDefaultParams(implname);
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId()
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ ".publish.rule");
- IConfigStore instancesConfig =
- destStore.getSubStore("instance");
+ IConfigStore instancesConfig = destStore.getSubStore("instance");
IConfigStore substore = instancesConfig.makeSubStore(id);
if (configParams != null) {
@@ -1767,13 +1837,12 @@ public class PublisherAdminServlet extends AdminServlet {
String val = req.getParameter(kv.substring(0, index));
if (val == null) {
- substore.put(kv.substring(0, index),
- kv.substring(index + 1));
+ substore.put(kv.substring(0, index),
+ kv.substring(index + 1));
} else {
if (val.equals(NOMAPPER))
val = "";
- substore.put(kv.substring(0, index),
- val);
+ substore.put(kv.substring(0, index), val);
}
}
}
@@ -1788,21 +1857,27 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (ClassNotFoundException e) {
// cleanup
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
@@ -1827,41 +1902,39 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (EBaseException e) {
// clean up.
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
// inited and commited ok. now add manager instance to list.
mProcessor.getRuleInsts().put(id, ruleInst);
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_RULE_INST_ADDED", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_RULE_INST_ADDED", id));
NameValuePairs params = new NameValuePairs();
params.add(Constants.PR_RULE_IMPL_NAME, implname);
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void listRulePlugins(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listRulePlugins(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
Enumeration e = mProcessor.getRulePlugins().keys();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
- RulePlugin value = (RulePlugin)
- mProcessor.getRulePlugins().get(name);
+ RulePlugin value = (RulePlugin) mProcessor.getRulePlugins().get(
+ name);
// get Description
- String c = value.getClassPath();
+ String c = value.getClassPath();
String desc = "unknown";
try {
- ILdapRule lp = (ILdapRule)
- Class.forName(c).newInstance();
+ ILdapRule lp = (ILdapRule) Class.forName(c).newInstance();
desc = lp.getDescription();
} catch (Exception exp) {
@@ -1872,17 +1945,17 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void listRuleInsts(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listRuleInsts(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
String insts = null;
Enumeration e = mProcessor.getRuleInsts().keys();
for (; e.hasMoreElements();) {
String name = (String) e.nextElement();
- ILdapRule value = (ILdapRule)
- mProcessor.getRuleInsts().get((Object) name);
+ ILdapRule value = (ILdapRule) mProcessor.getRuleInsts().get(
+ (Object) name);
String enabled = value.enabled() ? "enabled" : "disabled";
params.add(name, value.getInstanceName() + ";visible;" + enabled);
@@ -1901,47 +1974,46 @@ public class PublisherAdminServlet extends AdminServlet {
}
}
- private synchronized void delRulePlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void delRulePlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does rule exist?
if (mProcessor.getRulePlugins().containsKey(id) == false) {
- sendResponse(ERROR,
- new ERulePluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_RULE_PLUGIN_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ERulePluginNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_RULE_PLUGIN_NOT_FOUND", id)).toString(),
+ null, resp);
return;
}
// first check if any instances from this rule
// DON'T remove rule if any instance
- for (Enumeration e = mProcessor.getRuleInsts().elements();
- e.hasMoreElements();) {
- ILdapRule rule = (ILdapRule)
- e.nextElement();
+ for (Enumeration e = mProcessor.getRuleInsts().elements(); e
+ .hasMoreElements();) {
+ ILdapRule rule = (ILdapRule) e.nextElement();
if (id.equals(getRulePluginName(rule))) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_IN_USE"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_IN_USE"), null, resp);
return;
}
}
-
+
// then delete this rule
mProcessor.getRulePlugins().remove((Object) id);
- IConfigStore destStore =
- mConfig.getSubStore(
- mAuth.getId() + ".rule");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId() + ".rule");
IConfigStore instancesConfig = destStore.getSubStore("impl");
instancesConfig.removeSubStore(id);
@@ -1949,27 +2021,25 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void delRuleInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void delRuleInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
@@ -1977,24 +2047,24 @@ public class PublisherAdminServlet extends AdminServlet {
// does rule instance exist?
if (mProcessor.getRuleInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new ERuleNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_RULE_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ERuleNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_RULE_NOT_FOUND", id)).toString(), null,
+ resp);
return;
}
// only remove from memory
// cannot shutdown because we don't keep track of whether it's
- // being used.
- ILdapRule ruleInst = (ILdapRule)
- mProcessor.getRuleInsts().get(id);
+ // being used.
+ ILdapRule ruleInst = (ILdapRule) mProcessor.getRuleInsts().get(id);
mProcessor.getRuleInsts().remove((Object) id);
// remove the configuration.
- IConfigStore destStore =
- mConfig.getSubStore(
- mAuth.getId() + ".publish.rule");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.rule");
IConfigStore instancesConfig = destStore.getSubStore("instance");
instancesConfig.removeSubStore(id);
@@ -2002,26 +2072,24 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
sendResponse(SUCCESS, null, params, resp);
return;
- }
+ }
- private synchronized void getRuleConfig(HttpServletRequest req,
- HttpServletResponse resp)
- throws ServletException, IOException, EBaseException {
+ private synchronized void getRuleConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String implname = req.getParameter(Constants.RS_ID);
if (implname == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
@@ -2035,50 +2103,47 @@ public class PublisherAdminServlet extends AdminServlet {
String kv = (String) configParams.elementAt(i);
int index = kv.indexOf('=');
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
sendResponse(0, null, params, resp);
return;
}
- private synchronized void getRuleInstConfig(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void getRuleInstConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does rule instance exist?
if (mProcessor.getRuleInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new ERuleNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_RULE_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ERuleNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_RULE_NOT_FOUND", id)).toString(), null,
+ resp);
return;
}
- ILdapRule ruleInst = (ILdapRule)
- mProcessor.getRuleInsts().get(id);
+ ILdapRule ruleInst = (ILdapRule) mProcessor.getRuleInsts().get(id);
Vector configParams = ruleInst.getInstanceParams();
NameValuePairs params = new NameValuePairs();
- params.add(Constants.PR_RULE_IMPL_NAME,
- getRulePluginName(ruleInst));
+ params.add(Constants.PR_RULE_IMPL_NAME, getRulePluginName(ruleInst));
// implName is always required so always send it.
if (configParams != null) {
for (int i = 0; i < configParams.size(); i++) {
String kv = (String) configParams.elementAt(i);
int index = kv.indexOf('=');
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
@@ -2086,23 +2151,22 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void modRuleInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void modRuleInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// Does the manager instance exist?
if (!mProcessor.getRuleInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
@@ -2110,26 +2174,26 @@ public class PublisherAdminServlet extends AdminServlet {
String implname = req.getParameter(Constants.PR_RULE_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
- // get plugin for implementation
- RulePlugin plugin =
- (RulePlugin) mProcessor.getRulePlugins().get(implname);
+ // get plugin for implementation
+ RulePlugin plugin = (RulePlugin) mProcessor.getRulePlugins().get(
+ implname);
if (plugin == null) {
sendResponse(ERROR,
- //new ERulePluginNotFound(implname).toString(getLocale(req)),
- "",
- null, resp);
+ // new ERulePluginNotFound(implname).toString(getLocale(req)),
+ "", null, resp);
return;
}
- // save old instance substore params in case new one fails.
+ // save old instance substore params in case new one fails.
- ILdapRule oldinst =
- (ILdapRule) mProcessor.getRuleInsts().get((Object) id);
+ ILdapRule oldinst = (ILdapRule) mProcessor.getRuleInsts().get(
+ (Object) id);
Vector oldConfigParms = oldinst.getInstanceParams();
NameValuePairs saveParams = new NameValuePairs();
@@ -2140,8 +2204,7 @@ public class PublisherAdminServlet extends AdminServlet {
String kv = (String) oldConfigParms.elementAt(i);
int index = kv.indexOf('=');
- saveParams.add(kv.substring(0, index),
- kv.substring(index + 1));
+ saveParams.add(kv.substring(0, index), kv.substring(index + 1));
}
}
@@ -2149,9 +2212,8 @@ public class PublisherAdminServlet extends AdminServlet {
// remove old substore.
- IConfigStore destStore =
- mConfig.getSubStore(
- mAuth.getId() + ".publish.rule");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.rule");
IConfigStore instancesConfig = destStore.getSubStore("instance");
// create new substore.
@@ -2171,8 +2233,7 @@ public class PublisherAdminServlet extends AdminServlet {
String val = req.getParameter(key);
if (val == null) {
- substore.put(key,
- kv.substring(index + 1));
+ substore.put(key, kv.substring(index + 1));
} else {
if (val.equals(NOMAPPER))
val = "";
@@ -2191,21 +2252,27 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (ClassNotFoundException e) {
// cleanup
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
@@ -2224,16 +2291,15 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- // initialized ok. commiting
+ // initialized ok. commiting
try {
mConfig.commit(true);
} catch (EBaseException e) {
// clean up.
restore(instancesConfig, id, saveParams);
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -2241,47 +2307,48 @@ public class PublisherAdminServlet extends AdminServlet {
mProcessor.getRuleInsts().put(id, newRuleInst);
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_RULE_INST_REP", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_RULE_INST_REP", id));
NameValuePairs params = new NameValuePairs();
sendResponse(SUCCESS, null, params, resp);
return;
}
- private synchronized void addPublisherPlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addPublisherPlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// is the manager id unique?
if (mProcessor.getPublisherPlugins().containsKey((Object) id)) {
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(),
+ null, resp);
return;
}
String classPath = req.getParameter(Constants.PR_PUBLISHER_CLASS);
if (classPath == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req),"CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NULL_CLASS"), null, resp);
return;
}
IConfigStore destStore = null;
- destStore = mConfig.getSubStore(
- mAuth.getId() + ".publish.publisher");
+ destStore = mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
IConfigStore instancesConfig = destStore.getSubStore("impl");
// Does the class exist?
@@ -2290,21 +2357,25 @@ public class PublisherAdminServlet extends AdminServlet {
try {
newImpl = Class.forName(classPath);
} catch (ClassNotFoundException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
} catch (IllegalArgumentException e) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_NO_CLASS"), null, resp);
return;
}
// is the class an ILdapPublisher?
try {
if (ILdapPublisher.class.isAssignableFrom(newImpl) == false) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
} catch (NullPointerException e) { // unlikely, only if newImpl null.
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_CLASS", classPath), null, resp);
return;
}
@@ -2316,10 +2387,9 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -2327,8 +2397,8 @@ public class PublisherAdminServlet extends AdminServlet {
PublisherPlugin plugin = new PublisherPlugin(id, classPath);
mProcessor.getPublisherPlugins().put(id, plugin);
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_PUB_PLUG_ADDED", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_PUB_PLUG_ADDED", id));
NameValuePairs params = new NameValuePairs();
@@ -2336,56 +2406,56 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void addPublisherInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void addPublisherInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
if (!isValidID(id)) {
- sendResponse(ERROR, "Invalid ID '" + id + "'",
- null, resp);
+ sendResponse(ERROR, "Invalid ID '" + id + "'", null, resp);
return;
}
if (mProcessor.getPublisherInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
// get required parameters
- String implname = req.getParameter(
- Constants.PR_PUBLISHER_IMPL_NAME);
+ String implname = req.getParameter(Constants.PR_PUBLISHER_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
// check if implementation exists.
- PublisherPlugin plugin =
- (PublisherPlugin) mProcessor.getPublisherPlugins().get(
- implname);
+ PublisherPlugin plugin = (PublisherPlugin) mProcessor
+ .getPublisherPlugins().get(implname);
if (plugin == null) {
- sendResponse(ERROR,
- new EPublisherPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherPluginNotFound(CMS.getUserMessage(
+ getLocale(req),
+ "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname))
+ .toString(), null, resp);
return;
}
Vector configParams = mProcessor.getPublisherDefaultParams(implname);
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.publisher");
IConfigStore instancesConfig = destStore.getSubStore("instance");
IConfigStore substore = instancesConfig.makeSubStore(id);
@@ -2404,15 +2474,14 @@ public class PublisherAdminServlet extends AdminServlet {
if (index == -1) {
substore.put(kv, "");
} else {
- substore.put(kv.substring(0, index),
- kv.substring(index + 1));
+ substore.put(kv.substring(0, index),
+ kv.substring(index + 1));
}
} else {
if (index == -1) {
substore.put(kv, val);
} else {
- substore.put(kv.substring(0, index),
- val);
+ substore.put(kv.substring(0, index), val);
}
}
}
@@ -2424,25 +2493,32 @@ public class PublisherAdminServlet extends AdminServlet {
ILdapPublisher publisherInst = null;
try {
- publisherInst = (ILdapPublisher) Class.forName(className).newInstance();
+ publisherInst = (ILdapPublisher) Class.forName(className)
+ .newInstance();
} catch (ClassNotFoundException e) {
// cleanup
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
@@ -2466,17 +2542,17 @@ public class PublisherAdminServlet extends AdminServlet {
} catch (EBaseException e) {
// clean up.
instancesConfig.removeSubStore(id);
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
// inited and commited ok. now add manager instance to list.
- mProcessor.getPublisherInsts().put(id, new PublisherProxy(true, publisherInst));
+ mProcessor.getPublisherInsts().put(id,
+ new PublisherProxy(true, publisherInst));
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_PUB_INST_ADDED", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_PUB_INST_ADDED", id));
NameValuePairs params = new NameValuePairs();
@@ -2485,24 +2561,24 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void listPublisherPlugins(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listPublisherPlugins(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
Enumeration e = mProcessor.getPublisherPlugins().keys();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
- PublisherPlugin value = (PublisherPlugin)
- mProcessor.getPublisherPlugins().get(name);
+ PublisherPlugin value = (PublisherPlugin) mProcessor
+ .getPublisherPlugins().get(name);
// get Description
- String c = value.getClassPath();
+ String c = value.getClassPath();
String desc = "unknown";
try {
- ILdapPublisher lp = (ILdapPublisher)
- Class.forName(c).newInstance();
+ ILdapPublisher lp = (ILdapPublisher) Class.forName(c)
+ .newInstance();
desc = lp.getDescription();
} catch (Exception exp) {
@@ -2523,9 +2599,9 @@ public class PublisherAdminServlet extends AdminServlet {
}
}
- private synchronized void listPublisherInsts(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void listPublisherInsts(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
NameValuePairs params = new NameValuePairs();
String insts = null;
@@ -2543,48 +2619,50 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void delPublisherPlugin(HttpServletRequest req,
- HttpServletResponse resp, String scope) throws ServletException,
+ private synchronized void delPublisherPlugin(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does publisher exist?
if (mProcessor.getPublisherPlugins().containsKey(id) == false) {
- sendResponse(ERROR,
- new EPublisherPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherPluginNotFound(CMS.getUserMessage(
+ getLocale(req),
+ "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", id))
+ .toString(), null, resp);
return;
}
// first check if any instances from this publisher
// DON'T remove publisher if any instance
- for (Enumeration e = mProcessor.getPublisherInsts().keys();
- e.hasMoreElements();) {
+ for (Enumeration e = mProcessor.getPublisherInsts().keys(); e
+ .hasMoreElements();) {
String name = (String) e.nextElement();
- ILdapPublisher publisher =
- mProcessor.getPublisherInstance(name);
+ ILdapPublisher publisher = mProcessor.getPublisherInstance(name);
if (id.equals(getPublisherPluginName(publisher))) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_IN_USE"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_IN_USE"), null, resp);
return;
}
}
-
+
// then delete this publisher
mProcessor.getPublisherPlugins().remove((Object) id);
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.publisher");
IConfigStore instancesConfig = destStore.getSubStore("impl");
instancesConfig.removeSubStore(id);
@@ -2592,9 +2670,8 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
@@ -2602,18 +2679,17 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void delPublisherInst(HttpServletRequest req,
- HttpServletResponse resp, String scope) throws ServletException,
+ private synchronized void delPublisherInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
IOException, EBaseException {
NameValuePairs params = new NameValuePairs();
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
@@ -2621,22 +2697,24 @@ public class PublisherAdminServlet extends AdminServlet {
// does publisher instance exist?
if (mProcessor.getPublisherInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new EPublisherNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_PUBLISHER_NOT_FOUND", id)).toString(),
+ null, resp);
return;
}
// only remove from memory
// cannot shutdown because we don't keep track of whether it's
- // being used.
+ // being used.
ILdapPublisher publisherInst = mProcessor.getPublisherInstance(id);
mProcessor.getPublisherInsts().remove((Object) id);
// remove the configuration.
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.publisher");
IConfigStore instancesConfig = destStore.getSubStore("instance");
instancesConfig.removeSubStore(id);
@@ -2644,10 +2722,9 @@ public class PublisherAdminServlet extends AdminServlet {
try {
mConfig.commit(true);
} catch (EBaseException e) {
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
sendResponse(SUCCESS, null, params, resp);
@@ -2655,25 +2732,23 @@ public class PublisherAdminServlet extends AdminServlet {
}
/**
- * used for getting the required configuration parameters (with
- * possible default values) for a particular plugin
- * implementation name specified in the RS_ID. Actually, there is
- * no logic in here to set any default value here...there's no
- * default value for any parameter in this publishing subsystem
- * at this point. Later, if we do have one (or some), it can be
- * added. The interface remains the same.
+ * used for getting the required configuration parameters (with possible
+ * default values) for a particular plugin implementation name specified in
+ * the RS_ID. Actually, there is no logic in here to set any default value
+ * here...there's no default value for any parameter in this publishing
+ * subsystem at this point. Later, if we do have one (or some), it can be
+ * added. The interface remains the same.
*/
- private synchronized void getConfig(HttpServletRequest req,
- HttpServletResponse resp)
- throws ServletException, IOException, EBaseException {
+ private synchronized void getConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String implname = req.getParameter(Constants.RS_ID);
if (implname == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
@@ -2690,8 +2765,7 @@ public class PublisherAdminServlet extends AdminServlet {
if (index == -1) {
params.add(kv, "");
} else {
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
}
@@ -2699,43 +2773,43 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- private synchronized void getInstConfig(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException,
- IOException, EBaseException {
+ private synchronized void getInstConfig(HttpServletRequest req,
+ HttpServletResponse resp) throws ServletException, IOException,
+ EBaseException {
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// does publisher instance exist?
if (mProcessor.getPublisherInsts().containsKey(id) == false) {
- sendResponse(ERROR,
- new EPublisherNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_NOT_FOUND", id)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherNotFound(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_PUBLISHER_NOT_FOUND", id)).toString(),
+ null, resp);
return;
}
- ILdapPublisher publisherInst = (ILdapPublisher)
- mProcessor.getPublisherInstance(id);
+ ILdapPublisher publisherInst = (ILdapPublisher) mProcessor
+ .getPublisherInstance(id);
Vector configParams = publisherInst.getInstanceParams();
NameValuePairs params = new NameValuePairs();
- params.add(Constants.PR_PUBLISHER_IMPL_NAME,
- getPublisherPluginName(publisherInst));
+ params.add(Constants.PR_PUBLISHER_IMPL_NAME,
+ getPublisherPluginName(publisherInst));
// implName is always required so always send it.
if (configParams != null) {
for (int i = 0; i < configParams.size(); i++) {
String kv = (String) configParams.elementAt(i);
int index = kv.indexOf('=');
- params.add(kv.substring(0, index),
- kv.substring(index + 1));
+ params.add(kv.substring(0, index), kv.substring(index + 1));
}
}
@@ -2744,33 +2818,30 @@ public class PublisherAdminServlet extends AdminServlet {
}
/**
- * Modify publisher instance.
- * This will actually create a new instance with new configuration
- * parameters and replace the old instance, if the new instance
- * created and initialized successfully.
- * The old instance is left running. so this is very expensive.
- * Restart of server recommended.
+ * Modify publisher instance. This will actually create a new instance with
+ * new configuration parameters and replace the old instance, if the new
+ * instance created and initialized successfully. The old instance is left
+ * running. so this is very expensive. Restart of server recommended.
*/
- private synchronized void modPublisherInst(HttpServletRequest req,
- HttpServletResponse resp, String scope)
- throws ServletException, IOException, EBaseException {
+ private synchronized void modPublisherInst(HttpServletRequest req,
+ HttpServletResponse resp, String scope) throws ServletException,
+ IOException, EBaseException {
// expensive operation.
String id = req.getParameter(Constants.RS_ID);
if (id == null) {
- //System.out.println("SRVLT_NULL_RS_ID");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_NULL_RS_ID"),
- null, resp);
+ // System.out.println("SRVLT_NULL_RS_ID");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_NULL_RS_ID"), null, resp);
return;
}
// Does the manager instance exist?
if (!mProcessor.getPublisherInsts().containsKey((Object) id)) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
- null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp);
return;
}
@@ -2778,22 +2849,26 @@ public class PublisherAdminServlet extends AdminServlet {
String implname = req.getParameter(Constants.PR_PUBLISHER_IMPL_NAME);
if (implname == null) {
- sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_SRVLT_ADD_MISSING_PARAMS"), null, resp);
return;
}
- // get plugin for implementation
- PublisherPlugin plugin =
- (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname);
+ // get plugin for implementation
+ PublisherPlugin plugin = (PublisherPlugin) mProcessor
+ .getPublisherPlugins().get(implname);
if (plugin == null) {
- sendResponse(ERROR,
- new EPublisherPluginNotFound(CMS.getUserMessage(getLocale(req), "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new EPublisherPluginNotFound(CMS.getUserMessage(
+ getLocale(req),
+ "CMS_LDAP_PUBLISHER_PLUGIN_NOT_FOUND", implname))
+ .toString(), null, resp);
return;
}
- // save old instance substore params in case new one fails.
+ // save old instance substore params in case new one fails.
ILdapPublisher oldinst = mProcessor.getPublisherInstance(id);
Vector oldConfigParms = oldinst.getInstanceParams();
@@ -2807,14 +2882,16 @@ public class PublisherAdminServlet extends AdminServlet {
String kv = (String) oldConfigParms.elementAt(i);
int index = kv.indexOf('=');
if (index > -1) {
- if (kv.substring(0, index).equalsIgnoreCase("caObjectClass")) {
+ if (kv.substring(0, index)
+ .equalsIgnoreCase("caObjectClass")) {
pubType = "cacert";
- } else if (kv.substring(0, index).equalsIgnoreCase("crlObjectClass")) {
+ } else if (kv.substring(0, index).equalsIgnoreCase(
+ "crlObjectClass")) {
pubType = "crl";
}
- saveParams.add(kv.substring(0, index),
- kv.substring(index + 1));
+ saveParams.add(kv.substring(0, index),
+ kv.substring(index + 1));
}
}
}
@@ -2823,17 +2900,23 @@ public class PublisherAdminServlet extends AdminServlet {
// remove old substore.
- IConfigStore destStore =
- mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
+ IConfigStore destStore = mConfig.getSubStore(mAuth.getId()
+ + ".publish.publisher");
IConfigStore instancesConfig = destStore.getSubStore("instance");
// get objects added and deleted
if (pubType.equals("cacert")) {
- saveParams.add("caObjectClassAdded", instancesConfig.getString(id + ".caObjectClassAdded", ""));
- saveParams.add("caObjectClassDeleted", instancesConfig.getString(id + ".caObjectClassDeleted", ""));
+ saveParams.add("caObjectClassAdded",
+ instancesConfig.getString(id + ".caObjectClassAdded", ""));
+ saveParams
+ .add("caObjectClassDeleted",
+ instancesConfig.getString(id
+ + ".caObjectClassDeleted", ""));
} else if (pubType.equals("crl")) {
- saveParams.add("crlObjectClassAdded", instancesConfig.getString(id + ".crlObjectClassAdded", ""));
- saveParams.add("crlObjectClassDeleted", instancesConfig.getString(id + ".crlObjectClassDeleted", ""));
+ saveParams.add("crlObjectClassAdded",
+ instancesConfig.getString(id + ".crlObjectClassAdded", ""));
+ saveParams.add("crlObjectClassDeleted", instancesConfig.getString(
+ id + ".crlObjectClassDeleted", ""));
}
// create new substore.
@@ -2859,9 +2942,9 @@ public class PublisherAdminServlet extends AdminServlet {
}
// process any changes to the ldap object class definitions
- if (pubType.equals("cacert")) {
+ if (pubType.equals("cacert")) {
processChangedOC(saveParams, substore, "caObjectClass");
- substore.put("pubtype", "cacert");
+ substore.put("pubtype", "cacert");
}
if (pubType.equals("crl")) {
@@ -2875,25 +2958,32 @@ public class PublisherAdminServlet extends AdminServlet {
ILdapPublisher newMgrInst = null;
try {
- newMgrInst = (ILdapPublisher) Class.forName(className).newInstance();
+ newMgrInst = (ILdapPublisher) Class.forName(className)
+ .newInstance();
} catch (ClassNotFoundException e) {
// cleanup
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (InstantiationException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
} catch (IllegalAccessException e) {
restore(instancesConfig, id, saveParams);
- sendResponse(ERROR,
- new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
- null, resp);
+ sendResponse(
+ ERROR,
+ new ELdapException(CMS.getUserMessage(getLocale(req),
+ "CMS_LDAP_FAIL_LOAD_CLASS", className)).toString(),
+ null, resp);
return;
}
@@ -2912,25 +3002,25 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- // initialized ok. commiting
+ // initialized ok. commiting
try {
mConfig.commit(true);
} catch (EBaseException e) {
// clean up.
restore(instancesConfig, id, saveParams);
- //System.out.println("SRVLT_FAIL_COMMIT");
- sendResponse(ERROR,
- CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_COMMIT_FAILED"),
- null, resp);
+ // System.out.println("SRVLT_FAIL_COMMIT");
+ sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
+ "CMS_ADMIN_SRVLT_COMMIT_FAILED"), null, resp);
return;
}
// commited ok. replace instance.
- mProcessor.getPublisherInsts().put(id, new PublisherProxy(true, newMgrInst));
+ mProcessor.getPublisherInsts().put(id,
+ new PublisherProxy(true, newMgrInst));
- mProcessor.log(ILogger.LL_INFO,
- CMS.getLogMessage("ADMIN_SRVLT_PUB_INST_REP", id));
+ mProcessor.log(ILogger.LL_INFO,
+ CMS.getLogMessage("ADMIN_SRVLT_PUB_INST_REP", id));
NameValuePairs params = new NameValuePairs();
@@ -2938,61 +3028,65 @@ public class PublisherAdminServlet extends AdminServlet {
return;
}
- // convenience function - takes list1, list2. Returns what is in list1
+ // convenience function - takes list1, list2. Returns what is in list1
// but not in list2
private String[] getExtras(String[] list1, String[] list2) {
- Vector <String> extras = new Vector<String>();
- for (int i=0; i< list1.length; i++) {
- boolean match=false;
- for (int j=0; j < list2.length; j++) {
- if ((list1[i].trim()).equalsIgnoreCase(list2[j].trim())) {
- match = true;
- break;
- }
- }
- if (!match) extras.add(list1[i].trim());
- }
-
- return (String[])extras.toArray(new String[extras.size()]);
+ Vector<String> extras = new Vector<String>();
+ for (int i = 0; i < list1.length; i++) {
+ boolean match = false;
+ for (int j = 0; j < list2.length; j++) {
+ if ((list1[i].trim()).equalsIgnoreCase(list2[j].trim())) {
+ match = true;
+ break;
+ }
+ }
+ if (!match)
+ extras.add(list1[i].trim());
+ }
+
+ return (String[]) extras.toArray(new String[extras.size()]);
}
- // convenience function - takes list1, list2. Concatenates the two
+ // convenience function - takes list1, list2. Concatenates the two
// lists removing duplicates
private String[] joinLists(String[] list1, String[] list2) {
- Vector <String> sum = new Vector<String>();
- for (int i=0; i< list1.length; i++) {
- sum.add(list1[i]);
- }
-
- for (int i=0; i < list2.length; i++) {
- boolean match=false;
- for (int j=0; j < list1.length; j++) {
- if ((list2[i].trim()).equalsIgnoreCase(list1[j].trim())) {
- match = true;
- break;
- }
- }
- if (!match) sum.add(list2[i].trim());
- }
-
- return (String[])sum.toArray(new String[sum.size()]);
+ Vector<String> sum = new Vector<String>();
+ for (int i = 0; i < list1.length; i++) {
+ sum.add(list1[i]);
+ }
+
+ for (int i = 0; i < list2.length; i++) {
+ boolean match = false;
+ for (int j = 0; j < list1.length; j++) {
+ if ((list2[i].trim()).equalsIgnoreCase(list1[j].trim())) {
+ match = true;
+ break;
+ }
+ }
+ if (!match)
+ sum.add(list2[i].trim());
+ }
+
+ return (String[]) sum.toArray(new String[sum.size()]);
}
// convenience funtion. Takes a string array and delimiter
// and returns a String with the concatenation
private static String join(String[] s, String delimiter) {
- if (s.length == 0) return "";
+ if (s.length == 0)
+ return "";
StringBuffer buffer = new StringBuffer(s[0]);
if (s.length > 1) {
- for (int i=1; i< s.length; i++) {
+ for (int i = 1; i < s.length; i++) {
buffer.append(delimiter).append(s[i].trim());
}
}
return buffer.toString();
}
- private void processChangedOC(NameValuePairs saveParams, IConfigStore newstore, String objName) {
+ private void processChangedOC(NameValuePairs saveParams,
+ IConfigStore newstore, String objName) {
String newOC = null, oldOC = null;
String oldAdded = null, oldDeleted = null;
@@ -3005,36 +3099,38 @@ public class PublisherAdminServlet extends AdminServlet {
oldAdded = saveParams.getValue(objName + "Added");
oldDeleted = saveParams.getValue(objName + "Deleted");
- if ((oldOC == null) || (newOC == null)) return;
- if (oldOC.equalsIgnoreCase(newOC)) return;
+ if ((oldOC == null) || (newOC == null))
+ return;
+ if (oldOC.equalsIgnoreCase(newOC))
+ return;
- String [] oldList = oldOC.split(",");
- String [] newList = newOC.split(",");
- String [] deletedList = getExtras(oldList, newList);
- String [] addedList = getExtras(newList, oldList);
+ String[] oldList = oldOC.split(",");
+ String[] newList = newOC.split(",");
+ String[] deletedList = getExtras(oldList, newList);
+ String[] addedList = getExtras(newList, oldList);
// CMS.debug("addedList = " + join(addedList, ","));
// CMS.debug("deletedList = " + join(deletedList, ","));
- if ((addedList.length ==0) && (deletedList.length == 0))
- return; // no changes
+ if ((addedList.length == 0) && (deletedList.length == 0))
+ return; // no changes
if (oldAdded != null) {
// CMS.debug("oldAdded is " + oldAdded);
- String [] oldAddedList = oldAdded.split(",");
+ String[] oldAddedList = oldAdded.split(",");
addedList = joinLists(addedList, oldAddedList);
}
if (oldDeleted != null) {
// CMS.debug("oldDeleted is " + oldDeleted);
- String [] oldDeletedList = oldDeleted.split(",");
+ String[] oldDeletedList = oldDeleted.split(",");
deletedList = joinLists(deletedList, oldDeletedList);
}
String[] addedList1 = getExtras(addedList, deletedList);
String[] deletedList1 = getExtras(deletedList, addedList);
- //create the final strings and write to config
+ // create the final strings and write to config
String addedListStr = join(addedList1, ",");
String deletedListStr = join(deletedList1, ",");
@@ -3046,8 +3142,8 @@ public class PublisherAdminServlet extends AdminServlet {
}
// convenience routine.
- private static void restore(IConfigStore store,
- String id, NameValuePairs saveParams) {
+ private static void restore(IConfigStore store, String id,
+ NameValuePairs saveParams) {
store.removeSubStore(id);
IConfigStore rstore = store.makeSubStore(id);
@@ -3057,7 +3153,7 @@ public class PublisherAdminServlet extends AdminServlet {
String key = (String) keys.nextElement();
String value = saveParams.getValue(key);
- if (value != null)
+ if (value != null)
rstore.put(key, value);
}
}
@@ -3078,7 +3174,7 @@ public class PublisherAdminServlet extends AdminServlet {
public void log(int level, String msg) {
if (mLogger == null)
return;
- mLogger.log(ILogger.EV_SYSTEM,
- ILogger.S_LDAP, level, "PublishingAdminServlet: " + msg);
+ mLogger.log(ILogger.EV_SYSTEM, ILogger.S_LDAP, level,
+ "PublishingAdminServlet: " + msg);
}
}