Skip to content

Commit c03035a

Browse files
sirthiassirthias
committed
Rename domain name from spray.cc to spray.io, rename packages from 'cc.spray' to 'spray'
1 parent af3c59b commit c03035a

File tree

380 files changed

+1254
-1254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+1254
-1254
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This software is licensed under the Apache 2 license, quoted below.
22

3-
Copyright (C) 2011-2012 spray.cc
3+
Copyright (C) 2011-2012 spray.io
44

55
Licensed under the Apache License, Version 2.0 (the "License"); you may not
66
use this file except in compliance with the License. You may obtain a copy of

‎README.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Please see
22

3-
* <http://spray.cc/> for all documentation
4-
* <http://repo.spray.cc/> for the released artifacts
3+
* <http://spray.io/> for all documentation
4+
* <http://repo.spray.io/> for the released artifacts
55
* <http://groups.google.com/group/spray-user/> for the user mailing list / forum
66
* <http://spray.github.com/spray/api/> for the _spray_ API documentation
77
* <http://github.com/spray/spray-template> for the SBT template project

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
source_encoding = 'utf-8'
99
master_doc = 'index'
1010
project = u'spray'
11-
copyright = u'2011-2012 spray.cc.'
11+
copyright = u'2011-2012 spray.io.'
1212
version = '$VERSION$'
1313
release = '$VERSION$'
1414
exclude_patterns = []

‎docs/contact.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ Twitter
1818

1919
If you `follow us on twitter`__ we'll keep you informed about new developments as well as general news around *spray*.
2020

21-
__ http://twitter.com/spraycc
21+
__ http://twitter.com/sprayio
2222

2323

2424
Email
2525
-----
2626

2727
If you feel that the mailing list is not appropriate for your request, you can also mail us under
2828

29-
``info (at) spray (dot) cc``
29+
``info (at) spray (dot) io``
3030

3131

3232
Skype / GTalk / Jabber

‎docs/documentation/spray-caching/code/docs/CachingExamplesSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import org.specs2.mutable.Specification
55
//# example-1
66
import akka.dispatch.Future
77
import akka.actor.ActorSystem
8-
import cc.spray.caching.{LruCache, Cache}
9-
import cc.spray.util._
8+
import spray.caching.{LruCache, Cache}
9+
import spray.util._
1010

1111
//#
1212

‎docs/documentation/spray-caching/index.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Installation
3333

3434
The :ref:`maven-repo` chapter contains all the info about how to pull *spray-caching* into your classpath.
3535

36-
Afterwards just ``import cc.spray.caching._`` to bring all relevant identifiers into scope.
36+
Afterwards just ``import spray.caching._`` to bring all relevant identifiers into scope.
3737

3838

3939
The `Cache` Interface
@@ -109,6 +109,6 @@ has to be strictly greater than the time-to-idle.
109109
they might prevent gargabe collection of their values for longer than expected.
110110

111111

112-
.. _Cache: https://github.com/spray/spray/blob/master/spray-caching/src/main/scala/cc/spray/caching/Cache.scala
113-
.. _SimpleLruCache and ExpiringLruCache: https://github.com/spray/spray/blob/master/spray-caching/src/main/scala/cc/spray/caching/LruCache.scala
112+
.. _Cache: https://github.com/spray/spray/blob/master/spray-caching/src/main/scala/spray/caching/Cache.scala
113+
.. _SimpleLruCache and ExpiringLruCache: https://github.com/spray/spray/blob/master/spray-caching/src/main/scala/spray/caching/LruCache.scala
114114
.. _concurrentlinkedhashmap: http://code.google.com/p/concurrentlinkedhashmap/

‎docs/documentation/spray-can/code/docs/HttpDialogExamplesSpec.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import akka.actor.{Props, ActorSystem} // example-1
55
import akka.dispatch.Future // example-1
66
import akka.util.Duration
77
import akka.pattern.ask
8-
import cc.spray.can.client.{HttpDialog, HttpClient} // example-1
9-
import cc.spray.can.server.HttpServer
10-
import cc.spray.io._ // example-1
11-
import cc.spray.util._
12-
import cc.spray.http._ // example-1
8+
import spray.can.client.{HttpDialog, HttpClient} // example-1
9+
import spray.can.server.HttpServer
10+
import spray.io._ // example-1
11+
import spray.util._
12+
import spray.http._ // example-1
1313
import HttpMethods._ // example-1
1414

