s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adding eclipse project files and changing the build system

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/branches/split-refactor@912 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-05-30 17:13:37 +00:00
parent 01ea2043f8
commit 301dd4deb3
10 changed files with 193 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.classpath
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/server/java"/>
<classpathentry kind="src" path="tests/java/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib-src/servlet-api-2.5-sources.jar"/>
<classpathentry kind="lib" path="lib/jetty-6.1.22.jar" sourcepath="lib-src/jetty-6.1.22-sources.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-6.1.22.jar" sourcepath="lib-src/jetty-util-6.1.22-sources.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar" sourcepath="lib-src/slf4j-api-1.5.6-sources.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar" sourcepath="lib-src/log4j-1.2.15-sources.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar" sourcepath="lib-src/slf4j-log4j12-1.5.6-sources.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar" sourcepath="lib-src/jcl-over-slf4j-1.5.6-sources.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.4.jar" sourcepath="lib-src/commons-codec-1.4-sources.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.5.jar" sourcepath="lib-src/commons-lang-2.5-sources.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar" sourcepath="lib-src/commons-fileupload-1.2.1-sources.jar"/>
<classpathentry kind="lib" path="lib/json-20100208.jar" sourcepath="lib-src/json-20100208-sources.jar"/>
<classpathentry kind="lib" path="lib/icu4j-4.2.1.jar" sourcepath="lib-src/icu4j-4.2.1-sources.jar"/>
<classpathentry kind="lib" path="lib/arithcode-1.1.jar" sourcepath="lib-src/arithcode-1.1-sources.jar"/>
<classpathentry kind="lib" path="lib/jdatapath-alpha2.jar" sourcepath="lib-src/jdatapath-alpha2-sources.jar"/>
<classpathentry kind="lib" path="lib/secondstring-20100303.jar" sourcepath="lib-src/secondstring-20100303-sources.jar"/>
<classpathentry kind="lib" path="lib/ant-tools-1.8.0.jar" sourcepath="lib-src/ant-tools-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="lib/vicino-1.1.jar" sourcepath="lib-src/vicino-1.1-sources.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib-src/httpcore-4.0.1-sources.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib-src/httpclient-4.0.1-sources.jar"/>
<classpathentry kind="lib" path="lib/signpost-core-1.2.1.1.jar" sourcepath="lib-src/signpost-core-1.2.1.1-sources.jar"/>
<classpathentry kind="lib" path="lib/signpost-commonshttp4-1.2.1.1.jar" sourcepath="lib-src/signpost-commonshttp4-1.2.1.1-sources.jar"/>
<classpathentry kind="lib" path="lib/opencsv-2.2.jar" sourcepath="tests/java/lib-src/opencsv-2.2-sources.jar"/>
<classpathentry kind="lib" path="lib/poi-3.6.jar"/>
<classpathentry kind="lib" path="lib/poi-ooxml-3.6.jar"/>
<classpathentry kind="lib" path="lib/poi-ooxml-schemas-3.6-20091214.jar"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="lib/jython-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/clojure-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-asl-1.5.1.jar"/>
<classpathentry kind="lib" path="lib/marc4j-2.4.jar"/>
<classpathentry kind="lib" path="tests/java/lib/mockito-all-1.8.4.jar" sourcepath="tests/java/lib-src/mockito-all-1.8.4-sources.jar"/>
<classpathentry kind="lib" path="tests/java/lib/testng-5.12.1.jar" sourcepath="tests/java/lib-src/testng-5.12.1-sources.jar"/>
<classpathentry kind="lib" path="lib/jrdf-0.5.6.jar"/>
<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
</classpath>

181
build.xml
View File

