Get some libs into ivy.

diff --git a/.classpath b/.classpath
index cb44e718e2d42d909dd966f4b38880359198dced..44477ac530c9c690c9fed1e00b40309093781915 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -6,15 +6,10 @@
        <classpathentry kind="src" path="gui"/>\r
        <classpathentry kind="src" path="gpl"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>\r
        <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>\r
-       <classpathentry kind="lib" path="lib/gui/l2fprod-common-sheet.jar"/>\r
        <classpathentry kind="lib" path="lib/jscience.jar"/>\r
-       <classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>\r
-       <classpathentry kind="lib" path="lib/xstream-1.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/gui/jcommon-1.0.16.jar"/>\r
-       <classpathentry kind="lib" path="lib/gui/jfreechart-1.0.13.jar"/>\r
-       <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>\r
+       <classpathentry kind="lib" path="lib/gui/l2fprod-common-sheet.jar"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/OpenRocket"/>\r
+       <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/ivy.xml b/ivy.xml
new file mode 100644 (file)
index 0000000..c4b3005
--- /dev/null
+++ b/ivy.xml
@@ -0,0 +1,25 @@
+<ivy-module version="1.0">\r
+       <info organisation="com.martellotech" module="marwatch.marCentral" />\r
+       <configurations>\r
+               <conf name="core" />\r
+               <conf name="gui" extends="core" />\r
+               <conf name="test" extends="gui" visibility="private" />\r
+       </configurations>\r
+       <dependencies>\r
+\r
+               <dependency org="log4j" name="log4j" rev="1.2.16" conf="core->default" />\r
+\r
+\r
+               <dependency org="junit" name="junit" rev="4.10" conf="test->default" />\r
+\r
+               <dependency org="xpp3" name="xpp3_min" rev="1.1.4c" conf="core->default" />\r
+\r
+               <dependency org="com.thoughtworks.xstream" name="xstream"\r
+                       rev="1.3" conf="core->default" />\r
+\r
+               <dependency org="jfree" name="jfreechart" rev="1.0.13"\r
+                       conf="gui->default" />\r
+\r
+\r
+       </dependencies>\r
+</ivy-module>\r

diff --git a/lib/gui/jcommon-1.0.16.jar b/lib/gui/jcommon-1.0.16.jar
deleted file mode 100644 (file)
index 4cd6807..0000000
Binary files a/lib/gui/jcommon-1.0.16.jar and /dev/null differ

diff --git a/lib/gui/jfreechart-1.0.13.jar b/lib/gui/jfreechart-1.0.13.jar
deleted file mode 100644 (file)
index 83c6993..0000000
Binary files a/lib/gui/jfreechart-1.0.13.jar and /dev/null differ

diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar
deleted file mode 100644 (file)
index 3f9d847..0000000
Binary files a/lib/log4j-1.2.16.jar and /dev/null differ

diff --git a/lib/xpp3_min-1.1.4c.jar b/lib/xpp3_min-1.1.4c.jar
deleted file mode 100644 (file)
index 813a9a8..0000000
Binary files a/lib/xpp3_min-1.1.4c.jar and /dev/null differ

diff --git a/lib/xstream-1.3.jar b/lib/xstream-1.3.jar
deleted file mode 100644 (file)
index e5a3234..0000000
Binary files a/lib/xstream-1.3.jar and /dev/null differ