diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..34bd262d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +project +target diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/project/Build.scala b/project/Build.scala new file mode 100644 index 000000000..1a07a793b --- /dev/null +++ b/project/Build.scala @@ -0,0 +1,31 @@ +import sbt._ +import Keys._ + +object Build extends Build { + + override lazy val settings = super.settings ++ Seq( + name := "json-permissive", + version := "1.0.0", + organization := "org.json", + + scalaVersion := "2.10.3", + publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/.m2/repository"))), + + fork in run := true, + sourcesInBase := false, + + publishArtifact in packageDoc := false, + publishArtifact in packageSrc := false, + sources in doc := Seq.empty, + + javacOptions += sys.env.getOrElse("JAVAC_OPTS", "-g:none"), + scalacOptions += sys.env.getOrElse("SCALAC_OPTS", "-g:none") + ) + + lazy val project = Project(id = "json-permissive", + base = file("."), + settings = Project.defaultSettings + ) + .settings(net.virtualvoid.sbt.graph.Plugin.graphSettings: _*) +} + diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 000000000..a8c4f8e79 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.7-RC1 diff --git a/project/plugins.sbt b/project/plugins.sbt new file mode 100644 index 000000000..deedc4e04 --- /dev/null +++ b/project/plugins.sbt @@ -0,0 +1,17 @@ +resolvers ++= Seq( + "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/", + "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/" +) + +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") + +addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") + +addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.6.2") + +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.8.0-M2") + +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4") + +addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "1.0.0") + diff --git a/sbt b/sbt new file mode 100755 index 000000000..e4f038dbc --- /dev/null +++ b/sbt @@ -0,0 +1,483 @@ +#!/usr/bin/env bash +# +# A more capable sbt runner, coincidentally also called sbt. +# Author: Paul Phillips + +# todo - make this dynamic +declare -r sbt_release_version=0.13.7-RC1 + +declare sbt_jar sbt_dir sbt_create sbt_launch_dir +declare scala_version java_home sbt_explicit_version +declare verbose debug quiet noshare batch trace_level log_level +declare sbt_saved_stty + +echoerr () { [[ -z $quiet ]] && echo "$@" >&2; } +vlog () { [[ -n "$verbose$debug" ]] && echoerr "$@"; } +dlog () { [[ -n $debug ]] && echoerr "$@"; } + +# we'd like these set before we get around to properly processing arguments +for arg in "$@"; do + case $arg in + -q|-quiet) quiet=true ;; + -d|-debug) debug=true ;; + -v|-verbose) verbose=true ;; + *) ;; + esac +done + +build_props_sbt () { + if [[ -r project/build.properties ]]; then + versionLine=$(grep ^sbt.version project/build.properties | tr -d '\r') + versionString=${versionLine##sbt.version=} + echo "$versionString" + fi +} + +update_build_props_sbt () { + local ver="$1" + local old=$(build_props_sbt) + + if [[ $ver == $old ]]; then + return + elif [[ -r project/build.properties ]]; then + perl -pi -e "s/^sbt\.version=.*\$/sbt.version=${ver}/" project/build.properties + grep -q '^sbt.version=' project/build.properties || echo "sbt.version=${ver}" >> project/build.properties + + echoerr !!! + echoerr !!! Updated file project/build.properties setting sbt.version to: $ver + echoerr !!! Previous value was: $old + echoerr !!! + fi +} + +sbt_version () { + if [[ -n $sbt_explicit_version ]]; then + echo $sbt_explicit_version + else + local v=$(build_props_sbt) + if [[ -n $v ]]; then + echo $v + else + echo $sbt_release_version + fi + fi +} + +# restore stty settings (echo in particular) +onSbtRunnerExit() { + [[ -n $sbt_saved_stty ]] || return + dlog "" + dlog "restoring stty: $sbt_saved_stty" + stty $sbt_saved_stty + unset sbt_saved_stty +} + +# save stty and trap exit, to ensure echo is reenabled if we are interrupted. +trap onSbtRunnerExit EXIT +sbt_saved_stty=$(stty -g 2>/dev/null) +dlog "Saved stty: $sbt_saved_stty" + +# this seems to cover the bases on OSX, and someone will +# have to tell me about the others. +get_script_path () { + local path="$1" + [[ -L "$path" ]] || { echo "$path" ; return; } + + local target=$(readlink "$path") + if [[ "${target:0:1}" == "/" ]]; then + echo "$target" + else + echo "$(dirname $path)/$target" + fi +} + +die() { + echo "Aborting: $@" + exit 1 +} + +make_url () { + groupid="$1" + category="$2" + version="$3" + + echo "http://typesafe.artifactoryonline.com/typesafe/ivy-$category/$groupid/sbt-launch/$version/sbt-launch.jar" +} + +readarr () { + while read ; do + eval "$1+=(\"$REPLY\")" + done +} + +init_default_option_file () { + local overriding_var=${!1} + local default_file=$2 + if [[ ! -r "$default_file" && $overriding_var =~ ^@(.*)$ ]]; then + local envvar_file=${BASH_REMATCH[1]} + if [[ -r $envvar_file ]]; then + default_file=$envvar_file + fi + fi + echo $default_file +} + +declare -r default_jvm_opts="-Dfile.encoding=UTF8 -XX:MaxPermSize=256m -Xms512m -Xmx1g -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC" +declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" +declare -r latest_28="2.8.2" +declare -r latest_29="2.9.3" +declare -r latest_210="2.10.3" + +declare -r script_path=$(get_script_path "$BASH_SOURCE") +declare -r script_dir="$(dirname $script_path)" +declare -r script_name="$(basename $script_path)" + +# some non-read-onlies set with defaults +declare java_cmd=java +declare sbt_opts_file=$(init_default_option_file SBT_OPTS .sbtopts) +declare jvm_opts_file=$(init_default_option_file JVM_OPTS .jvmopts) + +# pull -J and -D options to give to java. +declare -a residual_args +declare -a java_args +declare -a scalac_args +declare -a sbt_commands + +# args to jvm/sbt via files or environment variables +declare -a extra_jvm_opts extra_sbt_opts + +# if set, use JAVA_HOME over java found in path +[[ -e "$JAVA_HOME/bin/java" ]] && java_cmd="$JAVA_HOME/bin/java" + +# directory to store sbt launchers +declare sbt_launch_dir="$HOME/.sbt/launchers" +[[ -d "$sbt_launch_dir" ]] || mkdir -p "$sbt_launch_dir" +[[ -w "$sbt_launch_dir" ]] || sbt_launch_dir="$(mktemp -d -t sbt_extras_launchers)" + +build_props_scala () { + if [[ -r project/build.properties ]]; then + versionLine=$(grep ^build.scala.versions project/build.properties) + versionString=${versionLine##build.scala.versions=} + echo ${versionString%% .*} + fi +} + +execRunner () { + # print the arguments one to a line, quoting any containing spaces + [[ $verbose || $debug ]] && echo "# Executing command line:" && { + for arg; do + if [[ -n "$arg" ]]; then + if printf "%s\n" "$arg" | grep -q ' '; then + printf "\"%s\"\n" "$arg" + else + printf "%s\n" "$arg" + fi + fi + done + echo "" + } + + if [[ -n $batch ]]; then + # the only effective way I've found to avoid sbt hanging when backgrounded. + exec 0<&- + ( "$@" & ) + # I'm sure there's some way to get our hands on the pid and wait for it + # but it exceeds my present level of ambition. + else + { "$@"; } + fi +} + +sbt_groupid () { + case $(sbt_version) in + 0.7.*) echo org.scala-tools.sbt ;; + 0.10.*) echo org.scala-tools.sbt ;; + 0.11.[12]) echo org.scala-tools.sbt ;; + *) echo org.scala-sbt ;; + esac +} + +make_release_url () { + make_url $(sbt_groupid) releases $(sbt_version) +} + +jar_url () { + case $(sbt_version) in + 0.7.*) echo "http://simple-build-tool.googlecode.com/files/sbt-launch-0.7.7.jar" ;; + *) make_release_url ;; + esac +} + +jar_file () { + case $1 in + 0.13.*) echo "$sbt_launch_dir/$1/sbt-launch.jar" ;; + *) echo "$sbt_launch_dir/$sbt_release_version/sbt-launch.jar" ;; + esac +} + +download_url () { + local url="$1" + local jar="$2" + + echo "Downloading sbt launcher $(sbt_version):" + echo " From $url" + echo " To $jar" + + mkdir -p $(dirname "$jar") && { + if which curl >/dev/null; then + curl --fail --silent "$url" --output "$jar" + elif which wget >/dev/null; then + wget --quiet -O "$jar" "$url" + fi + } && [[ -r "$jar" ]] +} + +acquire_sbt_jar () { + sbt_url="$(jar_url)" + sbt_jar="$(jar_file $(sbt_version))" + + [[ -r "$sbt_jar" ]] || download_url "$sbt_url" "$sbt_jar" +} + +usage () { + cat < display stack traces with a max of frames (default: -1, traces suppressed) + -no-colors disable ANSI color codes + -sbt-create start sbt even if current directory contains no sbt project + -sbt-dir path to global settings/plugins directory (default: ~/.sbt/) + -sbt-boot path to shared boot directory (default: ~/.sbt/boot in 0.11+) + -ivy path to local Ivy repository (default: ~/.ivy2) + -no-share use all local caches; no sharing + -offline put sbt in offline mode + -jvm-debug Turn on JVM debugging, open at the given port. + -batch Disable interactive mode + -prompt Set the sbt prompt; in expr, 's' is the State and 'e' is Extracted + + # sbt version (default: from project/build.properties if present, else latest release) + !!! The only way to accomplish this pre-0.12.0 if there is a build.properties file which + !!! contains an sbt.version property is to update the file on disk. That's what this does. + -sbt-version use the specified version of sbt (default: $sbt_release_version) + -sbt-jar use the specified jar as the sbt launcher + -sbt-launch-dir directory to hold sbt launchers (default: $sbt_launch_dir) + + # scala version (default: as chosen by sbt) + -28 use $latest_28 + -29 use $latest_29 + -210 use $latest_210 + -scala-home use the scala build at the specified directory + -scala-version use the specified version of scala + -binary-version use the specified scala version when searching for dependencies + + # java version (default: java from PATH, currently $(java -version 2>&1 | grep version)) + -java-home alternate JAVA_HOME + + # passing options to the jvm - note it does NOT use JAVA_OPTS due to pollution + # The default set is used if JVM_OPTS is unset and no -jvm-opts file is found + $default_jvm_opts + JVM_OPTS environment variable holding either the jvm args directly, or + the reference to a file containing jvm args if given path is prepended by '@' (e.g. '@/etc/jvmopts') + Note: "@"-file is overridden by local '.jvmopts' or '-jvm-opts' argument. + -jvm-opts file containing jvm args (if not given, .jvmopts in project root is used if present) + -Dkey=val pass -Dkey=val directly to the jvm + -J-X pass option -X directly to the jvm (-J is stripped) + + # passing options to sbt, OR to this runner + SBT_OPTS environment variable holding either the sbt args directly, or + the reference to a file containing sbt args if given path is prepended by '@' (e.g. '@/etc/sbtopts') + Note: "@"-file is overridden by local '.sbtopts' or '-sbt-opts' argument. + -sbt-opts file containing sbt args (if not given, .sbtopts in project root is used if present) + -S-X add -X to sbt's scalacOptions (-S is stripped) +EOM +} + +addJava () { + dlog "[addJava] arg = '$1'" + java_args=( "${java_args[@]}" "$1" ) +} +addSbt () { + dlog "[addSbt] arg = '$1'" + sbt_commands=( "${sbt_commands[@]}" "$1" ) +} +addScalac () { + dlog "[addScalac] arg = '$1'" + scalac_args=( "${scalac_args[@]}" "$1" ) +} +addResidual () { + dlog "[residual] arg = '$1'" + residual_args=( "${residual_args[@]}" "$1" ) +} +addResolver () { + addSbt "set resolvers += $1" +} +addDebugger () { + addJava "-Xdebug" + addJava "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$1" +} +setScalaVersion () { + [[ "$1" == *-SNAPSHOT ]] && addResolver 'Resolver.sonatypeRepo("snapshots")' + addSbt "++ \"$1\"" +} + +process_args () +{ + require_arg () { + local type="$1" + local opt="$2" + local arg="$3" + + if [[ -z "$arg" ]] || [[ "${arg:0:1}" == "-" ]]; then + die "$opt requires <$type> argument" + fi + } + while [[ $# -gt 0 ]]; do + case "$1" in + -h|-help) usage; exit 1 ;; + -v|-verbose) verbose=true && log_level=Info && shift ;; + -d|-debug) debug=true && log_level=Debug && shift ;; + -q|-quiet) quiet=true && log_level=Error && shift ;; + + -trace) require_arg integer "$1" "$2" && trace_level=$2 && shift 2 ;; + -ivy) require_arg path "$1" "$2" && addJava "-Dsbt.ivy.home=$2" && shift 2 ;; + -no-colors) addJava "-Dsbt.log.noformat=true" && shift ;; + -no-share) noshare=true && shift ;; + -sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;; + -sbt-dir) require_arg path "$1" "$2" && sbt_dir="$2" && shift 2 ;; + -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;; + -offline) addSbt "set offline := true" && shift ;; + -jvm-debug) require_arg port "$1" "$2" && addDebugger $2 && shift 2 ;; + -batch) batch=true && shift ;; + -prompt) require_arg "expr" "$1" "$2" && addSbt "set shellPrompt in ThisBuild := (s => { val e = Project.extract(s) ; $2 })" && shift 2 ;; + + -sbt-create) sbt_create=true && shift ;; + -sbt-jar) require_arg path "$1" "$2" && sbt_jar="$2" && shift 2 ;; + -sbt-version) require_arg version "$1" "$2" && sbt_explicit_version="$2" && shift 2 ;; +-sbt-launch-dir) require_arg path "$1" "$2" && sbt_launch_dir="$2" && shift 2 ;; + -scala-version) require_arg version "$1" "$2" && setScalaVersion "$2" && shift 2 ;; +-binary-version) require_arg version "$1" "$2" && addSbt "set scalaBinaryVersion in ThisBuild := \"$2\"" && shift 2 ;; + -scala-home) require_arg path "$1" "$2" && addSbt "set every scalaHome := Some(file(\"$2\"))" && shift 2 ;; + -java-home) require_arg path "$1" "$2" && java_cmd="$2/bin/java" && shift 2 ;; + -sbt-opts) require_arg path "$1" "$2" && sbt_opts_file="$2" && shift 2 ;; + -jvm-opts) require_arg path "$1" "$2" && jvm_opts_file="$2" && shift 2 ;; + + -D*) addJava "$1" && shift ;; + -J*) addJava "${1:2}" && shift ;; + -S*) addScalac "${1:2}" && shift ;; + -28) addSbt "++ $latest_28" && shift ;; + -29) addSbt "++ $latest_29" && shift ;; + -210) addSbt "++ $latest_210" && shift ;; + + *) addResidual "$1" && shift ;; + esac + done +} + +# process the direct command line arguments +process_args "$@" + +# skip #-styled comments +readConfigFile() { + while read line; do echo ${line/\#*/} | grep -vE '^\s*$'; done < $1 +} + +# if there are file/environment sbt_opts, process again so we +# can supply args to this runner +if [[ -r "$sbt_opts_file" ]]; then + vlog "Using sbt options defined in file $sbt_opts_file" + readarr extra_sbt_opts < <(readConfigFile "$sbt_opts_file") +elif [[ -n "$SBT_OPTS" && !($SBT_OPTS =~ ^@.*) ]]; then + vlog "Using sbt options defined in variable \$SBT_OPTS" + extra_sbt_opts=( $SBT_OPTS ) +else + vlog "No extra sbt options have been defined" +fi + +[[ -n $extra_sbt_opts ]] && process_args "${extra_sbt_opts[@]}" + +# reset "$@" to the residual args +set -- "${residual_args[@]}" +argumentCount=$# + +# only exists in 0.12+ +setTraceLevel() { + case $(sbt_version) in + 0.{7,10,11}.*) echoerr "Cannot set trace level in sbt version $(sbt_version)" ;; + *) addSbt "set every traceLevel := $trace_level" ;; + esac +} + +# set scalacOptions if we were given any -S opts +[[ ${#scalac_args[@]} -eq 0 ]] || addSbt "set scalacOptions in ThisBuild += \"${scalac_args[@]}\"" + +# Update build.properties no disk to set explicit version - sbt gives us no choice +[[ -n "$sbt_explicit_version" ]] && update_build_props_sbt "$sbt_explicit_version" +vlog "Detected sbt version $(sbt_version)" + +[[ -n "$scala_version" ]] && echoerr "Overriding scala version to $scala_version" + +# no args - alert them there's stuff in here +(( $argumentCount > 0 )) || vlog "Starting $script_name: invoke with -help for other options" + +# verify this is an sbt dir or -create was given +[[ -r ./build.sbt || -d ./project || -n "$sbt_create" ]] || { + cat <') { + x.back(); + } + } else if (c != ':') { + throw x.syntaxError("Expected a ':' after a key"); } this.putOnce(key, x.nextValue()); diff --git a/JSONString.java b/src/main/java/permissive/org/json/JSONString.java old mode 100755 new mode 100644 similarity index 95% rename from JSONString.java rename to src/main/java/permissive/org/json/JSONString.java index 1f2d77dd1..66b5b0c54 --- a/JSONString.java +++ b/src/main/java/permissive/org/json/JSONString.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /** * The JSONString interface allows a toJSONString() * method so that a class can change the behavior of diff --git a/JSONStringer.java b/src/main/java/permissive/org/json/JSONStringer.java old mode 100755 new mode 100644 similarity index 96% rename from JSONStringer.java rename to src/main/java/permissive/org/json/JSONStringer.java index 25c2e5d78..8859b9616 --- a/JSONStringer.java +++ b/src/main/java/permissive/org/json/JSONStringer.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /* Copyright (c) 2006 JSON.org diff --git a/JSONTokener.java b/src/main/java/permissive/org/json/JSONTokener.java similarity index 99% rename from JSONTokener.java rename to src/main/java/permissive/org/json/JSONTokener.java index 32548ed9f..0d9dacef3 100644 --- a/JSONTokener.java +++ b/src/main/java/permissive/org/json/JSONTokener.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; import java.io.BufferedReader; import java.io.IOException; diff --git a/JSONWriter.java b/src/main/java/permissive/org/json/JSONWriter.java old mode 100755 new mode 100644 similarity index 96% rename from JSONWriter.java rename to src/main/java/permissive/org/json/JSONWriter.java index 07bbc8cfa..3a226e3b2 --- a/JSONWriter.java +++ b/src/main/java/permissive/org/json/JSONWriter.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; import java.io.IOException; import java.io.Writer; diff --git a/Kim.java b/src/main/java/permissive/org/json/Kim.java similarity index 99% rename from Kim.java rename to src/main/java/permissive/org/json/Kim.java index 9f7af92d0..56e7d6703 100644 --- a/Kim.java +++ b/src/main/java/permissive/org/json/Kim.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /* diff --git a/Property.java b/src/main/java/permissive/org/json/Property.java similarity index 98% rename from Property.java rename to src/main/java/permissive/org/json/Property.java index 8122241e9..7e1054cf9 100644 --- a/Property.java +++ b/src/main/java/permissive/org/json/Property.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /* Copyright (c) 2002 JSON.org diff --git a/XML.java b/src/main/java/permissive/org/json/XML.java old mode 100755 new mode 100644 similarity index 99% rename from XML.java rename to src/main/java/permissive/org/json/XML.java index 07090abe3..5a55a77e5 --- a/XML.java +++ b/src/main/java/permissive/org/json/XML.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /* Copyright (c) 2002 JSON.org diff --git a/XMLTokener.java b/src/main/java/permissive/org/json/XMLTokener.java old mode 100755 new mode 100644 similarity index 99% rename from XMLTokener.java rename to src/main/java/permissive/org/json/XMLTokener.java index d3197653c..02f12c1df --- a/XMLTokener.java +++ b/src/main/java/permissive/org/json/XMLTokener.java @@ -1,4 +1,4 @@ -package org.json; +package permissive.org.json; /* Copyright (c) 2002 JSON.org diff --git a/zip/BitInputStream.java b/src/main/java/permissive/org/json/zip/BitInputStream.java similarity index 99% rename from zip/BitInputStream.java rename to src/main/java/permissive/org/json/zip/BitInputStream.java index 2282d30c0..1196971e1 100644 --- a/zip/BitInputStream.java +++ b/src/main/java/permissive/org/json/zip/BitInputStream.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; import java.io.IOException; import java.io.InputStream; diff --git a/zip/BitOutputStream.java b/src/main/java/permissive/org/json/zip/BitOutputStream.java similarity index 99% rename from zip/BitOutputStream.java rename to src/main/java/permissive/org/json/zip/BitOutputStream.java index da47301cf..eeb1573a7 100644 --- a/zip/BitOutputStream.java +++ b/src/main/java/permissive/org/json/zip/BitOutputStream.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; import java.io.IOException; import java.io.OutputStream; diff --git a/zip/BitReader.java b/src/main/java/permissive/org/json/zip/BitReader.java similarity index 96% rename from zip/BitReader.java rename to src/main/java/permissive/org/json/zip/BitReader.java index 4fd99dbbf..373f9f5b8 100644 --- a/zip/BitReader.java +++ b/src/main/java/permissive/org/json/zip/BitReader.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; import java.io.IOException; diff --git a/zip/BitWriter.java b/src/main/java/permissive/org/json/zip/BitWriter.java similarity index 97% rename from zip/BitWriter.java rename to src/main/java/permissive/org/json/zip/BitWriter.java index ba8a109c6..b99b23cf9 100644 --- a/zip/BitWriter.java +++ b/src/main/java/permissive/org/json/zip/BitWriter.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; import java.io.IOException; diff --git a/zip/Huff.java b/src/main/java/permissive/org/json/zip/Huff.java similarity index 99% rename from zip/Huff.java rename to src/main/java/permissive/org/json/zip/Huff.java index a7849ae93..3ccd2d524 100644 --- a/zip/Huff.java +++ b/src/main/java/permissive/org/json/zip/Huff.java @@ -1,6 +1,6 @@ -package org.json.zip; +package permissive.org.json.zip; -import org.json.JSONException; +import permissive.org.json.JSONException; /* Copyright (c) 2013 JSON.org diff --git a/zip/JSONzip.java b/src/main/java/permissive/org/json/zip/JSONzip.java similarity index 99% rename from zip/JSONzip.java rename to src/main/java/permissive/org/json/zip/JSONzip.java index d8e3ac652..c55077da1 100644 --- a/zip/JSONzip.java +++ b/src/main/java/permissive/org/json/zip/JSONzip.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; /* Copyright (c) 2013 JSON.org diff --git a/zip/Keep.java b/src/main/java/permissive/org/json/zip/Keep.java similarity index 98% rename from zip/Keep.java rename to src/main/java/permissive/org/json/zip/Keep.java index bc647b6a0..9ed674686 100644 --- a/zip/Keep.java +++ b/src/main/java/permissive/org/json/zip/Keep.java @@ -1,8 +1,8 @@ -package org.json.zip; +package permissive.org.json.zip; import java.util.HashMap; -import org.json.Kim; +import permissive.org.json.Kim; /* Copyright (c) 2013 JSON.org diff --git a/zip/None.java b/src/main/java/permissive/org/json/zip/None.java similarity index 91% rename from zip/None.java rename to src/main/java/permissive/org/json/zip/None.java index 818e68d8f..f70572339 100644 --- a/zip/None.java +++ b/src/main/java/permissive/org/json/zip/None.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; /** * None is an interface that makes the constant none (short for diff --git a/zip/PostMortem.java b/src/main/java/permissive/org/json/zip/PostMortem.java similarity index 98% rename from zip/PostMortem.java rename to src/main/java/permissive/org/json/zip/PostMortem.java index 0f220ee48..a9ac3e8ef 100644 --- a/zip/PostMortem.java +++ b/src/main/java/permissive/org/json/zip/PostMortem.java @@ -1,4 +1,4 @@ -package org.json.zip; +package permissive.org.json.zip; /* Copyright (c) 2013 JSON.org diff --git a/zip/README b/src/main/java/permissive/org/json/zip/README similarity index 100% rename from zip/README rename to src/main/java/permissive/org/json/zip/README diff --git a/zip/Unzipper.java b/src/main/java/permissive/org/json/zip/Unzipper.java similarity index 98% rename from zip/Unzipper.java rename to src/main/java/permissive/org/json/zip/Unzipper.java index a7c308eda..228fe3ebf 100644 --- a/zip/Unzipper.java +++ b/src/main/java/permissive/org/json/zip/Unzipper.java @@ -1,9 +1,9 @@ -package org.json.zip; +package permissive.org.json.zip; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.Kim; +import permissive.org.json.JSONArray; +import permissive.org.json.JSONException; +import permissive.org.json.JSONObject; +import permissive.org.json.Kim; /* Copyright (c) 2012 JSON.org diff --git a/zip/Zipper.java b/src/main/java/permissive/org/json/zip/Zipper.java similarity index 98% rename from zip/Zipper.java rename to src/main/java/permissive/org/json/zip/Zipper.java index 48b4f1acb..f7f0a7c28 100644 --- a/zip/Zipper.java +++ b/src/main/java/permissive/org/json/zip/Zipper.java @@ -1,13 +1,13 @@ -package org.json.zip; +package permissive.org.json.zip; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.Kim; +import permissive.org.json.JSONArray; +import permissive.org.json.JSONException; +import permissive.org.json.JSONObject; +import permissive.org.json.Kim; /* Copyright (c) 2013 JSON.org