@ -29,6 +29,10 @@
<not><isset property="revision"/></not> <not><isset property="revision"/></not>
</condition> </condition>
<condition property="full_version" value="0.0.0.0">
<not><isset property="full_version"/></not>
</condition>
<condition property="build.dir" value="build"> <condition property="build.dir" value="build">
<not><isset property="build.dir"/></not> <not><isset property="build.dir"/></not>
</condition> </condition>
@ -37,82 +41,118 @@
<not><isset property="dist.dir"/></not> <not><isset property="dist.dir"/></not>
</condition> </condition>
<property name="src.dir" value="${basedir}/src/main/java" /> <property name="fullname" value="gridworks-${version}-${revision}" />
<property name="server.src.dir" value="${basedir}/src/server/java" />
<property name="graphics.dir" value="${basedir}/src/graphics" /> <property name="main.dir" value="${basedir}/main" />
<property name="conf.dir" value="${basedir}/src/conf" />
<property name="lib.dir" value="${basedir}/lib" /> <property name="webapp.dir" value="${main.dir}/webapp" />
<property name="tests.dir" value="${basedir}/tests/java" /> <property name="webapp.src.dir" value="${main.dir}/src" />
<property name="webapp.lib.dir" value="${webapp.dir}/WEB-INF/lib" />
<property name="webapp.classes.dir" value="${webapp.dir}/WEB-INF/classes" />
<property name="server.dir" value="${basedir}/server" />
<property name="server.src.dir" value="${server.dir}/src" />
<property name="server.lib.dir" value="${server.dir}/lib" />
<property name="server.classes.dir" value="${server.dir}/classes" />
<property name="appengine.dir" value="${basedir}/appengine" />
<property name="appengine.src.dir" value="${appengine.dir}/src" />
<property name="appengine.lib.dir" value="${appengine.dir}/lib" />
<property name="appengine.classes.dir" value="${appengine.dir}/classes" />
<property name="tests.dir" value="${main.dir}/tests" />
<property name="server.tests.dir" value="${tests.dir}/server" />
<property name="server.tests.lib.dir" value="${server.tests.dir}/lib" />
<property name="server.tests.src.dir" value="${server.tests.dir}/src" />
<property name="server.tests.classes.dir" value="${server.tests.dir}/classes" />
<property name="graphics.dir" value="${basedir}/graphics" />
<property name="conf.dir" value="${basedir}/conf" />
<property name="tools.dir" value="${basedir}/tools" /> <property name="tools.dir" value="${basedir}/tools" />
<property name="reports.dir" value="${build.dir}/reports" /> <property name="reports.dir" value="${build.dir}/reports" />
<property name="server_classes.dir" value="${build.dir}/classes" />
<property name="webapp_classes.dir" value="${basedir}/src/main/webapp/WEB-INF/classes" /> <property name="built.webapp.name" value="webapp" />
<property name="tests_classes.dir" value="${tests.dir}/classes" /> <property name="built.webapp.dir" value="${build.dir}/${built.webapp.name}" />
<property name="webapp.name" value="webapp" />
<property name="webapp.dir" value="${build.dir}/${webapp.name}" />
<property name="mac.dir" value="${build.dir}/mac" /> <property name="mac.dir" value="${build.dir}/mac" />
<property name="windows.dir" value="${build.dir}/windows" /> <property name="windows.dir" value="${build.dir}/windows" />
<property name="linux.name" value="gridworks-${version}" /> <property name="linux.name" value="gridworks-${version}" />
<property name="linux.dir" value="${build.dir}/linux/${linux.name}" /> <property name="linux.dir" value="${build.dir}/linux/${linux.name}" />
<path id="class.path"> <path id="server.class.path">
<fileset dir="${lib.dir}"> <fileset dir="${server.lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<pathelement location="${server_classes.dir}"/> <pathelement location="${server.classes.dir}"/>
<pathelement location="${webapp_classes.dir}"/> </path>
<path id="webapp.class.path">
<fileset dir="${server.lib.dir}">
<include name="**/servlet-api*.jar" />
</fileset>
<fileset dir="${webapp.lib.dir}">
<include name="**/*.jar" />
</fileset>
<pathelement location="${webapp.classes.dir}"/>
</path> </path>
<path id="tests.class.path"> <path id="tests.class.path">
<path refid="class.path"/> <path refid="webapp.class.path"/>
<fileset dir="${tests.dir}/lib"> <fileset dir="${server.tests.lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
</path> </path>
<!-- NOTE(SM): this is needed to support autoreloading, don't remove! -->
<target name="build_server"> <target name="build_server">
<mkdir dir="${server_classes.dir}" /> <mkdir dir="${server.classes.dir}" />
<javac srcdir="${server.src.dir}" destdir="${server_classes.dir}" debug="true" includeAntRuntime="no"> <javac srcdir="${server.src.dir}" destdir="${server.classes.dir}" debug="true" includeAntRuntime="no">
<classpath refid="class.path" /> <classpath refid="server.class.path" />
</javac> </javac>
<copy file="${server.src.dir}/log4j.properties" tofile="${server_classes.dir}/log4j.properties"/> <copy file="${server.src.dir}/log4j.properties" tofile="${server.classes.dir}/log4j.properties"/>
</target> </target>
<target name="build" depends="build_server"> <target name="build_webapp">
<mkdir dir="${webapp_classes.dir}" /> <mkdir dir="${webapp.classes.dir}" />
<javac destdir="${webapp_classes.dir}" debug="true" includeAntRuntime="no"> <javac destdir="${webapp.classes.dir}" debug="true" includeAntRuntime="no">
<src path="${server.src.dir}"/> <src path="${webapp.src.dir}"/>
<src path="${src.dir}"/> <classpath refid="webapp.class.path" />
<classpath refid="class.path" />
</javac> </javac>
<copy file="${server.src.dir}/log4j.properties" tofile="${webapp_classes.dir}/log4j.properties"/>
</target> </target>
<target name="build_tests" depends="build"> <target name="build_tests" depends="build_webapp">
<mkdir dir="${tests_classes.dir}" /> <mkdir dir="${server.tests.classes.dir}" />
<javac srcdir="${tests.dir}/src" destdir="${tests_classes.dir}" debug="true" includeAntRuntime="no"> <javac srcdir="${server.tests.src.dir}" destdir="${server.tests.classes.dir}" debug="true" includeAntRuntime="no">
<classpath refid="tests.class.path" /> <classpath refid="tests.class.path" />
</javac> </javac>
<copy file="${tests.dir}/src/log4j.properties" tofile="${tests_classes.dir}/log4j.properties"/>
</target> </target>
<target name="jar" depends="build"> <target name="build" depends="build_server, build_webapp"/>
<jar destfile="${build.dir}/gridworks.jar" basedir="${webapp_classes.dir}"/>
<target name="jar_server" depends="build_server">
<jar destfile="${build.dir}/${fullname}-server.jar" basedir="${webapp.classes.dir}"/>
</target>
<target name="jar_webapp" depends="build_webapp">
<jar destfile="${build.dir}/${fullname}.jar" basedir="${webapp.classes.dir}"/>
</target> </target>
<target name="prepare_webapp"> <target name="jar" depends="jar_server, jar_webapp"/>
<mkdir dir="${webapp.dir}" />
<target name="prepare_webapp" depends="jar_webapp">
<mkdir dir="${built.webapp.dir}" />
<copy todir="${webapp.dir}"> <copy todir="${built.webapp.dir}">
<fileset dir="${basedir}/src/main/webapp"> <fileset dir="${webapp.dir}">
<include name="**/*"/> <include name="**/*"/>
<exclude name="WEB-INF/classes/**"/> <exclude name="WEB-INF/classes/**"/>
<exclude name="WEB-INF/lib-src/**"/>
</fileset> </fileset>
</copy> </copy>
<replace file="${webapp.dir}/scripts/version.js"> <copy file="${build.dir}/${fullname}.jar" tofile="${built.webapp.dir}/WEB-INF/lib/${fullname}.jar"/>
<replace file="${built.webapp.dir}/scripts/version.js">
<replacefilter token="$VERSION" value="${version}"/> <replacefilter token="$VERSION" value="${version}"/>
<replacefilter token="$REVISION" value="${revision}"/> <replacefilter token="$REVISION" value="${revision}"/>
</replace> </replace>
@ -144,16 +184,13 @@
liveresize="true" liveresize="true"
growboxintrudes="true" growboxintrudes="true"
screenmenu="true"> screenmenu="true">
<jarfileset dir="${lib.dir}"> <jarfilelist dir="${build.dir}" files="${fullname}-server.jar" />
<jarfileset dir="${server.lib.dir}">
<exclude name="**/.svn" /> <exclude name="**/.svn" />
<include name="**/*.jar" /> <include name="**/*.jar" />
</jarfileset> </jarfileset>
<jarfilelist dir="${build.dir}" files="gridworks.jar" /> <resourcefileset dir="${built.webapp.dir}/..">
<resourcefileset dir="${webapp.dir}/.."> <include name="${built.webapp.name}/**" />
<include name="${webapp.name}/**" />
</resourcefileset>
<resourcefileset dir="${lib.dir}/..">
<include name="lib/jython/**" />
</resourcefileset> </resourcefileset>
</jarbundler> </jarbundler>
</target> </target>
@ -169,7 +206,7 @@
<config <config
headerType="console" headerType="console"
outfile="${windows.dir}/Gridworks.exe" outfile="${windows.dir}/Gridworks.exe"
jarPath="lib/gridworks-${version}-${revision}.jar" jarPath="lib/${fullname}.jar"
dontWrapJar="true" dontWrapJar="true"
icon="${graphics.dir}/icon/gridworks.ico"> icon="${graphics.dir}/icon/gridworks.ico">
<classPath mainClass="com.metaweb.gridworks.Gridworks"> <classPath mainClass="com.metaweb.gridworks.Gridworks">
@ -192,29 +229,25 @@
/> />
</config> </config>
</launch4j> </launch4j>
<copy file="${build.dir}/${fullname}-server.jar" tofile="${windows.dir}/${fullname}-server.jar"/>
<copy todir="${windows.dir}/lib"> <copy todir="${windows.dir}/lib">
<fileset dir="${lib.dir}"> <fileset dir="${server.lib.dir}">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
</copy> </copy>
<copy todir="${windows.dir}/lib/native/windows"> <copy todir="${windows.dir}/lib/native/windows">
<fileset dir="${lib.dir}/native/windows"> <fileset dir="${server.lib.dir}/native/windows">
<include name="*.dll"/> <include name="*.dll"/>
</fileset> </fileset>
</copy> </copy>
<copy file="${build.dir}/gridworks.jar" tofile="${windows.dir}/lib/gridworks-${version}-${revision}.jar"/> <copy file="${build.dir}/${fullname}.jar" tofile="${windows.dir}/${fullname}.jar"/>
<copy todir="${windows.dir}/lib/jython">
<fileset dir="${lib.dir}/jython">
<include name="**"/>
</fileset>
</copy>
<copy todir="${windows.dir}/webapp"> <copy todir="${windows.dir}/webapp">
<fileset dir="${webapp.dir}"> <fileset dir="${webapp.dir}">
<include name="**"/> <include name="**"/>
</fileset> </fileset>
</copy> </copy>
<copy todir="${linux.dir}/licenses"> <copy todir="${windows.dir}/licenses">
<fileset dir="${basedir}/licenses"> <fileset dir="${basedir}/licenses">
<include name="**"/> <include name="**"/>
</fileset> </fileset>
@ -232,19 +265,14 @@
<mkdir dir="${linux.dir}"/> <mkdir dir="${linux.dir}"/>
<copy todir="${linux.dir}/lib"> <copy todir="${linux.dir}/lib">
<fileset dir="${lib.dir}"> <fileset dir="${server.lib.dir}">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
</copy> </copy>
<copy file="${build.dir}/gridworks.jar" tofile="${linux.dir}/lib/gridworks-${version}-${revision}.jar"/> <copy file="${build.dir}/${fullname}-server.jar" tofile="${linux.dir}/lib/${fullname}-server.jar"/>
<copy todir="${linux.dir}/lib/jython"> <copy todir="${linux.dir}/webapp">
<fileset dir="${lib.dir}/jython">
<include name="**"/>
</fileset>
</copy>
<copy todir="${linux.dir}/src/main/webapp">
<fileset dir="${webapp.dir}"> <fileset dir="${webapp.dir}">
<include name="**"/> <include name="**"/>
</fileset> </fileset>
@ -281,9 +309,9 @@
classpath="${findbugs.dir}/lib/findbugs-ant.jar" classpath="${findbugs.dir}/lib/findbugs-ant.jar"
/> />
<findbugs jvmargs="-Xmx1024m" home="${findbugs.dir}" output="html" outputFile="${reports.dir}/findbugs.html" > <findbugs jvmargs="-Xmx1024m" home="${findbugs.dir}" output="html" outputFile="${reports.dir}/findbugs.html" >
<auxClasspath refid="class.path" /> <auxClasspath refid="webapp.class.path" />
<sourcePath path="${src.dir}" /> <sourcePath path="${webapp.src.dir}" />
<class location="${webapp_classes.dir}" /> <class location="${webapp.classes.dir}" />
</findbugs> </findbugs>
</target> </target>
@ -301,10 +329,10 @@
<fileset dir="${server.src.dir}"> <fileset dir="${server.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${src.dir}"> <fileset dir="${webapp.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${tests.dir}"> <fileset dir="${server.tests.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>
</fileset> </fileset>
</pmd> </pmd>
@ -323,7 +351,7 @@
<fileset dir="${server.src.dir}"> <fileset dir="${server.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${src.dir}"> <fileset dir="${webapp.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>
</fileset> </fileset>
</cpd> </cpd>
@ -340,17 +368,18 @@
/> />
<jslint> <jslint>
<formatter type="plain" destfile="${reports.dir}/jslint.txt" /> <formatter type="plain" destfile="${reports.dir}/jslint.txt" />
<fileset dir="${basedir}/src/main/webapp/scripts"> <fileset dir="${webapp.dir}/scripts">
<include name="**/*.js" /> <include name="**/*.js" />
</fileset> </fileset>
</jslint> </jslint>
</target> </target>
<target name="clean"> <target name="clean">
<delete file="${build.dir}/gridworks.jar" /> <delete file="${build.dir}/${fullname}.jar" />
<delete dir="${server_classes.dir}" /> <delete file="${build.dir}/${fullname}-server.jar" />
<delete dir="${webapp_classes.dir}" /> <delete dir="${server.classes.dir}" />
<delete dir="${tests_classes.dir}" /> <delete dir="${webapp.classes.dir}" />
<delete dir="${server.tests.classes.dir}" />
</target> </target>
<target name="distclean" depends="clean"> <target name="distclean" depends="clean">