1515

@@ -42,7 +42,7 @@ class HttpDialogExamplesSpec extends Specification {
4242
}
4343

4444
"example-2" in {
45-
import cc.spray.httpx.RequestBuilding._
45+
import spray.httpx.RequestBuilding._
4646

4747
val responses: Future[Seq[HttpResponse]] =
4848
HttpDialog(client, targetHostName, port)
@@ -54,7 +54,7 @@ class HttpDialogExamplesSpec extends Specification {
5454
}
5555

5656
"example-3" in {
57-
import cc.spray.httpx.RequestBuilding._ // hide
57+
import spray.httpx.RequestBuilding._ // hide
5858

5959
val responses: Future[Seq[HttpResponse]] =
6060
HttpDialog(client, targetHostName, port)
@@ -66,7 +66,7 @@ class HttpDialogExamplesSpec extends Specification {
6666
}
6767

6868
"example-4" in {
69-
import cc.spray.httpx.RequestBuilding._ // hide
69+
import spray.httpx.RequestBuilding._ // hide
7070

7171
val response: Future[HttpResponse] =
7272
HttpDialog(client, targetHostName, port)

‎docs/documentation/spray-can/code/docs/HttpServerExamplesSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package docs
22

33
import org.specs2.mutable.Specification
44
import akka.actor.Actor
5-
import cc.spray.http._
5+
import spray.http._
66
import HttpMethods._
77

88

‎docs/documentation/spray-can/http-client.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ in the HttpClient__ companion object). The client will attempt to connect to the
3737
an ``HttpClient.Connected`` event after the connection has been established, or a ``Status.Failure`` message
3838
(which is automatically turned into Future failures if the ``Connect`` was sent with an ``ask``).
3939

40-
__ https://github.com/spray/spray/blob/master/spray-can/src/main/scala/cc/spray/can/client/HttpClient.scala
40+
__ https://github.com/spray/spray/blob/master/spray-can/src/main/scala/spray/can/client/HttpClient.scala
4141

4242
After the connection has been established the application then sends an ``HttpRequest`` to the sender of the
4343
``Connected`` message (which is the connection actor responsible for the connection). After having received and parsed
@@ -103,7 +103,7 @@ Closed Notifications
103103
When a connection is closed, for whatever reason, the ``HttpClient`` dispatches a ``Closed`` event message to the
104104
application. This message carries a ``reason`` member whose possible values are define here__.
105105

106-
__ https://github.com/spray/spray/blob/master/spray-io/src/main/scala/cc/spray/io/ConnectionClosedReason.scala
106+
__ https://github.com/spray/spray/blob/master/spray-io/src/main/scala/spray/io/ConnectionClosedReason.scala
107107

108108

109109
Connection Configuration

‎docs/documentation/spray-can/http-server.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Message Protocol
7878
A running ``HttpServer`` actor understands the following command messages
7979
(they are all defined in the HttpServer__ companion object):
8080

81-
__ https://github.com/spray/spray/blob/master/spray-can/src/main/scala/cc/spray/can/server/HttpServer.scala
81+
__ https://github.com/spray/spray/blob/master/spray-can/src/main/scala/spray/can/server/HttpServer.scala
8282

8383
Bind
8484
Start listening for incoming connections on a particular port. The sender receives a ``Bound`` event upon completion.
@@ -146,7 +146,7 @@ Request Timeouts
146146
~~~~~~~~~~~~~~~~
147147

148148
If the handler does not respond to a request within the configured ``request-timeout`` period a
149-
``cc.spray.http.Timeout`` message is sent to the timeout handler, which can be the "regular" handler itself or
149+
``spray.http.Timeout`` message is sent to the timeout handler, which can be the "regular" handler itself or
150150
another actor (depending on the ``timeout-handler`` config setting). The timeout handler then has the chance to
151151
complete the request within the time period configured as ``timeout-timeout``. Only if the timeout handler also misses
152152
its deadline for completing the request will the ``HttpServer`` complete the request itself with a "hard-coded" error

‎docs/documentation/spray-can/installation.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ The :ref:`maven-repo` chapter contains all the info about how to pull *spray-can
55

66
Afterwards use the following imports to bring all relevant identifiers into scope:
77

8-
- ``import cc.spray.can.client._`` for everything related to the :ref:`HttpClient` and the :ref:`HttpDialog`
9-
- ``import cc.spray.can.server._`` for everything related to the :ref:`HttpServer`
8+
- ``import spray.can.client._`` for everything related to the :ref:`HttpClient` and the :ref:`HttpDialog`
9+
- ``import spray.can.server._`` for everything related to the :ref:`HttpServer`

‎docs/documentation/spray-client/code/docs/HttpConduitExamplesSpec.scala

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import akka.pattern.ask
88
import akka.actor.{Props, ActorSystem} // setup
99
import akka.dispatch.Future // setup
1010
import cc.spray.json.DefaultJsonProtocol
11-
import cc.spray.can.client.HttpClient // setup
12-
import cc.spray.can.server.HttpServer
13-
import cc.spray.client.HttpConduit // setup
14-
import cc.spray.io._ // setup
15-
import cc.spray.util._
16-
import cc.spray.http._ // setup
11+
import spray.can.client.HttpClient // setup
12+
import spray.can.server.HttpServer
13+
import spray.client.HttpConduit // setup
14+
import spray.io._ // setup
15+
import spray.util._
16+
import spray.http._ // setup
1717
import HttpMethods._ // setup
1818

1919

@@ -35,7 +35,7 @@ class HttpConduitExamplesSpec extends Specification {
3535
step {
3636
val handler = system.actorOf(Props(behavior = ctx => {
3737
case x@HttpRequest(POST, "/orders", _, _, _) =>
38-
import cc.spray.httpx.encoding.{Gzip, Deflate}
38+
import spray.httpx.encoding.{Gzip, Deflate}
3939
ctx.sender ! Deflate.encode(HttpResponse(entity = Gzip.decode(x).entity))
4040
case x: HttpRequest => ctx.sender ! HttpResponse(entity = x.uri)
4141
}))
@@ -50,8 +50,8 @@ class HttpConduitExamplesSpec extends Specification {
5050
}
5151

5252
"example-2" in {
53-
import cc.spray.httpx.encoding.{Gzip, Deflate}
54-
import cc.spray.httpx.SprayJsonSupport._
53+
import spray.httpx.encoding.{Gzip, Deflate}
54+
import spray.httpx.SprayJsonSupport._
5555

5656
case class Order(id: Int)
5757
case class OrderConfirmation(id: Int)

‎docs/documentation/spray-client/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Installation
3737

3838
The :ref:`maven-repo` chapter contains all the info about how to pull *spray-client* into your classpath.
3939

40-
Afterwards just ``import cc.spray.client._`` to bring all relevant identifiers into scope.
40+
Afterwards just ``import spray.client._`` to bring all relevant identifiers into scope.
4141

4242

4343
Configuration

‎docs/documentation/spray-http/code/docs/CustomHttpExtensionExamplesSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.specs2.mutable.Specification
66
class CustomHttpExtensionExamplesSpec extends Specification {
77

88
"custom-media-type" in {
9-
import cc.spray.http.MediaTypes._
9+
import spray.http.MediaTypes._
1010
val MarkdownType = register(CustomMediaType("text/x-markdown", "markdown", "mdown", "md"))
1111
getForKey("text" -> "x-markdown") === Some(MarkdownType) // hide
1212
}

‎docs/documentation/spray-http/index.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Installation
2626

2727
The :ref:`maven-repo` chapter contains all the info about how to pull *spray-http* into your classpath.
2828

29-
Afterwards just ``import cc.spray.http._`` to bring all relevant identifiers into scope.
29+
Afterwards just ``import spray.http._`` to bring all relevant identifiers into scope.
3030

3131

3232
Overview
@@ -35,7 +35,7 @@ Overview
3535
Since *spray-http* provides the central HTTP data structures for *spray* you will find the following import
3636
in quite a few places around the *spray* code base (and probably your own code as well)::
3737

38-
import cc.spray.http._
38+
import spray.http._
3939

4040
This brings in scope all of the relevant things that are defined here_ and that you'll want to work with, mainly:
4141

@@ -64,7 +64,7 @@ In order to develop a better understanding for how *spray* models HTTP you proba
6464
around the `spray-http sources`_ (ideally with an IDE that supports proper code navigation).
6565

6666
.. _here: `spray-http sources`_
67-
.. _spray-http sources: https://github.com/spray/spray/tree/master/spray-http/src/main/scala/cc/spray/http
67+
.. _spray-http sources: https://github.com/spray/spray/tree/master/spray-http/src/main/scala/spray/http
6868

6969

7070
2-Stage Message Parsing
@@ -116,4 +116,4 @@ incoming responses by :ref:`spray-client`. File extension resolution (as used fo
116116
:ref:`FileAndResourceDirectives`) will work as expected.
117117

118118
.. _IANA MIME media type registry: http://www.iana.org/assignments/media-types/index.html
119-
.. _MediaTypes: https://github.com/spray/spray/blob/master/spray-http/src/main/scala/cc/spray/http/MediaType.scala
119+
.. _MediaTypes: https://github.com/spray/spray/blob/master/spray-http/src/main/scala/spray/http/MediaType.scala

‎docs/documentation/spray-httpx/code/docs/MarshallingExamplesSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import org.specs2.mutable.Specification
66
class MarshallingExamplesSpec extends Specification {
77

88
//# example-1
9-
import cc.spray.http.HttpBody
10-
import cc.spray.httpx.marshalling._
11-
import cc.spray.http.MediaTypes._
9+
import spray.http.HttpBody
10+
import spray.httpx.marshalling._
11+
import spray.http.MediaTypes._
1212

1313
val `application/vnd.acme.person` =
1414
register(CustomMediaType("application/vnd.acme.person"))

‎docs/documentation/spray-httpx/code/docs/RequestBuildingExamplesSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package docs
22

33
import org.specs2.mutable.Specification
4-
import cc.spray.httpx.marshalling.Marshaller
4+
import spray.httpx.marshalling.Marshaller
55

66

77
class RequestBuildingExamplesSpec extends Specification {
88

99
"example-1" in {
10-
import cc.spray.http._
10+
import spray.http._
1111
import HttpMethods._
1212
import HttpHeaders._
1313
import MediaTypes._
14-
import cc.spray.httpx.RequestBuilding._
14+
import spray.httpx.RequestBuilding._
1515

1616
// simple GET requests
1717
Get() === HttpRequest(method = GET)

‎docs/documentation/spray-httpx/code/docs/SprayJsonSupportExamplesSpec.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import org.specs2.mutable.Specification
66
class SprayJsonSupportExamplesSpec extends Specification {
77

88
//# example-1
9-
import cc.spray.httpx.unmarshalling.pimpHttpEntity
9+
import spray.httpx.unmarshalling.pimpHttpEntity
1010
import cc.spray.json.DefaultJsonProtocol
11-
import cc.spray.httpx.marshalling._
12-
import cc.spray.http._
11+
import spray.httpx.marshalling._
12+
import spray.http._
1313
import MediaTypes.`application/json`
1414

1515
case class Person(name: String, firstName: String, age: Int)
@@ -22,7 +22,7 @@ class SprayJsonSupportExamplesSpec extends Specification {
2222

2323
"example-1" in {
2424
import MyJsonProtocol._
25-
import cc.spray.httpx.SprayJsonSupport._
25+
import spray.httpx.SprayJsonSupport._
2626

2727
val bob = Person("Bob", "Parr", 32)
2828
val body = HttpBody(`application/json`,

‎docs/documentation/spray-httpx/code/docs/UnmarshallingExamplesSpec.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package docs
22

33
import org.specs2.mutable.Specification
4-
import cc.spray.httpx.unmarshalling.ContentExpected
5-
import cc.spray.http.EmptyEntity
4+
import spray.httpx.unmarshalling.ContentExpected
5+
import spray.http.EmptyEntity
66
import xml.NodeSeq
77

88

99
class UnmarshallingExamplesSpec extends Specification {
1010

1111
//# example-1
12-
import cc.spray.http.HttpBody
13-
import cc.spray.util.pimpByteArray
14-
import cc.spray.httpx.unmarshalling.{Unmarshaller, pimpHttpEntity}
15-
import cc.spray.http.MediaTypes._
12+
import spray.http.HttpBody
13+
import spray.util.pimpByteArray
14+
import spray.httpx.unmarshalling.{Unmarshaller, pimpHttpEntity}
15+
import spray.http.MediaTypes._
1616

1717
val `application/vnd.acme.person` =
1818
register(CustomMediaType("application/vnd.acme.person"))
@@ -55,7 +55,7 @@ class UnmarshallingExamplesSpec extends Specification {
5555
}
5656

5757
"example-3" in {
58-
import cc.spray.http.MediaTypes.`text/xml`
58+
import spray.http.MediaTypes.`text/xml`
5959

6060
implicit val myNodeSeqUnmarshaller = Unmarshaller.forNonEmpty[NodeSeq]
6161

‎docs/documentation/spray-httpx/de-compression.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ text), are compression algorithms.
77

88
Currently *spray* supports the compression and decompression of HTTP requests and responses with the ``gzip`` or
99
``deflate`` encodings. The core logic for this, which is shared by the :ref:`spray-client` and :ref:`spray-routing`
10-
modules for the client- and server-side (respectively), lives in the `cc.spray.httpx.encoding`_ package.
10+
modules for the client- and server-side (respectively), lives in the `spray.httpx.encoding`_ package.
1111

1212
.. _HTTP spec: http://www.w3.org/Protocols/rfc2616/rfc2616.html
13-
.. _cc.spray.httpx.encoding: https://github.com/spray/spray/tree/master/spray-httpx/src/main/scala/cc/spray/httpx/encoding
13+
.. _spray.httpx.encoding: https://github.com/spray/spray/tree/master/spray-httpx/src/main/scala/spray/httpx/encoding
1414

1515

1616
Compression of Chunk Streams

‎docs/documentation/spray-httpx/installation.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ The :ref:`maven-repo` chapter contains all the info about how to pull *spray-htt
55

66
Afterwards use the following imports to bring all relevant identifiers into scope:
77

8-
- ``import cc.spray.httpx.encoding._`` for everything related to (de)compression
9-
- ``import cc.spray.httpx.marshalling._`` for everything related to marshalling
10-
- ``import cc.spray.httpx.unmarshalling._`` for everything related to unmarshalling
11-
- ``import cc.spray.httpx.RequestBuilding`` for ``RequestBuilding``
12-
- ``import cc.spray.httpx.ResponseTransformation`` for ``ResponseTransformation``
13-
- ``import cc.spray.httpx.SprayJsonSupport`` for ``SprayJsonSupport``
14-
- ``import cc.spray.httpx.LiftJsonSupport`` for ``LiftJsonSupport``
15-
- ``import cc.spray.httpx.TwirlSupport`` for ``TwirlSupport``
8+
- ``import spray.httpx.encoding._`` for everything related to (de)compression
9+
- ``import spray.httpx.marshalling._`` for everything related to marshalling
10+
- ``import spray.httpx.unmarshalling._`` for everything related to unmarshalling
11+
- ``import spray.httpx.RequestBuilding`` for ``RequestBuilding``
12+
- ``import spray.httpx.ResponseTransformation`` for ``ResponseTransformation``
13+
- ``import spray.httpx.SprayJsonSupport`` for ``SprayJsonSupport``
14+
- ``import spray.httpx.LiftJsonSupport`` for ``LiftJsonSupport``
15+
- ``import spray.httpx.TwirlSupport`` for ``TwirlSupport``

‎docs/documentation/spray-httpx/lift-json-support.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ with your custom logic.
1515
project yourself. Check the lift-json_ documentation for information on how to do this.
1616

1717

18-
.. _LiftJsonSupport: https://github.com/spray/spray/blob/master/spray-httpx/src/main/scala/cc/spray/httpx/LiftJsonSupport.scala
18+
.. _LiftJsonSupport: https://github.com/spray/spray/blob/master/spray-httpx/src/main/scala/spray/httpx/LiftJsonSupport.scala
1919
.. _lift-json: https://github.com/lift/lift/tree/master/framework/lift-base/lift-json/

0 commit comments

Comments
 (0)