summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2012-10-12 14:13:43 +0200
committerMathias <mathias@spray.cc>2012-10-12 14:13:43 +0200
commit5354b7b2b1af66049328eed150e036a314878559 (patch)
treed14346f16c6a962267e99e9335b01f73a461896f
parent573b9d6e0b637e6ffe9c5a036bf552542d79eae8 (diff)
downloadspray-json-5354b7b2b1af66049328eed150e036a314878559.tar.gz
spray-json-5354b7b2b1af66049328eed150e036a314878559.tar.bz2
spray-json-5354b7b2b1af66049328eed150e036a314878559.zip
Rename domain name from spray.cc to spray.io, rename package from 'cc.spray.json' to 'spray.json'
-rw-r--r--README.markdown8
-rw-r--r--build.sbt8
-rw-r--r--notes/about.markdown2
-rw-r--r--src/main/ls/1.1.0.json2
-rw-r--r--src/main/ls/1.1.1.json2
-rw-r--r--src/main/scala/cc/spray/json/AdditionalFormats.scala2
-rw-r--r--src/main/scala/cc/spray/json/BasicFormats.scala2
-rw-r--r--src/main/scala/cc/spray/json/CollectionFormats.scala4
-rw-r--r--src/main/scala/cc/spray/json/CompactPrinter.scala2
-rw-r--r--src/main/scala/cc/spray/json/DefaultJsonProtocol.scala2
-rw-r--r--src/main/scala/cc/spray/json/JsValue.scala2
-rw-r--r--src/main/scala/cc/spray/json/JsonFormat.scala2
-rw-r--r--src/main/scala/cc/spray/json/JsonParser.scala2
-rw-r--r--src/main/scala/cc/spray/json/JsonPrinter.scala2
-rw-r--r--src/main/scala/cc/spray/json/PrettyPrinter.scala2
-rw-r--r--src/main/scala/cc/spray/json/ProductFormats.scala2
-rw-r--r--src/main/scala/cc/spray/json/StandardFormats.scala2
-rw-r--r--src/main/scala/cc/spray/json/package.scala2
-rw-r--r--src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/BasicFormatsSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/CollectionFormatsSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/CompactPrinterSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/CustomFormatSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/JsonParserSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/PrettyPrinterSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/ProductFormatsSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/ReadmeSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/StandardFormatsSpec.scala2
28 files changed, 35 insertions, 35 deletions
diff --git a/README.markdown b/README.markdown
index b0c428c..569f0f4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,12 +10,12 @@ It sports the following features:
### Installation
-_spray-json_ is available from the [repo.spray.cc] repository.
+_spray-json_ is available from the [repo.spray.io] repository.
The latest release is `1.1.1` and is built against Scala 2.9.1.
If you use SBT you can include _spray-json_ in your project with
- "cc.spray" %% "spray-json" % "1.1.1"
+ "io.spray" %% "spray-json" % "1.1.1"
_spray-json_ has only one dependency: the parsing library [parboiled][]
(which is also a dependency of _spray-server_ and _spray-client_, so if you use _spray-json_ with either of them you
@@ -27,7 +27,7 @@ are not incurring any additional dependency).
_spray-json_ is really easy to use.
Just bring all relevant elements in scope with
- import cc.spray.json._
+ import spray.json._
and do one or more of the following:
@@ -254,7 +254,7 @@ _spray-json_ project under the project’s open source license.
[JSON]: http://json.org
[parboiled]: http://parboiled.org
- [repo.spray.cc]: http://repo.spray.cc
+ [repo.spray.io]: http://repo.spray.io
[SJSON]: https://github.com/debasishg/sjson
[Databinder-Dispatch]: https://github.com/n8han/Databinder-Dispatch
[APL 2.0]: http://www.apache.org/licenses/LICENSE-2.0
diff --git a/build.sbt b/build.sbt
index 4adc735..a0511d9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,9 +2,9 @@ name := "spray-json"
version := "1.1.2"
-organization := "cc.spray"
+organization := "io.spray"
-organizationHomepage := Some(new URL("http://spray.cc"))
+organizationHomepage := Some(new URL("http://spray.io"))
description := "A Scala library for easy and idiomatic JSON (de)serialization"
@@ -37,7 +37,7 @@ publishMavenStyle := true
publishTo <<= version { version =>
Some {
"spray repo" at {
- // public uri is repo.spray.cc, we use an SSH tunnel to the nexus here
+ // public uri is repo.spray.io, we use an SSH tunnel to the nexus here
"http://localhost:42424/content/repositories/" + {
if (version.trim.endsWith("SNAPSHOT")) "snapshots/" else"releases/"
}
@@ -57,4 +57,4 @@ seq(lsSettings:_*)
(LsKeys.docsUrl in LsKeys.lsync) := Some(new URL("http://spray.github.com/spray/api/spray-json/"))
-(externalResolvers in LsKeys.lsync) := Seq("spray repo" at "http://repo.spray.cc") \ No newline at end of file
+(externalResolvers in LsKeys.lsync) := Seq("spray repo" at "http://repo.spray.io") \ No newline at end of file
diff --git a/notes/about.markdown b/notes/about.markdown
index fbc188a..975f50c 100644
--- a/notes/about.markdown
+++ b/notes/about.markdown
@@ -7,6 +7,6 @@ It sports the following features:
* Choice of either compact or pretty JSON-to-string printing
* Type-class based (de)serialization of custom objects (no reflection, no intrusion)
- [spray-json]: http://json.spray.cc
+ [spray-json]: http://json.spray.io
[JSON]: http://json.org
[parboiled]: http://parboiled.org
diff --git a/src/main/ls/1.1.0.json b/src/main/ls/1.1.0.json
index 9504e42..6e3df7e 100644
--- a/src/main/ls/1.1.0.json
+++ b/src/main/ls/1.1.0.json
@@ -11,7 +11,7 @@
"name": "Apache 2",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
}],
- "resolvers": ["http://repo.spray.cc"],
+ "resolvers": ["http://repo.spray.io"],
"dependencies": [{
"organization":"org.parboiled",
"name": "parboiled-scala",
diff --git a/src/main/ls/1.1.1.json b/src/main/ls/1.1.1.json
index f2326ee..9bc7660 100644
--- a/src/main/ls/1.1.1.json
+++ b/src/main/ls/1.1.1.json
@@ -11,7 +11,7 @@
"name": "Apache 2",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
}],
- "resolvers": ["http://repo.spray.cc"],
+ "resolvers": ["http://repo.spray.io"],
"dependencies": [{
"organization":"org.parboiled",
"name": "parboiled-scala",
diff --git a/src/main/scala/cc/spray/json/AdditionalFormats.scala b/src/main/scala/cc/spray/json/AdditionalFormats.scala
index 889fdaf..20fdc74 100644
--- a/src/main/scala/cc/spray/json/AdditionalFormats.scala
+++ b/src/main/scala/cc/spray/json/AdditionalFormats.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
/**
* Provides additional JsonFormats and helpers
diff --git a/src/main/scala/cc/spray/json/BasicFormats.scala b/src/main/scala/cc/spray/json/BasicFormats.scala
index 0389e3a..55fe0bf 100644
--- a/src/main/scala/cc/spray/json/BasicFormats.scala
+++ b/src/main/scala/cc/spray/json/BasicFormats.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
/**
* Provides the JsonFormats for the most important Scala types.
diff --git a/src/main/scala/cc/spray/json/CollectionFormats.scala b/src/main/scala/cc/spray/json/CollectionFormats.scala
index 93e41ab..3b0d0c2 100644
--- a/src/main/scala/cc/spray/json/CollectionFormats.scala
+++ b/src/main/scala/cc/spray/json/CollectionFormats.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
trait CollectionFormats {
@@ -43,7 +43,7 @@ trait CollectionFormats {
/**
* Supplies the JsonFormat for Maps. The implicitly available JsonFormat for the key type K must
- * always write JsStrings, otherwise a [[cc.spray.json.SerializationException]] will be thrown.
+ * always write JsStrings, otherwise a [[spray.json.SerializationException]] will be thrown.
*/
implicit def mapFormat[K :JsonFormat, V :JsonFormat] = new RootJsonFormat[Map[K, V]] {
def write(m: Map[K, V]) = JsObject {
diff --git a/src/main/scala/cc/spray/json/CompactPrinter.scala b/src/main/scala/cc/spray/json/CompactPrinter.scala
index 467160d..b7d2856 100644
--- a/src/main/scala/cc/spray/json/CompactPrinter.scala
+++ b/src/main/scala/cc/spray/json/CompactPrinter.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import java.lang.StringBuilder
diff --git a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
index 6f8daf5..4c93184 100644
--- a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
+++ b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
/**
* Provides all the predefined JsonFormats.
diff --git a/src/main/scala/cc/spray/json/JsValue.scala b/src/main/scala/cc/spray/json/JsValue.scala
index d14312b..8b25c98 100644
--- a/src/main/scala/cc/spray/json/JsValue.scala
+++ b/src/main/scala/cc/spray/json/JsValue.scala
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import collection.immutable.ListMap
diff --git a/src/main/scala/cc/spray/json/JsonFormat.scala b/src/main/scala/cc/spray/json/JsonFormat.scala
index 683a823..c4915cc 100644
--- a/src/main/scala/cc/spray/json/JsonFormat.scala
+++ b/src/main/scala/cc/spray/json/JsonFormat.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import annotation.implicitNotFound
diff --git a/src/main/scala/cc/spray/json/JsonParser.scala b/src/main/scala/cc/spray/json/JsonParser.scala
index 3886672..c01193b 100644
--- a/src/main/scala/cc/spray/json/JsonParser.scala
+++ b/src/main/scala/cc/spray/json/JsonParser.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.parboiled.scala._
import org.parboiled.errors.{ErrorUtils, ParsingException}
diff --git a/src/main/scala/cc/spray/json/JsonPrinter.scala b/src/main/scala/cc/spray/json/JsonPrinter.scala
index 44ee9de..23529f3 100644
--- a/src/main/scala/cc/spray/json/JsonPrinter.scala
+++ b/src/main/scala/cc/spray/json/JsonPrinter.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import annotation.tailrec
import java.lang.StringBuilder
diff --git a/src/main/scala/cc/spray/json/PrettyPrinter.scala b/src/main/scala/cc/spray/json/PrettyPrinter.scala
index 429c984..0daaf71 100644
--- a/src/main/scala/cc/spray/json/PrettyPrinter.scala
+++ b/src/main/scala/cc/spray/json/PrettyPrinter.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import java.lang.StringBuilder
import annotation.tailrec
diff --git a/src/main/scala/cc/spray/json/ProductFormats.scala b/src/main/scala/cc/spray/json/ProductFormats.scala
index 3bd3783..5504fbd 100644
--- a/src/main/scala/cc/spray/json/ProductFormats.scala
+++ b/src/main/scala/cc/spray/json/ProductFormats.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
/**
* Provides the helpers for constructing custom JsonFormat implementations for types implementing the Product trait
diff --git a/src/main/scala/cc/spray/json/StandardFormats.scala b/src/main/scala/cc/spray/json/StandardFormats.scala
index 78bc539..6a9712a 100644
--- a/src/main/scala/cc/spray/json/StandardFormats.scala
+++ b/src/main/scala/cc/spray/json/StandardFormats.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import scala.{Left, Right}
diff --git a/src/main/scala/cc/spray/json/package.scala b/src/main/scala/cc/spray/json/package.scala
index ec12939..5bf5714 100644
--- a/src/main/scala/cc/spray/json/package.scala
+++ b/src/main/scala/cc/spray/json/package.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray
+package spray
package object json {
diff --git a/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
index f25c9d8..0a28560 100644
--- a/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
index f873948..82fb127 100644
--- a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
index a252b1f..3d953bb 100644
--- a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
import java.util.Arrays
diff --git a/src/test/scala/cc/spray/json/CompactPrinterSpec.scala b/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
index c441864..c00512d 100644
--- a/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
+++ b/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/CustomFormatSpec.scala b/src/test/scala/cc/spray/json/CustomFormatSpec.scala
index e8feb59..dcea4f2 100644
--- a/src/test/scala/cc/spray/json/CustomFormatSpec.scala
+++ b/src/test/scala/cc/spray/json/CustomFormatSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable.Specification
diff --git a/src/test/scala/cc/spray/json/JsonParserSpec.scala b/src/test/scala/cc/spray/json/JsonParserSpec.scala
index cfe270f..af68216 100644
--- a/src/test/scala/cc/spray/json/JsonParserSpec.scala
+++ b/src/test/scala/cc/spray/json/JsonParserSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
import org.parboiled.common.FileUtils
diff --git a/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala b/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
index 3bc29ff..8b7bc2b 100644
--- a/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
+++ b/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
index c34f491..e452639 100644
--- a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/ReadmeSpec.scala b/src/test/scala/cc/spray/json/ReadmeSpec.scala
index 791720f..89d3dbc 100644
--- a/src/test/scala/cc/spray/json/ReadmeSpec.scala
+++ b/src/test/scala/cc/spray/json/ReadmeSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
diff --git a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
index ed6283f..0b4dc26 100644
--- a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package cc.spray.json
+package spray.json
import org.specs2.mutable._
import scala.Right