diff --git a/.classpath b/.classpath deleted file mode 100644 index fb50116..0000000 --- a/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.gitignore b/.gitignore index d5d4f10..1adc831 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/bin -/build -/distribution -/ivy -/tools -/.gradle -*.iml +# Created by .ignore support plugin (hsz.mobi) \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..d87148f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +jsword-minimalbible \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..9a8b7e5 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..747f24e --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ 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 new file mode 100644 index 0000000..2229cbb --- /dev/null +++ b/.idea/libraries/Gradle__commons_codec_commons_codec_1_6.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..98c7afc --- /dev/null +++ b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..292d834 --- /dev/null +++ b/.idea/libraries/Gradle__commons_net_commons_net_3_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2902c07 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..7fd7997 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..49252ed --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..c99a909 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_lucene_lucene_analyzers_3_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..1723ecf --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_lucene_lucene_core_3_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..82b8f1e --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_lucene_lucene_smartcn_3_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..12e0734 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_lucene_lucene_snowball_3_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..0b28197 --- /dev/null +++ b/.idea/libraries/Gradle__org_jdom_jdom2_2_0_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..b4476b3 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_6.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..cef5ad4 --- /dev/null +++ b/.idea/libraries/Gradle__org_tukaani_xz_1_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..1652a32 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..ea24fc8 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..86c71db --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 9c9fffe..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - jsword-minimalbible - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/build.gradle b/build.gradle index 43125b3..0fa72e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,52 @@ -configurations { - buildJSword +group 'org.bspeice' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +repositories { + mavenCentral() } -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() +sourceSets { + main { + java { + srcDir 'src/main/java' + } + resources { + srcDir 'src/main/resources' + } } } -artifacts { - buildJSword(compileJava.ext.outputJar) { - builtBy compileJava - } +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' } diff --git a/build.xml b/build.xml deleted file mode 100644 index d436e88..0000000 --- a/build.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..2322723 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4bdc34b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#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 new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/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 new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 deleted file mode 100644 index 6b932a8..0000000 --- a/ivy.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jsword b/jsword new file mode 160000 index 0000000..d7ad5ef --- /dev/null +++ b/jsword @@ -0,0 +1 @@ +Subproject commit d7ad5ef9b9ace682f80fff65c8e9124748b1b210 diff --git a/jsword-minimalbible.iml b/jsword-minimalbible.iml new file mode 100644 index 0000000..bafe30d --- /dev/null +++ b/jsword-minimalbible.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jsword-stub.gradle b/jsword-stub.gradle deleted file mode 100644 index c6bd0f0..0000000 --- a/jsword-stub.gradle +++ /dev/null @@ -1 +0,0 @@ -ant.importBuild('../jsword-minimalbible/build.xml') diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index a813550..0000000 --- a/lib/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/javadocs -/sources -/jars diff --git a/libs/.gitignore b/libs/.gitignore deleted file mode 100644 index 72e8ffc..0000000 --- a/libs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a174f48 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'jsword-minimalbible' + diff --git a/src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java b/src/stage/java/org/crosswire/jsword/book/FilterUtil.java similarity index 100% rename from src/main/java/jsword/org/crosswire/jsword/book/FilterUtil.java rename to src/stage/java/org/crosswire/jsword/book/FilterUtil.java diff --git a/src/main/java/jsword/org/crosswire/jsword/versification/Versification.java b/src/stage/java/org/crosswire/jsword/versification/Versification.java similarity index 100% rename from src/main/java/jsword/org/crosswire/jsword/versification/Versification.java rename to src/stage/java/org/crosswire/jsword/versification/Versification.java