From c73f0eeeb50e85641c6c7c0fab01fbfa6ca5c26c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 13 Mar 2014 13:58:50 +0000
Subject: [PATCH] more Jetty classpath cleanup
---
apps/i2psnark/java/build.xml | 5 +----
.../java/src/org/klomp/snark/web/RunStandalone.java | 11 ++++++++---
apps/sam/java/build.xml | 5 ++---
apps/susidns/src/build.xml | 1 -
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index c02d89d7e9..a4fd04c063 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -17,10 +17,7 @@
<classpath>
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../ministreaming/java/build/obj" />
- <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/jetty-servlet.jar" />
- <pathelement location="../../jetty/jettylib/jetty-util.jar" />
</classpath>
</depend>
</target>
@@ -41,7 +38,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
- classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
+ classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
index 30700dd4d7..d89c011e2c 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
@@ -5,13 +5,18 @@ import java.io.File;
import net.i2p.I2PAppContext;
import net.i2p.util.FileUtil;
-import org.eclipse.jetty.server.Server;
+//import org.eclipse.jetty.server.Server;
+/**
+ * @deprecated does not work
+ */
public class RunStandalone {
+/****
static {
System.setProperty("org.mortbay.http.Version.paranoid", "true");
System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
}
+****/
private RunStandalone(String args[]) {}
@@ -21,6 +26,8 @@ public class RunStandalone {
}
public void start() {
+ throw new RuntimeException("unsupported");
+/****
File workDir = new File(I2PAppContext.getGlobalContext().getTempDir(), "jetty-work");
boolean workDirRemoved = FileUtil.rmdir(workDir, false);
if (!workDirRemoved)
@@ -29,8 +36,6 @@ public class RunStandalone {
if (!workDirCreated)
System.err.println("ERROR: Unable to create Jetty temporary work directory");
- throw new RuntimeException("unsupported");
-/****
try {
_server = new Server("jetty-i2psnark.xml");
// just blow up NPE if we don't have a context
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index ff993646c0..5d93ae4768 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -17,7 +17,6 @@
<classpath>
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../ministreaming/java/build/obj" />
- <pathelement location="../../streaming/java/build/obj" />
</classpath>
</depend>
</target>
@@ -34,7 +33,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
destdir="./build/obj"
- classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
+ classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
@@ -45,7 +44,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
destdir="./build/obj"
- classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
+ classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index 0a68d15953..fdf42ceb5e 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -11,7 +11,6 @@
<pathelement path="${classpath}" />
<pathelement location="${bin}" />
<pathelement location="${lib}/javax.servlet.jar"/>
- <pathelement location="${lib}/org.mortbay.jetty.jar"/>
<pathelement location="WEB-INF/lib/jstl.jar" />
<pathelement location="WEB-INF/lib/standard.jar" />
<pathelement location="${lib}/jasper-runtime.jar" />
--
GitLab