diff options
author | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:59 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:59 -0500 |
commit | 171aaece4f23709d33d180cf36eb3af5e454b0c9 (patch) | |
tree | 1485f9f0a7bd10de4ff25030db575dbb8dafae74 /pki/base/migrate | |
parent | adad2fcee8a29fdb82376fbce07dedb11fccc182 (diff) | |
download | pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.tar.gz pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.tar.xz pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.zip |
Revert "Formatting"
This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.
Diffstat (limited to 'pki/base/migrate')
-rw-r--r-- | pki/base/migrate/80/MigrateSecurityDomain.java | 129 |
1 files changed, 51 insertions, 78 deletions
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/pki/base/migrate/80/MigrateSecurityDomain.java index cab37e49e..7ecdcd1e6 100644 --- a/pki/base/migrate/80/MigrateSecurityDomain.java +++ b/pki/base/migrate/80/MigrateSecurityDomain.java @@ -37,7 +37,8 @@ import com.netscape.cmsutil.xml.XMLObject; public class MigrateSecurityDomain { private static LDAPConnection getLDAPConn(FileConfigStore cs, String passwd) - throws IOException { + throws IOException + { String host = ""; String port = ""; @@ -50,8 +51,7 @@ public class MigrateSecurityDomain { binddn = cs.getString("internaldb.ldapauth.bindDN"); security = cs.getString("internaldb.ldapconn.secureConn"); } catch (Exception e) { - System.out.println("MigrateSecurityDomain: getLDAPConnection" - + e.toString()); + System.out.println("MigrateSecurityDomain: getLDAPConnection" + e.toString()); throw new IOException( "Failed to retrieve LDAP information from CS.cfg."); } @@ -61,40 +61,36 @@ public class MigrateSecurityDomain { try { p = Integer.parseInt(port); } catch (Exception e) { - System.out.println("MigrateSecurityDomain getLDAPConn: " - + e.toString()); + System.out.println("MigrateSecurityDomain getLDAPConn: " + e.toString()); throw new IOException("Port is not valid"); } LDAPConnection conn = null; if (security.equals("true")) { - System.out - .println("MigrateSecurityDomain getLDAPConn: creating secure (SSL) connection for internal ldap"); - conn = new LDAPConnection(new LdapJssSSLSocketFactory()); + System.out.println("MigrateSecurityDomain getLDAPConn: creating secure (SSL) connection for internal ldap"); + conn = new LDAPConnection(new LdapJssSSLSocketFactory()); } else { - System.out - .println("MigrateSecurityDomain getLDAPConn: creating non-secure (non-SSL) connection for internal ldap"); - conn = new LDAPConnection(); + System.out.println("MigrateSecurityDomain getLDAPConn: creating non-secure (non-SSL) connection for internal ldap"); + conn = new LDAPConnection(); } - System.out.println("MigrateSecurityDomain connecting to " + host + ":" - + p); + System.out.println("MigrateSecurityDomain connecting to " + host + ":" + p); try { conn.connect(host, p, binddn, passwd); } catch (LDAPException e) { - System.out.println("MigrateSecurityDomain getLDAPConn: " - + e.toString()); + System.out.println("MigrateSecurityDomain getLDAPConn: " + e.toString()); throw new IOException("Failed to connect to the internal database."); } - return conn; + return conn; } - public static void main(String args[]) throws Exception { + + public static void main(String args[]) throws Exception + { if (args.length != 2) { - System.out - .println("Usage: MigrateSecurityDomain <instance root path> <directory manager password>"); - System.exit(0); + System.out.println("Usage: MigrateSecurityDomain <instance root path> <directory manager password>"); + System.exit(0); } String instRoot = args[0]; @@ -104,13 +100,12 @@ public class MigrateSecurityDomain { // get the security domain data from the domain.xml file try { String path = instRoot + "/conf/domain.xml"; - System.out - .println("MigrateSecurityDomain: Reading domain.xml from file ..."); + System.out.println("MigrateSecurityDomain: Reading domain.xml from file ..."); parser = new XMLObject(new FileInputStream(path)); - } catch (Exception e) { - System.out - .println("MigrateSecurityDomain: Unable to get domain info from domain.xml file"); + } + catch (Exception e) { + System.out.println("MigrateSecurityDomain: Unable to get domain info from domain.xml file"); System.out.println(e.toString()); System.exit(1); } @@ -118,23 +113,21 @@ public class MigrateSecurityDomain { try { String configFile = instRoot + "/conf/CS.cfg"; FileConfigStore cs = new FileConfigStore(configFile); - + LDAPConnection conn = null; conn = MigrateSecurityDomain.getLDAPConn(cs, dmPass); if (conn == null) { - System.out - .println("MigrateSecurityDomain: Failed to connect to internal database"); + System.out.println("MigrateSecurityDomain: Failed to connect to internal database"); System.exit(1); - } + } // add new schema elements String importFile = "./schema-add.ldif"; try { LDAPUtil.importLDIF(conn, importFile); } catch (Exception e) { - System.out - .println("MigrateSecurityDomain: Error in adding new schema elements"); - System.exit(1); + System.out.println("MigrateSecurityDomain: Error in adding new schema elements"); + System.exit(1); } // create the containers String basedn = cs.getString("internaldb.basedn"); @@ -142,31 +135,27 @@ public class MigrateSecurityDomain { try { String dn = "ou=Security Domain," + basedn; - System.out - .println("MigrateSecurityDomain: creating ldap entry : " - + dn); + System.out.println("MigrateSecurityDomain: creating ldap entry : " + dn); LDAPEntry entry = null; LDAPAttributeSet attrs = null; attrs = new LDAPAttributeSet(); attrs.add(new LDAPAttribute("objectclass", "top")); attrs.add(new LDAPAttribute("objectclass", "organizationalUnit")); - attrs.add(new LDAPAttribute("name", secdomain)); + attrs.add(new LDAPAttribute("name", secdomain)); attrs.add(new LDAPAttribute("ou", "Security Domain")); entry = new LDAPEntry(dn, attrs); conn.add(entry); } catch (LDAPException e) { if (e.getLDAPResultCode() != 68) { - System.out.println("Unable to create security domain" - + e.toString()); + System.out.println("Unable to create security domain" + e.toString()); System.exit(1); } } // create list containers - String clist[] = { "CAList", "OCSPList", "KRAList", "RAList", - "TKSList", "TPSList" }; - for (int i = 0; i < 6; i++) { + String clist[] = {"CAList", "OCSPList", "KRAList", "RAList", "TKSList", "TPSList"}; + for (int i=0; i< 6; i++) { LDAPEntry entry = null; LDAPAttributeSet attrs = null; String dn = "cn=" + clist[i] + ",ou=Security Domain," + basedn; @@ -179,48 +168,36 @@ public class MigrateSecurityDomain { conn.add(entry); } catch (LDAPException e) { if (e.getLDAPResultCode() != 68) { - System.out - .println("Unable to create security domain list entry " - + dn + ": " + e.toString()); + System.out.println("Unable to create security domain list entry " + dn +": "+ e.toString()); System.exit(1); } } } - // create system entries - String tlist[] = { "CA", "OCSP", "KRA", "RA", "TKS", "TPS" }; + // create system entries + String tlist[] = {"CA", "OCSP", "KRA", "RA", "TKS", "TPS"}; Document doc = parser.getDocument(); - for (int j = 0; j < 6; j++) { + for (int j=0; j<6; j++) { String type = tlist[j]; NodeList nodeList = doc.getElementsByTagName(type); int len = nodeList.getLength(); for (int i = 0; i < len; i++) { - Vector v_clone = parser.getValuesFromContainer( - nodeList.item(i), "Clone"); - Vector v_name = parser.getValuesFromContainer( - nodeList.item(i), "SubsystemName"); - Vector v_host = parser.getValuesFromContainer( - nodeList.item(i), "Host"); - Vector v_port = parser.getValuesFromContainer( - nodeList.item(i), "SecurePort"); + Vector v_clone = parser.getValuesFromContainer(nodeList.item(i), "Clone"); + Vector v_name = parser.getValuesFromContainer(nodeList.item(i), "SubsystemName"); + Vector v_host = parser.getValuesFromContainer(nodeList.item(i), "Host"); + Vector v_port = parser.getValuesFromContainer(nodeList.item(i), "SecurePort"); - String cn = (String) v_host.elementAt(0) + ":" - + (String) v_port.elementAt(0); - String dn = "cn=" + cn + ",cn=" + type - + "List,ou=Security Domain," + basedn; + String cn = (String)v_host.elementAt(0) + ":" + (String)v_port.elementAt(0); + String dn = "cn=" + cn + ",cn=" + type +"List,ou=Security Domain," + basedn; LDAPEntry entry = null; LDAPAttributeSet attrs = null; attrs = new LDAPAttributeSet(); attrs.add(new LDAPAttribute("objectclass", "top")); attrs.add(new LDAPAttribute("objectclass", "pkiSubsystem")); - attrs.add(new LDAPAttribute("Host", (String) v_host - .elementAt(0))); - attrs.add(new LDAPAttribute("SecurePort", (String) v_port - .elementAt(0))); - attrs.add(new LDAPAttribute("Clone", (String) v_clone - .elementAt(0))); - attrs.add(new LDAPAttribute("SubsystemName", - (String) v_name.elementAt(0))); + attrs.add(new LDAPAttribute("Host", (String)v_host.elementAt(0))); + attrs.add(new LDAPAttribute("SecurePort", (String)v_port.elementAt(0))); + attrs.add(new LDAPAttribute("Clone", (String)v_clone.elementAt(0))); + attrs.add(new LDAPAttribute("SubsystemName", (String)v_name.elementAt(0))); attrs.add(new LDAPAttribute("cn", cn)); attrs.add(new LDAPAttribute("DomainManager", "true")); // Since the initial port separation feature didn't occur @@ -228,29 +205,25 @@ public class MigrateSecurityDomain { // value for BOTH the "SecureAgentPort" and the // "SecureAdminPort", and DON'T store any values for the // "UnSecurePort" - attrs.add(new LDAPAttribute("SecureAgentPort", - (String) v_port.elementAt(0))); - attrs.add(new LDAPAttribute("SecureAdminPort", - (String) v_port.elementAt(0))); + attrs.add(new LDAPAttribute("SecureAgentPort", (String)v_port.elementAt(0))); + attrs.add(new LDAPAttribute("SecureAdminPort", (String)v_port.elementAt(0))); entry = new LDAPEntry(dn, attrs); try { conn.add(entry); - } catch (LDAPException e) { + } + catch (LDAPException e) { if (e.getLDAPResultCode() != 68) { - System.out.println("Unable to create entry " + dn - + ": " + e.toString()); + System.out.println("Unable to create entry " + dn +": "+ e.toString()); } } } } cs.putString("securitydomain.store", "ldap"); cs.commit(false); - System.out - .println("MigrateSecurityDomain: Domain successfully migrated."); + System.out.println("MigrateSecurityDomain: Domain successfully migrated."); } catch (Exception e) { - System.out.println("MigrateSecurityDomain: Migration failed. " - + e.toString()); + System.out.println("MigrateSecurityDomain: Migration failed. " + e.toString()); } System.exit(0); } |