Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changing server runtime to Jetty 6.11 and changing Base64Decoder used…

… on UserAction from sun.misc to apache.commons
  • Loading branch information...
commit be51573a8932ced94c6b6c16d1ad7305fc82f854 1 parent b9bcbbc
erich authored
View
11 .classpath
@@ -6,11 +6,6 @@
<classpathentry kind="src" path="tools/phpbb2jforum/src"/>
<classpathentry kind="src" path="tools/luceneIndexer"/>
<classpathentry kind="src" path="tests/core"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- <attribute name="owner.project.facets" value="jst.java"/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="lib/jsp-2.1-6.1.10.jar"/>
@@ -76,5 +71,11 @@
<classpathentry kind="lib" path="www/website/WEB-INF/lib/oscache.jar"/>
<classpathentry kind="lib" path="www/website/WEB-INF/lib/sandler.jar"/>
<classpathentry kind="lib" path="www/website/WEB-INF/lib/xmlrpc.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.mortbay.jetty.serveradaptor.runtimeClasspathProvider/Jetty 6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
</classpath>
View
1  .settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Apache Tomcat v6.0"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="6.0"/>
View
5 src/net/jforum/view/forum/UserAction.java
@@ -81,6 +81,7 @@
import net.jforum.view.forum.common.UserCommon;
import net.jforum.view.forum.common.ViewCommon;
+import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
/**
@@ -556,9 +557,9 @@ private boolean parseBasicAuthentication()
String decoded;
try {
- decoded = new String(new sun.misc.BASE64Decoder().decodeBuffer(auth.substring(6)));
+ decoded = new String(new Base64().decode(auth.substring(6)).toString());
}
- catch (IOException e) {
+ catch (Exception e) {
throw new ForumException(e);
}
Please sign in to comment.
Something went wrong with that request. Please try again.