Skip to content

Commit

Permalink
update engine version to 1.0-b8, rename package to org.rythmengine
Browse files Browse the repository at this point in the history
  • Loading branch information
greenlaw110 committed May 10, 2013
1 parent 4eb94b8 commit 8cedb5e
Show file tree
Hide file tree
Showing 40 changed files with 1,043 additions and 1,037 deletions.
2 changes: 1 addition & 1 deletion app/rythm/e500.html
Expand Up @@ -137,7 +137,7 @@ <h2>In @src (around line @errLineNo)</h2>
}
@for (String line: lines) {
@//line_index + @from | @pex.getLineNumber()
<pre @if(pex.getLineNumber() == line_index+from) {class="error" data-src="@src" data-line="@errLineNo"}><span class="line">@(line_index+from)</span><span class="code">&nbsp;@com.greenlaw110.rythm.utils.S.escapeXml(line).toString().replace("&darr;", "<strong>&darr;</strong>").replace("\000", "<em>").replace("\001", "</em>").raw()</span></pre>
<pre @if(pex.getLineNumber() == line_index+from) {class="error" data-src="@src" data-line="@errLineNo"}><span class="line">@(line_index+from)</span><span class="code">&nbsp;@org.rythmengine.utils.S.escapeXml(line).toString().replace("&darr;", "<strong>&darr;</strong>").replace("\000", "<em>").replace("\001", "</em>").raw()</span></pre>
}
</div>
}
Expand Down
9 changes: 6 additions & 3 deletions conf/dependencies.yml
@@ -1,11 +1,14 @@
# History
# 1.0-b8
# - update to rythm-engine 1.0-b8
# - package name changed from com.greenlaw110.rythm to org.rythmengine
# 1.0-b7
# - update to rythm-engine b7
# - update to rythm-engine 1.0-b7
# - https://github.com/greenlaw110/Rythm/issues/150
# 1.0-b6a
# - https://github.com/greenlaw110/Rythm/issues/148
# 1.0-b6
# - update to rythm-engine b6
# - update to rythm-engine 1.0-b6
# - add "key" to "CachedResult" for profiling purpose
# 1.0-b5t
# - https://github.com/greenlaw110/Rythm/issues/146
Expand Down Expand Up @@ -286,7 +289,7 @@
# 0.2c - fix bug: runtime exception when path point to a layout template
# 0.2b - strip off ';' from @args declaration line
# 0.2a - working with Play!
self: play -> rythm 1.0-b6a
self: play -> rythm 1.0-b8

require:
- play 1.2
14 changes: 7 additions & 7 deletions documentation/manual/auto_to_string.textile
Expand Up @@ -11,7 +11,7 @@ bc. public class Address {
public String suburb;
public String state;
public String postCode;
@com.greenlaw110.rythm.toString.NoExpose
@org.rythmengine.toString.NoExpose
public String accessCode;
@Override public String toString() {
return Rythm.toString(this);
Expand All @@ -22,8 +22,8 @@ You can also pass option and style to fine tune to toString result:

bc. @Override public String toString() {
return Rythm.toString(this,
com.greenlaw110.rythm.toString.ToStringOption.defaultOption.setAppendTransient(true),
com.greenlaw110.rythm.toString.ToStringStyle.MULTI_LINE_STYLE);
org.rythmengine.toString.ToStringOption.defaultOption.setAppendTransient(true),
org.rythmengine.toString.ToStringStyle.MULTI_LINE_STYLE);
}

h2. @Rythm.toString()@ API
Expand All @@ -35,8 +35,8 @@ bc. public String toString(Object)
This API export object using default option and default style

bc. public String toString(Object,
com.greenlaw110.rythm.toString.ToStringOption,
com.greenlaw110.rythm.toString.ToStringStyle)
org.rythmengine.toString.ToStringOption,
org.rythmengine.toString.ToStringStyle)

This API export object using specified option and style.

Expand All @@ -56,11 +56,11 @@ if @appendStatic@ is set to true then static properties will be output. By defau

h2. @ToStringStyle@

@com.greenlaw110.rythm.toString.ToStringStyle@ cloned @org.apache.commons.lang3.builder.ToStringStyle@
@org.rythmengine.toString.ToStringStyle@ cloned @org.apache.commons.lang3.builder.ToStringStyle@

h2. Skip certain properties

ATSM suppresses output properties annotated with @com.greenlaw110.rythm.toString.NoExpose@, or @org.codehaus.jackson.annotate.JsonIgnore@.
ATSM suppresses output properties annotated with @org.rythmengine.toString.NoExpose@, or @org.codehaus.jackson.annotate.JsonIgnore@.

h2. Performance

Expand Down
4 changes: 3 additions & 1 deletion documentation/manual/history.textile
Expand Up @@ -4,7 +4,9 @@ h2. <a name="roadmap">What's left for R1.0</a>

* Waiting for rythm-engine 1.0 release

h2. <a name="v1.0-b6a">v1.0-b7</a>
h2. <a name="v1.0-b8">v1.0-b8</a>

p(note). **Break change**: package name renamed from @com.greenlaw110.rythm@ to @org.rythmengine@

* Changes:
** Add "key" to CachedResult for profiling purpose
Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/home.textile
@@ -1,6 +1,6 @@
h1. PlayRythm module documentation

Welcome to *PlayRythm module* documentation. This documentation is intended for the *1.0-b7 release* and might be significantly differ from previous module version (1.0.0-20130132).
Welcome to *PlayRythm module* documentation. This documentation is intended for the *1.0-b8 release* and might be significantly differ from previous module version (1.0.0-20130132).

