Cyclus path

.gitignore

@@ -1,2 +1,5 @@
 deploy
 /bin
+*~
+
+

README.md

@@ -7,7 +7,7 @@ Cyclist is a visual interface companion for the Cyclus project. It provides an i
 ### Dependencies:
 | package | version | download
 | ------- | ------- | --------
-| Java    | 8.0     | https://jdk8.java.net/download.html
+| Java    | 8.0_25  | http://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html
 | JavaFX  | 8.0     | (JavaFX is part of Java 8)
 | Ant     | 1.9+    | http://ant.apache.org/bindownload.cgi
 

build.xml

@@ -5,6 +5,7 @@
 			<filelist>
 				<file name="${java.home}\..\lib\ant-javafx.jar"/>
 				<file name="${java.home}\lib\jfxrt.jar"/>
+                <file name="${basedir}"/>
 			</filelist>
 		</path>
 
@@ -35,7 +36,7 @@
 		</copy>
 		<copy todir="deploy/externalLibs">
 			<fileset dir="${basedir}\cyclist\lib">
-				<filename name="sqlite-jdbc-3.8.5-pre1.jar"/>	
+				<filename name="sqlite-jdbc-3.8.10.1.jar"/>	
 			</fileset>
 		</copy>
 		<copy todir="deploy/externalLibs">
@@ -45,7 +46,7 @@
 		</copy>
 		<copy todir="deploy/externalLibs">
 					<fileset dir="${basedir}\cyclist\lib">
-						<filename name="javax.json-1.0.4.jar"/>	
+						<filename name="json-simple-1.1.1.jar"/>	
 					</fileset>
 				</copy>
 		<copy todir="deploy/externalLibs">
@@ -126,6 +127,7 @@
 				<include name="httpcore-4.3.2.jar"/>
 				<include name="fluent-hc-4.3.5.jar"/>
 				<include name="httpclient-4.3.5.jar"/>
+				<include name="json-simple-1.1.1.jar"/>
 			</fileset>
 		</copy>
 
@@ -160,20 +162,13 @@
 		<mkdir dir="deploy/dist" />
 		<mkdir dir="deploy/dist/libs" />
 		<mkdir dir="deploy/dist/externalApps" />
-		<mkdir dir="deploy/dist/skinImages" />
 
 		<copy todir="deploy/dist">
 			<fileset dir="${basedir}\cyclist\">
 				<filename name="default-metadata.json"/>	
 			</fileset>
 		</copy>
 
-		<copy todir="deploy/dist/skinImages">
-			<fileset dir="${basedir}\cyclist\skinImages">
-				<filename name="*"/>
-			</fileset>
-		</copy>
-
 		<copy todir="deploy/dist/libs">
 			<fileset dir="deploy/externalLibs">
 				<include name="*" />
@@ -212,7 +207,7 @@
 			<manifest>
 				<attribute name="Implementation-Vendor" value="SCI Institute, University of Utah"/>
 				<attribute name="Implementation-Title" value="Cyclist"/>
-				<attribute name="Implementation-Version" value="0.8.2"/>
+				<attribute name="Implementation-Version" value="1.0.0"/>
 				<attribute name="JavaFX-Feature-Proxy" value="None"/>
 			</manifest>
 		</fx:jar>
@@ -224,6 +219,7 @@
 		<!-- Need to use ${basedir} because somehow the ant task is calculating the directory differently -->
 		<fx:deploy
 			embedJNLP="true"
+			verbose="true"
 			extension="false"
 			width="1200" height="800" 
 			includeDT="false"
@@ -235,6 +231,9 @@
 			<fx:info title="cyclist" vendor="SCI Institute, University of Utah"/>
 			<fx:application refId="fxApplication"/>
 			<fx:resources refid="appRes"/>
+
+			<!-- request user level installation -->
+			<fx:preferences install="false"/>
 		</fx:deploy>
 	</target>
 

cyclist/.classpath

@@ -5,16 +5,16 @@
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.18-bin.jar"/>
 	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.5-pre1.jar" sourcepath="/Users/yarden/.m2/repository/org/xerial/sqlite-jdbc/3.8.5-pre1/sqlite-jdbc-3.8.5-pre1-sources.jar"/>
 	<classpathentry kind="lib" path="lib/javax.json-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.3.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/fluent-hc-4.3.5.jar"/>
 	<classpathentry kind="lib" path="lib/controlsfx-8.20.8.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/openjfx-dialogs-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.7.jar"/>
+	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.10.1.jar"/>
+	<classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

cyclist/.classpath.orig

@@ -5,20 +5,19 @@
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.18-bin.jar"/>
 	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.5-pre1.jar" sourcepath="/Users/yarden/.m2/repository/org/xerial/sqlite-jdbc/3.8.5-pre1/sqlite-jdbc-3.8.5-pre1-sources.jar"/>
 	<classpathentry kind="lib" path="lib/javax.json-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.3.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/fluent-hc-4.3.5.jar"/>
-	<classpathentry kind="lib" path="lib/controlsfx-8.0.6.jar"/>
-<<<<<<< HEAD
+	<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/controlsfx-8.20.8.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/openjfx-dialogs-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/controlsfx-8.0.4-dev.jar"/>
+<<<<<<< HEAD
 =======
->>>>>>> upstream/master
+	<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.7.jar"/>
+>>>>>>> d1089b11dcdf5ed055565977412869ee90c1a44b
 	<classpathentry kind="output" path="bin"/>
 </classpath>