* renamed samples-and-test/sienatest to crudsienatest

* added some models for tests

.gitignore

@@ -1 +1,7 @@
 /.project
+/lib
+/.classpath
+/commands.pyc
+/dist
+/.settings
+/modules

app/views/CRUD/show.html

@@ -1,6 +1,6 @@
 #{extends 'CRUD/layout.html' /}
 %{
-    def keyVal = play.modules.crudsiena.SienaUtils.findKey(object)
+    def keyVal = play.modules.siena.SienaModelUtils.keyValue(object)
   }%
 <div id="crudShow" class="${type.name}">
 

app/views/tags/crud/navigation.html

@@ -4,7 +4,7 @@
 		<li>&gt; <a href="@{list()}">&{_caller.type.name}</a></li>
 	#{/if}
 	#{if _caller.object}
-		<li>&gt; <a href="@{show(play.modules.crudsiena.SienaUtils.findKey(_caller.object))}">${_caller.object?.toString()?.escape()?.raw()}</a></li>
+		<li>&gt; <a href="@{show(play.modules.siena.SienaModelUtils.keyValue(_caller.object))}">${_caller.object?.toString()?.escape()?.raw()}</a></li>
 	#{/if}
 	#{if request.actionMethod == 'blank'}
 		<li>&gt; <a href="@{blank()}">&{'crud.blank'}</a></li>

app/views/tags/crud/table.html

