Author: solomax
Date: Fri Jan 22 07:22:24 2016
New Revision: 1726152
URL: http://svn.apache.org/viewvc?rev=1726152&view=rev
Log:
Hardcoded charset name was replaced with Java constant
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Fri Jan 22 07:22:24 2016
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -309,7 +310,7 @@ public class LdapLoginManagement {
this.domainId = domainId;
LdapConfig ldapConfig = ldapConfigDao.get(domainId);
try (InputStream is = new FileInputStream(new
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
- Reader r = new InputStreamReader(is,
"UTF-8"))
+ Reader r = new InputStreamReader(is,
StandardCharsets.UTF_8))
{
config.load(r);
if (config.isEmpty()) {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
Fri Jan 22 07:22:24 2016
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -182,7 +183,7 @@ public class MailHandler {
log.debug("getMimeMessage");
// Building MimeMessage
MimeMessage msg = getBasicMimeMessage();
- msg.setSubject(m.getSubject(), "UTF-8");
+ msg.setSubject(m.getSubject(), StandardCharsets.UTF_8.name());
String replyTo = m.getReplyTo();
if (replyTo != null && mailAddReplyTo) {
log.debug("setReplyTo " + replyTo);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
Fri Jan 22 07:22:24 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.ser
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +39,7 @@ public abstract class BaseHttpServlet ex
String msg = "Server is not booted yet";
- out.write(msg.getBytes());
+ out.write(msg.getBytes(StandardCharsets.UTF_8));
out.flush();
out.close();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
Fri Jan 22 07:22:24 2016
@@ -27,6 +27,7 @@ import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Set;
import javax.servlet.ServletException;
@@ -77,7 +78,7 @@ public class DownloadHandler extends Bas
@Override
protected void service(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
try {
- request.setCharacterEncoding("UTF-8");
+
request.setCharacterEncoding(StandardCharsets.UTF_8.name());
log.debug("\nquery = " + request.getQueryString());
log.debug("\n\nfileName = " +
request.getParameter("fileName"));
@@ -264,10 +265,10 @@ public class DownloadHandler extends Bas
}
if (browserType == 0) {
-
response.setHeader("Content-Disposition", "attachment; filename=" +
URLEncoder.encode(fileNameResult, "UTF-8"));
+
response.setHeader("Content-Disposition", "attachment; filename=" +
URLEncoder.encode(fileNameResult, StandardCharsets.UTF_8.name()));
} else {
response.setHeader("Content-Disposition", "attachment; filename*=UTF-8'en'"
-
+ URLEncoder.encode(fileNameResult, "UTF-8"));
+
+ URLEncoder.encode(fileNameResult, StandardCharsets.UTF_8.name()));
}
response.setHeader("Content-Length", "" + full_path.length());
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
Fri Jan 22 07:22:24 2016
@@ -28,6 +28,7 @@ import java.io.FilenameFilter;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -129,7 +130,7 @@ public class AsfCopyRightReplace {
System.out.println("Processing " +
javaFile.getCanonicalPath());
BufferedReader is = new BufferedReader(new
InputStreamReader(
- new FileInputStream(javaFile),
"UTF-8"));
+ new FileInputStream(javaFile),
StandardCharsets.UTF_8));
String line;
String firstline = "";
@@ -165,7 +166,7 @@ public class AsfCopyRightReplace {
is.close();
OutputStreamWriter out = new OutputStreamWriter(
- new
FileOutputStream(javaFile.getCanonicalPath()), "UTF-8");
+ new
FileOutputStream(javaFile.getCanonicalPath()), StandardCharsets.UTF_8);
out.write(strWriter.toString());
out.flush();
@@ -181,7 +182,7 @@ public class AsfCopyRightReplace {
System.out.println("Processing " +
javaFile.getCanonicalPath());
BufferedReader is = new BufferedReader(new
InputStreamReader(
- new FileInputStream(javaFile),
"UTF-8"));
+ new FileInputStream(javaFile),
StandardCharsets.UTF_8));
String line;
StringWriter strWriter = new StringWriter();
@@ -202,7 +203,7 @@ public class AsfCopyRightReplace {
is.close();
OutputStreamWriter out = new OutputStreamWriter(
- new
FileOutputStream(javaFile.getCanonicalPath()), "UTF-8");
+ new
FileOutputStream(javaFile.getCanonicalPath()), StandardCharsets.UTF_8);
out.write(strWriter.toString());
out.flush();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
Fri Jan 22 07:22:24 2016
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.ut
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import junit.framework.TestCase;
@@ -86,12 +87,11 @@ public class TestSVGTextExporterArrow ex
// Finally, stream out SVG to the standard output using
// UTF-8 encoding.
boolean useCSS = true; // we want to use CSS style attributes
- //Writer out = new OutputStreamWriter(System.out, "UTF-8");
//OutputStream out = httpServletResponse.getOutputStream();
//httpServletResponse.setContentType("APPLICATION/OCTET-STREAM");
//httpServletResponse.setHeader("Content-Disposition","attachment; filename=\""
+ requestedFile + "\"");
- Writer out = new OutputStreamWriter(System.out, "UTF-8");
+ Writer out = new OutputStreamWriter(System.out,
StandardCharsets.UTF_8);
//StringWriter out = new StringWriter();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Fri Jan 22 07:22:24 2016
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -426,7 +427,7 @@ public class BackupExport {
private <T> void writeList(Serializer ser, OutputStream os, String
listElement, List<T> list) throws Exception {
Format format = new Format("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
- OutputNode doc = NodeBuilder.write(new OutputStreamWriter(os,
"UTF-8"), format);
+ OutputNode doc = NodeBuilder.write(new OutputStreamWriter(os,
StandardCharsets.UTF_8), format);
OutputNode root = doc.getChild("root");
root.setComment(BACKUP_COMMENT);
OutputNode listNode = root.getChild(listElement);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Fri Jan 22 07:22:24 2016
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -539,7 +540,7 @@ public class UserManager implements IUse
for (int i = 0; i < rawPass.length; ++i) {
rawPass[i] = (byte) ('!' + rnd.nextInt(93));
}
- String pass = new String(rawPass, "UTF-8");
+ String pass = new String(rawPass, StandardCharsets.UTF_8);
// check if the user already exists and register new one if
it's needed
if (u == null) {
u = userDao.getNewUserInstance(null);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
Fri Jan 22 07:22:24 2016
@@ -23,6 +23,7 @@ import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -65,7 +66,7 @@ public class XmlExport {
public static Document createDocument() {
Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
+ document.setXMLEncoding(StandardCharsets.UTF_8.name());
document.addComment(XmlExport.FILE_COMMENT);
return document;
}
@@ -83,7 +84,7 @@ public class XmlExport {
public static void toXml(Writer out, Document doc) throws Exception {
OutputFormat outformat = OutputFormat.createPrettyPrint();
- outformat.setEncoding("UTF-8");
+ outformat.setEncoding(StandardCharsets.UTF_8.name());
XMLWriter writer = new XMLWriter(out, outformat);
writer.write(doc);
writer.flush();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
Fri Jan 22 07:22:24 2016
@@ -18,16 +18,16 @@
*/
package org.apache.openmeetings.util.crypt;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import org.apache.commons.codec.binary.Hex;
public class MD5 {
- public static String do_checksum(String data) throws
NoSuchAlgorithmException, UnsupportedEncodingException {
+ public static String do_checksum(String data) throws
NoSuchAlgorithmException {
MessageDigest md5 = MessageDigest.getInstance("MD5");
- byte[] b = data == null ? new byte[0] : data.getBytes("UTF-8");
+ byte[] b = data == null ? new byte[0] :
data.getBytes(StandardCharsets.UTF_8);
md5.update(b, 0, b.length);
return Hex.encodeHexString(md5.digest());
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
Fri Jan 22 07:22:24 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.util.crypt;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -267,17 +268,16 @@ public final class MD5Crypt {
ctx = MessageDigest.getInstance("MD5");
- ctx.update(password.getBytes()); // The password first, since
that is
-
// what is most unknown
- ctx.update(magic.getBytes()); // Then our magic string
- ctx.update(salt.getBytes()); // Then the raw salt
+ ctx.update(password.getBytes(StandardCharsets.UTF_8)); // The
password first, since that is what is most unknown
+ ctx.update(magic.getBytes(StandardCharsets.UTF_8)); // Then our
magic string
+ ctx.update(salt.getBytes(StandardCharsets.UTF_8)); // Then the
raw salt
/* Then just as many characters of the MD5(pw,salt,pw) */
ctx1 = MessageDigest.getInstance("MD5");
- ctx1.update(password.getBytes());
- ctx1.update(salt.getBytes());
- ctx1.update(password.getBytes());
+ ctx1.update(password.getBytes(StandardCharsets.UTF_8));
+ ctx1.update(salt.getBytes(StandardCharsets.UTF_8));
+ ctx1.update(password.getBytes(StandardCharsets.UTF_8));
finalState = ctx1.digest();
for (int pl = password.length(); pl > 0; pl -= 16) {
@@ -299,7 +299,7 @@ public final class MD5Crypt {
if ((i & 1) != 0) {
ctx.update(finalState[0]);
} else {
- ctx.update(password.getBytes()[0]);
+
ctx.update(password.getBytes(StandardCharsets.UTF_8)[0]);
}
}
@@ -317,25 +317,25 @@ public final class MD5Crypt {
ctx1 = MessageDigest.getInstance("MD5");
if ((i & 1) != 0) {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
} else {
for (int c = 0; c < 16; c++)
ctx1.update(finalState[c]);
}
if ((i % 3) != 0) {
- ctx1.update(salt.getBytes());
+
ctx1.update(salt.getBytes(StandardCharsets.UTF_8));
}
if ((i % 7) != 0) {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
}
if ((i & 1) != 0) {
for (int c = 0; c < 16; c++)
ctx1.update(finalState[c]);
} else {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
}
finalState = ctx1.digest();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
Fri Jan 22 07:22:24 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.util.cry
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import org.red5.logging.Red5LoggerFactory;
@@ -38,7 +37,7 @@ public class MD5Implementation implement
String passPhrase = null;
try {
passPhrase = MD5.do_checksum(userGivenPass);
- } catch (NoSuchAlgorithmException |
UnsupportedEncodingException e) {
+ } catch (NoSuchAlgorithmException e) {
log.error("Error", e);
}
return passPhrase;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
Fri Jan 22 07:22:24 2016
@@ -19,6 +19,8 @@
package org.apache.openmeetings.util.mail;
import java.io.*;
+import java.nio.charset.StandardCharsets;
+
import javax.activation.*;
public class ByteArrayDataSource implements DataSource {
@@ -49,13 +51,7 @@ public class ByteArrayDataSource impleme
/* Create a DataSource from a String */
public ByteArrayDataSource(String data, String type) {
- try {
- // Assumption that the string contains only ASCII
- // characters! Otherwise just pass a charset into this
- // constructor and use it in getBytes()
- this.data = data.getBytes("utf-8");
- } catch (UnsupportedEncodingException uex) {
- }
+ this.data = data.getBytes(StandardCharsets.UTF_8);
this.type = type;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
Fri Jan 22 07:22:24 2016
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
@@ -60,7 +61,7 @@ public class ProcessHelper {
private StreamWatcher(Process process, boolean isError) throws
UnsupportedEncodingException {
output = new StringBuilder();
is = isError ? process.getErrorStream() :
process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is,
"UTF-8"));
+ br = new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
}
@Override
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
Fri Jan 22 07:22:24 2016
@@ -32,6 +32,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -172,7 +173,7 @@ public class SignInPage extends BaseInit
result = result.replace("{$access_token}", clientToken);
}
if (redirectUri != null) {
- result = result.replace("{$redirect_uri}",
URLEncoder.encode(redirectUri, "UTF-8"));
+ result = result.replace("{$redirect_uri}",
URLEncoder.encode(redirectUri, StandardCharsets.UTF_8.name()));
}
if (code != null) {
result = result.replace("{$code}", code);
@@ -236,7 +237,7 @@ public class SignInPage extends BaseInit
prepareConnection(urlConnection);
urlConnection.setRequestMethod("POST");
urlConnection.setRequestProperty("Content-Type",
"application/x-www-form-urlencoded");
- urlConnection.setRequestProperty("charset", "utf-8");
+ urlConnection.setRequestProperty("charset",
StandardCharsets.UTF_8.name());
urlConnection.setRequestProperty("Content-Length",
String.valueOf(requestTokenParams.length()));
urlConnection.setDoInput(true);
urlConnection.setDoOutput(true);
@@ -244,7 +245,7 @@ public class SignInPage extends BaseInit
DataOutputStream paramsOutputStream = new
DataOutputStream(urlConnection.getOutputStream());
paramsOutputStream.writeBytes(requestTokenParams);
paramsOutputStream.flush();
- String sourceResponse =
IOUtils.toString(urlConnection.getInputStream(), "utf-8");
+ String sourceResponse =
IOUtils.toString(urlConnection.getInputStream(), StandardCharsets.UTF_8);
// parse json result
AuthInfo result = new AuthInfo();
try {
@@ -304,7 +305,7 @@ public class SignInPage extends BaseInit
// send request
URLConnection connection = new
URL(requestInfoUrl).openConnection();
prepareConnection(connection);
- String sourceResponse =
IOUtils.toString(connection.getInputStream(), "utf-8");
+ String sourceResponse =
IOUtils.toString(connection.getInputStream(), StandardCharsets.UTF_8);
// parse json result
Map<String, String> result = new HashMap<String, String>();
try {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Fri Jan 22 07:22:24 2016
@@ -35,6 +35,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import org.apache.commons.codec.binary.Hex;
@@ -90,7 +91,7 @@ public class StartSharingEventBehavior e
String app = "";
try (InputStream jnlp =
getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) {
ConfigurationDao cfgDao =
getBean(ConfigurationDao.class);
- app = IOUtils.toString(jnlp, "UTF-8");
+ app = IOUtils.toString(jnlp, StandardCharsets.UTF_8);
String baseUrl = cfgDao.getBaseUrl();
String _url = getParam(getComponent(),
PARAM_URL).toString();
URI url = new URI(_url);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Fri Jan 22 07:22:24 2016
@@ -26,6 +26,7 @@ import static org.red5.logging.Red5Logge
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import org.slf4j.Logger;
@@ -55,7 +56,7 @@ public class UserDashboardPersister impl
public XStreamDashboardPersister() {
this.file = getUserDashboard(getUserId());
- xstream = new XStream(new DomDriver("UTF-8"));
+ xstream = new XStream(new
DomDriver(StandardCharsets.UTF_8.name()));
xstream.setMode(XStream.NO_REFERENCES);
xstream.alias("dashboard", UserDashboard.class);
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Fri Jan 22 07:22:24 2016
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -309,7 +310,7 @@ public class LdapLoginManagement {
this.domainId = domainId;
LdapConfig ldapConfig = ldapConfigDao.get(domainId);
try (InputStream is = new FileInputStream(new
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
- Reader r = new InputStreamReader(is,
"UTF-8"))
+ Reader r = new InputStreamReader(is,
StandardCharsets.UTF_8))
{
config.load(r);
if (config.isEmpty()) {
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
Fri Jan 22 07:22:24 2016
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -182,7 +183,7 @@ public class MailHandler {
log.debug("getMimeMessage");
// Building MimeMessage
MimeMessage msg = getBasicMimeMessage();
- msg.setSubject(m.getSubject(), "UTF-8");
+ msg.setSubject(m.getSubject(), StandardCharsets.UTF_8.name());
String replyTo = m.getReplyTo();
if (replyTo != null && mailAddReplyTo) {
log.debug("setReplyTo " + replyTo);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
Fri Jan 22 07:22:24 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.ser
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +39,7 @@ public abstract class BaseHttpServlet ex
String msg = "Server is not booted yet";
- out.write(msg.getBytes());
+ out.write(msg.getBytes(StandardCharsets.UTF_8));
out.flush();
out.close();
Modified:
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
Fri Jan 22 07:22:24 2016
@@ -28,6 +28,7 @@ import java.io.FilenameFilter;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -129,7 +130,7 @@ public class AsfCopyRightReplace {
System.out.println("Processing " +
javaFile.getCanonicalPath());
BufferedReader is = new BufferedReader(new
InputStreamReader(
- new FileInputStream(javaFile),
"UTF-8"));
+ new FileInputStream(javaFile),
StandardCharsets.UTF_8));
String line;
String firstline = "";
@@ -165,7 +166,7 @@ public class AsfCopyRightReplace {
is.close();
OutputStreamWriter out = new OutputStreamWriter(
- new
FileOutputStream(javaFile.getCanonicalPath()), "UTF-8");
+ new
FileOutputStream(javaFile.getCanonicalPath()), StandardCharsets.UTF_8);
out.write(strWriter.toString());
out.flush();
@@ -181,7 +182,7 @@ public class AsfCopyRightReplace {
System.out.println("Processing " +
javaFile.getCanonicalPath());
BufferedReader is = new BufferedReader(new
InputStreamReader(
- new FileInputStream(javaFile),
"UTF-8"));
+ new FileInputStream(javaFile),
StandardCharsets.UTF_8));
String line;
StringWriter strWriter = new StringWriter();
@@ -202,7 +203,7 @@ public class AsfCopyRightReplace {
is.close();
OutputStreamWriter out = new OutputStreamWriter(
- new
FileOutputStream(javaFile.getCanonicalPath()), "UTF-8");
+ new
FileOutputStream(javaFile.getCanonicalPath()), StandardCharsets.UTF_8);
out.write(strWriter.toString());
out.flush();
Modified:
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
Fri Jan 22 07:22:24 2016
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.ut
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import junit.framework.TestCase;
@@ -86,12 +87,11 @@ public class TestSVGTextExporterArrow ex
// Finally, stream out SVG to the standard output using
// UTF-8 encoding.
boolean useCSS = true; // we want to use CSS style attributes
- //Writer out = new OutputStreamWriter(System.out, "UTF-8");
//OutputStream out = httpServletResponse.getOutputStream();
//httpServletResponse.setContentType("APPLICATION/OCTET-STREAM");
//httpServletResponse.setHeader("Content-Disposition","attachment; filename=\""
+ requestedFile + "\"");
- Writer out = new OutputStreamWriter(System.out, "UTF-8");
+ Writer out = new OutputStreamWriter(System.out,
StandardCharsets.UTF_8);
//StringWriter out = new StringWriter();
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Fri Jan 22 07:22:24 2016
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -426,7 +427,7 @@ public class BackupExport {
private <T> void writeList(Serializer ser, OutputStream os, String
listElement, List<T> list) throws Exception {
Format format = new Format("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
- OutputNode doc = NodeBuilder.write(new OutputStreamWriter(os,
"UTF-8"), format);
+ OutputNode doc = NodeBuilder.write(new OutputStreamWriter(os,
StandardCharsets.UTF_8), format);
OutputNode root = doc.getChild("root");
root.setComment(BACKUP_COMMENT);
OutputNode listNode = root.getChild(listElement);
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Fri Jan 22 07:22:24 2016
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -539,7 +540,7 @@ public class UserManager implements IUse
for (int i = 0; i < rawPass.length; ++i) {
rawPass[i] = (byte) ('!' + rnd.nextInt(93));
}
- String pass = new String(rawPass, "UTF-8");
+ String pass = new String(rawPass, StandardCharsets.UTF_8);
// check if the user already exists and register new one if
it's needed
if (u == null) {
u = userDao.getNewUserInstance(null);
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
Fri Jan 22 07:22:24 2016
@@ -23,6 +23,7 @@ import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -65,7 +66,7 @@ public class XmlExport {
public static Document createDocument() {
Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
+ document.setXMLEncoding(StandardCharsets.UTF_8.name());
document.addComment(XmlExport.FILE_COMMENT);
return document;
}
@@ -83,7 +84,7 @@ public class XmlExport {
public static void toXml(Writer out, Document doc) throws Exception {
OutputFormat outformat = OutputFormat.createPrettyPrint();
- outformat.setEncoding("UTF-8");
+ outformat.setEncoding(StandardCharsets.UTF_8.name());
XMLWriter writer = new XMLWriter(out, outformat);
writer.write(doc);
writer.flush();
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5.java
Fri Jan 22 07:22:24 2016
@@ -18,16 +18,16 @@
*/
package org.apache.openmeetings.util.crypt;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import org.apache.commons.codec.binary.Hex;
public class MD5 {
- public static String do_checksum(String data) throws
NoSuchAlgorithmException, UnsupportedEncodingException {
+ public static String do_checksum(String data) throws
NoSuchAlgorithmException {
MessageDigest md5 = MessageDigest.getInstance("MD5");
- byte[] b = data == null ? new byte[0] : data.getBytes("UTF-8");
+ byte[] b = data == null ? new byte[0] :
data.getBytes(StandardCharsets.UTF_8);
md5.update(b, 0, b.length);
return Hex.encodeHexString(md5.digest());
}
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Crypt.java
Fri Jan 22 07:22:24 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.util.crypt;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -267,17 +268,16 @@ public final class MD5Crypt {
ctx = MessageDigest.getInstance("MD5");
- ctx.update(password.getBytes()); // The password first, since
that is
-
// what is most unknown
- ctx.update(magic.getBytes()); // Then our magic string
- ctx.update(salt.getBytes()); // Then the raw salt
+ ctx.update(password.getBytes(StandardCharsets.UTF_8)); // The
password first, since that is what is most unknown
+ ctx.update(magic.getBytes(StandardCharsets.UTF_8)); // Then our
magic string
+ ctx.update(salt.getBytes(StandardCharsets.UTF_8)); // Then the
raw salt
/* Then just as many characters of the MD5(pw,salt,pw) */
ctx1 = MessageDigest.getInstance("MD5");
- ctx1.update(password.getBytes());
- ctx1.update(salt.getBytes());
- ctx1.update(password.getBytes());
+ ctx1.update(password.getBytes(StandardCharsets.UTF_8));
+ ctx1.update(salt.getBytes(StandardCharsets.UTF_8));
+ ctx1.update(password.getBytes(StandardCharsets.UTF_8));
finalState = ctx1.digest();
for (int pl = password.length(); pl > 0; pl -= 16) {
@@ -299,7 +299,7 @@ public final class MD5Crypt {
if ((i & 1) != 0) {
ctx.update(finalState[0]);
} else {
- ctx.update(password.getBytes()[0]);
+
ctx.update(password.getBytes(StandardCharsets.UTF_8)[0]);
}
}
@@ -317,25 +317,25 @@ public final class MD5Crypt {
ctx1 = MessageDigest.getInstance("MD5");
if ((i & 1) != 0) {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
} else {
for (int c = 0; c < 16; c++)
ctx1.update(finalState[c]);
}
if ((i % 3) != 0) {
- ctx1.update(salt.getBytes());
+
ctx1.update(salt.getBytes(StandardCharsets.UTF_8));
}
if ((i % 7) != 0) {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
}
if ((i & 1) != 0) {
for (int c = 0; c < 16; c++)
ctx1.update(finalState[c]);
} else {
- ctx1.update(password.getBytes());
+
ctx1.update(password.getBytes(StandardCharsets.UTF_8));
}
finalState = ctx1.digest();
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
Fri Jan 22 07:22:24 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.util.cry
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import org.red5.logging.Red5LoggerFactory;
@@ -38,7 +37,7 @@ public class MD5Implementation implement
String passPhrase = null;
try {
passPhrase = MD5.do_checksum(userGivenPass);
- } catch (NoSuchAlgorithmException |
UnsupportedEncodingException e) {
+ } catch (NoSuchAlgorithmException e) {
log.error("Error", e);
}
return passPhrase;
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/ByteArrayDataSource.java
Fri Jan 22 07:22:24 2016
@@ -19,6 +19,8 @@
package org.apache.openmeetings.util.mail;
import java.io.*;
+import java.nio.charset.StandardCharsets;
+
import javax.activation.*;
public class ByteArrayDataSource implements DataSource {
@@ -49,13 +51,7 @@ public class ByteArrayDataSource impleme
/* Create a DataSource from a String */
public ByteArrayDataSource(String data, String type) {
- try {
- // Assumption that the string contains only ASCII
- // characters! Otherwise just pass a charset into this
- // constructor and use it in getBytes()
- this.data = data.getBytes("utf-8");
- } catch (UnsupportedEncodingException uex) {
- }
+ this.data = data.getBytes(StandardCharsets.UTF_8);
this.type = type;
}
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
Fri Jan 22 07:22:24 2016
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
@@ -60,7 +61,7 @@ public class ProcessHelper {
private StreamWatcher(Process process, boolean isError) throws
UnsupportedEncodingException {
output = new StringBuilder();
is = isError ? process.getErrorStream() :
process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is,
"UTF-8"));
+ br = new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
Fri Jan 22 07:22:24 2016
@@ -32,6 +32,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -172,7 +173,7 @@ public class SignInPage extends BaseInit
result = result.replace("{$access_token}", clientToken);
}
if (redirectUri != null) {
- result = result.replace("{$redirect_uri}",
URLEncoder.encode(redirectUri, "UTF-8"));
+ result = result.replace("{$redirect_uri}",
URLEncoder.encode(redirectUri, StandardCharsets.UTF_8.name()));
}
if (code != null) {
result = result.replace("{$code}", code);
@@ -236,7 +237,7 @@ public class SignInPage extends BaseInit
prepareConnection(urlConnection);
urlConnection.setRequestMethod("POST");
urlConnection.setRequestProperty("Content-Type",
"application/x-www-form-urlencoded");
- urlConnection.setRequestProperty("charset", "utf-8");
+ urlConnection.setRequestProperty("charset",
StandardCharsets.UTF_8.name());
urlConnection.setRequestProperty("Content-Length",
String.valueOf(requestTokenParams.length()));
urlConnection.setDoInput(true);
urlConnection.setDoOutput(true);
@@ -244,7 +245,7 @@ public class SignInPage extends BaseInit
DataOutputStream paramsOutputStream = new
DataOutputStream(urlConnection.getOutputStream());
paramsOutputStream.writeBytes(requestTokenParams);
paramsOutputStream.flush();
- String sourceResponse =
IOUtils.toString(urlConnection.getInputStream(), "utf-8");
+ String sourceResponse =
IOUtils.toString(urlConnection.getInputStream(), StandardCharsets.UTF_8);
// parse json result
AuthInfo result = new AuthInfo();
try {
@@ -304,7 +305,7 @@ public class SignInPage extends BaseInit
// send request
URLConnection connection = new
URL(requestInfoUrl).openConnection();
prepareConnection(connection);
- String sourceResponse =
IOUtils.toString(connection.getInputStream(), "utf-8");
+ String sourceResponse =
IOUtils.toString(connection.getInputStream(), StandardCharsets.UTF_8);
// parse json result
Map<String, String> result = new HashMap<String, String>();
try {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Fri Jan 22 07:22:24 2016
@@ -32,6 +32,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import org.apache.commons.codec.binary.Hex;
@@ -89,7 +90,7 @@ public class StartSharingEventBehavior e
String app = "";
try (InputStream jnlp =
getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) {
ConfigurationDao cfgDao =
getBean(ConfigurationDao.class);
- app = IOUtils.toString(jnlp, "UTF-8");
+ app = IOUtils.toString(jnlp, StandardCharsets.UTF_8);
String baseUrl = cfgDao.getBaseUrl();
String _url = getParam(getComponent(),
PARAM_URL).toString();
URI url = new URI(_url);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1726152&r1=1726151&r2=1726152&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Fri Jan 22 07:22:24 2016
@@ -26,6 +26,7 @@ import static org.red5.logging.Red5Logge
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import org.slf4j.Logger;
@@ -55,7 +56,7 @@ public class UserDashboardPersister impl
public XStreamDashboardPersister() {
this.file = getUserDashboard(getUserId());
- xstream = new XStream(new DomDriver("UTF-8"));
+ xstream = new XStream(new
DomDriver(StandardCharsets.UTF_8.name()));
xstream.setMode(XStream.NO_REFERENCES);
xstream.alias("dashboard", UserDashboard.class);
}
