OF-749: Tidy up code and update build.xml to exclude bouncycastle jar files from pack200

Jitsivideobridge plugin - Allow no authentication with blank username/password

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13972 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -1559,7 +1559,7 @@
                      be manually added to this list.
                 -->
                 <property name="pack200.excludes"
-                          value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar,tangosol.jar"/>
+                          value="gnujaxp.jar,mail.jar,activation.jar,bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar,tangosol.jar"/>
 
                 <if>
                     <equals arg1="${pack200.enabled}" arg2="true" />

src/java/org/jivesoftware/util/CertificateManager.java

@@ -581,17 +581,6 @@ public class CertificateManager {
             Log.warn("Certificate already exists for alias: " + alias);
             return false;
         }
-/*
-        // Retrieve the private key of the stored certificate
-        PasswordFinder passwordFinder = new PasswordFinder() {
-            public char[] getPassword() {
-                return passPhrase != null ? passPhrase.toCharArray() : new char[] {};
-            }
-        };
-        PEMReader pemReader = new PEMReader(new InputStreamReader(pkInputStream), passwordFinder);
-        KeyPair kp = (KeyPair) pemReader.readObject();
-        PrivateKey privKey = kp.getPrivate();
-*/
 
         PEMParser pemParser = new PEMParser(new InputStreamReader(pkInputStream));
 		Object object = pemParser.readObject();

src/plugins/jitsivideobridge/src/java/org/jitsi/videobridge/openfire/PluginImpl.java

@@ -231,7 +231,7 @@ public class PluginImpl  implements Plugin, PropertyEventListener
 			String username = JiveGlobals.getProperty(USERNAME_PROPERTY_NAME, null);
 			String password = JiveGlobals.getProperty(PASSWORD_PROPERTY_NAME, "jitsi");
 
-			if (username != null)
+			if (username != null && "".equals(username) == false)
 			{
 				context.setSecurityHandler(basicAuth(username, password, "Private!"));
 			}