Commit 6c07f387 authored by Sven Bunge's avatar Sven Bunge

Replace servlet.jar (servlet api 2.5) with servlet-api.jar (3.1 of jetty 9.1.5)

parent f13ffc5b
......@@ -133,7 +133,7 @@
<fileset dir="${lib.build.dir}" includes="*.jar" excludes="junit.jar"/>
<fileset dir="${lib.merge.dir}" includes="*.jar"/>
<fileset dir="${lib.dist.dir}"
includes="servlet.jar, mail.jar, activation.jar, jdic.jar, bcpg-jdk15on.jar bcpkix-jdk15on.jar bcprov-jdk15on.jar"/>
includes="servlet-api.jar, mail.jar, activation.jar, jdic.jar, bcpg-jdk15on.jar bcpkix-jdk15on.jar bcprov-jdk15on.jar"/>
</path>
<path id="compile.dependencies">
......
......@@ -38,7 +38,7 @@
<classpathentry kind="lib" path="build/lib/dist/mail.jar"/>
<classpathentry kind="lib" path="build/lib/dist/mysql.jar"/>
<classpathentry kind="lib" path="build/lib/dist/postgres.jar"/>
<classpathentry kind="lib" path="build/lib/dist/servlet.jar"/>
<classpathentry kind="lib" path="build/lib/dist/servlet-api.jar"/>
<classpathentry kind="lib" path="build/lib/dist/slf4j-log4j12.jar"/>
<classpathentry kind="lib" path="build/lib/i4jruntime.jar"/>
<classpathentry kind="lib" path="build/lib/jasper-compiler.jar"/>
......
......@@ -62,7 +62,7 @@ postgres.jar | 9.3-1101.jdbc4
proxool.jar | 0.9.0RC3+ (see note #1) | Apache 1.1 (http://proxool.sourceforge.net/licence.html)
rome.jar | 0.9 | Apache 2.0
rome-fetcher.jar | 0.9 | Apache 2.0
servlet.jar | Jetty 6.1.10 (2.5) |
servlet-api.jar | 3.1 - from Jetty 9.1.5.v20140505 |
shaj.jar | 0.5 | Apache 2.0
sitemesh.jar | 2.2.1 | Apache 1.1
slf4j-api | 1.5.8 | http://www.slf4j.org/license.html
......
......@@ -37,7 +37,7 @@ start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -Ddevel
goto end
:debug
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -Xdebug -Xint -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -DdevelopmentMode="true" -D%PLUGIN_WEBROOT% -D%PLUGIN_CLASSES% -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\activation.jar;..\lib\bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -Xdebug -Xint -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -DdevelopmentMode="true" -D%PLUGIN_WEBROOT% -D%PLUGIN_CLASSES% -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\activation.jar;..\lib\bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet-api.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
goto end
:end
......@@ -562,7 +562,7 @@ public class PluginServlet extends HttpServlet {
File openfireRoot = pluginDirectory.getParentFile().getParentFile().getParentFile();
File openfireLib = new File(openfireRoot, "target//lib");
classpath.append(openfireLib.getAbsolutePath()).append("//servlet.jar;");
classpath.append(openfireLib.getAbsolutePath()).append("//servlet-api.jar;");
classpath.append(openfireLib.getAbsolutePath()).append("//openfire.jar;");
classpath.append(openfireLib.getAbsolutePath()).append("//jasper-compiler.jar;");
classpath.append(openfireLib.getAbsolutePath()).append("//jasper-runtime.jar;");
......
......@@ -173,9 +173,9 @@
</orderEntry>
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="servlet.jar">
<library name="servlet-api.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/dist/servlet.jar!/" />
<root url="jar://$MODULE_DIR$/../openfire/build/lib/dist/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment