diff --git a/nbbuild.xml b/main/.nbbuild.xml
old mode 100755
new mode 100644
similarity index 92%
rename from nbbuild.xml
rename to main/.nbbuild.xml
index d581a6c51..970b7abd3
--- a/nbbuild.xml
+++ b/main/.nbbuild.xml
@@ -1,74 +1,74 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project gridworks.
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Builds, tests, and runs the project gridworks main.
+
+
+
diff --git a/nbproject/build-impl.xml b/main/nbproject/build-impl.xml
old mode 100755
new mode 100644
similarity index 94%
rename from nbproject/build-impl.xml
rename to main/nbproject/build-impl.xml
index aed36e8d8..124a38121
--- a/nbproject/build-impl.xml
+++ b/main/nbproject/build-impl.xml
@@ -1,889 +1,872 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set gridworks2.dir
- Must set test.tests.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+
+
+
+
+
+ java -cp "${run.classpath.with.dist.jar}" ${main.class}
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/nbproject/genfiles.properties b/main/nbproject/genfiles.properties
new file mode 100644
index 000000000..6c38ae227
--- /dev/null
+++ b/main/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+.nbbuild.xml.data.CRC32=a4049610
+.nbbuild.xml.script.CRC32=b5f8df35
+.nbbuild.xml.stylesheet.CRC32=28e38971@1.38.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=a4049610
+nbproject/build-impl.xml.script.CRC32=00c7738e
+nbproject/build-impl.xml.stylesheet.CRC32=b91b6a14@1.38.1.45
diff --git a/main/nbproject/project.properties b/main/nbproject/project.properties
new file mode 100644
index 000000000..96987d1f7
--- /dev/null
+++ b/main/nbproject/project.properties
@@ -0,0 +1,138 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=gridworks main
+application.vendor=dfhuynh
+build.classes.dir=${build.dir}/
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=webapp/WEB-INF/classes
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+buildfile=.nbbuild.xml
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/gridworks main.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.ant-tools-1.8.0.jar=webapp/WEB-INF/lib/ant-tools-1.8.0.jar
+file.reference.arithcode-1.1.jar=webapp/WEB-INF/lib/arithcode-1.1.jar
+file.reference.butterfly-trunk.jar=webapp/WEB-INF/lib/butterfly-trunk.jar
+file.reference.clojure-1.1.0.jar=webapp/WEB-INF/lib/clojure-1.1.0.jar
+file.reference.commons-codec-1.4.jar=webapp/WEB-INF/lib/commons-codec-1.4.jar
+file.reference.commons-collections-3.2.1.jar=webapp/WEB-INF/lib/commons-collections-3.2.1.jar
+file.reference.commons-fileupload-1.2.1.jar=webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
+file.reference.commons-io-1.4.jar=webapp/WEB-INF/lib/commons-io-1.4.jar
+file.reference.commons-lang-2.5.jar=webapp/WEB-INF/lib/commons-lang-2.5.jar
+file.reference.dom4j-1.6.1.jar=webapp/WEB-INF/lib/dom4j-1.6.1.jar
+file.reference.httpclient-4.0.1.jar=webapp/WEB-INF/lib/httpclient-4.0.1.jar
+file.reference.httpcore-4.0.1.jar=webapp/WEB-INF/lib/httpcore-4.0.1.jar
+file.reference.icu4j-4.2.1.jar=webapp/WEB-INF/lib/icu4j-4.2.1.jar
+file.reference.jackson-core-asl-1.5.1.jar=webapp/WEB-INF/lib/jackson-core-asl-1.5.1.jar
+file.reference.jcl-over-slf4j-1.5.6.jar=webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
+file.reference.jrdf-0.5.6.jar=webapp/WEB-INF/lib/jrdf-0.5.6.jar
+file.reference.json-20100208.jar=webapp/WEB-INF/lib/json-20100208.jar
+file.reference.jython-2.5.1.jar=webapp/WEB-INF/lib/jython-2.5.1.jar
+file.reference.log4j-1.2.15.jar=webapp/WEB-INF/lib/log4j-1.2.15.jar
+file.reference.main-src=src
+file.reference.marc4j-2.4.jar=webapp/WEB-INF/lib/marc4j-2.4.jar
+file.reference.opencsv-2.2.jar=webapp/WEB-INF/lib/opencsv-2.2.jar
+file.reference.poi-3.6.jar=webapp/WEB-INF/lib/poi-3.6.jar
+file.reference.poi-ooxml-3.6.jar=webapp/WEB-INF/lib/poi-ooxml-3.6.jar
+file.reference.poi-ooxml-schemas-3.6-20091214.jar=webapp/WEB-INF/lib/poi-ooxml-schemas-3.6-20091214.jar
+file.reference.rhino-1.7R2.jar=webapp/WEB-INF/lib/rhino-1.7R2.jar
+file.reference.secondstring-20100303.jar=webapp/WEB-INF/lib/secondstring-20100303.jar
+file.reference.servlet-api-2.5.jar=../server/lib/servlet-api-2.5.jar
+file.reference.signpost-commonshttp4-1.2.1.1.jar=webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.1.jar
+file.reference.signpost-core-1.2.1.1.jar=webapp/WEB-INF/lib/signpost-core-1.2.1.1.jar
+file.reference.slf4j-api-1.5.6.jar=webapp/WEB-INF/lib/slf4j-api-1.5.6.jar
+file.reference.velocity-1.5.jar=webapp/WEB-INF/lib/velocity-1.5.jar
+file.reference.vicino-1.1.jar=webapp/WEB-INF/lib/vicino-1.1.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+ ${file.reference.ant-tools-1.8.0.jar}:\
+ ${file.reference.arithcode-1.1.jar}:\
+ ${file.reference.butterfly-trunk.jar}:\
+ ${file.reference.clojure-1.1.0.jar}:\
+ ${file.reference.commons-codec-1.4.jar}:\
+ ${file.reference.commons-collections-3.2.1.jar}:\
+ ${file.reference.commons-fileupload-1.2.1.jar}:\
+ ${file.reference.commons-io-1.4.jar}:\
+ ${file.reference.commons-lang-2.5.jar}:\
+ ${file.reference.dom4j-1.6.1.jar}:\
+ ${file.reference.httpclient-4.0.1.jar}:\
+ ${file.reference.httpcore-4.0.1.jar}:\
+ ${file.reference.icu4j-4.2.1.jar}:\
+ ${file.reference.jackson-core-asl-1.5.1.jar}:\
+ ${file.reference.jcl-over-slf4j-1.5.6.jar}:\
+ ${file.reference.jrdf-0.5.6.jar}:\
+ ${file.reference.json-20100208.jar}:\
+ ${file.reference.jython-2.5.1.jar}:\
+ ${file.reference.log4j-1.2.15.jar}:\
+ ${file.reference.marc4j-2.4.jar}:\
+ ${file.reference.opencsv-2.2.jar}:\
+ ${file.reference.poi-3.6.jar}:\
+ ${file.reference.poi-ooxml-3.6.jar}:\
+ ${file.reference.poi-ooxml-schemas-3.6-20091214.jar}:\
+ ${file.reference.rhino-1.7R2.jar}:\
+ ${file.reference.secondstring-20100303.jar}:\
+ ${file.reference.signpost-commonshttp4-1.2.1.1.jar}:\
+ ${file.reference.signpost-core-1.2.1.1.jar}:\
+ ${file.reference.slf4j-api-1.5.6.jar}:\
+ ${file.reference.velocity-1.5.jar}:\
+ ${file.reference.vicino-1.1.jar}:\
+ ${file.reference.servlet-api-2.5.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=${file.reference.main-src}
diff --git a/nbproject/project.xml b/main/nbproject/project.xml
old mode 100755
new mode 100644
similarity index 55%
rename from nbproject/project.xml
rename to main/nbproject/project.xml
index dcc348a18..08f939cdb
--- a/nbproject/project.xml
+++ b/main/nbproject/project.xml
@@ -1,16 +1,13 @@
-
-
- org.netbeans.modules.java.j2seproject
-
-
- gridworks
-
-
-
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+ gridworks main
+
+
+
+
+
+
+
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100755
index fb4bf6338..000000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-nbbuild.xml.data.CRC32=e92cdd33
-nbbuild.xml.script.CRC32=ac4630e5
-nbbuild.xml.stylesheet.CRC32=28e38971@1.39.0.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e92cdd33
-nbproject/build-impl.xml.script.CRC32=acc77277
-nbproject/build-impl.xml.stylesheet.CRC32=b91b6a14@1.39.0.45
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100755
index 5d2282b7c..000000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.homepage=
-application.title=gridworks
-application.vendor=metaweb
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-buildfile=nbbuild.xml
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/gridworks.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.ant-tools-1.8.0.jar=main/webapp/WEB-INF/lib/ant-tools-1.8.0.jar
-file.reference.arithcode-1.1.jar=main/webapp/WEB-INF/lib/arithcode-1.1.jar
-file.reference.butterfly-trunk.jar=main/webapp/WEB-INF/lib/butterfly-trunk.jar
-file.reference.client-src=../FREEBASE/gridworks/main/tests/client/src
-file.reference.clojure-1.1.0.jar=main/webapp/WEB-INF/lib/clojure-1.1.0.jar
-file.reference.commons-codec-1.4.jar=main/webapp/WEB-INF/lib/commons-codec-1.4.jar
-file.reference.commons-fileupload-1.2.1.jar=main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
-file.reference.commons-lang-2.5.jar=main/webapp/WEB-INF/lib/commons-lang-2.5.jar
-file.reference.dom4j-1.6.1.jar=main/webapp/WEB-INF/lib/dom4j-1.6.1.jar
-file.reference.httpclient-4.0.1.jar=main/webapp/WEB-INF/lib/httpclient-4.0.1.jar
-file.reference.httpcore-4.0.1.jar=main/webapp/WEB-INF/lib/httpcore-4.0.1.jar
-file.reference.icu4j-4.2.1.jar=main/webapp/WEB-INF/lib/icu4j-4.2.1.jar
-file.reference.jackson-core-asl-1.5.1.jar=main/webapp/WEB-INF/lib/jackson-core-asl-1.5.1.jar
-file.reference.jcl-over-slf4j-1.5.6.jar=main/webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
-file.reference.jdatapath-alpha2.jar=server/lib/jdatapath-alpha2.jar
-file.reference.jetty-6.1.22.jar=server/lib/jetty-6.1.22.jar
-file.reference.jetty-util-6.1.22.jar=server/lib/jetty-util-6.1.22.jar
-file.reference.jrdf-0.5.6.jar=main/webapp/WEB-INF/lib/jrdf-0.5.6.jar
-file.reference.json-20100208.jar=main/webapp/WEB-INF/lib/json-20100208.jar
-file.reference.jython-2.5.1.jar=main/webapp/WEB-INF/lib/jython-2.5.1.jar
-file.reference.log4j-1.2.15.jar=main/webapp/WEB-INF/lib/log4j-1.2.15.jar
-file.reference.main-src=../FREEBASE/gridworks/main/src
-file.reference.main-webapp=main/webapp
-file.reference.marc4j-2.4.jar=main/webapp/WEB-INF/lib/marc4j-2.4.jar
-file.reference.mockito-all-1.8.4.jar=main/tests/server/lib/mockito-all-1.8.4.jar
-file.reference.opencsv-2.2.jar=main/webapp/WEB-INF/lib/opencsv-2.2.jar
-file.reference.poi-3.6.jar=main/webapp/WEB-INF/lib/poi-3.6.jar
-file.reference.poi-ooxml-3.6.jar=main/webapp/WEB-INF/lib/poi-ooxml-3.6.jar
-file.reference.poi-ooxml-schemas-3.6-20091214.jar=main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.6-20091214.jar
-file.reference.secondstring-20100303.jar=main/webapp/WEB-INF/lib/secondstring-20100303.jar
-file.reference.server-src=../FREEBASE/gridworks/server/src
-file.reference.server-src-1=../FREEBASE/gridworks/main/tests/server/src
-file.reference.servlet-api-2.5.jar=server/lib/servlet-api-2.5.jar
-file.reference.signpost-commonshttp4-1.2.1.1.jar=main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.1.jar
-file.reference.signpost-core-1.2.1.1.jar=main/webapp/WEB-INF/lib/signpost-core-1.2.1.1.jar
-file.reference.slf4j-api-1.5.6.jar=main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar
-file.reference.slf4j-log4j12-1.5.6.jar=main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
-file.reference.testng-5.12.1.jar=main/tests/server/lib/testng-5.12.1.jar
-file.reference.vicino-1.1.jar=main/webapp/WEB-INF/lib/vicino-1.1.jar
-file.reference.xmlbeans-2.3.0.jar=main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar
-gridworks2.dir=${file.reference.server-src}
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
- ${file.reference.ant-tools-1.8.0.jar}:\
- ${file.reference.arithcode-1.1.jar}:\
- ${file.reference.clojure-1.1.0.jar}:\
- ${file.reference.commons-codec-1.4.jar}:\
- ${file.reference.commons-fileupload-1.2.1.jar}:\
- ${file.reference.commons-lang-2.5.jar}:\
- ${file.reference.dom4j-1.6.1.jar}:\
- ${file.reference.httpclient-4.0.1.jar}:\
- ${file.reference.httpcore-4.0.1.jar}:\
- ${file.reference.icu4j-4.2.1.jar}:\
- ${file.reference.jackson-core-asl-1.5.1.jar}:\
- ${file.reference.jcl-over-slf4j-1.5.6.jar}:\
- ${file.reference.jrdf-0.5.6.jar}:\
- ${file.reference.json-20100208.jar}:\
- ${file.reference.jython-2.5.1.jar}:\
- ${file.reference.log4j-1.2.15.jar}:\
- ${file.reference.marc4j-2.4.jar}:\
- ${file.reference.opencsv-2.2.jar}:\
- ${file.reference.poi-3.6.jar}:\
- ${file.reference.poi-ooxml-3.6.jar}:\
- ${file.reference.poi-ooxml-schemas-3.6-20091214.jar}:\
- ${file.reference.secondstring-20100303.jar}:\
- ${file.reference.signpost-commonshttp4-1.2.1.1.jar}:\
- ${file.reference.signpost-core-1.2.1.1.jar}:\
- ${file.reference.slf4j-api-1.5.6.jar}:\
- ${file.reference.slf4j-log4j12-1.5.6.jar}:\
- ${file.reference.vicino-1.1.jar}:\
- ${file.reference.xmlbeans-2.3.0.jar}:\
- ${file.reference.jdatapath-alpha2.jar}:\
- ${file.reference.jetty-6.1.22.jar}:\
- ${file.reference.jetty-util-6.1.22.jar}:\
- ${file.reference.servlet-api-2.5.jar}:\
- ${file.reference.butterfly-trunk.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${file.reference.mockito-all-1.8.4.jar}:\
- ${file.reference.testng-5.12.1.jar}:\
- ${libs.junit_4.classpath}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=defaut
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=com.metaweb.gridworks.Gridworks
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${file.reference.main-webapp}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Dgridworks.autoreloading=true -Dgridworks.webapp=main/webapp
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=${file.reference.main-src}
-test.tests.dir=main\\tests
diff --git a/server/.nbbuild.xml b/server/.nbbuild.xml
new file mode 100644
index 000000000..0615b3be5
--- /dev/null
+++ b/server/.nbbuild.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ Builds, tests, and runs the project gridworks server.
+
+
+
diff --git a/server/nbproject/build-impl.xml b/server/nbproject/build-impl.xml
new file mode 100644
index 000000000..7208cd9ac
--- /dev/null
+++ b/server/nbproject/build-impl.xml
@@ -0,0 +1,872 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+
+
+
+
+
+ java -cp "${run.classpath.with.dist.jar}" ${main.class}
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/nbproject/genfiles.properties b/server/nbproject/genfiles.properties
new file mode 100644
index 000000000..aa71927d0
--- /dev/null
+++ b/server/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+.nbbuild.xml.data.CRC32=487fecb3
+.nbbuild.xml.script.CRC32=2d82381a
+.nbbuild.xml.stylesheet.CRC32=28e38971@1.38.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=487fecb3
+nbproject/build-impl.xml.script.CRC32=cb1d401f
+nbproject/build-impl.xml.stylesheet.CRC32=b91b6a14@1.38.1.45
diff --git a/server/nbproject/project.properties b/server/nbproject/project.properties
new file mode 100644
index 000000000..0e87ddabc
--- /dev/null
+++ b/server/nbproject/project.properties
@@ -0,0 +1,92 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=gridworks server
+application.vendor=dfhuynh
+build.classes.dir=${build.dir}/
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=classes
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+buildfile=.nbbuild.xml
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/gridworks server.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.butterfly-trunk.jar=../main/webapp/WEB-INF/lib/butterfly-trunk.jar
+file.reference.jdatapath-alpha2.jar=lib/jdatapath-alpha2.jar
+file.reference.jetty-6.1.22.jar=lib/jetty-6.1.22.jar
+file.reference.jetty-util-6.1.22.jar=lib/jetty-util-6.1.22.jar
+file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar
+file.reference.server-src=src
+file.reference.servlet-api-2.5.jar=lib/servlet-api-2.5.jar
+file.reference.slf4j-api-1.5.6.jar=lib/slf4j-api-1.5.6.jar
+file.reference.slf4j-log4j12-1.5.6.jar=lib/slf4j-log4j12-1.5.6.jar
+file.reference.WEB-INF-classes=../main/webapp/WEB-INF/classes
+includes=**
+jar.compress=false
+javac.classpath=\
+ ${file.reference.jdatapath-alpha2.jar}:\
+ ${file.reference.jetty-6.1.22.jar}:\
+ ${file.reference.jetty-util-6.1.22.jar}:\
+ ${file.reference.log4j-1.2.15.jar}:\
+ ${file.reference.servlet-api-2.5.jar}:\
+ ${file.reference.slf4j-api-1.5.6.jar}:\
+ ${file.reference.slf4j-log4j12-1.5.6.jar}:\
+ ${file.reference.WEB-INF-classes}:\
+ ${file.reference.butterfly-trunk.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=com.metaweb.gridworks.Gridworks
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=${file.reference.server-src}
diff --git a/server/nbproject/project.xml b/server/nbproject/project.xml
new file mode 100644
index 000000000..e312e1de5
--- /dev/null
+++ b/server/nbproject/project.xml
@@ -0,0 +1,13 @@
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+ gridworks server
+
+
+
+
+
+
+