55
gridworks
View File

@ -369,7 +369,7 @@ ant() {
#export ANT_OPTS="-Xmx1024M" #export ANT_OPTS="-Xmx1024M"
"$ANT" -f build.xml $ANT_PARAMS -Dbuild.dir="$GRIDWORKS_BUILD_DIR" -Ddist.dir="$GRIDWORKS_DIST_DIR" -Dversion="$VERSION" -Dnum_version="$NUM_VERSION" -Dfull_version="$FULL_VERSION" -Drevision="$REVISION" $1 || error "Error while running ant task '$1'" "$ANT" -f build.xml $ANT_PARAMS -Dversion="$VERSION" -Dnum_version="$NUM_VERSION" -Dfull_version="$FULL_VERSION" -Drevision="$REVISION" $1 || error "Error while running ant task '$1'"
} }
# ---------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------
@ -383,7 +383,7 @@ dist() {
echo echo
echo "Upload them to the distibution site, then prepend the GridworksReleases array at" echo "Upload them to the distibution site, then prepend the GridworksReleases array at"
echo echo
echo " http://acre.freebase.com/#app=/user/dfhuynh/labs-site&file=gridworks.js" echo " http://code.google.com/p/freebase-gridworks/source/browse/support/releases.js"
echo echo
echo "with" echo "with"
echo echo
@ -427,7 +427,7 @@ mac_dist() {
ant mac ant mac
mkdir -p "$GRIDWORKS_BUILD_DIR/mac/.background" mkdir -p "$GRIDWORKS_BUILD_DIR/mac/.background"
cp src/graphics/dmg_background/dmg_background.png "$GRIDWORKS_BUILD_DIR/mac/.background/dmg_background.png" cp graphics/dmg_background/dmg_background.png "$GRIDWORKS_BUILD_DIR/mac/.background/dmg_background.png"
SIZE=60 SIZE=60
@ -526,10 +526,10 @@ server_test() {
ant build_tests ant build_tests
echo "" echo ""
CLASSPATH="$GRIDWORKS_TEST_DIR/java/classes${SEP}$GRIDWORKS_WEBAPP/WEB-INF/classes${SEP}$GRIDWORKS_BUILD_DIR/classes${SEP}$GRIDWORKS_TEST_DIR/java/lib/*${SEP}$GRIDWORKS_LIB_DIR/*${SEP}$GRIDWORKS_WEBAPP/WEB-INF/lib/*" CLASSPATH="$GRIDWORKS_TEST_DIR/server/classes${SEP}$GRIDWORKS_WEBAPP/WEB-INF/classes${SEP}$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_TEST_DIR/server/lib/*${SEP}$GRIDWORKS_LIB_DIR/*${SEP}$GRIDWORKS_WEBAPP/WEB-INF/lib/*"
if [ -z "$1" ]; then if [ -z "$1" ]; then
TESTS="-excludegroups broken $GRIDWORKS_TEST_DIR/java/conf/tests.xml" TESTS="-excludegroups broken $GRIDWORKS_TEST_DIR/server/conf/tests.xml"
else else
TESTS="-testclass $1" TESTS="-testclass $1"
fi fi
@ -545,7 +545,7 @@ server_test() {
run() { run() {
FORK=$1 FORK=$1
if [ ! -d $GRIDWORKS_BUILD_DIR/classes ]; then if [ ! -d $GRIDWORKS_CLASSES_DIR ]; then
IS_JAR=`ls $GRIDWORKS_LIB_DIR | grep gridworks` IS_JAR=`ls $GRIDWORKS_LIB_DIR | grep gridworks`
if [ -z "$IS_JAR" ]; then if [ -z "$IS_JAR" ]; then
ant build ant build
@ -559,19 +559,19 @@ run() {
warn "Gridworks is already running." warn "Gridworks is already running."
fi fi
if [ -d $GRIDWORKS_BUILD_DIR/classes ]; then if [ -d $GRIDWORKS_CLASSES_DIR ]; then
add_option "-Dgridworks.autoreloading=true" add_option "-Dgridworks.autoreloading=true"
fi fi
if $DARWIN ; then if $DARWIN ; then
add_option "-Xdock:name=Gridworks -Xdock:icon=src/graphics/icon/gridworks.icns" add_option "-Xdock:name=Gridworks -Xdock:icon=graphics/icon/gridworks.icns"
fi fi
if [ "$GRIDWORKS_DATA_DIR" ]; then if [ "$GRIDWORKS_DATA_DIR" ]; then
add_option "-Dgridworks.data_dir=$GRIDWORKS_DATA_DIR" add_option "-Dgridworks.data_dir=$GRIDWORKS_DATA_DIR"
fi fi
CLASSPATH="$GRIDWORKS_BUILD_DIR/classes${SEP}$GRIDWORKS_LIB_DIR/*" CLASSPATH="$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_LIB_DIR/*"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks" RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks"
@ -588,22 +588,6 @@ run() {
GRIDWORKS_PID="$!" GRIDWORKS_PID="$!"
fi fi
} }
execute() {
if [ ! -d $GRIDWORKS_BUILD_DIR/classes ]; then
ant build
echo ""
fi
CLASSPATH="$GRIDWORKS_BUILD_DIR/classes${SEP}$GRIDWORKS_LIB_DIR/*"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS $*"
#echo "$RUN_CMD"
#echo ""
exec $RUN_CMD $*
}
findbugs() { findbugs() {
findbugs_prepare findbugs_prepare
@ -761,22 +745,26 @@ fi
add_option "-Dgridworks.host=$GRIDWORKS_HOST" add_option "-Dgridworks.host=$GRIDWORKS_HOST"
if [ -z "$GRIDWORKS_WEBAPP" ]; then if [ -z "$GRIDWORKS_WEBAPP" ]; then
GRIDWORKS_WEBAPP="src/main/webapp" GRIDWORKS_WEBAPP="main/webapp"
fi fi
add_option "-Dgridworks.webapp=$GRIDWORKS_WEBAPP" add_option "-Dgridworks.webapp=$GRIDWORKS_WEBAPP"
if [ -z "$GRIDWORKS_TEST_DIR" ]; then if [ -z "$GRIDWORKS_TEST_DIR" ]; then
GRIDWORKS_TEST_DIR="tests" GRIDWORKS_TEST_DIR="main/tests"
fi
if [ -z "$GRIDWORKS_CLASSES_DIR" ]; then
GRIDWORKS_CLASSES_DIR="server/classes"
fi
if [ -z "$GRIDWORKS_LIB_DIR" ]; then
GRIDWORKS_LIB_DIR="server/lib"
fi fi
if [ -z "$GRIDWORKS_BUILD_DIR" ]; then if [ -z "$GRIDWORKS_BUILD_DIR" ]; then
GRIDWORKS_BUILD_DIR="build" GRIDWORKS_BUILD_DIR="build"
fi fi
if [ -z "$GRIDWORKS_LIB_DIR" ]; then
GRIDWORKS_LIB_DIR="lib"
fi
if [ -z "$GRIDWORKS_TOOLS_DIR" ]; then if [ -z "$GRIDWORKS_TOOLS_DIR" ]; then
GRIDWORKS_TOOLS_DIR="tools" GRIDWORKS_TOOLS_DIR="tools"
fi fi
@ -791,9 +779,9 @@ fi
add_option "-Dgridworks.verbosity=$GRIDWORKS_VERBOSITY" add_option "-Dgridworks.verbosity=$GRIDWORKS_VERBOSITY"
if [ -z "$JYTHONPATH" ]; then if [ -z "$JYTHONPATH" ]; then
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython" JYTHONPATH="$GRIDWORKS_WEBAPP/WEB-INF/lib/jython"
else else
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython/${SEP}$JYTHONPATH" JYTHONPATH="$GRIDWORKS_WEBAPP/WEB-INF/lib/jython${SEP}$JYTHONPATH"
fi fi
add_option "-Dpython.path=$JYTHONPATH" add_option "-Dpython.path=$JYTHONPATH"
@ -815,7 +803,6 @@ case "$ACTION" in
cpd) cpd;; cpd) cpd;;
jslint) jslint;; jslint) jslint;;
run) run;; run) run;;
execute) execute $*;;
mac_dist) mac_dist $1;; mac_dist) mac_dist $1;;
windows_dist) windows_dist $1;; windows_dist) windows_dist $1;;
linux_dist) linux_dist $1;; linux_dist) linux_dist $1;;

