diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..fb50116 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.gitignore b/.gitignore index 1adc831..d5d4f10 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ -# Created by .ignore support plugin (hsz.mobi) \ No newline at end of file +/bin +/build +/distribution +/ivy +/tools +/.gradle +*.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index d87148f..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -jsword-minimalbible \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 747f24e..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml deleted file mode 100644 index 2229cbb..0000000 --- a/.idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml deleted file mode 100644 index 98c7afc..0000000 --- a/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_net_commons_net_3_3.xml b/.idea/libraries/Gradle__commons_net_commons_net_3_3.xml deleted file mode 100644 index 292d834..0000000 --- a/.idea/libraries/Gradle__commons_net_commons_net_3_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml deleted file mode 100644 index dc26b34..0000000 --- a/.idea/libraries/Gradle__junit_junit_4_11.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml b/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml deleted file mode 100644 index 2902c07..0000000 --- a/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml deleted file mode 100644 index 7fd7997..0000000 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml deleted file mode 100644 index 49252ed..0000000 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml b/.idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml deleted file mode 100644 index c99a909..0000000 --- a/.idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml b/.idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml deleted file mode 100644 index 1723ecf..0000000 --- a/.idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml b/.idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml deleted file mode 100644 index 82b8f1e..0000000 --- a/.idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml b/.idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml deleted file mode 100644 index 12e0734..0000000 --- a/.idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index 8262f72..0000000 --- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml b/.idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml deleted file mode 100644 index 0b28197..0000000 --- a/.idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml deleted file mode 100644 index b4476b3..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_tukaani_xz_1_4.xml b/.idea/libraries/Gradle__org_tukaani_xz_1_4.xml deleted file mode 100644 index cef5ad4..0000000 --- a/.idea/libraries/Gradle__org_tukaani_xz_1_4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1652a32..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ea24fc8..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 86c71db..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 0000000..9c9fffe --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + jsword-minimalbible + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/build.gradle b/build.gradle index 0fa72e5..43125b3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,52 +1,19 @@ -group 'org.bspeice' -version '1.0-SNAPSHOT' - -apply plugin: 'java' - -repositories { - mavenCentral() +configurations { + buildJSword } -sourceSets { - main { - java { - srcDir 'src/main/java' - } - resources { - srcDir 'src/main/resources' - } +task compileJava (type: GradleBuild) { + buildFile = 'jsword-stub.gradle' + tasks = ['clean', 'ivy.check', 'ivy.download', 'ivy.task', 'ivy', + 'init', 'mergeCode', 'compile', 'jar'] //, 'copyJarsToMinimalBible'] + ext.outputJar = file('distribution/jsword.jar') + outputs.upToDateWhen { + ext.outputJar.exists() } } -println(sourceSets.main.java) - -task mergeSources(type: Copy) { - from 'jsword/src/main/java' - from 'src/stage/java' - - into 'src/main/java' -} - -task mergeResources(type: Copy) { - from 'jsword/src/main/resources' - from 'src/stage/resources' - - into 'src/main/resources' -} - -tasks.compileJava.dependsOn(mergeSources) - -dependencies { - compile 'commons-net:commons-net:3.3' - compile 'org.apache.commons:commons-compress:1.7' - compile 'org.apache.httpcomponents:httpcore:4.3.2' - compile 'org.apache.httpcomponents:httpclient:4.3.2' - compile 'org.slf4j:slf4j-api:1.7.6' - compile 'org.jdom:jdom2:2.0.5' - compile 'org.apache.lucene:lucene-core:3.0.3' - compile 'org.apache.lucene:lucene-analyzers:3.0.3' - compile 'org.apache.lucene:lucene-snowball:3.0.3' - compile 'org.apache.lucene:lucene-smartcn:3.0.3' - - testCompile group: 'junit', name: 'junit', version: '4.11' +artifacts { + buildJSword(compileJava.ext.outputJar) { + builtBy compileJava + } } diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..d436e88 --- /dev/null +++ b/build.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 2322723..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 4bdc34b..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Sat Jun 13 18:08:03 EDT 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip diff --git a/gradlew b/gradlew deleted file mode 100755 index 91a7e26..0000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 8a0b282..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/ivy.xml b/ivy.xml new file mode 100644 index 0000000..6b932a8 --- /dev/null +++ b/ivy.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jsword b/jsword deleted file mode 160000 index d7ad5ef..0000000 --- a/jsword +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7ad5ef9b9ace682f80fff65c8e9124748b1b210 diff --git a/jsword-minimalbible.iml b/jsword-minimalbible.iml deleted file mode 100644 index bafe30d..0000000 --- a/jsword-minimalbible.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jsword-stub.gradle b/jsword-stub.gradle new file mode 100644 index 0000000..c6bd0f0 --- /dev/null +++ b/jsword-stub.gradle @@ -0,0 +1 @@ +ant.importBuild('../jsword-minimalbible/build.xml') diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..a813550 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1,3 @@ +/javadocs +/sources +/jars diff --git a/libs/.gitignore b/libs/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/libs/.gitignore @@ -0,0 +1 @@ +* diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index a174f48..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'jsword-minimalbible' - diff --git a/src/stage/java/org/crosswire/jsword/book/FilterUtil.java b/src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java similarity index 100% rename from src/stage/java/org/crosswire/jsword/book/FilterUtil.java rename to src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java diff --git a/src/stage/java/org/crosswire/jsword/versification/Versification.java b/src/main/java/jsword/org/crosswire/jsword/versification/Versification.java similarity index 100% rename from src/stage/java/org/crosswire/jsword/versification/Versification.java rename to src/main/java/jsword/org/crosswire/jsword/versification/Versification.java