Permalink
Browse files

Merge pull request #728 from xuwei-k/org-to-com

s/playframework.org/playframework.com
  • Loading branch information...
jroper committed Feb 7, 2013
2 parents df621e9 + b33604f commit 1198166e13613836aa1a7f379369a3ebbeee5240
View
@@ -4,7 +4,7 @@ Play 2.1 is a high productivity Java and Scala Web application framework, integr
It is based on a lightweight stateless Web friendly architecture and features predictable and minimal resources consumption (CPU, Memory, Threads) for highly scalable applications thanks to its reactive model based on Iteratee IO.
-http://www.playframework.org
+http://www.playframework.com
## Installing
@@ -15,7 +15,7 @@
1. [[Using the Play console | PlayConsole ]]
1. [[Setting up your preferred IDE | IDE]]
1. [[Sample applications | Samples]]
-1. [[Security policy | http://www.playframework.org/code/security]]
+1. [[Security policy | http://www.playframework.com/code/security]]
## Working with Play
@@ -97,7 +97,7 @@
* **Website:** <https://github.com/mbknor/gt-engine-play2>
* **Documentation:** <https://github.com/mbknor/gt-engine-play2/blob/master/README.markdown>
-* **Short description:** This module brings the Groovy Template engine from play 1 to Play 2. It uses gt-engine which is used by the Play 1 module "Faster Groovy Templates" <http://www.playframework.org/modules/fastergt>
+* **Short description:** This module brings the Groovy Template engine from play 1 to Play 2. It uses gt-engine which is used by the Play 1 module "Faster Groovy Templates" <http://www.playframework.com/modules/fastergt>
* **Samples:** <https://github.com/mbknor/gt-engine-play2/tree/master/samples>
## Guice Plugin (Java and Scala)
@@ -6,7 +6,7 @@
- [[Using the Play console | PlayConsole ]]
- [[Setting-up your preferred IDE | IDE]]
- [[Sample applications | Samples]]
-- [[Security policy | http://www.playframework.org/code/security]]
+- [[Security policy | http://www.playframework.com/code/security]]
### Working with Play
@@ -27,4 +27,4 @@
- [[Akka|http://akka.io/docs/]]
- [[sbt|http://www.scala-sbt.org/learn.html]]
- [[Configuration|https://github.com/typesafehub/config]]
-- [[Logback|http://logback.qos.ch/documentation.html]]
+- [[Logback|http://logback.qos.ch/documentation.html]]
@@ -12,7 +12,7 @@ Be sure to have the `java` and `javac` commands in the current path (you can che
## Download the binary package
-Download the latest [[Play binary package | http://www.playframework.org/download]] (take the latest official version) and extract the archive to a location where you have both read **and write** access. (Running `play` writes some files to directories within the archive, so don't install to `/opt`, `/usr/local` or anywhere else you’d need special permission to write to.)
+Download the latest [[Play binary package | http://www.playframework.com/download]] (take the latest official version) and extract the archive to a location where you have both read **and write** access. (Running `play` writes some files to directories within the archive, so don't install to `/opt`, `/usr/local` or anywhere else you’d need special permission to write to.)
## Add the play script to your PATH
@@ -13,7 +13,7 @@ public void renderTemplate() {
}
```
-You can find the complete list of the *test helpers* in the [Helper class API documentation](http://www.playframework.org/documentation/api/2.0.1/java/play/test/Helpers.html).
+You can find the complete list of the *test helpers* in the [Helper class API documentation](http://www.playframework.com/documentation/api/2.0.1/java/play/test/Helpers.html).
## Testing your controllers
@@ -78,4 +78,4 @@ public void runInBrowser() {
}
});
}
-```
+```
@@ -21,7 +21,7 @@ object Console {
|| __/|_|\____|\__ (_)
||_| |__/
|
- |""".stripMargin) + ("play! " + play.core.PlayVersion.current + " (using Java " + System.getProperty("java.version") + " and Scala " + play.core.PlayVersion.scalaVersion + "), http://www.playframework.org")
+ |""".stripMargin) + ("play! " + play.core.PlayVersion.current + " (using Java " + System.getProperty("java.version") + " and Scala " + play.core.PlayVersion.scalaVersion + "), http://www.playframework.com")
// -- Commands
@@ -225,7 +225,7 @@ object Console {
|license Display licensing informations.
|new [directory] Create a new Play application in the specified directory.
|
- |You can also browse the complete documentation at http://www.playframework.org.""".stripMargin, 0)
+ |You can also browse the complete documentation at http://www.playframework.com.""".stripMargin, 0)
}
def main(args: Array[String]) {
@@ -241,7 +241,7 @@ object Console {
|Use `play new` to create a new Play application in the current directory,
|or go to an existing application and launch the development console using `play`.
|
- |You can also browse the complete documentation at http://www.playframework.org.""".stripMargin), -1)
+ |You can also browse the complete documentation at http://www.playframework.com.""".stripMargin), -1)
}
println(text)
@@ -2,6 +2,6 @@
* Provides the Play framework's publicly accessible Java API.
*
* <h3>Play 2.1</h3>
- * <a href="http://www.playframework.org">http://www.playframework.org</a>
+ * <a href="http://www.playframework.com">http://www.playframework.com</a>
*/
package play;
@@ -2,7 +2,7 @@
* Play framework.
*
* == Play 2.1 ==
- * [[http://www.playframework.org http://www.playframework.org]]
+ * [[http://www.playframework.com http://www.playframework.com]]
*/
package object play
@@ -21,7 +21,7 @@ <h1><a href="/@@documentation">@message</a></h1>
</section>
<div id="news">
- <iframe src="http://www.playframework.org/widget?uid=@play.api.Play.maybeApplication.flatMap(_.configuration.getString("application.secret")).map(_.take(5)).map(play.api.libs.Codecs.sha1(_))&version=@play.core.PlayVersion.current&tag=@style.toUpperCase" scrolling="no" style="overflow: hidden; display: block; margin: 0 auto; width: 960px; height: 60px"></iframe>
+ <iframe src="http://www.playframework.com/widget?uid=@play.api.Play.maybeApplication.flatMap(_.configuration.getString("application.secret")).map(_.take(5)).map(play.api.libs.Codecs.sha1(_))&version=@play.core.PlayVersion.current&tag=@style.toUpperCase" scrolling="no" style="overflow: hidden; display: block; margin: 0 auto; width: 960px; height: 60px"></iframe>
</div>
@@ -133,7 +133,7 @@ <h2>Need more help?</h2>
<p>
When your application is run from the Play console, you can access the current documentation directly, at
- the <a href="/@@documentation">/@@documentation</a> URL or go to <a href="http://www.playframework.org">http://www.playframework.org</a>.
+ the <a href="/@@documentation">/@@documentation</a> URL or go to <a href="http://www.playframework.com">http://www.playframework.com</a>.
</p>
<p>
@@ -268,7 +268,7 @@ <h2>Need more help?</h2>
<p>
When your application is run from the Play console, you can access the current documentation directly, at
- the <a href="/@@documentation">/@@documentation</a> URL or go to <a href="http://www.playframework.org">http://www.playframework.org</a>.
+ the <a href="/@@documentation">/@@documentation</a> URL or go to <a href="http://www.playframework.com">http://www.playframework.com</a>.
</p>
<p>
@@ -7,7 +7,7 @@ object WSSpec extends Specification {
"WS" should {
"support several query string values for a parameter" in {
- val req = WS.url("http://playframework.org/")
+ val req = WS.url("http://playframework.com/")
.withQueryString("foo"->"foo1", "foo"->"foo2")
.prepare("GET").build
req.getQueryParams.get("foo").contains("foo1") must beTrue
@@ -16,4 +16,4 @@ object WSSpec extends Specification {
}
}
-}
+}
@@ -25,7 +25,7 @@ object PlayProject extends Plugin with PlayExceptions with PlayKeys with PlayRel
|Looks like you are using a deprecated version of Play's SBT Project (PlayProject in project/Build.scala).
|We are adding all of the new Play artifacts to your libraryDependencies for now but consider switching to the new API (i.e. play.Project).
|
- |For any migration related issues, please consult the migration manual at http://www.playframework.org
+ |For any migration related issues, please consult the migration manual at http://www.playframework.com
""").stripMargin)
val allDependencies = (dependencies ++ Seq(jdbc, anorm, javaCore, javaJdbc, javaEbean )).toSet.toSeq
@@ -50,9 +50,9 @@ public void test() {
start();
Result result = callAction(
controllers.routes.ref.JavaApi.headers(),
- fakeRequest().withHeader(HOST, "playframework.org")
+ fakeRequest().withHeader(HOST, "playframework.com")
);
- assertThat(contentAsString(result)).isEqualTo("playframework.org");
+ assertThat(contentAsString(result)).isEqualTo("playframework.com");
}
@Test
public void testCookie() {
@@ -49,7 +49,7 @@ <h1>@title</h1>
<footer>
<p>
- <a href="http://www.playframework.org">www.playframework.org</a>
+ <a href="http://www.playframework.com">www.playframework.com</a>
</p>
</footer>
@@ -41,7 +41,7 @@
<footer>
<p>
- <a href="http://www.playframework.org">www.playframework.org</a>
+ <a href="http://www.playframework.com">www.playframework.com</a>
</p>
</footer>
@@ -46,7 +46,7 @@ <h1>@title</h1>
<footer>
<p>
- <a href="http://www.playframework.org">www.playframework.org</a>
+ <a href="http://www.playframework.com">www.playframework.com</a>
</p>
</footer>
@@ -41,7 +41,7 @@
<footer>
<p>
- <a href="http://www.playframework.org">www.playframework.org</a>
+ <a href="http://www.playframework.com">www.playframework.com</a>
</p>
</footer>

0 comments on commit 1198166

Please sign in to comment.