Skip to content

Commit

Permalink
Modules are now named net.gyokuro.*
Browse files Browse the repository at this point in the history
  • Loading branch information
bjansen committed Nov 29, 2016
1 parent 883eb3d commit 9c09007
Show file tree
Hide file tree
Showing 93 changed files with 128 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ script:
env:
global:
- CEYLON="http://ceylon-lang.org/download/dist/1_3_1"
- TEST_MODULE="test.com.github.bjansen.gyokuro.core"
- TEST_MODULE="test.net.gyokuro.core"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Create a new Ceylon module:

```ceylon
module gyokuro.demo.rest "1.0.0" {
import com.github.bjansen.gyokuro.core "0.1.0";
import net.gyokuro.core "0.1.0";
import ceylon.net "1.2.0-3";
}
```

Add a runnable top level function that bootstraps a gyokuro application:

```ceylon
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
Application,
get,
post,
Expand Down Expand Up @@ -103,7 +103,7 @@ Each function annotated with `route` will be mapped to the corresponding path. F
import ceylon.net.http.server {
Response
}
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
controller,
route
}
Expand Down
2 changes: 1 addition & 1 deletion demos/gyokuro/demo/ceylonhtml/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
native("jvm")
module gyokuro.demo.ceylonhtml "0.2" {
import com.github.bjansen.gyokuro.view.ceylonhtml "0.2";
import net.gyokuro.view.ceylonhtml "0.2";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/ceylonhtml/run.ceylon
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import ceylon.html {
Div
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
render,
Application,
get
}
import com.github.bjansen.gyokuro.view.ceylonhtml {
import net.gyokuro.view.ceylonhtml {
CeylonHtmlRenderer,
HtmlTemplate
}
Expand Down
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/gson/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
native("jvm")
module gyokuro.demo.gson "0.2" {
import com.github.bjansen.gyokuro.core "0.2";
import com.github.bjansen.gyokuro.transform.gson "0.2";
import net.gyokuro.core "0.2";
import net.gyokuro.transform.gson "0.2";
import ceylon.logging "1.3.1";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/gson/run.ceylon
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
get,
Application,
serve,
post
}
import com.github.bjansen.gyokuro.transform.gson {
import net.gyokuro.transform.gson {
GsonTransformer
}
import ceylon.logging {
Expand Down
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/mustache/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
native("jvm")
module gyokuro.demo.mustache "0.2" {
import com.github.bjansen.gyokuro.core "0.2";
import com.github.bjansen.gyokuro.view.mustache "0.2";
import net.gyokuro.core "0.2";
import net.gyokuro.view.mustache "0.2";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/mustache/run.ceylon
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
get,
Application,
Template,
render
}
import com.github.bjansen.gyokuro.view.mustache {
import net.gyokuro.view.mustache {
MustacheRenderer
}

Expand Down
2 changes: 1 addition & 1 deletion demos/gyokuro/demo/report/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
native("jvm")
module gyokuro.demo.report "0.2" {
import com.github.bjansen.gyokuro.report "0.2";
import net.gyokuro.report "0.2";
import gyokuro.demo.rest "1.0.0";
}
2 changes: 1 addition & 1 deletion demos/gyokuro/demo/report/run.ceylon
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ceylon.file {
Nil
}

import com.github.bjansen.gyokuro.report {
import net.gyokuro.report {
GyokuroApiGenerator
}
"Run the module `gyokuro.demo.report`."
Expand Down
2 changes: 1 addition & 1 deletion demos/gyokuro/demo/rest/controllers.ceylon
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ceylon.http.server {
Request
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
controller,
route,
halt
Expand Down
2 changes: 1 addition & 1 deletion demos/gyokuro/demo/rest/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
native("jvm")
module gyokuro.demo.rest "1.0.0" {
import com.github.bjansen.gyokuro.core "0.2";
import net.gyokuro.core "0.2";
import ceylon.logging "1.3.1";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/rest/run.ceylon
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ceylon.http.server {
Response
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
Application,
get,
post,
Expand All @@ -18,7 +18,7 @@ import com.github.bjansen.gyokuro.core {
serve,
bind
}
import com.github.bjansen.gyokuro.view.api {
import net.gyokuro.view.api {
TemplateRenderer
}

Expand Down
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/rythm/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
native("jvm")
module gyokuro.demo.rythm "0.2" {
import com.github.bjansen.gyokuro.core "0.2";
import com.github.bjansen.gyokuro.view.rythm "0.2";
import net.gyokuro.core "0.2";
import net.gyokuro.view.rythm "0.2";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/rythm/run.ceylon
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
render,
Application,
Template,
get
}
import com.github.bjansen.gyokuro.view.rythm {
import net.gyokuro.view.rythm {
RythmRenderer
}

Expand Down
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/thymeleaf/module.ceylon
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
native("jvm")
module gyokuro.demo.thymeleaf "0.2" {
import com.github.bjansen.gyokuro.core "0.2";
import com.github.bjansen.gyokuro.view.thymeleaf "0.2";
import net.gyokuro.core "0.2";
import net.gyokuro.view.thymeleaf "0.2";
import ceylon.logging "1.3.1";
}
4 changes: 2 additions & 2 deletions demos/gyokuro/demo/thymeleaf/run.ceylon
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
render,
Application,
Template,
get
}
import com.github.bjansen.gyokuro.view.thymeleaf {
import net.gyokuro.view.thymeleaf {
ThymeleafRenderer
}
import ceylon.logging {
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion source/com/github/bjansen/gyokuro/core/json/package.ceylon

This file was deleted.

1 change: 0 additions & 1 deletion source/com/github/bjansen/gyokuro/core/package.ceylon

This file was deleted.

7 changes: 0 additions & 7 deletions source/com/github/bjansen/gyokuro/report/module.ceylon

This file was deleted.

1 change: 0 additions & 1 deletion source/com/github/bjansen/gyokuro/report/package.ceylon

This file was deleted.

4 changes: 0 additions & 4 deletions source/com/github/bjansen/gyokuro/report/run.ceylon

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion source/com/github/bjansen/gyokuro/view/api/package.ceylon

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ceylon.http.server {
Session
}

import com.github.bjansen.gyokuro.core.internal {
import net.gyokuro.core.internal {
DefaultFlash
}

Expand All @@ -24,7 +24,7 @@ shared interface Flash {

"Creates a new instance of a [[Flash]]. You shouldn't have
to use this function directly unless you are creating a custom
[[com.github.bjansen.gyokuro.view.api::TemplateRenderer]].
[[net.gyokuro.view.api::TemplateRenderer]].
If you want to access a `Flash` instance from a handler,
use parameters injection instead:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import ceylon.http.server.endpoints {
RepositoryEndpoint
}

import com.github.bjansen.gyokuro.core.internal {
import net.gyokuro.core.internal {
RequestDispatcher
}
import com.github.bjansen.gyokuro.view.api {
import net.gyokuro.view.api {
TemplateRenderer
}
import com.github.bjansen.gyokuro.transform.api {
import net.gyokuro.transform.api {
Transformer
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import ceylon.http.server {
Response
}

import com.github.bjansen.gyokuro.core.internal {
import net.gyokuro.core.internal {
router,
HaltException,
RedirectException
}
import com.github.bjansen.gyokuro.view.api {
import net.gyokuro.view.api {
TemplateRenderer
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ceylon.logging {
logger
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
ControllerAnnotation,
RouteAnnotation
}
Expand All @@ -22,7 +22,7 @@ import ceylon.http.common {

shared object annotationScanner {

Logger log = logger(`module com.github.bjansen.gyokuro.core`);
Logger log = logger(`module net.gyokuro.core`);

shared alias Consumer => Anything(String, [Object, FunctionDeclaration], {AbstractMethod+});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ceylon.http.server {
Session
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
Flash
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ import ceylon.http.server {
UploadedFile
}

import com.github.bjansen.gyokuro.core {
import net.gyokuro.core {
SessionAnnotation,
Flash,
mimeParse,
AnyTemplate
}
import com.github.bjansen.gyokuro.transform.api {
import net.gyokuro.transform.api {
Transformer
}
import com.github.bjansen.gyokuro.view.api {
import net.gyokuro.view.api {
TemplateRenderer
}

shared class RequestDispatcher<T>([String, Package]? packageToScan, Boolean(Request, Response) filter,
TemplateRenderer<T>? renderer = null, Transformer[] transformers = []) {

value log = logger(`module com.github.bjansen.gyokuro.core`);
value log = logger(`module net.gyokuro.core`);

Converter<out Object>[] converters = [primitiveTypesConverter, listsConverter];

Expand Down Expand Up @@ -276,7 +276,7 @@ shared class RequestDispatcher<T>([String, Package]? packageToScan, Boolean(Requ
resp.addHeader(contentType("text/plain", utf8));
resp.writeString(result);
} else if (exists result, extendsHtmlNode(result)) {
// TODO do we need this if we have com.github.bjansen.gyokuro.view.ceylonhtml??
// TODO do we need this if we have net.gyokuro.view.ceylonhtml??
resp.addHeader(contentType("text/html", utf8));
resp.writeString(result.string);
} else if (is Object result, exists tr = findTransformerFor(req)) {
Expand Down
1 change: 1 addition & 0 deletions source/net/gyokuro/core/internal/package.ceylon
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared package net.gyokuro.core.internal;
1 change: 1 addition & 0 deletions source/net/gyokuro/core/json/package.ceylon
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared package net.gyokuro.core.json;
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
and Spark, for creating web applications with very little boilerplate.
It is based on the Ceylon SDK and uses ceylon."
native("jvm")
module com.github.bjansen.gyokuro.core "0.2" {
shared import com.github.bjansen.gyokuro.view.api "0.2";
shared import com.github.bjansen.gyokuro.transform.api "0.2";
module net.gyokuro.core "0.2" {
shared import net.gyokuro.view.api "0.2";
shared import net.gyokuro.transform.api "0.2";

shared import ceylon.http.server "1.3.1";
shared import ceylon.json "1.3.1";
Expand Down
1 change: 1 addition & 0 deletions source/net/gyokuro/core/package.ceylon
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared package net.gyokuro.core;
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import ceylon.http.server {
Response
}

import com.github.bjansen.gyokuro.core.internal {
import net.gyokuro.core.internal {
annotationScanner
}

Expand Down
7 changes: 7 additions & 0 deletions source/net/gyokuro/report/module.ceylon
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
native("jvm")
module net.gyokuro.report "0.2" {
shared import ceylon.file "1.3.1";

import ceylon.html "1.3.1";
import net.gyokuro.core "0.2";
}
1 change: 1 addition & 0 deletions source/net/gyokuro/report/package.ceylon
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared package net.gyokuro.report;
Loading

0 comments on commit 9c09007

Please sign in to comment.