8
gridworks.bat
View File

@ -141,16 +141,16 @@ set GRIDWORKS_HOST=127.0.0.1
set OPTS=%OPTS% -Dgridworks.host=%GRIDWORKS_HOST% set OPTS=%OPTS% -Dgridworks.host=%GRIDWORKS_HOST%
if not "%GRIDWORKS_WEBAPP%" == "" goto gotHost if not "%GRIDWORKS_WEBAPP%" == "" goto gotHost
set GRIDWORKS_WEBAPP=src\main\webapp set GRIDWORKS_WEBAPP=main\webapp
:gotHOST :gotHOST
set OPTS=%OPTS% -Dgridworks.webapp=%GRIDWORKS_WEBAPP% set OPTS=%OPTS% -Dgridworks.webapp=%GRIDWORKS_WEBAPP%
if not "%GRIDWORKS_BUILD_DIR%" == "" goto gotBuildDir if not "%GRIDWORKS_BUILD_DIR%" == "" goto gotBuildDir
set GRIDWORKS_BUILD_DIR=build set GRIDWORKS_BUILD_DIR=server\build
:gotBuildDir :gotBuildDir
if not "%GRIDWORKS_LIB_DIR%" == "" goto gotLibDir if not "%GRIDWORKS_LIB_DIR%" == "" goto gotLibDir
set GRIDWORKS_LIB_DIR=lib set GRIDWORKS_LIB_DIR=server\lib
:gotLibDir :gotLibDir
rem ----- Respond to the action ---------------------------------------------------------- rem ----- Respond to the action ----------------------------------------------------------
@ -164,7 +164,7 @@ if ""%ACTION%"" == ""run"" goto doRun
:doRun :doRun
set CLASSPATH="%GRIDWORKS_BUILD_DIR%\classes;%GRIDWORKS_LIB_DIR%\*" set CLASSPATH="%GRIDWORKS_BUILD_DIR%\classes;%GRIDWORKS_LIB_DIR%\*"
"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=lib/native/windows com.metaweb.gridworks.Gridworks "%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%GRIDWORKS_LIB_DIR%/native/windows com.metaweb.gridworks.Gridworks
goto end goto end
:doAnt :doAnt

