put rome and jdom in the syndie.war, and fix some deprecation warnings
This commit is contained in:
@ -32,7 +32,7 @@ public class I2PTunnelGUI extends Frame implements ActionListener, Logging {
|
|||||||
log.setEditable(false);
|
log.setEditable(false);
|
||||||
log("enter 'help' for help.");
|
log("enter 'help' for help.");
|
||||||
pack();
|
pack();
|
||||||
show();
|
setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void log(String s) {
|
public void log(String s) {
|
||||||
|
@ -32,10 +32,16 @@
|
|||||||
<ant target="war" />
|
<ant target="war" />
|
||||||
</target>
|
</target>
|
||||||
<target name="war" depends="builddep, compile, precompilejsp">
|
<target name="war" depends="builddep, compile, precompilejsp">
|
||||||
|
<mkdir dir="./tmpwar" />
|
||||||
|
<copy file="../../jdom/jdom.jar" tofile="./tmpwar/jdom.jar" />
|
||||||
|
<copy file="../../rome/rome-0.7.jar" tofile="./tmpwar/rome-0.7.jar" />
|
||||||
|
|
||||||
<war destfile="../syndie.war" webxml="../jsp/web-out.xml">
|
<war destfile="../syndie.war" webxml="../jsp/web-out.xml">
|
||||||
<fileset dir="../jsp/" includes="**/*" excludes=".nbintdb, web.xml, web-out.xml, web-fragment.xml, **/*.java, **/*.jsp" />
|
<fileset dir="../jsp/" includes="**/*" excludes=".nbintdb, web.xml, web-out.xml, web-fragment.xml, **/*.java, **/*.jsp" />
|
||||||
<classes dir="./build/obj" />
|
<classes dir="./build/obj" />
|
||||||
|
<lib dir="./tmpwar" />
|
||||||
</war>
|
</war>
|
||||||
|
<delete dir="./tmpwar" />
|
||||||
</target>
|
</target>
|
||||||
<target name="precompilejsp">
|
<target name="precompilejsp">
|
||||||
<delete dir="../jsp/WEB-INF/" />
|
<delete dir="../jsp/WEB-INF/" />
|
||||||
|
@ -6,6 +6,7 @@ import java.io.FileInputStream;
|
|||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
@ -25,6 +26,7 @@ import com.sun.syndication.io.XmlReader;
|
|||||||
import net.i2p.I2PAppContext;
|
import net.i2p.I2PAppContext;
|
||||||
import net.i2p.data.Base64;
|
import net.i2p.data.Base64;
|
||||||
import net.i2p.data.DataFormatException;
|
import net.i2p.data.DataFormatException;
|
||||||
|
import net.i2p.data.DataHelper;
|
||||||
import net.i2p.data.Hash;
|
import net.i2p.data.Hash;
|
||||||
import net.i2p.syndie.data.BlogURI;
|
import net.i2p.syndie.data.BlogURI;
|
||||||
import net.i2p.util.EepGet;
|
import net.i2p.util.EepGet;
|
||||||
@ -294,11 +296,17 @@ public class Sucker {
|
|||||||
|
|
||||||
// get its output (your input) stream
|
// get its output (your input) stream
|
||||||
|
|
||||||
DataInputStream ls_in = new DataInputStream(pushScript_proc.getInputStream());
|
InputStream ls_in = pushScript_proc.getInputStream();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
while ((ls_str = ls_in.readLine()) != null) {
|
StringBuffer buf = new StringBuffer();
|
||||||
infoLog(pushScript + ": " + ls_str);
|
while (true) {
|
||||||
|
boolean eof = DataHelper.readLine(ls_in, buf);
|
||||||
|
if (buf.length() > 0)
|
||||||
|
infoLog(pushScript + ": " + buf.toString());
|
||||||
|
buf.setLength(0);
|
||||||
|
if (eof)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -25,6 +25,6 @@ public class BrowserChooser extends FileDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void initialize(){
|
public void initialize(){
|
||||||
this.show();
|
this.setVisible(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user