@@ -49,7 +49,7 @@
 					}%
 				%{ } else { }%
 					%{ if(i == 0) { }%
-						<a href="@{show(play.modules.crudsiena.SienaUtils.findKey(object))}">${object[field]?.toString()?.escape()?.raw() ?: '(no value)'}</a>
+						<a href="@{show(play.modules.siena.SienaModelUtils.keyValue(object))}">${object[field]?.toString()?.escape()?.raw() ?: '(no value)'}</a>
 					%{ } else { }%
                         %{ if(_caller.type.getField(field).type == 'file') { }%
                             %{ if(object[field]) { }%
@@ -73,7 +73,7 @@
 				#{doBody body:handler /}
 			%{ } else { }%
 				<td>
-					<a href="@{show(play.modules.crudsiena.SienaUtils.findKey(object))}">${object.toString()?.escape()?.raw() ?: '(no value)'}</a>
+					<a href="@{show(play.modules.siena.SienaModelUtils.keyValue(object))}">${object.toString()?.escape()?.raw() ?: '(no value)'}</a>
 				</td>
 			%{ } }%
 		%{ } }%

build.xml

@@ -13,7 +13,7 @@
         <fileset dir="lib">
             <include name="*.jar"/>
         </fileset>
-    	<fileset dir="${play.path}/modules/">
+    	<fileset dir="${play.path}/modules/siena-2.0.0">
             <include name="**/*siena*.jar"/>
         </fileset>
     </path>

conf/dependencies.yml

@@ -1,8 +1,8 @@
 # Application dependencies
 
-self: play -> crudsiena 2.0
+self: play -> crudsiena 2.0.0
 
 require:
     - play [1.2.1,)
-    - play -> siena [2.0,)
+    - play -> siena [2.0.0,)
 

samples-and-tests/sienatest/.gitignore → samples-and-tests/crudsienatest/.gitignore

@@ -11,3 +11,4 @@
 /.classpath
 /test-result
 /tmp
+/modules

samples-and-tests/crudsienatest/app/controllers/ContainerModels.java

@@ -0,0 +1,8 @@
+package controllers;
+
+import models.ContainerModel;
+
+@CRUD.For(ContainerModel.class)
+public class ContainerModels extends controllers.CRUD {    
+
+}

samples-and-tests/crudsienatest/app/controllers/EmbeddedModels.java

@@ -0,0 +1,8 @@
+package controllers;
+
+import models.EmbeddedModel;
+
+@CRUD.For(EmbeddedModel.class)
+public class EmbeddedModels extends controllers.CRUD {    
+
+}

samples-and-tests/crudsienatest/app/controllers/UUIDModels.java

@@ -0,0 +1,8 @@
+package controllers;
+
+import models.UUIDModel;
+
+@CRUD.For(UUIDModel.class)
+public class UUIDModels extends controllers.CRUD {    
+
+}

samples-and-tests/sienatest/app/models/ContainerModel.java → samples-and-tests/crudsienatest/app/models/ContainerModel.java

@@ -1,6 +1,6 @@
 package models;
 
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Column;
 import siena.Generator;
 import siena.Id;
@@ -10,14 +10,16 @@
 
 @Table("container_models")
 @EmbeddedList
-public class ContainerModel extends Model{
+public class ContainerModel extends EnhancedModel{
     @Id(Generator.NONE)
     public String id;
 
     @Embedded
     @Column("embed")
     public EmbeddedModel embed;
 
+    public long test;
+
     public String toString() {
     	return id + " " + embed;
     }

samples-and-tests/sienatest/app/models/EmbeddedModel.java → samples-and-tests/crudsienatest/app/models/EmbeddedModel.java

@@ -1,14 +1,14 @@
 package models;
 
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Generator;
 import siena.Id;
 import siena.Table;
 import siena.embed.EmbeddedMap;
 
 @Table("embedded_models")
 @EmbeddedMap
-public class EmbeddedModel extends Model{
+public class EmbeddedModel extends EnhancedModel{
     @Id(Generator.NONE)
     public String id;
 

samples-and-tests/sienatest/app/models/Employee.java → samples-and-tests/crudsienatest/app/models/Employee.java

@@ -5,18 +5,16 @@
 import java.util.Map;
 
 import play.data.validation.Password;
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Column;
 import siena.DateTime;
-import siena.Entity;
 import siena.Filter;
 import siena.Generator;
 import siena.Id;
 import siena.Index;
 import siena.Json;
 import siena.Max;
 import siena.NotNull;
-import siena.Query;
 import siena.Table;
 import siena.embed.At;
 import siena.embed.Embedded;
@@ -25,7 +23,7 @@
 
 
 @Table("employees")
-public class Employee extends Model {
+public class Employee extends EnhancedModel {
 
         @Id(Generator.AUTO_INCREMENT)
         public Long id;

samples-and-tests/sienatest/app/models/ManualStringModel.java → samples-and-tests/crudsienatest/app/models/ManualStringModel.java

@@ -1,13 +1,12 @@
 package models;
 
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Generator;
 import siena.Id;
 import siena.Table;
-import siena.embed.EmbeddedMap;
 
 @Table("manual_string_models")
-public class ManualStringModel extends Model{
+public class ManualStringModel extends EnhancedModel{
     @Id(Generator.NONE)
     public String id;
 

samples-and-tests/sienatest/app/models/OtherIdModel.java → samples-and-tests/crudsienatest/app/models/OtherIdModel.java

@@ -1,13 +1,12 @@
 package models;
 
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Generator;
 import siena.Id;
 import siena.Table;
-import siena.embed.EmbeddedMap;
 
 @Table("otherid_models")
-public class OtherIdModel extends Model{
+public class OtherIdModel extends EnhancedModel{
     @Id(Generator.AUTO_INCREMENT)
     public Long myId;
 

samples-and-tests/sienatest/app/models/UUIDModel.java → samples-and-tests/crudsienatest/app/models/UUIDModel.java

@@ -1,13 +1,12 @@
 package models;
 
-import play.modules.siena.Model;
+import play.modules.siena.EnhancedModel;
 import siena.Generator;
 import siena.Id;
 import siena.Table;
-import siena.embed.EmbeddedMap;
 
 @Table("uuid_models")
-public class UUIDModel extends Model{
+public class UUIDModel extends EnhancedModel{
     @Id(Generator.UUID)
     public String id;
 

samples-and-tests/sienatest/conf/application.conf → samples-and-tests/crudsienatest/conf/application.conf

@@ -1,12 +1,12 @@
 # This is the main configuration file for the application.
 # ~~~~~
-application.name=sienatest
+application.name=crudsienatest
 
 # Application mode
 # ~~~~~
 # Set to dev to enable instant reloading and other development help.
 # Otherwise set to prod.
-application.mode=prod
+application.mode=dev
 %prod.application.mode=prod
 
 # Secret key
@@ -77,7 +77,7 @@ application.log=DEBUG
 # To quickly set up a development database, use either:
 #   - mem : for a transient in memory database (H2 in memory)
 #   - fs  : for a simple file written database (H2 file stored)
-#db=fs
+db=mem
 #
 # To connect to a local MySQL5 database, use:
 #db=mysql:sienatest:sienatest@sienatest

samples-and-tests/crudsienatest/conf/dependencies.yml

@@ -0,0 +1,7 @@
+# Application dependencies
+
+require:
+    - play -> play [1.2.1,)
+    - play -> crudsiena 2.0.0
+    #- play -> gae 1.4
+    #- postgresql -> postgresql 8.4-702.jdbc4

src/play.plugins

@@ -1 +1 @@
-0:play.modules.crudsiena.CrudSienaPlugin
+500:play.modules.crudsiena.CrudSienaPlugin

src/play/modules/crudsiena/CrudSienaEnhancer.java

@@ -16,18 +16,52 @@
 import play.Logger;
 import play.classloading.ApplicationClasses.ApplicationClass;
 import play.classloading.enhancers.Enhancer;
+import siena.ClassInfo;
 import siena.Max;
 
 public class CrudSienaEnhancer extends Enhancer {
 
 	@Override
 	public void enhanceThisClass(ApplicationClass applicationClass)
 			throws Exception {
-        final CtClass ctClass = makeClass(applicationClass);
-
-        if (!ctClass.subtypeOf(classPool.get("play.modules.siena.Model"))) {
+        Logger.debug("CrudSiena: trying to enhance class:" + applicationClass.name);
+		final CtClass ctClass = makeClass(applicationClass);
+		if(ctClass == null) return;
+		String pack = ctClass.getPackageName(); 
+        if(pack==null || pack.startsWith("java.")){
+        	return;
+        }        
+        if (ctClass.subtypeOf(classPool.get(siena.Json.class.getName()))) {
             return;
         }
+        boolean isModel = false;
+
+        if(ctClass.subclassOf(classPool.get(siena.Model.class.getName()))){
+        	isModel = true;
+        }     
+        else {        
+	        CtField[] fields = ctClass.getDeclaredFields();
+	        CtClass cl = ctClass;
+	        while(cl != null){
+		        for (CtField field : fields) {
+		        	Object[] annotations = field.getAnnotations();
+					for(Object ann: annotations){
+						if(ann.getClass() == siena.Id.class){
+							isModel = true;
+							break;
+						}
+					}
+					if(isModel){
+						break;
+					}
+		        }
+
+		        cl = cl.getSuperclass();
+	        }
+        }
+        if(!isModel){
+        	return;
+        }
 
         Logger.debug("CrudSiena: start to enhance class:" + applicationClass.name);
         // this method will be called after configuration finished

src/play/modules/crudsiena/CrudSienaPlugin.java

@@ -4,12 +4,15 @@
 import play.classloading.ApplicationClasses.ApplicationClass;
 
 public class CrudSienaPlugin extends PlayPlugin {
+
+    private CrudSienaEnhancer enhancer = new CrudSienaEnhancer();
+
     /**
      * Enhance this class
      * @param applicationClass
      * @throws java.lang.Exception
      */
     public void enhance(ApplicationClass applicationClass) throws Exception {
-    	CrudSienaEnhancer.class.newInstance().enhanceThisClass(applicationClass);
+    	enhancer.enhanceThisClass(applicationClass);
     }
 }