* use Apache Ivy for dependency management (as for as possible, same jars are not on Maven Central)

This commit is contained in:
Reinhard Pointner 2015-05-18 07:03:05 +00:00
parent 6cf41ab1bf
commit f79c71ce49
46 changed files with 40 additions and 37 deletions

View File

@ -2,38 +2,29 @@
<classpath> <classpath>
<classpathentry kind="src" path="source"/> <classpathentry kind="src" path="source"/>
<classpathentry kind="src" path="test"/> <classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/args4j.jar"/>
<classpathentry kind="lib" path="lib/build/junit.jar"/>
<classpathentry kind="lib" path="lib/commons-io.jar"/>
<classpathentry kind="lib" path="lib/ehcache.jar"/>
<classpathentry kind="lib" path="lib/glazedlists.jar"/>
<classpathentry kind="lib" path="lib/groovy.jar"/>
<classpathentry kind="lib" path="lib/icu4j.jar"/>
<classpathentry kind="lib" path="lib/jacksum.jar"/>
<classpathentry kind="lib" path="lib/jna-platform.jar"/>
<classpathentry kind="lib" path="lib/jna.jar"/>
<classpathentry kind="lib" path="lib/json-io.jar"/>
<classpathentry kind="lib" path="lib/json-simple.jar"/>
<classpathentry kind="lib" path="lib/jsoup.jar"/>
<classpathentry kind="lib" path="lib/miglayout-core.jar"/>
<classpathentry kind="lib" path="lib/miglayout-swing.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea.jar"/>
<classpathentry kind="lib" path="lib/scripting/commons-net.jar"/>
<classpathentry kind="lib" path="lib/scripting/ivy.jar"/>
<classpathentry kind="lib" path="lib/scripting/jsch.jar"/>
<classpathentry kind="lib" path="lib/scripting/mail.jar"/>
<classpathentry kind="lib" path="lib/sevenzipjbinding.jar"/>
<classpathentry kind="lib" path="lib/simmetrics.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14.jar"/>
<classpathentry kind="lib" path="lib/xmlrpc.jar"/>
<classpathentry kind="lib" path="lib/xz.jar"/>
<classpathentry kind="lib" path="lib/ObjCBridge.jar"/>
<classpathentry kind="lib" path="lib/scripting/ant-commons-net.jar"/>
<classpathentry kind="lib" path="lib/scripting/ant-javamail.jar"/>
<classpathentry kind="lib" path="lib/scripting/ant-jsch.jar"/>
<classpathentry kind="lib" path="lib/scripting/ant-launcher.jar"/>
<classpathentry kind="lib" path="lib/scripting/ant.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/ivy/bundle/args4j.jar"/>
<classpathentry kind="lib" path="lib/ivy/bundle/json-simple.jar"/>
<classpathentry kind="lib" path="lib/jars/jacksum.jar"/>
<classpathentry kind="lib" path="lib/jars/sevenzipjbinding.jar"/>
<classpathentry kind="lib" path="lib/jars/simmetrics.jar"/>
<classpathentry kind="lib" path="lib/jars/xmlrpc.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/ehcache.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/glazedlists_java15.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/icu4j.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/java-objc-bridge.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/jna.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/junit.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/miglayout-core.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/miglayout-swing.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/platform.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/rsyntaxtextarea.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/xz.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/slf4j-api.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/commons-io.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/json-io.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/jsoup.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/groovy-all.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/slf4j-jdk14.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<project name="filebot" default="fatjar"> <project name="filebot" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- include default inputs (optional) --> <!-- include default inputs (optional) -->
<property file="profile.properties" /> <property file="profile.properties" />
@ -32,6 +32,17 @@
<property name="frs.website" value="web.sourceforge.net:htdocs" /> <property name="frs.website" value="web.sourceforge.net:htdocs" />
<target name="resolve" description="Retrieve dependencies with Apache Ivy">
<delete dir="${dir.lib}/ivy" />
<ivy:retrieve pattern="${dir.lib}/ivy/[type]/[artifact].[ext]" />
</target>
<path id="build.classpath">
<fileset dir="${dir.lib}" includes="**/*.jar" />
</path>
<target name="jar" depends="build"> <target name="jar" depends="build">
<!-- create dist dir --> <!-- create dist dir -->
<mkdir dir="${dir.dist}" /> <mkdir dir="${dir.dist}" />
@ -871,4 +882,5 @@
<input message="Please enter sourceforge password:" addproperty="sf.password" /> <input message="Please enter sourceforge password:" addproperty="sf.password" />
</target> </target>
</project> </project>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -121,7 +121,7 @@ public class GroovyPad extends JFrame {
} }
protected JComponent createOutputLog() throws IOException { protected JComponent createOutputLog() throws IOException {
output = new TextEditorPane(TextEditorPane.OVERWRITE_MODE, false); output = new TextEditorPane(TextEditorPane.INSERT_MODE, false);
output.setEditable(false); output.setEditable(false);
output.setReadOnly(true); output.setReadOnly(true);
output.setAutoscrolls(true); output.setAutoscrolls(true);

View File

@ -47,7 +47,7 @@ public class MetaAttributes {
public void setObject(Object object) { public void setObject(Object object) {
try { try {
metaAttributeView.put(METADATA_KEY, JsonWriter.objectToJson(object)); metaAttributeView.put(METADATA_KEY, JsonWriter.objectToJson(object));
} catch (IOException e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ -58,7 +58,7 @@ public class MetaAttributes {
if (jsonObject != null && jsonObject.length() > 0) { if (jsonObject != null && jsonObject.length() > 0) {
return JsonReader.jsonToJava(jsonObject); return JsonReader.jsonToJava(jsonObject);
} }
} catch (IOException e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return null; return null;

View File

@ -650,7 +650,7 @@ public class FormatDialog extends JDialog {
try { try {
mode.persistentSample().setValue(info == null ? "" : JsonWriter.objectToJson(info)); mode.persistentSample().setValue(info == null ? "" : JsonWriter.objectToJson(info));
persistentSampleFile.setValue(file == null ? "" : sample.getMediaFile().getAbsolutePath()); persistentSampleFile.setValue(file == null ? "" : sample.getMediaFile().getAbsolutePath());
} catch (IOException e) { } catch (Exception e) {
Logger.getLogger(FormatDialog.class.getName()).log(Level.WARNING, e.getMessage(), e); Logger.getLogger(FormatDialog.class.getName()).log(Level.WARNING, e.getMessage(), e);
} }