38
main/.classpath Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="tests/server/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-codec-1.4.jar" sourcepath="webapp/WEB-INF/lib-src/commons-codec-1.4-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-lang-2.5.jar" sourcepath="webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar" sourcepath="webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/json-20100208.jar" sourcepath="webapp/WEB-INF/lib-src/json-20100208-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/icu4j-4.2.1.jar" sourcepath="webapp/WEB-INF/lib-src/icu4j-4.2.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/arithcode-1.1.jar" sourcepath="webapp/WEB-INF/lib-src/arithcode-1.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/secondstring-20100303.jar" sourcepath="webapp/WEB-INF/lib-src/secondstring-20100303-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/ant-tools-1.8.0.jar" sourcepath="webapp/WEB-INF/lib-src/ant-tools-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/vicino-1.1.jar" sourcepath="webapp/WEB-INF/lib-src/vicino-1.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpcore-4.0.1.jar" sourcepath="webapp/WEB-INF/lib-src/httpcore-4.0.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/httpclient-4.0.1.jar" sourcepath="webapp/WEB-INF/lib-src/httpclient-4.0.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-core-1.2.1.1.jar" sourcepath="webapp/WEB-INF/lib-src/signpost-core-1.2.1.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.1.jar" sourcepath="webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.1-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/opencsv-2.2.jar" sourcepath="tests/java/lib-src/opencsv-2.2-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-3.6.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-3.6.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/poi-ooxml-schemas-3.6-20091214.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/jython-2.5.1.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/clojure-1.1.0.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/jackson-core-asl-1.5.1.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/marc4j-2.4.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/jrdf-0.5.6.jar"/>
<classpathentry kind="lib" path="tests/server/lib/mockito-all-1.8.4.jar" sourcepath="tests/server/lib-src/mockito-all-1.8.4-sources.jar"/>
<classpathentry kind="lib" path="tests/server/lib/testng-5.12.1.jar" sourcepath="tests/server/lib-src/testng-5.12.1-sources.jar"/>
<classpathentry kind="lib" path="/gridworks server/lib/servlet-api-2.5.jar" sourcepath="/gridworks server/lib-src/servlet-api-2.5-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar" sourcepath="webapp/WEB-INF/lib-src/jcl-over-slf4j-1.5.6-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-api-1.5.6.jar" sourcepath="webapp/WEB-INF/lib/slf4j-api-1.5.6.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar" sourcepath="webapp/WEB-INF/lib-src/slf4j-log4j12-1.5.6-sources.jar"/>
<classpathentry kind="lib" path="webapp/WEB-INF/lib/log4j-1.2.15.jar" sourcepath="webapp/WEB-INF/lib-src/log4j-1.2.15-sources.jar"/>
<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
</classpath>

0
.project → main/.project
View File

0
.settings/org.eclipse.core.resources.prefs → main/.settings/org.eclipse.core.resources.prefs
View File

0
.settings/org.eclipse.jdt.core.prefs → main/.settings/org.eclipse.jdt.core.prefs
View File

13
server/.classpath Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib-src/servlet-api-2.5-sources.jar"/>
<classpathentry kind="lib" path="lib/jetty-6.1.22.jar" sourcepath="lib-src/jetty-6.1.22-sources.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-6.1.22.jar" sourcepath="lib-src/jetty-util-6.1.22-sources.jar"/>
<classpathentry kind="lib" path="lib/jdatapath-alpha2.jar" sourcepath="lib-src/jdatapath-alpha2-sources.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar" />
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar" />
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar" />
<classpathentry kind="output" path="classes"/>
</classpath>

12
server/.project Normal file
View File

@ -0,0 +1,12 @@
<projectDescription>
<name>gridworks server</name>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>