From 93b87097fdb01b92fd25dcae34d13af7c515df3e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 26 Nov 2011 19:42:52 -0500 Subject: [PATCH] Move the main project to config/ subdir and add a root aggregate project --- build.sbt | 36 ++++--------------- config/build.sbt | 31 ++++++++++++++++ .../main/java/com/typesafe/config/Config.java | 0 .../com/typesafe/config/ConfigException.java | 0 .../com/typesafe/config/ConfigFactory.java | 0 .../typesafe/config/ConfigIncludeContext.java | 0 .../com/typesafe/config/ConfigIncluder.java | 0 .../java/com/typesafe/config/ConfigList.java | 0 .../com/typesafe/config/ConfigMergeable.java | 0 .../com/typesafe/config/ConfigObject.java | 0 .../com/typesafe/config/ConfigOrigin.java | 0 .../typesafe/config/ConfigParseOptions.java | 0 .../com/typesafe/config/ConfigParseable.java | 0 .../typesafe/config/ConfigResolveOptions.java | 0 .../com/typesafe/config/ConfigSyntax.java | 0 .../java/com/typesafe/config/ConfigValue.java | 0 .../typesafe/config/ConfigValueFactory.java | 0 .../com/typesafe/config/ConfigValueType.java | 0 .../config/impl/AbstractConfigObject.java | 0 .../config/impl/AbstractConfigValue.java | 0 .../typesafe/config/impl/ConfigBoolean.java | 0 .../config/impl/ConfigDelayedMerge.java | 0 .../config/impl/ConfigDelayedMergeObject.java | 0 .../typesafe/config/impl/ConfigDouble.java | 0 .../com/typesafe/config/impl/ConfigImpl.java | 0 .../com/typesafe/config/impl/ConfigInt.java | 0 .../com/typesafe/config/impl/ConfigLong.java | 0 .../com/typesafe/config/impl/ConfigNull.java | 0 .../typesafe/config/impl/ConfigNumber.java | 0 .../typesafe/config/impl/ConfigString.java | 0 .../config/impl/ConfigSubstitution.java | 0 .../com/typesafe/config/impl/ConfigUtil.java | 0 .../config/impl/DefaultTransformer.java | 0 .../com/typesafe/config/impl/FromMapMode.java | 0 .../com/typesafe/config/impl/OriginType.java | 0 .../com/typesafe/config/impl/Parseable.java | 0 .../java/com/typesafe/config/impl/Parser.java | 0 .../java/com/typesafe/config/impl/Path.java | 0 .../com/typesafe/config/impl/PathBuilder.java | 0 .../config/impl/PropertiesParser.java | 0 .../typesafe/config/impl/ResolveStatus.java | 0 .../typesafe/config/impl/SimpleConfig.java | 0 .../config/impl/SimpleConfigList.java | 0 .../config/impl/SimpleConfigObject.java | 0 .../config/impl/SimpleConfigOrigin.java | 0 .../config/impl/SubstitutionResolver.java | 0 .../java/com/typesafe/config/impl/Token.java | 0 .../com/typesafe/config/impl/TokenType.java | 0 .../com/typesafe/config/impl/Tokenizer.java | 0 .../java/com/typesafe/config/impl/Tokens.java | 0 .../com/typesafe/config/impl/Unmergeable.java | 0 .../java/com/typesafe/config/package.html | 0 .../src}/test/resources/equiv01/comments.conf | 0 .../src}/test/resources/equiv01/equals.conf | 0 .../test/resources/equiv01/no-commas.conf | 0 .../resources/equiv01/no-root-braces.conf | 0 .../test/resources/equiv01/no-whitespace.json | 0 .../test/resources/equiv01/omit-colons.conf | 0 .../src}/test/resources/equiv01/original.json | 0 .../test/resources/equiv01/path-keys.conf | 0 .../resources/equiv01/properties-style.conf | 0 .../test/resources/equiv01/substitutions.conf | 0 .../src}/test/resources/equiv01/unquoted.conf | 0 .../src}/test/resources/equiv02/original.json | 0 .../equiv02/path-keys-weird-whitespace.conf | 0 .../test/resources/equiv02/path-keys.conf | 0 .../src}/test/resources/equiv03/includes.conf | 0 .../test/resources/equiv03/letters/a.conf | 0 .../test/resources/equiv03/letters/b.json | 0 .../test/resources/equiv03/letters/c.conf | 0 .../resources/equiv03/letters/c.properties | 0 .../resources/equiv03/letters/numbers/1.conf | 0 .../equiv03/letters/numbers/2.properties | 0 .../src}/test/resources/equiv03/original.json | 0 .../src}/test/resources/test01.conf | 0 .../src}/test/resources/test01.json | 0 .../src}/test/resources/test01.properties | 0 .../src}/test/resources/test02.conf | 0 .../src}/test/resources/test03.conf | 0 .../src}/test/resources/test04.conf | 0 .../src}/test/resources/test05.conf | 0 .../src}/test/resources/test06.conf | 0 .../src}/test/scala/ApiExamples.scala | 0 .../src}/test/scala/Profiling.scala | 0 .../src}/test/scala/Rendering.scala | 0 .../typesafe/config/impl/ConfParserTest.scala | 0 .../config/impl/ConfigSubstitutionTest.scala | 0 .../com/typesafe/config/impl/ConfigTest.scala | 0 .../config/impl/ConfigValueTest.scala | 0 .../config/impl/EquivalentsTest.scala | 0 .../com/typesafe/config/impl/JsonTest.scala | 0 .../com/typesafe/config/impl/PathTest.scala | 0 .../typesafe/config/impl/PropertiesTest.scala | 0 .../typesafe/config/impl/PublicApiTest.scala | 0 .../com/typesafe/config/impl/TestUtils.scala | 0 .../com/typesafe/config/impl/TokenTest.scala | 0 .../typesafe/config/impl/TokenizerTest.scala | 0 .../typesafe/config/impl/UnitParserTest.scala | 0 .../com/typesafe/config/impl/UtilTest.scala | 0 .../scala/equiv03/SomethingInEquiv03.java | 0 project/Build.scala | 7 ++-- 101 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 config/build.sbt rename {src => config/src}/main/java/com/typesafe/config/Config.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigException.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigFactory.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigIncludeContext.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigIncluder.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigList.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigMergeable.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigObject.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigOrigin.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigParseOptions.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigParseable.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigResolveOptions.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigSyntax.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigValue.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigValueFactory.java (100%) rename {src => config/src}/main/java/com/typesafe/config/ConfigValueType.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/AbstractConfigObject.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/AbstractConfigValue.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigBoolean.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigDouble.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigImpl.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigInt.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigLong.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigNull.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigNumber.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigString.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigSubstitution.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ConfigUtil.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/DefaultTransformer.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/FromMapMode.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/OriginType.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Parseable.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Parser.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Path.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/PathBuilder.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/PropertiesParser.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/ResolveStatus.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/SimpleConfig.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/SimpleConfigList.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/SimpleConfigObject.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/SubstitutionResolver.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Token.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/TokenType.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Tokenizer.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Tokens.java (100%) rename {src => config/src}/main/java/com/typesafe/config/impl/Unmergeable.java (100%) rename {src => config/src}/main/java/com/typesafe/config/package.html (100%) rename {src => config/src}/test/resources/equiv01/comments.conf (100%) rename {src => config/src}/test/resources/equiv01/equals.conf (100%) rename {src => config/src}/test/resources/equiv01/no-commas.conf (100%) rename {src => config/src}/test/resources/equiv01/no-root-braces.conf (100%) rename {src => config/src}/test/resources/equiv01/no-whitespace.json (100%) rename {src => config/src}/test/resources/equiv01/omit-colons.conf (100%) rename {src => config/src}/test/resources/equiv01/original.json (100%) rename {src => config/src}/test/resources/equiv01/path-keys.conf (100%) rename {src => config/src}/test/resources/equiv01/properties-style.conf (100%) rename {src => config/src}/test/resources/equiv01/substitutions.conf (100%) rename {src => config/src}/test/resources/equiv01/unquoted.conf (100%) rename {src => config/src}/test/resources/equiv02/original.json (100%) rename {src => config/src}/test/resources/equiv02/path-keys-weird-whitespace.conf (100%) rename {src => config/src}/test/resources/equiv02/path-keys.conf (100%) rename {src => config/src}/test/resources/equiv03/includes.conf (100%) rename {src => config/src}/test/resources/equiv03/letters/a.conf (100%) rename {src => config/src}/test/resources/equiv03/letters/b.json (100%) rename {src => config/src}/test/resources/equiv03/letters/c.conf (100%) rename {src => config/src}/test/resources/equiv03/letters/c.properties (100%) rename {src => config/src}/test/resources/equiv03/letters/numbers/1.conf (100%) rename {src => config/src}/test/resources/equiv03/letters/numbers/2.properties (100%) rename {src => config/src}/test/resources/equiv03/original.json (100%) rename {src => config/src}/test/resources/test01.conf (100%) rename {src => config/src}/test/resources/test01.json (100%) rename {src => config/src}/test/resources/test01.properties (100%) rename {src => config/src}/test/resources/test02.conf (100%) rename {src => config/src}/test/resources/test03.conf (100%) rename {src => config/src}/test/resources/test04.conf (100%) rename {src => config/src}/test/resources/test05.conf (100%) rename {src => config/src}/test/resources/test06.conf (100%) rename {src => config/src}/test/scala/ApiExamples.scala (100%) rename {src => config/src}/test/scala/Profiling.scala (100%) rename {src => config/src}/test/scala/Rendering.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/ConfParserTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/ConfigTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/ConfigValueTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/EquivalentsTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/JsonTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/PathTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/PropertiesTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/PublicApiTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/TestUtils.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/TokenTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/TokenizerTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/UnitParserTest.scala (100%) rename {src => config/src}/test/scala/com/typesafe/config/impl/UtilTest.scala (100%) rename {src => config/src}/test/scala/equiv03/SomethingInEquiv03.java (100%) diff --git a/build.sbt b/build.sbt index f061a587..bd4dc20d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,33 +1,11 @@ -import de.johoop.findbugs4sbt.FindBugs._ -import de.johoop.findbugs4sbt.ReportType -import de.johoop.jacoco4sbt._ -import JacocoPlugin._ -import javadoc.JavadocPlugin._ -version := "0.1" +version in GlobalScope := "0.1" -fork in test := true +// no binary for the root project +publishArtifact in (Compile, packageBin) := false -fork in run := true +// no javadoc for the root project +publishArtifact in (Compile, packageDoc) := false -fork in run in Test := true - -libraryDependencies += "net.liftweb" %% "lift-json" % "2.4-SNAPSHOT" % "test" - -libraryDependencies += "com.novocode" % "junit-interface" % "0.7" % "test" - -externalResolvers += "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots/" - -seq(findbugsSettings : _*) - -findbugsReportType := ReportType.Html - -findbugsReportName := "findbugs.html" - -seq(jacoco.settings : _*) - -seq(javadocSettings: _*) - -JavadocKeys.javadocOptions += "-exclude com.typesafe.config.impl" - -doc := error("use the 'javadoc' task instead of 'doc'") +// no source for the root project +publishArtifact in (Compile, packageSrc) := false diff --git a/config/build.sbt b/config/build.sbt new file mode 100644 index 00000000..7de50cdd --- /dev/null +++ b/config/build.sbt @@ -0,0 +1,31 @@ +import de.johoop.findbugs4sbt.FindBugs._ +import de.johoop.findbugs4sbt.ReportType +import de.johoop.jacoco4sbt._ +import JacocoPlugin._ +import javadoc.JavadocPlugin._ + +fork in test := true + +fork in run := true + +fork in run in Test := true + +libraryDependencies += "net.liftweb" %% "lift-json" % "2.4-SNAPSHOT" % "test" + +libraryDependencies += "com.novocode" % "junit-interface" % "0.7" % "test" + +externalResolvers += "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots/" + +seq(findbugsSettings : _*) + +findbugsReportType := ReportType.Html + +findbugsReportName := "findbugs.html" + +seq(jacoco.settings : _*) + +seq(javadocSettings: _*) + +JavadocKeys.javadocOptions += "-exclude com.typesafe.config.impl" + +doc := error("use the 'javadoc' task instead of 'doc'") diff --git a/src/main/java/com/typesafe/config/Config.java b/config/src/main/java/com/typesafe/config/Config.java similarity index 100% rename from src/main/java/com/typesafe/config/Config.java rename to config/src/main/java/com/typesafe/config/Config.java diff --git a/src/main/java/com/typesafe/config/ConfigException.java b/config/src/main/java/com/typesafe/config/ConfigException.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigException.java rename to config/src/main/java/com/typesafe/config/ConfigException.java diff --git a/src/main/java/com/typesafe/config/ConfigFactory.java b/config/src/main/java/com/typesafe/config/ConfigFactory.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigFactory.java rename to config/src/main/java/com/typesafe/config/ConfigFactory.java diff --git a/src/main/java/com/typesafe/config/ConfigIncludeContext.java b/config/src/main/java/com/typesafe/config/ConfigIncludeContext.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigIncludeContext.java rename to config/src/main/java/com/typesafe/config/ConfigIncludeContext.java diff --git a/src/main/java/com/typesafe/config/ConfigIncluder.java b/config/src/main/java/com/typesafe/config/ConfigIncluder.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigIncluder.java rename to config/src/main/java/com/typesafe/config/ConfigIncluder.java diff --git a/src/main/java/com/typesafe/config/ConfigList.java b/config/src/main/java/com/typesafe/config/ConfigList.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigList.java rename to config/src/main/java/com/typesafe/config/ConfigList.java diff --git a/src/main/java/com/typesafe/config/ConfigMergeable.java b/config/src/main/java/com/typesafe/config/ConfigMergeable.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigMergeable.java rename to config/src/main/java/com/typesafe/config/ConfigMergeable.java diff --git a/src/main/java/com/typesafe/config/ConfigObject.java b/config/src/main/java/com/typesafe/config/ConfigObject.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigObject.java rename to config/src/main/java/com/typesafe/config/ConfigObject.java diff --git a/src/main/java/com/typesafe/config/ConfigOrigin.java b/config/src/main/java/com/typesafe/config/ConfigOrigin.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigOrigin.java rename to config/src/main/java/com/typesafe/config/ConfigOrigin.java diff --git a/src/main/java/com/typesafe/config/ConfigParseOptions.java b/config/src/main/java/com/typesafe/config/ConfigParseOptions.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigParseOptions.java rename to config/src/main/java/com/typesafe/config/ConfigParseOptions.java diff --git a/src/main/java/com/typesafe/config/ConfigParseable.java b/config/src/main/java/com/typesafe/config/ConfigParseable.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigParseable.java rename to config/src/main/java/com/typesafe/config/ConfigParseable.java diff --git a/src/main/java/com/typesafe/config/ConfigResolveOptions.java b/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigResolveOptions.java rename to config/src/main/java/com/typesafe/config/ConfigResolveOptions.java diff --git a/src/main/java/com/typesafe/config/ConfigSyntax.java b/config/src/main/java/com/typesafe/config/ConfigSyntax.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigSyntax.java rename to config/src/main/java/com/typesafe/config/ConfigSyntax.java diff --git a/src/main/java/com/typesafe/config/ConfigValue.java b/config/src/main/java/com/typesafe/config/ConfigValue.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigValue.java rename to config/src/main/java/com/typesafe/config/ConfigValue.java diff --git a/src/main/java/com/typesafe/config/ConfigValueFactory.java b/config/src/main/java/com/typesafe/config/ConfigValueFactory.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigValueFactory.java rename to config/src/main/java/com/typesafe/config/ConfigValueFactory.java diff --git a/src/main/java/com/typesafe/config/ConfigValueType.java b/config/src/main/java/com/typesafe/config/ConfigValueType.java similarity index 100% rename from src/main/java/com/typesafe/config/ConfigValueType.java rename to config/src/main/java/com/typesafe/config/ConfigValueType.java diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java b/config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/AbstractConfigObject.java rename to config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java b/config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/AbstractConfigValue.java rename to config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigBoolean.java b/config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigBoolean.java rename to config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java rename to config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java rename to config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigDouble.java b/config/src/main/java/com/typesafe/config/impl/ConfigDouble.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigDouble.java rename to config/src/main/java/com/typesafe/config/impl/ConfigDouble.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigImpl.java rename to config/src/main/java/com/typesafe/config/impl/ConfigImpl.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigInt.java b/config/src/main/java/com/typesafe/config/impl/ConfigInt.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigInt.java rename to config/src/main/java/com/typesafe/config/impl/ConfigInt.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigLong.java b/config/src/main/java/com/typesafe/config/impl/ConfigLong.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigLong.java rename to config/src/main/java/com/typesafe/config/impl/ConfigLong.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigNull.java b/config/src/main/java/com/typesafe/config/impl/ConfigNull.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigNull.java rename to config/src/main/java/com/typesafe/config/impl/ConfigNull.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigNumber.java b/config/src/main/java/com/typesafe/config/impl/ConfigNumber.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigNumber.java rename to config/src/main/java/com/typesafe/config/impl/ConfigNumber.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigString.java b/config/src/main/java/com/typesafe/config/impl/ConfigString.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigString.java rename to config/src/main/java/com/typesafe/config/impl/ConfigString.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java b/config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigSubstitution.java rename to config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java diff --git a/src/main/java/com/typesafe/config/impl/ConfigUtil.java b/config/src/main/java/com/typesafe/config/impl/ConfigUtil.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ConfigUtil.java rename to config/src/main/java/com/typesafe/config/impl/ConfigUtil.java diff --git a/src/main/java/com/typesafe/config/impl/DefaultTransformer.java b/config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/DefaultTransformer.java rename to config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java diff --git a/src/main/java/com/typesafe/config/impl/FromMapMode.java b/config/src/main/java/com/typesafe/config/impl/FromMapMode.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/FromMapMode.java rename to config/src/main/java/com/typesafe/config/impl/FromMapMode.java diff --git a/src/main/java/com/typesafe/config/impl/OriginType.java b/config/src/main/java/com/typesafe/config/impl/OriginType.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/OriginType.java rename to config/src/main/java/com/typesafe/config/impl/OriginType.java diff --git a/src/main/java/com/typesafe/config/impl/Parseable.java b/config/src/main/java/com/typesafe/config/impl/Parseable.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Parseable.java rename to config/src/main/java/com/typesafe/config/impl/Parseable.java diff --git a/src/main/java/com/typesafe/config/impl/Parser.java b/config/src/main/java/com/typesafe/config/impl/Parser.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Parser.java rename to config/src/main/java/com/typesafe/config/impl/Parser.java diff --git a/src/main/java/com/typesafe/config/impl/Path.java b/config/src/main/java/com/typesafe/config/impl/Path.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Path.java rename to config/src/main/java/com/typesafe/config/impl/Path.java diff --git a/src/main/java/com/typesafe/config/impl/PathBuilder.java b/config/src/main/java/com/typesafe/config/impl/PathBuilder.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/PathBuilder.java rename to config/src/main/java/com/typesafe/config/impl/PathBuilder.java diff --git a/src/main/java/com/typesafe/config/impl/PropertiesParser.java b/config/src/main/java/com/typesafe/config/impl/PropertiesParser.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/PropertiesParser.java rename to config/src/main/java/com/typesafe/config/impl/PropertiesParser.java diff --git a/src/main/java/com/typesafe/config/impl/ResolveStatus.java b/config/src/main/java/com/typesafe/config/impl/ResolveStatus.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/ResolveStatus.java rename to config/src/main/java/com/typesafe/config/impl/ResolveStatus.java diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfig.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfig.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/SimpleConfig.java rename to config/src/main/java/com/typesafe/config/impl/SimpleConfig.java diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigList.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/SimpleConfigList.java rename to config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/SimpleConfigObject.java rename to config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java rename to config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java diff --git a/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java b/config/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/SubstitutionResolver.java rename to config/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java diff --git a/src/main/java/com/typesafe/config/impl/Token.java b/config/src/main/java/com/typesafe/config/impl/Token.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Token.java rename to config/src/main/java/com/typesafe/config/impl/Token.java diff --git a/src/main/java/com/typesafe/config/impl/TokenType.java b/config/src/main/java/com/typesafe/config/impl/TokenType.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/TokenType.java rename to config/src/main/java/com/typesafe/config/impl/TokenType.java diff --git a/src/main/java/com/typesafe/config/impl/Tokenizer.java b/config/src/main/java/com/typesafe/config/impl/Tokenizer.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Tokenizer.java rename to config/src/main/java/com/typesafe/config/impl/Tokenizer.java diff --git a/src/main/java/com/typesafe/config/impl/Tokens.java b/config/src/main/java/com/typesafe/config/impl/Tokens.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Tokens.java rename to config/src/main/java/com/typesafe/config/impl/Tokens.java diff --git a/src/main/java/com/typesafe/config/impl/Unmergeable.java b/config/src/main/java/com/typesafe/config/impl/Unmergeable.java similarity index 100% rename from src/main/java/com/typesafe/config/impl/Unmergeable.java rename to config/src/main/java/com/typesafe/config/impl/Unmergeable.java diff --git a/src/main/java/com/typesafe/config/package.html b/config/src/main/java/com/typesafe/config/package.html similarity index 100% rename from src/main/java/com/typesafe/config/package.html rename to config/src/main/java/com/typesafe/config/package.html diff --git a/src/test/resources/equiv01/comments.conf b/config/src/test/resources/equiv01/comments.conf similarity index 100% rename from src/test/resources/equiv01/comments.conf rename to config/src/test/resources/equiv01/comments.conf diff --git a/src/test/resources/equiv01/equals.conf b/config/src/test/resources/equiv01/equals.conf similarity index 100% rename from src/test/resources/equiv01/equals.conf rename to config/src/test/resources/equiv01/equals.conf diff --git a/src/test/resources/equiv01/no-commas.conf b/config/src/test/resources/equiv01/no-commas.conf similarity index 100% rename from src/test/resources/equiv01/no-commas.conf rename to config/src/test/resources/equiv01/no-commas.conf diff --git a/src/test/resources/equiv01/no-root-braces.conf b/config/src/test/resources/equiv01/no-root-braces.conf similarity index 100% rename from src/test/resources/equiv01/no-root-braces.conf rename to config/src/test/resources/equiv01/no-root-braces.conf diff --git a/src/test/resources/equiv01/no-whitespace.json b/config/src/test/resources/equiv01/no-whitespace.json similarity index 100% rename from src/test/resources/equiv01/no-whitespace.json rename to config/src/test/resources/equiv01/no-whitespace.json diff --git a/src/test/resources/equiv01/omit-colons.conf b/config/src/test/resources/equiv01/omit-colons.conf similarity index 100% rename from src/test/resources/equiv01/omit-colons.conf rename to config/src/test/resources/equiv01/omit-colons.conf diff --git a/src/test/resources/equiv01/original.json b/config/src/test/resources/equiv01/original.json similarity index 100% rename from src/test/resources/equiv01/original.json rename to config/src/test/resources/equiv01/original.json diff --git a/src/test/resources/equiv01/path-keys.conf b/config/src/test/resources/equiv01/path-keys.conf similarity index 100% rename from src/test/resources/equiv01/path-keys.conf rename to config/src/test/resources/equiv01/path-keys.conf diff --git a/src/test/resources/equiv01/properties-style.conf b/config/src/test/resources/equiv01/properties-style.conf similarity index 100% rename from src/test/resources/equiv01/properties-style.conf rename to config/src/test/resources/equiv01/properties-style.conf diff --git a/src/test/resources/equiv01/substitutions.conf b/config/src/test/resources/equiv01/substitutions.conf similarity index 100% rename from src/test/resources/equiv01/substitutions.conf rename to config/src/test/resources/equiv01/substitutions.conf diff --git a/src/test/resources/equiv01/unquoted.conf b/config/src/test/resources/equiv01/unquoted.conf similarity index 100% rename from src/test/resources/equiv01/unquoted.conf rename to config/src/test/resources/equiv01/unquoted.conf diff --git a/src/test/resources/equiv02/original.json b/config/src/test/resources/equiv02/original.json similarity index 100% rename from src/test/resources/equiv02/original.json rename to config/src/test/resources/equiv02/original.json diff --git a/src/test/resources/equiv02/path-keys-weird-whitespace.conf b/config/src/test/resources/equiv02/path-keys-weird-whitespace.conf similarity index 100% rename from src/test/resources/equiv02/path-keys-weird-whitespace.conf rename to config/src/test/resources/equiv02/path-keys-weird-whitespace.conf diff --git a/src/test/resources/equiv02/path-keys.conf b/config/src/test/resources/equiv02/path-keys.conf similarity index 100% rename from src/test/resources/equiv02/path-keys.conf rename to config/src/test/resources/equiv02/path-keys.conf diff --git a/src/test/resources/equiv03/includes.conf b/config/src/test/resources/equiv03/includes.conf similarity index 100% rename from src/test/resources/equiv03/includes.conf rename to config/src/test/resources/equiv03/includes.conf diff --git a/src/test/resources/equiv03/letters/a.conf b/config/src/test/resources/equiv03/letters/a.conf similarity index 100% rename from src/test/resources/equiv03/letters/a.conf rename to config/src/test/resources/equiv03/letters/a.conf diff --git a/src/test/resources/equiv03/letters/b.json b/config/src/test/resources/equiv03/letters/b.json similarity index 100% rename from src/test/resources/equiv03/letters/b.json rename to config/src/test/resources/equiv03/letters/b.json diff --git a/src/test/resources/equiv03/letters/c.conf b/config/src/test/resources/equiv03/letters/c.conf similarity index 100% rename from src/test/resources/equiv03/letters/c.conf rename to config/src/test/resources/equiv03/letters/c.conf diff --git a/src/test/resources/equiv03/letters/c.properties b/config/src/test/resources/equiv03/letters/c.properties similarity index 100% rename from src/test/resources/equiv03/letters/c.properties rename to config/src/test/resources/equiv03/letters/c.properties diff --git a/src/test/resources/equiv03/letters/numbers/1.conf b/config/src/test/resources/equiv03/letters/numbers/1.conf similarity index 100% rename from src/test/resources/equiv03/letters/numbers/1.conf rename to config/src/test/resources/equiv03/letters/numbers/1.conf diff --git a/src/test/resources/equiv03/letters/numbers/2.properties b/config/src/test/resources/equiv03/letters/numbers/2.properties similarity index 100% rename from src/test/resources/equiv03/letters/numbers/2.properties rename to config/src/test/resources/equiv03/letters/numbers/2.properties diff --git a/src/test/resources/equiv03/original.json b/config/src/test/resources/equiv03/original.json similarity index 100% rename from src/test/resources/equiv03/original.json rename to config/src/test/resources/equiv03/original.json diff --git a/src/test/resources/test01.conf b/config/src/test/resources/test01.conf similarity index 100% rename from src/test/resources/test01.conf rename to config/src/test/resources/test01.conf diff --git a/src/test/resources/test01.json b/config/src/test/resources/test01.json similarity index 100% rename from src/test/resources/test01.json rename to config/src/test/resources/test01.json diff --git a/src/test/resources/test01.properties b/config/src/test/resources/test01.properties similarity index 100% rename from src/test/resources/test01.properties rename to config/src/test/resources/test01.properties diff --git a/src/test/resources/test02.conf b/config/src/test/resources/test02.conf similarity index 100% rename from src/test/resources/test02.conf rename to config/src/test/resources/test02.conf diff --git a/src/test/resources/test03.conf b/config/src/test/resources/test03.conf similarity index 100% rename from src/test/resources/test03.conf rename to config/src/test/resources/test03.conf diff --git a/src/test/resources/test04.conf b/config/src/test/resources/test04.conf similarity index 100% rename from src/test/resources/test04.conf rename to config/src/test/resources/test04.conf diff --git a/src/test/resources/test05.conf b/config/src/test/resources/test05.conf similarity index 100% rename from src/test/resources/test05.conf rename to config/src/test/resources/test05.conf diff --git a/src/test/resources/test06.conf b/config/src/test/resources/test06.conf similarity index 100% rename from src/test/resources/test06.conf rename to config/src/test/resources/test06.conf diff --git a/src/test/scala/ApiExamples.scala b/config/src/test/scala/ApiExamples.scala similarity index 100% rename from src/test/scala/ApiExamples.scala rename to config/src/test/scala/ApiExamples.scala diff --git a/src/test/scala/Profiling.scala b/config/src/test/scala/Profiling.scala similarity index 100% rename from src/test/scala/Profiling.scala rename to config/src/test/scala/Profiling.scala diff --git a/src/test/scala/Rendering.scala b/config/src/test/scala/Rendering.scala similarity index 100% rename from src/test/scala/Rendering.scala rename to config/src/test/scala/Rendering.scala diff --git a/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/ConfParserTest.scala rename to config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala rename to config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/ConfigTest.scala rename to config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala rename to config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala b/config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala rename to config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/JsonTest.scala b/config/src/test/scala/com/typesafe/config/impl/JsonTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/JsonTest.scala rename to config/src/test/scala/com/typesafe/config/impl/JsonTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/PathTest.scala b/config/src/test/scala/com/typesafe/config/impl/PathTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/PathTest.scala rename to config/src/test/scala/com/typesafe/config/impl/PathTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala b/config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/PropertiesTest.scala rename to config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala b/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/PublicApiTest.scala rename to config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/TestUtils.scala b/config/src/test/scala/com/typesafe/config/impl/TestUtils.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/TestUtils.scala rename to config/src/test/scala/com/typesafe/config/impl/TestUtils.scala diff --git a/src/test/scala/com/typesafe/config/impl/TokenTest.scala b/config/src/test/scala/com/typesafe/config/impl/TokenTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/TokenTest.scala rename to config/src/test/scala/com/typesafe/config/impl/TokenTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala b/config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/TokenizerTest.scala rename to config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/UnitParserTest.scala rename to config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala diff --git a/src/test/scala/com/typesafe/config/impl/UtilTest.scala b/config/src/test/scala/com/typesafe/config/impl/UtilTest.scala similarity index 100% rename from src/test/scala/com/typesafe/config/impl/UtilTest.scala rename to config/src/test/scala/com/typesafe/config/impl/UtilTest.scala diff --git a/src/test/scala/equiv03/SomethingInEquiv03.java b/config/src/test/scala/equiv03/SomethingInEquiv03.java similarity index 100% rename from src/test/scala/equiv03/SomethingInEquiv03.java rename to config/src/test/scala/equiv03/SomethingInEquiv03.java diff --git a/project/Build.scala b/project/Build.scala index f72c36d4..3c6c9fb2 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -2,6 +2,9 @@ import sbt._ import Keys._ object ConfigBuild extends Build { - lazy val root = Project(id = "config", - base = file(".")) + lazy val root = Project(id = "root", + base = file(".")) aggregate(configLib) + + lazy val configLib = Project(id = "config", + base = file("config")) }