marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

more Jetty classpath cleanup

Browse Source
This commit is contained in:
zzz
2014-03-13 13:58:50 +00:00
parent c68769cf7f
commit c73f0eeeb5
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/i2psnark/java/build.xml
View File

@@ -17,10 +17,7 @@
<classpath> <classpath>
<pathelement location="../../../core/java/build/obj" /> <pathelement location="../../../core/java/build/obj" />
<pathelement location="../../ministreaming/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/javax.servlet.jar" />
<pathelement location="../../jetty/jettylib/jetty-servlet.jar" />
<pathelement location="../../jetty/jettylib/jetty-util.jar" />
</classpath> </classpath>
</depend> </depend>
</target> </target>
@@ -41,7 +38,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" 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}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>

11
apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
View File

@@ -5,13 +5,18 @@ import java.io.File;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.util.FileUtil; import net.i2p.util.FileUtil;
import org.eclipse.jetty.server.Server; //import org.eclipse.jetty.server.Server;
/**
* @deprecated does not work
*/
public class RunStandalone { public class RunStandalone {
/****
static { static {
System.setProperty("org.mortbay.http.Version.paranoid", "true"); System.setProperty("org.mortbay.http.Version.paranoid", "true");
System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true"); System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
} }
****/
private RunStandalone(String args[]) {} private RunStandalone(String args[]) {}
@@ -21,6 +26,8 @@ public class RunStandalone {
} }
public void start() { public void start() {
throw new RuntimeException("unsupported");
/****
File workDir = new File(I2PAppContext.getGlobalContext().getTempDir(), "jetty-work"); File workDir = new File(I2PAppContext.getGlobalContext().getTempDir(), "jetty-work");
boolean workDirRemoved = FileUtil.rmdir(workDir, false); boolean workDirRemoved = FileUtil.rmdir(workDir, false);
if (!workDirRemoved) if (!workDirRemoved)
@@ -29,8 +36,6 @@ public class RunStandalone {
if (!workDirCreated) if (!workDirCreated)
System.err.println("ERROR: Unable to create Jetty temporary work directory"); System.err.println("ERROR: Unable to create Jetty temporary work directory");
throw new RuntimeException("unsupported");
/****
try { try {
_server = new Server("jetty-i2psnark.xml"); _server = new Server("jetty-i2psnark.xml");
// just blow up NPE if we don't have a context // just blow up NPE if we don't have a context

5
apps/sam/java/build.xml
View File

@@ -17,7 +17,6 @@
<classpath> <classpath>
<pathelement location="../../../core/java/build/obj" /> <pathelement location="../../../core/java/build/obj" />
<pathelement location="../../ministreaming/java/build/obj" /> <pathelement location="../../ministreaming/java/build/obj" />
<pathelement location="../../streaming/java/build/obj" />
</classpath> </classpath>
</depend> </depend>
</target> </target>
@@ -34,7 +33,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" 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}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
@@ -45,7 +44,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" 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}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>

1
apps/susidns/src/build.xml
View File

@@ -11,7 +11,6 @@
<pathelement path="${classpath}" /> <pathelement path="${classpath}" />
<pathelement location="${bin}" /> <pathelement location="${bin}" />
<pathelement location="${lib}/javax.servlet.jar"/> <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/jstl.jar" />
<pathelement location="WEB-INF/lib/standard.jar" /> <pathelement location="WEB-INF/lib/standard.jar" />
<pathelement location="${lib}/jasper-runtime.jar" /> <pathelement location="${lib}/jasper-runtime.jar" />