diff --git a/README.md b/README.md index 2faa7be1..be534c0b 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ The following changes are needed if migrating from the original Java version. - Change the package organization name from `com.typesafe` to `org.ekrich`. - Other code sites may require removing `()` where the method just returns state. This is to follow the Scala convention which supports the *uniform access principle* [1]. +- The serialization format has changed due to the package name change. This could +require special consideration. The following document copies are local to this repository but internal links may refer to the original site documents via hyperlink. diff --git a/build.sbt b/build.sbt index 654163ba..d5c1773a 100644 --- a/build.sbt +++ b/build.sbt @@ -13,10 +13,18 @@ addCommandAlias( ).mkString(";", ";", "") ) -val configVersion = "0.7.0-SNAPSHOT" -val scalacOpts = List("-unchecked", "-deprecation", "-feature") +val nextVersion = "0.7.0" +// stable snapshot is not great for publish local +def versionFmt(out: sbtdynver.GitDescribeOutput): String = { + val snap = "-SNAPSHOT" + val tag = out.ref.dropV.value + if (out.isCleanAfterTag) tag + // out.ref.value in non git project? + else nextVersion + "-" + out.ref.value + snap +} + +val scalacOpts = List("-unchecked", "-deprecation", "-feature") -ThisBuild / version := configVersion ThisBuild / Compile / scalacOptions := scalacOpts ThisBuild / Test / scalacOptions := scalacOpts @@ -24,8 +32,12 @@ ThisBuild / crossScalaVersions := Seq("2.12.8", "2.11.12") inThisBuild( List( + version := dynverGitDescribeOutput.value.mkVersion(versionFmt, ""), + dynver := sbtdynver.DynVer + .getGitDescribeOutput(new java.util.Date) + .mkVersion(versionFmt, ""), description := "Configuration library for Scala using HOCON files", - organization := "org.ekrich", // causes package error not being com.typesafe + organization := "org.ekrich", homepage := Some(url("https://github.com/ekrich/sconfig")), licenses := List( "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), diff --git a/examples/java/complex-app/src/main/java/ComplexApp.java b/examples/java/complex-app/src/main/java/ComplexApp.java index 447b0908..3b9bedff 100644 --- a/examples/java/complex-app/src/main/java/ComplexApp.java +++ b/examples/java/complex-app/src/main/java/ComplexApp.java @@ -1,4 +1,4 @@ -import com.typesafe.config.*; +import org.ekrich.config.*; import simplelib.*; class ComplexApp { diff --git a/examples/java/simple-app/src/main/java/SimpleApp.java b/examples/java/simple-app/src/main/java/SimpleApp.java index bc4a148e..08e3c8d6 100644 --- a/examples/java/simple-app/src/main/java/SimpleApp.java +++ b/examples/java/simple-app/src/main/java/SimpleApp.java @@ -1,4 +1,4 @@ -import com.typesafe.config.*; +import org.ekrich.config.*; import simplelib.*; class SimpleApp { diff --git a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java index 690fb16f..c9d80fc9 100644 --- a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java +++ b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java @@ -1,6 +1,6 @@ package simplelib; -import com.typesafe.config.*; +import org.ekrich.config.*; // Whenever you write a library, allow people to supply a Config but // also default to ConfigFactory.load if they don't supply one. diff --git a/examples/scala/complex-app/src/main/scala/ComplexApp.scala b/examples/scala/complex-app/src/main/scala/ComplexApp.scala index df08ff7b..7a334db6 100644 --- a/examples/scala/complex-app/src/main/scala/ComplexApp.scala +++ b/examples/scala/complex-app/src/main/scala/ComplexApp.scala @@ -1,4 +1,4 @@ -import com.typesafe.config._ +import org.ekrich.config._ import simplelib._ object ComplexApp extends App { diff --git a/examples/scala/simple-app/src/main/scala/SimpleApp.scala b/examples/scala/simple-app/src/main/scala/SimpleApp.scala index d171b30e..db5efbc8 100644 --- a/examples/scala/simple-app/src/main/scala/SimpleApp.scala +++ b/examples/scala/simple-app/src/main/scala/SimpleApp.scala @@ -1,4 +1,4 @@ -import com.typesafe.config._ +import org.ekrich.config._ import simplelib._ object SimpleApp extends App { diff --git a/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala b/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala index dc957fab..c7e54597 100644 --- a/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala +++ b/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala @@ -1,6 +1,6 @@ package simplelib -import com.typesafe.config._ +import org.ekrich.config._ // Whenever you write a library, allow people to supply a Config but // also default to ConfigFactory.load if they don't supply one. diff --git a/sconfig/src/main/java/com/typesafe/config/Optional.java b/sconfig/src/main/java/org/ekrich/config/Optional.java similarity index 90% rename from sconfig/src/main/java/com/typesafe/config/Optional.java rename to sconfig/src/main/java/org/ekrich/config/Optional.java index 4645ed5f..8df51a1a 100644 --- a/sconfig/src/main/java/com/typesafe/config/Optional.java +++ b/sconfig/src/main/java/org/ekrich/config/Optional.java @@ -1,4 +1,4 @@ -package com.typesafe.config; +package org.ekrich.config; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/FullIncluder.scala b/sconfig/src/main/scala/com/typesafe/config/impl/FullIncluder.scala deleted file mode 100644 index 71e5b06c..00000000 --- a/sconfig/src/main/scala/com/typesafe/config/impl/FullIncluder.scala +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (C) 2011-2012 Typesafe Inc. - */ -package com.typesafe.config.impl - -import com.typesafe.config.ConfigIncluder -import com.typesafe.config.ConfigIncluderClasspath -import com.typesafe.config.ConfigIncluderFile -import com.typesafe.config.ConfigIncluderURL - -trait FullIncluder - extends ConfigIncluder - with ConfigIncluderFile - with ConfigIncluderURL - with ConfigIncluderClasspath {} diff --git a/sconfig/src/main/scala/com/typesafe/config/Config.scala b/sconfig/src/main/scala/org/ekrich/config/Config.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/Config.scala rename to sconfig/src/main/scala/org/ekrich/config/Config.scala index a0dd9e83..66294f7d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/Config.scala +++ b/sconfig/src/main/scala/org/ekrich/config/Config.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.time.Duration import java.time.Period diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigBeanFactory.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigBeanFactory.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/ConfigBeanFactory.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigBeanFactory.scala index 277769f4..fd34da2c 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigBeanFactory.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigBeanFactory.scala @@ -1,6 +1,6 @@ -package com.typesafe.config +package org.ekrich.config -import com.typesafe.config.impl.ConfigBeanImpl +import org.ekrich.config.impl.ConfigBeanImpl /** * Factory for automatically creating a Java class from a [[Config]]. diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigException.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigException.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigException.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigException.scala index 24ef5de9..554c3b2d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigException.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigException.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.io.{ IOException, @@ -12,7 +12,7 @@ import java.io.{ import java.{lang => jl} import jl.reflect.Field -import com.typesafe.config.impl.ConfigImplUtil +import org.ekrich.config.impl.ConfigImplUtil /** * All exceptions thrown by the library are subclasses of diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigFactory.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigFactory.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigFactory.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigFactory.scala index f5421a83..bbc53a89 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigFactory.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigFactory.scala @@ -1,10 +1,10 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config -import com.typesafe.config.impl.ConfigImpl -import com.typesafe.config.impl.Parseable +import org.ekrich.config.impl.ConfigImpl +import org.ekrich.config.impl.Parseable import java.io.{File, Reader} import java.net.URL import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigIncludeContext.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigIncludeContext.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigIncludeContext.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigIncludeContext.scala index 8379cb74..2d79ec05 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigIncludeContext.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigIncludeContext.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * Context provided to a {@link ConfigIncluder}; this interface is only useful diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluder.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluder.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigIncluder.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigIncluder.scala index 2bc1f58b..1a51a553 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluder.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluder.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * Implement this interface and provide an instance to diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderClasspath.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderClasspath.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigIncluderClasspath.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigIncluderClasspath.scala index 710904cb..1dd7f8bb 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderClasspath.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderClasspath.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * Implement this in addition to {@link ConfigIncluder} if you want to diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderFile.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderFile.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigIncluderFile.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigIncluderFile.scala index f54ed10b..9636eb7c 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderFile.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderFile.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.io.File diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderURL.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderURL.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigIncluderURL.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigIncluderURL.scala index fc1e4f2b..da659635 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigIncluderURL.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigIncluderURL.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.net.URL diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigList.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigList.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigList.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigList.scala index 58376084..4a547643 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigList.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigList.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigLoadingStrategy.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigLoadingStrategy.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/ConfigLoadingStrategy.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigLoadingStrategy.scala index e8f10ce6..d69731f4 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigLoadingStrategy.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigLoadingStrategy.scala @@ -1,4 +1,4 @@ -package com.typesafe.config +package org.ekrich.config /** * This method allows you to alter default config loading strategy for all the code which diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigMemorySize.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigMemorySize.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigMemorySize.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigMemorySize.scala index cae06e82..c36950c1 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigMemorySize.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigMemorySize.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * An immutable class representing an amount of memory. Use diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigMergeable.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigMergeable.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigMergeable.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigMergeable.scala index bf942b86..94ae0a13 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigMergeable.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigMergeable.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * Marker for types whose instances can be merged, that is [[Config]] and diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigObject.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigObject.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigObject.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigObject.scala index e1d09ddf..30da1142 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigObject.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigObject.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigOrigin.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigOrigin.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigOrigin.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigOrigin.scala index c58c47b0..6095fbad 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigOrigin.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigOrigin.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.net.URL import java.util.List diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigOriginFactory.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigOriginFactory.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/ConfigOriginFactory.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigOriginFactory.scala index 6cf60bc2..1f73953f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigOriginFactory.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigOriginFactory.scala @@ -1,7 +1,7 @@ -package com.typesafe.config +package org.ekrich.config import java.net.URL -import com.typesafe.config.impl.ConfigImpl +import org.ekrich.config.impl.ConfigImpl /** * This class contains some static factory methods for building a [[ConfigOrigin]]. diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigParseOptions.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigParseOptions.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigParseOptions.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigParseOptions.scala index bf145bc6..d2270885 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigParseOptions.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigParseOptions.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config -import com.typesafe.config.impl.ConfigImplUtil +import org.ekrich.config.impl.ConfigImplUtil /** * A set of options related to parsing. diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigParseable.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigParseable.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigParseable.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigParseable.scala index 4837a1e2..0ecc55c6 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigParseable.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigParseable.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * An opaque handle to something that can be parsed, obtained from diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigRenderOptions.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigRenderOptions.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigRenderOptions.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigRenderOptions.scala index debd05cf..d7760e27 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigRenderOptions.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigRenderOptions.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** *

diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigResolveOptions.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigResolveOptions.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigResolveOptions.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigResolveOptions.scala index 684a01c1..d0c740c0 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigResolveOptions.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigResolveOptions.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * A set of options related to resolving substitutions. Substitutions use the diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigResolver.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigResolver.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigResolver.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigResolver.scala index 2c285014..2441303d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigResolver.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigResolver.scala @@ -1,4 +1,4 @@ -package com.typesafe.config +package org.ekrich.config /** * Implement this interface and provide an instance to diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigSyntax.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigSyntax.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigSyntax.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigSyntax.scala index d8b4158b..09054191 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigSyntax.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigSyntax.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * The syntax of a character stream (JSON, ju} -import com.typesafe.config.impl.ConfigImplUtil +import org.ekrich.config.impl.ConfigImplUtil import scala.annotation.varargs diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigValue.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigValue.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/ConfigValue.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigValue.scala index 5ee7d8bc..40302b18 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigValue.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * An immutable value, following the JSON type diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigValueFactory.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigValueFactory.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/ConfigValueFactory.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigValueFactory.scala index de3b2438..37d33753 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigValueFactory.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigValueFactory.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config import java.{util => ju} import java.{lang => jl} -import com.typesafe.config.impl.ConfigImpl +import org.ekrich.config.impl.ConfigImpl /** * This class holds some static factory methods for building {@link ConfigValue} diff --git a/sconfig/src/main/scala/com/typesafe/config/ConfigValueType.scala b/sconfig/src/main/scala/org/ekrich/config/ConfigValueType.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/ConfigValueType.scala rename to sconfig/src/main/scala/org/ekrich/config/ConfigValueType.scala index 5b3d5292..ee010c4a 100644 --- a/sconfig/src/main/scala/com/typesafe/config/ConfigValueType.scala +++ b/sconfig/src/main/scala/org/ekrich/config/ConfigValueType.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config +package org.ekrich.config /** * The type of a configuration value (following the diff --git a/sconfig/src/main/scala/com/typesafe/config/DefaultConfigLoadingStrategy.scala b/sconfig/src/main/scala/org/ekrich/config/DefaultConfigLoadingStrategy.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/DefaultConfigLoadingStrategy.scala rename to sconfig/src/main/scala/org/ekrich/config/DefaultConfigLoadingStrategy.scala index eca476bc..82096b55 100644 --- a/sconfig/src/main/scala/com/typesafe/config/DefaultConfigLoadingStrategy.scala +++ b/sconfig/src/main/scala/org/ekrich/config/DefaultConfigLoadingStrategy.scala @@ -1,4 +1,4 @@ -package com.typesafe.config +package org.ekrich.config import java.io.File import java.net.MalformedURLException diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNode.scala b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNode.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNode.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNode.scala index 0e39c371..dcd63a08 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNode.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNode.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.parser.ConfigNode +import org.ekrich.config.parser.ConfigNode import java.{util => ju} abstract class AbstractConfigNode extends ConfigNode { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNodeValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNodeValue.scala similarity index 90% rename from sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNodeValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNodeValue.scala index 26f4fa09..7f5bead6 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNodeValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNodeValue.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl // This is required if we want // to be referencing the AbstractConfigNode class in implementation rather than the diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigObject.scala b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigObject.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigObject.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigObject.scala index 5ca139c7..882ec6b8 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigObject.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigObject.scala @@ -1,18 +1,18 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigMergeable +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigValueType import scala.annotation.varargs diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigValue.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigValue.scala index 3576f53f..6e7051ca 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigValue.scala @@ -1,19 +1,19 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} import ju.Collections -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValue -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigMergeable +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValue +import org.ekrich.config.impl.AbstractConfigValue.NotPossibleToResolve /** * diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/BadMap.scala b/sconfig/src/main/scala/org/ekrich/config/impl/BadMap.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/BadMap.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/BadMap.scala index 7bf68754..40df170b 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/BadMap.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/BadMap.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import scala.annotation.tailrec /** diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigBeanImpl.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigBeanImpl.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigBeanImpl.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigBeanImpl.scala index a0f11eac..1f45abea 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigBeanImpl.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigBeanImpl.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.beans.BeanInfo import java.beans.IntrospectionException @@ -13,14 +13,14 @@ import java.{util => ju} import java.{lang => jl} import java.time.Duration import scala.util.control.Breaks._ -import com.typesafe.config.Config -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigMemorySize -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigValueType -import com.typesafe.config.Optional +import org.ekrich.config.Config +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigList +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigMemorySize +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigValueType +import org.ekrich.config.Optional /** * Internal implementation detail, not ABI stable, do not touch. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigBoolean.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigBoolean.scala similarity index 87% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigBoolean.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigBoolean.scala index e35799ed..c44535af 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigBoolean.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigBoolean.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValueType @SerialVersionUID(2L) final class ConfigBoolean(origin: ConfigOrigin, val value: Boolean) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigConcatenation.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigConcatenation.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigConcatenation.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigConcatenation.scala index c3aec3ff..58fe3f4a 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigConcatenation.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigConcatenation.scala @@ -1,12 +1,12 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValueType /** * A ConfigConcatenation represents a list of values to be concatenated (see the diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMerge.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMerge.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMerge.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMerge.scala index d3b11d69..a9a09f5f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMerge.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMerge.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.impl.AbstractConfigValue._ +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.impl.AbstractConfigValue._ /** * The issue here is that we want to first merge our stack of config files, and diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMergeObject.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMergeObject.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala index 81273cf4..895d6d06 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDelayedMergeObject.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala @@ -1,18 +1,18 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValue +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigList +import org.ekrich.config.ConfigMergeable +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValue // This is just like ConfigDelayedMerge except we know statically // that it will turn out to be an object. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDocumentParser.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDocumentParser.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigDocumentParser.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigDocumentParser.scala index 1d35b52d..3c475d1d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDocumentParser.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDocumentParser.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} import scala.util.control.Breaks._ -import com.typesafe.config._ +import org.ekrich.config._ object ConfigDocumentParser { private[impl] def parse(tokens: ju.Iterator[Token], diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDouble.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDouble.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigDouble.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigDouble.scala index 5ed13f32..a01da9b8 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigDouble.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigDouble.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValueType @SerialVersionUID(2L) final class ConfigDouble(origin: ConfigOrigin, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigImpl.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigImpl.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala index d0449d59..421e0186 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigImpl.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.File import java.{lang => jl} @@ -11,15 +11,15 @@ import java.time.Duration import java.{util => ju} import java.util.concurrent.Callable import scala.collection.JavaConverters._ -import com.typesafe.config.Config -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigIncluder -import com.typesafe.config.ConfigMemorySize -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigParseable -import com.typesafe.config.ConfigValue +import org.ekrich.config.Config +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigIncluder +import org.ekrich.config.ConfigMemorySize +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigParseable +import org.ekrich.config.ConfigValue /** * Internal implementation detail, not ABI stable, do not touch. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigImplUtil.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigImplUtil.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigImplUtil.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigImplUtil.scala index 63e9f44d..f4d6ea14 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigImplUtil.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigImplUtil.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.DataOutputStream import java.io.File @@ -13,9 +13,9 @@ import java.net.URL import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigSyntax /** * Internal implementation detail, not ABI stable, do not touch. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigIncludeKind.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigIncludeKind.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigIncludeKind.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigIncludeKind.scala index f08dd298..bd107638 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigIncludeKind.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigIncludeKind.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl final class ConfigIncludeKind private (name: String, ordinal: Int) extends Enum[ConfigIncludeKind](name, ordinal) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigInt.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigInt.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigInt.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigInt.scala index 314524f9..eeca5072 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigInt.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigInt.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValueType @SerialVersionUID(2L) final class ConfigInt(origin: ConfigOrigin, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigLong.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigLong.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigLong.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigLong.scala index 132c3884..5ac61aaa 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigLong.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigLong.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValueType @SerialVersionUID(2L) final class ConfigLong(origin: ConfigOrigin, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeArray.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeArray.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeArray.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeArray.scala index 9c709c45..35c06e6b 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeArray.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeArray.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComment.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComment.scala similarity index 80% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComment.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComment.scala index d0d04b80..1ff515b2 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComment.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComment.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException final class ConfigNodeComment(val comment: Token) extends ConfigNodeSingleToken(comment) { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComplexValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComplexValue.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComplexValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComplexValue.scala index 45c701fa..60c4aaf8 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeComplexValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeComplexValue.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeConcatenation.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeConcatenation.scala similarity index 89% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeConcatenation.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeConcatenation.scala index 37040bcf..5bddd77f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeConcatenation.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeConcatenation.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeField.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeField.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeField.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeField.scala index c6ef4451..526e337a 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeField.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeField.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException import java.{util => ju} import scala.collection.JavaConverters._ diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeInclude.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeInclude.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeInclude.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeInclude.scala index 4a3963f7..8d0414c4 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeInclude.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeInclude.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeObject.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeObject.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeObject.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeObject.scala index ae766e53..4958182c 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeObject.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeObject.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigSyntax import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodePath.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodePath.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodePath.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodePath.scala index 44779a5e..ec8d7c0e 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodePath.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodePath.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException import java.{util => ju} final class ConfigNodePath private[impl] (path: Path, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeRoot.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeRoot.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeRoot.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeRoot.scala index 2ea38727..e64b7f40 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeRoot.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeRoot.scala @@ -1,8 +1,8 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigSyntax import java.{util => ju} final class ConfigNodeRoot private[impl] ( diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSimpleValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSimpleValue.scala similarity index 93% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSimpleValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSimpleValue.scala index f3296bfb..a8c66ef5 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSimpleValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSimpleValue.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException import java.{util => ju} final class ConfigNodeSimpleValue private[impl] (val token: Token) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSingleToken.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSingleToken.scala similarity index 88% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSingleToken.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSingleToken.scala index c19099ea..8e258853 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNodeSingleToken.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNodeSingleToken.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNull.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNull.scala similarity index 88% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNull.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNull.scala index 74fe3df5..9761a7bf 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNull.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNull.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValueType /** * This exists because sometimes null is not the same as missing. Specifically, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNumber.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNumber.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigNumber.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigNumber.scala index c408db4f..c6c0478d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigNumber.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigNumber.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin @SerialVersionUID(2L) object ConfigNumber { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigParser.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigParser.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigParser.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigParser.scala index e665db15..21834e8c 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigParser.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigParser.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.File import java.net.MalformedURLException @@ -11,7 +11,7 @@ import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config._ +import org.ekrich.config._ object ConfigParser { private[impl] def parse( diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigReference.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigReference.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigReference.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigReference.scala index 31367f43..d7eb4409 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigReference.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigReference.scala @@ -1,10 +1,10 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions /** * ConfigReference replaces ConfigReference (the older class kept for back diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigString.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigString.scala similarity index 93% rename from sconfig/src/main/scala/com/typesafe/config/impl/ConfigString.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ConfigString.scala index ecabf178..3c6a9e05 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ConfigString.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ConfigString.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException import java.io.Serializable -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValueType @SerialVersionUID(2L) object ConfigString { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Container.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Container.scala similarity index 92% rename from sconfig/src/main/scala/com/typesafe/config/impl/Container.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Container.scala index b9b8069c..b8d5f1b0 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Container.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Container.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2014 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigValue +import org.ekrich.config.ConfigValue /** * An AbstractConfigValue which contains other values. Java has no way to diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/DefaultTransformer.scala b/sconfig/src/main/scala/org/ekrich/config/impl/DefaultTransformer.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/DefaultTransformer.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/DefaultTransformer.scala index a75207d3..8dcdf5e4 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/DefaultTransformer.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/DefaultTransformer.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.{util => ju} @@ -9,8 +9,8 @@ import java.util.Collections import java.util.Comparator import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.ConfigValueType -import com.typesafe.config.ConfigValueType._ +import org.ekrich.config.ConfigValueType +import org.ekrich.config.ConfigValueType._ /** * Default automatic type transformations. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/FromMapMode.scala b/sconfig/src/main/scala/org/ekrich/config/impl/FromMapMode.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/FromMapMode.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/FromMapMode.scala index 82965fb3..ac336ed2 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/FromMapMode.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/FromMapMode.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl final class FromMapMode private (name: String, ordinal: Int) extends Enum[FromMapMode](name, ordinal) diff --git a/sconfig/src/main/scala/org/ekrich/config/impl/FullIncluder.scala b/sconfig/src/main/scala/org/ekrich/config/impl/FullIncluder.scala new file mode 100644 index 00000000..7425ad40 --- /dev/null +++ b/sconfig/src/main/scala/org/ekrich/config/impl/FullIncluder.scala @@ -0,0 +1,15 @@ +/** + * Copyright (C) 2011-2012 Typesafe Inc. + */ +package org.ekrich.config.impl + +import org.ekrich.config.ConfigIncluder +import org.ekrich.config.ConfigIncluderClasspath +import org.ekrich.config.ConfigIncluderFile +import org.ekrich.config.ConfigIncluderURL + +trait FullIncluder + extends ConfigIncluder + with ConfigIncluderFile + with ConfigIncluderURL + with ConfigIncluderClasspath {} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/MemoKey.scala b/sconfig/src/main/scala/org/ekrich/config/impl/MemoKey.scala similarity index 96% rename from sconfig/src/main/scala/com/typesafe/config/impl/MemoKey.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/MemoKey.scala index c688993f..96d6f656 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/MemoKey.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/MemoKey.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl /** The key used to memoize already-traversed nodes when resolving substitutions */ final class MemoKey private[impl] (val value: AbstractConfigValue, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/MergeableValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/MergeableValue.scala similarity index 57% rename from sconfig/src/main/scala/com/typesafe/config/impl/MergeableValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/MergeableValue.scala index 424a9fd1..4abd9248 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/MergeableValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/MergeableValue.scala @@ -1,7 +1,7 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigValue +import org.ekrich.config.ConfigMergeable +import org.ekrich.config.ConfigValue trait MergeableValue extends ConfigMergeable { // converts a Config to its root object and a ConfigValue to itself def toFallbackValue(): ConfigValue diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/OriginType.scala b/sconfig/src/main/scala/org/ekrich/config/impl/OriginType.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/OriginType.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/OriginType.scala index d151f3a5..6cd49c29 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/OriginType.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/OriginType.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl // caution: ordinals used in serialization final class OriginType private (name: String, ordinal: Int) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Parseable.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Parseable.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/Parseable.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Parseable.scala index 207380e7..0a66224d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Parseable.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Parseable.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.BufferedReader import java.io.File @@ -20,8 +20,8 @@ import java.net.URISyntaxException import java.net.URL import java.net.URLConnection import java.{util => ju} -import com.typesafe.config._ -import com.typesafe.config.parser._ +import org.ekrich.config._ +import org.ekrich.config.parser._ /** * Internal implementation detail, not ABI stable, do not touch. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Path.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Path.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/Path.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Path.scala index a64d128f..6289515d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Path.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Path.scala @@ -1,10 +1,10 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException import util.control.Breaks._ object Path { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/PathBuilder.scala b/sconfig/src/main/scala/org/ekrich/config/impl/PathBuilder.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/PathBuilder.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/PathBuilder.scala index 81b458a7..2c2771ed 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/PathBuilder.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/PathBuilder.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} import util.control.Breaks._ -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException final class PathBuilder private[impl] () { final private val keys = new ju.Stack[String] diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/PathParser.scala b/sconfig/src/main/scala/org/ekrich/config/impl/PathParser.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/PathParser.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/PathParser.scala index 97e77a15..2528eabc 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/PathParser.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/PathParser.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigSyntax +import org.ekrich.config.ConfigValueType import java.io.StringReader import java.{util => ju} import scala.util.control.Breaks._ diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/PropertiesParser.scala b/sconfig/src/main/scala/org/ekrich/config/impl/PropertiesParser.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/PropertiesParser.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/PropertiesParser.scala index b9bf695c..b91388f6 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/PropertiesParser.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/PropertiesParser.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.IOException import java.io.Reader @@ -10,8 +10,8 @@ import java.util.Collections import java.util.Comparator import java.util.Properties import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin object PropertiesParser { @throws[IOException] diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ReplaceableMergeStack.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ReplaceableMergeStack.scala similarity index 93% rename from sconfig/src/main/scala/com/typesafe/config/impl/ReplaceableMergeStack.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ReplaceableMergeStack.scala index 04bf41c5..d7ee25db 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ReplaceableMergeStack.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ReplaceableMergeStack.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl /** * Implemented by a merge stack (ConfigDelayedMerge, ConfigDelayedMergeObject) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveContext.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveContext.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ResolveContext.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ResolveContext.scala index 1d9f7ab1..5c07de0f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveContext.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveContext.scala @@ -1,9 +1,9 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigResolveOptions +import org.ekrich.config.impl.AbstractConfigValue.NotPossibleToResolve object ResolveContext { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveMemos.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveMemos.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/ResolveMemos.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ResolveMemos.scala index 9f3243ec..1e2c4cf4 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveMemos.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveMemos.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl /** * This exists because we have to memoize resolved substitutions as we go diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveResult.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveResult.scala similarity index 93% rename from sconfig/src/main/scala/com/typesafe/config/impl/ResolveResult.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ResolveResult.scala index b1640ae8..52a0845d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveResult.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveResult.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException // value is allowed to be null object ResolveResult { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveSource.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveSource.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/ResolveSource.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ResolveSource.scala index d8a784fd..55d455ca 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveSource.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveSource.scala @@ -1,7 +1,7 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve +import org.ekrich.config.ConfigException +import org.ekrich.config.impl.AbstractConfigValue.NotPossibleToResolve /** * This class is the source for values for a substitution like `\${foo}`. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveStatus.scala b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveStatus.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/impl/ResolveStatus.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/ResolveStatus.scala index a91b4fae..e175e8c9 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/ResolveStatus.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/ResolveStatus.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SerializedConfigValue.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SerializedConfigValue.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/SerializedConfigValue.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SerializedConfigValue.scala index ce6001a0..d888b941 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SerializedConfigValue.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SerializedConfigValue.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ByteArrayInputStream @@ -21,13 +21,13 @@ import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.Config -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigValueType +import org.ekrich.config.Config +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigList +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigValueType /** * Deliberately shoving all the serialization code into this class instead of diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfig.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfig.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala index 7babac02..e2682dfd 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfig.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.ObjectStreamException import java.io.Serializable @@ -18,17 +18,17 @@ import java.util.concurrent.TimeUnit import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.Config -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigMemorySize -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigValueType -import com.typesafe.config.impl.SimpleConfig.MemoryUnit +import org.ekrich.config.Config +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigList +import org.ekrich.config.ConfigMemorySize +import org.ekrich.config.ConfigMergeable +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigResolveOptions +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigValueType +import org.ekrich.config.impl.SimpleConfig.MemoryUnit /** * One thing to keep in mind in the future: as Collection-like APIs are added diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigDocument.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigDocument.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigDocument.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigDocument.scala index b49494df..25750458 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigDocument.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigDocument.scala @@ -1,7 +1,7 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config._ -import com.typesafe.config.parser.ConfigDocument +import org.ekrich.config._ +import org.ekrich.config.parser.ConfigDocument import java.io.StringReader final class SimpleConfigDocument private[impl] ( diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigList.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigList.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigList.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigList.scala index 142a4829..dd550e0f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigList.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigList.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.ObjectStreamException import java.io.Serializable @@ -9,8 +9,8 @@ import java.{lang => jl} import java.{util => ju} import scala.collection.JavaConverters._ -import com.typesafe.config._ -import com.typesafe.config.impl.AbstractConfigValue._ +import org.ekrich.config._ +import org.ekrich.config.impl.AbstractConfigValue._ @SerialVersionUID(2L) object SimpleConfigList { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigObject.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigObject.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigObject.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigObject.scala index 29897033..f4c7a053 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigObject.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigObject.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{lang => jl} import java.io.ObjectStreamException @@ -9,12 +9,12 @@ import java.io.Serializable import java.{util => ju} import scala.collection.JavaConverters._ import scala.util.control.Breaks._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValue -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValue +import org.ekrich.config.impl.AbstractConfigValue.NotPossibleToResolve @SerialVersionUID(2L) object SimpleConfigObject { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigOrigin.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigOrigin.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigOrigin.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigOrigin.scala index 4833801c..7f372183 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleConfigOrigin.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleConfigOrigin.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.File import java.io.IOException @@ -10,8 +10,8 @@ import java.net.MalformedURLException import java.net.URL import java.{util => ju} import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin // it would be cleaner to have a class hierarchy for various origin types, // but was hoping this would be enough simpler to be a little messy. eh. diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncludeContext.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncludeContext.scala similarity index 84% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncludeContext.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncludeContext.scala index 53a840fa..a59fb434 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncludeContext.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncludeContext.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigIncludeContext -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigParseable +import org.ekrich.config.ConfigIncludeContext +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigParseable class SimpleIncludeContext(parseable: Parseable, options: ConfigParseOptions) extends ConfigIncludeContext { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncluder.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncluder.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncluder.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncluder.scala index ef761de6..e3c01895 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SimpleIncluder.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SimpleIncluder.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.File import java.net.MalformedURLException @@ -9,17 +9,17 @@ import java.net.URL import java.{util => ju} import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigIncludeContext -import com.typesafe.config.ConfigIncluder -import com.typesafe.config.ConfigIncluderClasspath -import com.typesafe.config.ConfigIncluderFile -import com.typesafe.config.ConfigIncluderURL -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigParseable -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigIncludeContext +import org.ekrich.config.ConfigIncluder +import org.ekrich.config.ConfigIncluderClasspath +import org.ekrich.config.ConfigIncluderFile +import org.ekrich.config.ConfigIncluderURL +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigParseable +import org.ekrich.config.ConfigSyntax object SimpleIncluder { // ConfigIncludeContext does this for us on its options diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/SubstitutionExpression.scala b/sconfig/src/main/scala/org/ekrich/config/impl/SubstitutionExpression.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/impl/SubstitutionExpression.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/SubstitutionExpression.scala index dcb719cc..feea0a7a 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/SubstitutionExpression.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/SubstitutionExpression.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl final class SubstitutionExpression(val path: Path, val optional: Boolean) { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Token.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Token.scala similarity index 94% rename from sconfig/src/main/scala/com/typesafe/config/impl/Token.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Token.scala index 9dbe0346..b184b6f8 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Token.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Token.scala @@ -1,10 +1,10 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin object Token { // this is used for singleton tokens like COMMA or OPEN_CURLY def newWithoutOrigin(tokenType: TokenType, diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/TokenType.scala b/sconfig/src/main/scala/org/ekrich/config/impl/TokenType.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/TokenType.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/TokenType.scala index 67327c98..f6ab6274 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/TokenType.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/TokenType.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl final class TokenType private (name: String, ordinal: Int) extends Enum[TokenType](name, ordinal) diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Tokenizer.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Tokenizer.scala similarity index 99% rename from sconfig/src/main/scala/com/typesafe/config/impl/Tokenizer.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Tokenizer.scala index 98d255ef..97f89b53 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Tokenizer.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Tokenizer.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.IOException import java.io.Reader @@ -9,9 +9,9 @@ import java.{lang => jl} import java.{util => ju} import scala.util.control.Breaks._ -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigSyntax import scala.annotation.tailrec diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Tokens.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Tokens.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/impl/Tokens.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Tokens.scala index c06aa0cc..6eb875d3 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Tokens.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Tokens.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigValueType +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigOrigin +import org.ekrich.config.ConfigValueType /* FIXME the way the subclasses of Token are private with static isFoo and accessors is kind of ridiculous. */ object Tokens { diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/Unmergeable.scala b/sconfig/src/main/scala/org/ekrich/config/impl/Unmergeable.scala similarity index 93% rename from sconfig/src/main/scala/com/typesafe/config/impl/Unmergeable.scala rename to sconfig/src/main/scala/org/ekrich/config/impl/Unmergeable.scala index 6057db4c..825fcc1f 100644 --- a/sconfig/src/main/scala/com/typesafe/config/impl/Unmergeable.scala +++ b/sconfig/src/main/scala/org/ekrich/config/impl/Unmergeable.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.{util => ju} diff --git a/sconfig/src/main/scala/com/typesafe/config/impl/package.html b/sconfig/src/main/scala/org/ekrich/config/impl/package.html similarity index 100% rename from sconfig/src/main/scala/com/typesafe/config/impl/package.html rename to sconfig/src/main/scala/org/ekrich/config/impl/package.html diff --git a/sconfig/src/main/scala/com/typesafe/config/package.html b/sconfig/src/main/scala/org/ekrich/config/package.html similarity index 100% rename from sconfig/src/main/scala/com/typesafe/config/package.html rename to sconfig/src/main/scala/org/ekrich/config/package.html diff --git a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocument.scala b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala similarity index 98% rename from sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocument.scala rename to sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala index 1f24ff9d..a887b250 100644 --- a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocument.scala +++ b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.parser +package org.ekrich.config.parser -import com.typesafe.config.ConfigValue +import org.ekrich.config.ConfigValue /** * Represents an individual HOCON or JSON file, preserving all diff --git a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocumentFactory.scala b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocumentFactory.scala similarity index 95% rename from sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocumentFactory.scala rename to sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocumentFactory.scala index 33bef41a..44552e4d 100644 --- a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigDocumentFactory.scala +++ b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigDocumentFactory.scala @@ -1,7 +1,7 @@ -package com.typesafe.config.parser +package org.ekrich.config.parser -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.impl.Parseable +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.impl.Parseable import java.io.File import java.io.Reader diff --git a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigNode.scala b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigNode.scala similarity index 97% rename from sconfig/src/main/scala/com/typesafe/config/parser/ConfigNode.scala rename to sconfig/src/main/scala/org/ekrich/config/parser/ConfigNode.scala index 12ed21aa..bfb3dbd0 100644 --- a/sconfig/src/main/scala/com/typesafe/config/parser/ConfigNode.scala +++ b/sconfig/src/main/scala/org/ekrich/config/parser/ConfigNode.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.parser +package org.ekrich.config.parser /** * A node in the syntax tree for a HOCON or JSON document. diff --git a/sconfig/src/main/scala/com/typesafe/config/parser/package.html b/sconfig/src/main/scala/org/ekrich/config/parser/package.html similarity index 100% rename from sconfig/src/main/scala/com/typesafe/config/parser/package.html rename to sconfig/src/main/scala/org/ekrich/config/parser/package.html diff --git a/sconfig/src/test/java/beanconfig/ArraysConfig.java b/sconfig/src/test/java/beanconfig/ArraysConfig.java index d1917370..e46acb8c 100644 --- a/sconfig/src/test/java/beanconfig/ArraysConfig.java +++ b/sconfig/src/test/java/beanconfig/ArraysConfig.java @@ -3,10 +3,10 @@ import java.util.List; import java.time.Duration; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigValue; +import org.ekrich.config.Config; +import org.ekrich.config.ConfigMemorySize; +import org.ekrich.config.ConfigObject; +import org.ekrich.config.ConfigValue; public class ArraysConfig { diff --git a/sconfig/src/test/java/beanconfig/BytesConfig.java b/sconfig/src/test/java/beanconfig/BytesConfig.java index 975cb2ed..2fc2fb30 100644 --- a/sconfig/src/test/java/beanconfig/BytesConfig.java +++ b/sconfig/src/test/java/beanconfig/BytesConfig.java @@ -1,6 +1,6 @@ package beanconfig; -import com.typesafe.config.ConfigMemorySize; +import org.ekrich.config.ConfigMemorySize; public class BytesConfig { diff --git a/sconfig/src/test/java/beanconfig/ObjectsConfig.java b/sconfig/src/test/java/beanconfig/ObjectsConfig.java index 11d040f5..70ebd4b8 100644 --- a/sconfig/src/test/java/beanconfig/ObjectsConfig.java +++ b/sconfig/src/test/java/beanconfig/ObjectsConfig.java @@ -1,7 +1,7 @@ package beanconfig; -import com.typesafe.config.Optional; +import org.ekrich.config.Optional; public class ObjectsConfig { public static class ValueObject { diff --git a/sconfig/src/test/java/beanconfig/SetsConfig.java b/sconfig/src/test/java/beanconfig/SetsConfig.java index b81540df..186487bf 100644 --- a/sconfig/src/test/java/beanconfig/SetsConfig.java +++ b/sconfig/src/test/java/beanconfig/SetsConfig.java @@ -1,9 +1,9 @@ package beanconfig; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigValue; +import org.ekrich.config.Config; +import org.ekrich.config.ConfigMemorySize; +import org.ekrich.config.ConfigObject; +import org.ekrich.config.ConfigValue; import java.time.Duration; import java.util.Set; diff --git a/sconfig/src/test/java/beanconfig/ValuesConfig.java b/sconfig/src/test/java/beanconfig/ValuesConfig.java index f0a0eb7b..95ba88a3 100644 --- a/sconfig/src/test/java/beanconfig/ValuesConfig.java +++ b/sconfig/src/test/java/beanconfig/ValuesConfig.java @@ -2,10 +2,10 @@ import java.util.Map; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigValue; +import org.ekrich.config.Config; +import org.ekrich.config.ConfigList; +import org.ekrich.config.ConfigObject; +import org.ekrich.config.ConfigValue; // test bean for various "uncooked" values public class ValuesConfig { diff --git a/sconfig/src/test/scala/ApiExamples.scala b/sconfig/src/test/scala/ApiExamples.scala index fe228189..eb9a34d0 100644 --- a/sconfig/src/test/scala/ApiExamples.scala +++ b/sconfig/src/test/scala/ApiExamples.scala @@ -3,7 +3,7 @@ */ import org.junit.Assert._ import org.junit._ -import com.typesafe.config._ +import org.ekrich.config._ import scala.collection.JavaConverters._ import scala.collection.mutable import language.implicitConversions diff --git a/sconfig/src/test/scala/Profiling.scala b/sconfig/src/test/scala/Profiling.scala index cdae427e..09cf3259 100644 --- a/sconfig/src/test/scala/Profiling.scala +++ b/sconfig/src/test/scala/Profiling.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigException +import org.ekrich.config.Config +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigException import java.util.concurrent.TimeUnit import scala.annotation.tailrec diff --git a/sconfig/src/test/scala/Rendering.scala b/sconfig/src/test/scala/Rendering.scala index 74563c7d..ae0f76c3 100644 --- a/sconfig/src/test/scala/Rendering.scala +++ b/sconfig/src/test/scala/Rendering.scala @@ -1,5 +1,5 @@ -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigRenderOptions +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigRenderOptions object RenderExample extends App { val formatted = args.contains("--formatted") diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/BadMapTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/BadMapTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/BadMapTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/BadMapTest.scala index c9feda30..5314339e 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/BadMapTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/BadMapTest.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit.Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConcatenationTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConcatenationTest.scala index 3880f661..4e5d9414 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConcatenationTest.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2012 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigResolveOptions +import org.ekrich.config.Config +import org.ekrich.config.ConfigFactory import scala.collection.JavaConverters._ class ConcatenationTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfParserTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfParserTest.scala index 14e2e385..763ab295 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfParserTest.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import java.io.{File, StringReader} -import com.typesafe.config._ +import org.ekrich.config._ import scala.collection.JavaConverters._ import java.net.URL diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigBeanFactoryTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigBeanFactoryTest.scala index 32f8b92d..ab3f6151 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigBeanFactoryTest.scala @@ -1,10 +1,10 @@ /** * Copyright (C) 2013 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import beanconfig.EnumsConfig.{Solution, Problem} -import com.typesafe.config._ +import org.ekrich.config._ import java.io.{InputStream, InputStreamReader} import java.time.Duration diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentParserTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentParserTest.scala index 6fcff858..5c842646 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentParserTest.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.{ConfigException, ConfigSyntax, ConfigParseOptions} +import org.ekrich.config.{ConfigException, ConfigSyntax, ConfigParseOptions} import org.junit.Assert._ import org.junit.Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentTest.scala index a11e7be3..3a44b2b7 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigDocumentTest.scala @@ -1,10 +1,10 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.{BufferedReader, FileReader} import java.nio.file.{Paths, Files} -import com.typesafe.config._ -import com.typesafe.config.parser._ +import org.ekrich.config._ +import org.ekrich.config.parser._ import org.junit.Assert._ import org.junit.Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigMemorySizeTest.scala similarity index 88% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigMemorySizeTest.scala index ea73b67e..0a8d8c35 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigMemorySizeTest.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigMemorySize +import org.ekrich.config.ConfigMemorySize class ConfigMemorySizeTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigNodeTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigNodeTest.scala index 559e520f..98ad098e 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigNodeTest.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit.Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigSubstitutionTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigSubstitutionTest.scala index 5e41bb86..4159dc6d 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigSubstitutionTest.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory +import org.ekrich.config.ConfigValue +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigResolveOptions +import org.ekrich.config.Config +import org.ekrich.config.ConfigFactory import scala.collection.JavaConverters._ class ConfigSubstitutionTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigTest.scala index a853d1f8..d6b8e082 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigTest.scala @@ -1,17 +1,17 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.time.temporal.{ChronoUnit, TemporalUnit} import org.junit.Assert._ import org.junit._ -import com.typesafe.config._ +import org.ekrich.config._ import java.util.concurrent.TimeUnit import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigResolveOptions +import org.ekrich.config.ConfigResolveOptions import java.util.concurrent.TimeUnit.{ DAYS, HOURS, diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigValueTest.scala similarity index 95% rename from sconfig/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ConfigValueTest.scala index a48e9b8e..9f88c93c 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ConfigValueTest.scala @@ -1,21 +1,21 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue +import org.ekrich.config.ConfigValue import java.util.Collections import java.net.URL import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigValueType -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValueFactory -import com.typesafe.config.ConfigFactory +import org.ekrich.config.ConfigObject +import org.ekrich.config.ConfigList +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigValueType +import org.ekrich.config.ConfigRenderOptions +import org.ekrich.config.ConfigValueFactory +import org.ekrich.config.ConfigFactory class ConfigValueTest extends TestUtils { @@ -50,7 +50,7 @@ class ConfigValueTest extends TestUtils { @Test def configIntSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_902000000_-050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000009020000002A0002_4_20103" + "000000010001_x" @@ -73,7 +73,7 @@ class ConfigValueTest extends TestUtils { @Test def configLongSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_E02000000_9050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000015030000000080000029000A" + "_2_1_4_7_4_8_3_6_8_90103000000010001_x" @@ -110,10 +110,10 @@ class ConfigValueTest extends TestUtils { @Test def configDoubleSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w3F02000000_3050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000F0440091EB8_QEB851F0004" + - "_3_._1_40103000000010001_x" + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i_z_e" + + "_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w3F02000000_30500000019060000" + + "000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000F0440091EB8_QEB851F0004_3_." + + "_1_40103000000010001_x" val a = doubleValue(3.14) val b = checkSerializable(expectedSerialization, a) @@ -136,7 +136,7 @@ class ConfigValueTest extends TestUtils { @Test def configNullSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_10200000025050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000001000103000000010001_x" @@ -148,7 +148,7 @@ class ConfigValueTest extends TestUtils { @Test def configBooleanSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_20200000026050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000201010103000000010001_x" @@ -160,7 +160,7 @@ class ConfigValueTest extends TestUtils { @Test def configStringSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_F02000000_:050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000016050013_T_h_e_ _q_u_i_c" + "_k_ _b_r_o_w_n_ _f_o_x0103000000010001_x" @@ -215,7 +215,7 @@ class ConfigValueTest extends TestUtils { @Test def java6ConfigObjectSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + "000101040000000802000000010001_1010001_c050000000101040000000802000000030001_301" + @@ -232,7 +232,7 @@ class ConfigValueTest extends TestUtils { @Test def java6ConfigConfigSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + "000101040000000802000000010001_1010001_c050000000101040000000802000000030001_301" + @@ -249,7 +249,7 @@ class ConfigValueTest extends TestUtils { @Test def configObjectSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + "000101040000000802000000010001_1010001_b050000000101040000000802000000020001_201" + @@ -266,7 +266,7 @@ class ConfigValueTest extends TestUtils { @Test def configConfigSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + "000101040000000802000000010001_1010001_b050000000101040000000802000000020001_201" + @@ -313,7 +313,7 @@ class ConfigValueTest extends TestUtils { @Test def configListSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + + "ACED0005_s_r002C_o_r_g_._e_k_r_i_c_h_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_q02000000_e050000001906" + "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_A0600000003050000000101" + "040000000802000000010001_101050000000101040000000802000000020001_201050000000101" + diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/EquivalentsTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/EquivalentsTest.scala index 80b02265..058a9b8c 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/EquivalentsTest.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import net.liftweb.{json => lift} import java.io.Reader import java.io.StringReader -import com.typesafe.config._ +import org.ekrich.config._ import java.util.HashMap import java.io.File import org.junit.runner.RunWith diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/HttpTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/HttpTest.scala similarity index 96% rename from sconfig/src/test/scala/com/typesafe/config/impl/HttpTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/HttpTest.scala index 0e1b2cc0..79da4ea2 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/HttpTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/HttpTest.scala @@ -1,13 +1,13 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import org.junit.BeforeClass import java.net.URL -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigSyntax +import org.ekrich.config.ConfigException class HttpTest extends TestUtils { import HttpTest._ diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/JsonTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/JsonTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/JsonTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/JsonTest.scala index 9dc2337d..c55dcb67 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/JsonTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/JsonTest.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import net.liftweb.{json => lift} import java.io.Reader -import com.typesafe.config._ +import org.ekrich.config._ import java.util.HashMap class JsonTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ParseableReaderTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ParseableReaderTest.scala similarity index 90% rename from sconfig/src/test/scala/com/typesafe/config/impl/ParseableReaderTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ParseableReaderTest.scala index 2a889213..6e651ec3 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ParseableReaderTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ParseableReaderTest.scala @@ -1,8 +1,8 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.io.InputStreamReader -import com.typesafe.config.{ConfigException, ConfigFactory, ConfigParseOptions} +import org.ekrich.config.{ConfigException, ConfigFactory, ConfigParseOptions} import org.hamcrest.CoreMatchers.containsString import org.junit.Assert.{assertEquals, assertThat} import org.junit.Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/PathTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/PathTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/PathTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/PathTest.scala index 6c591d27..cb2f5d4b 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/PathTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/PathTest.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException class PathTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/PropertiesTest.scala similarity index 95% rename from sconfig/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/PropertiesTest.scala index 5af0b7e3..bd871919 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/PropertiesTest.scala @@ -1,16 +1,16 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import java.util.{Date, Properties} -import com.typesafe.config.Config -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions +import org.ekrich.config.Config +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigException +import org.ekrich.config.ConfigResolveOptions class PropertiesTest extends TestUtils { @Test diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/PublicApiTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/PublicApiTest.scala index b10ab950..8fdd079d 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/PublicApiTest.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ import scala.collection.JavaConverters._ -import com.typesafe.config._ +import org.ekrich.config._ import java.util.{Collections, TimeZone, TreeSet} import java.io.File import scala.collection.mutable diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/TestUtils.scala b/sconfig/src/test/scala/org/ekrich/config/impl/TestUtils.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/TestUtils.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/TestUtils.scala index 2c93b5bf..8206fcbd 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/TestUtils.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/TestUtils.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ -import com.typesafe.config.ConfigOrigin +import org.ekrich.config.ConfigOrigin import java.io.Reader import java.io.StringReader -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigFactory +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigSyntax +import org.ekrich.config.ConfigFactory import java.io.File import java.io.ByteArrayOutputStream import java.io.ObjectOutputStream @@ -23,7 +23,7 @@ import java.net.URL import java.util.Locale import java.util.concurrent.Executors import java.util.concurrent.Callable -import com.typesafe.config._ +import org.ekrich.config._ import scala.reflect.ClassTag import scala.reflect.classTag import scala.collection.JavaConverters._ diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/TokenTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/TokenTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/TokenTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/TokenTest.scala index 30b92186..21fb6ad2 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/TokenTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/TokenTest.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/TokenizerTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/TokenizerTest.scala index fb1eb413..2474a7be 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/TokenizerTest.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit.Test -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigException import language.implicitConversions class TokenizerTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ToyHttp.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ToyHttp.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/ToyHttp.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ToyHttp.scala index 393ead5f..c3e07db7 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ToyHttp.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ToyHttp.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.net.ServerSocket import java.net.InetSocketAddress diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/UnitParserTest.scala similarity index 99% rename from sconfig/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/UnitParserTest.scala index c4f96cfe..bd78bcb8 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/UnitParserTest.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import java.time.{LocalDate, Period} import java.time.temporal.ChronoUnit import org.junit.Assert._ import org.junit._ -import com.typesafe.config._ +import org.ekrich.config._ import java.util.concurrent.TimeUnit class UnitParserTest extends TestUtils { diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/UtilTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/UtilTest.scala similarity index 98% rename from sconfig/src/test/scala/com/typesafe/config/impl/UtilTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/UtilTest.scala index 253e0e1b..2e3f33e5 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/UtilTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/UtilTest.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl -import com.typesafe.config.ConfigSyntax +import org.ekrich.config.ConfigSyntax import org.junit.Assert._ import org.junit._ diff --git a/sconfig/src/test/scala/com/typesafe/config/impl/ValidationTest.scala b/sconfig/src/test/scala/org/ekrich/config/impl/ValidationTest.scala similarity index 96% rename from sconfig/src/test/scala/com/typesafe/config/impl/ValidationTest.scala rename to sconfig/src/test/scala/org/ekrich/config/impl/ValidationTest.scala index cb21c992..23f83754 100644 --- a/sconfig/src/test/scala/com/typesafe/config/impl/ValidationTest.scala +++ b/sconfig/src/test/scala/org/ekrich/config/impl/ValidationTest.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package org.ekrich.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigException +import org.ekrich.config.ConfigFactory +import org.ekrich.config.ConfigParseOptions +import org.ekrich.config.ConfigException import scala.collection.JavaConverters._ import scala.io.Source