Check the "version history":history.

Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/integration.textile
Expand Up @@ -174,7 +174,7 @@ Things you need to take care of:

h2. <a name="cache4">New Cache4 annotation for caching action invocation</a>

Though not so relevant to a template engine, Rythm still provides an new annotation <code>com.greenlaw110.rythm.play.Cache4</code> for controller action (GET and HEAD) result caching. It improves the Play's built-in <code>play.cache.CacheFor</code> in the following way:
Though not so relevant to a template engine, Rythm still provides an new annotation <code>org.rythmengine.play.Cache4</code> for controller action (GET and HEAD) result caching. It improves the Play's built-in <code>play.cache.CacheFor</code> in the following way:

* It will check <code>rythm.cache.prodOnly</code> configuration. If it's true (default value), then cache get disabled on dev mode, which is a desired behavior
* You can specify time by configuration name like <code>cron.xx.yy</code>, and Rythm will go @Play.configuration@ to find out the cache time duration. Meaning the cache duration is configurable now. Thus mechanism (by app developer) is well decoupled from policy (by app deployer). Note time duration configuration name must start with "cron"
Expand Down
12 changes: 6 additions & 6 deletions documentation/manual/user_guide.textile
Expand Up @@ -604,9 +604,9 @@ p(note). Developer cannot use all stuffs in FastTags. The constraints include @C

h3. <a name="rythm_java_tag">Implement Java Tag using Rythm's new Java Tag interface (Play specific)</a>

Another approach is to implement Java Tag using Rythm's new @com.greenlaw110.rythm.play.FastRythmTag@:
Another approach is to implement Java Tag using Rythm's new @org.rythmengine.play.FastRythmTag@:

bc. import com.greenlaw110.rythm.play.FastRythmTag;
bc. import org.rythmengine.play.FastRythmTag;

@play.templates.FastTags.Namespace("") // yes, you use the same Namespace annotation in Rythm Fast Tag definition
public class authenticityToken extends FastRythmTag {
Expand All @@ -627,13 +627,13 @@ h3. <a name="pure_rythm_java_tag">Create Java Tag in non-play environment

Pure rythm user can also implement Java based Tag easily:

# Create a Java class, say MyTag, extends @com.greenlaw110.rythm.template.JavaTagBase@
# Create a Java class, say MyTag, extends @org.rythmengine.template.JavaTagBase@
# Call @RythmEngine.registerTag(JavaTagBase)@ interface to register your Java tag class

bc. /**
* The Hello tag accept a name and output "hello @name"
*/
public class Hello extends com.greenlaw110.rythm.template.JavaTagBase {
public class Hello extends org.rythmengine.template.JavaTagBase {

public Hello() {
}
Expand Down Expand Up @@ -928,8 +928,8 @@ Unlike Play's Groovy template that all objects added to the renderArgs scope are
| @session@ | Session scope | "play.mvc.Scope.Session":/@api/play/mvc/Scope.Session.html | "Controllers - Session & Flash Scope":controllers#session |
| @_response_encoding@ | encoding of the response object | "play.mvc.Http.Response":/@api/play/mvc/Http.Response.html | |
| @_renderArgs@ | the renderArgs object | "play.mvc.Scope.RenderArgs":/@api/play/mvc/Scope.RenderArgs.html | |
| @_rythmPlugin@ | the RythmPlugin instance | @com.greenlaw110.rythm.play.RythmPlugin@ | |
| @_rythm@ | the rythm template engine instance | @com.greenlaw110.rythm.RythmEngine@ | |
| @_rythmPlugin@ | the RythmPlugin instance | @org.rythmengine.play.RythmPlugin@ | |
| @_rythm@ | the rythm template engine instance | @org.rythmengine.RythmEngine@ | |

So as you can see most of these implicit variables are the same as those defined in "Groovy templates":http://localhost:9000/@documentation/modules/play/user_guide#Implicitobjectsavailableinatemplate. The only exception is Groovy's implicit variable @play@ has been renamed to @_play@. The reason for this is I want to allow user to use full qualified classes in play.* package.

Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Expand Up @@ -31,7 +31,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.greenlaw110.play-rythm</groupId>
<artifactId>play-rythm</artifactId>
<version>1.0-b7</version>
<version>1.0-b8</version>
<packaging>jar</packaging>

<repositories>
Expand Down Expand Up @@ -80,9 +80,9 @@ under the License.
</dependency>

<dependency>
<groupId>com.greenlaw110.rythm</groupId>
<groupId>org.rythmengine</groupId>
<artifactId>rythm-engine</artifactId>
<version>1.0-b8-SNAPSHOT</version>
<version>1.0-b8</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -138,15 +138,15 @@ under the License.
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>com.greenlaw110.rythm</groupId>
<groupId>org.rythmengine</groupId>
<artifactId>rythm-engine</artifactId>
<version>1.0-b8-SNAPSHOT</version>
<version>1.0-b8</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>com.github.greenlaw110.play-rythm</groupId>
<artifactId>play-rythm</artifactId>
<version>1.0-b7</version>
<version>1.0-b8</version>
<type>jar</type>
</artifactItem>
</artifactItems>
Expand Down
4 changes: 2 additions & 2 deletions samples-and-tests/gae/app/controllers/Application.java
Expand Up @@ -7,8 +7,8 @@

import models.*;

import com.greenlaw110.rythm.*;
import com.greenlaw110.rythm.play.*;
import org.rythmengine.*;
import org.rythmengine.play.*;

public class Application extends Controller {

Expand Down

0 comments on commit 8cedb5e

Please sign in to comment.