Seam SVN: r7925 - branches/Seam_2_0/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:25:05 -0400 (Sun, 13 Apr 2008)
New Revision: 7925
Modified:
branches/Seam_2_0/seam-gen/build.xml
Log:
remove more extra commas
Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-04-13 20:24:03 UTC (rev 7924)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-04-13 20:25:05 UTC (rev 7925)
@@ -185,7 +185,7 @@
<property name="old.icefaces" value="n"/>
<input addproperty="icefaces.new"
message="Do you want to use ICEFaces instead of RichFaces [${old.icefaces}]"
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.icefaces}" />
<condition property="icefaces.home.new" value="">
@@ -404,13 +404,13 @@
<property name="old.database.exists" value="n"/>
<input addproperty="database.exists.new"
message="Are you working with tables that already exist in the database? [${old.database.exists}] "
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.database.exists}"/>
<property name="old.database.drop" value="n"/>
<input addproperty="database.drop.new"
message="Do you want to drop and recreate the database tables and data in import.sql each time you deploy? [${old.database.drop}] "
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.database.drop}"/>
<condition property="hibernate.default_schema.key" value="hibernate.default_schema">
16 years, 2 months
- 1
- 0
Seam SVN: r7924 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:24:03 -0400 (Sun, 13 Apr 2008)
New Revision: 7924
Modified:
trunk/seam-gen/build.xml
Log:
remove more extra commas
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-04-13 20:19:32 UTC (rev 7923)
+++ trunk/seam-gen/build.xml 2008-04-13 20:24:03 UTC (rev 7924)
@@ -186,7 +186,7 @@
<property name="old.icefaces" value="n"/>
<input addproperty="icefaces.new"
message="Do you want to use ICEFaces instead of RichFaces [${old.icefaces}]"
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.icefaces}" />
<condition property="icefaces.home.new" value="">
@@ -405,13 +405,13 @@
<property name="old.database.exists" value="n"/>
<input addproperty="database.exists.new"
message="Are you working with tables that already exist in the database? [${old.database.exists}] "
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.database.exists}"/>
<property name="old.database.drop" value="n"/>
<input addproperty="database.drop.new"
message="Do you want to drop and recreate the database tables and data in import.sql each time you deploy? [${old.database.drop}] "
- validargs="y,n,"
+ validargs="y,n"
defaultvalue="${old.database.drop}"/>
<condition property="hibernate.default_schema.key" value="hibernate.default_schema">
16 years, 2 months
- 1
- 0
Seam SVN: r7923 - trunk.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:19:32 -0400 (Sun, 13 Apr 2008)
New Revision: 7923
Modified:
trunk/seam
Log:
set svn:executable bit
Property changes on: trunk/seam
___________________________________________________________________
Name: svn:executable
+ *
16 years, 2 months
- 1
- 0
Seam SVN: r7922 - branches/Seam_2_0.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:19:00 -0400 (Sun, 13 Apr 2008)
New Revision: 7922
Modified:
branches/Seam_2_0/seam
Log:
set svn:executable bit
Property changes on: branches/Seam_2_0/seam
___________________________________________________________________
Name: svn:executable
+ *
16 years, 2 months
- 1
- 0
Seam SVN: r7921 - branches/Seam_2_0/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:06:19 -0400 (Sun, 13 Apr 2008)
New Revision: 7921
Modified:
branches/Seam_2_0/seam-gen/build.xml
Log:
remove extra comma
Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-04-13 20:05:30 UTC (rev 7920)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-04-13 20:06:19 UTC (rev 7921)
@@ -210,7 +210,7 @@
<property name="old.project.type" value="ear"/>
<input addproperty="project.type.new"
message="Is this project deployed as an EAR (with EJB components) or a WAR (with no EJB support) [${old.project.type}] "
- validargs="ear,war,"
+ validargs="ear,war"
defaultvalue="${old.project.type}"/>
<property name="old.action.package" value="com.mydomain.${project.name.new}"/>
@@ -695,7 +695,7 @@
</target>
<target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters">
-
+
<copy todir="${project.home}/resources">
<fileset dir="${base.dir}/resources/">
<exclude name="datasource-ds.xml"/>
16 years, 2 months
- 1
- 0
Seam SVN: r7920 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 16:05:30 -0400 (Sun, 13 Apr 2008)
New Revision: 7920
Modified:
trunk/seam-gen/build.xml
Log:
remove extra comma
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-04-13 19:31:09 UTC (rev 7919)
+++ trunk/seam-gen/build.xml 2008-04-13 20:05:30 UTC (rev 7920)
@@ -211,7 +211,7 @@
<property name="old.project.type" value="ear"/>
<input addproperty="project.type.new"
message="Is this project deployed as an EAR (with EJB components) or a WAR (with no EJB support) [${old.project.type}] "
- validargs="ear,war,"
+ validargs="ear,war"
defaultvalue="${old.project.type}"/>
<property name="old.action.package" value="com.mydomain.${project.name.new}"/>
16 years, 2 months
- 1
- 0
Seam SVN: r7919 - branches/Seam_2_0/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 15:31:09 -0400 (Sun, 13 Apr 2008)
New Revision: 7919
Modified:
branches/Seam_2_0/seam-gen/README
Log:
formatting and one spelling error
Modified: branches/Seam_2_0/seam-gen/README
===================================================================
--- branches/Seam_2_0/seam-gen/README 2008-04-13 19:30:56 UTC (rev 7918)
+++ branches/Seam_2_0/seam-gen/README 2008-04-13 19:31:09 UTC (rev 7919)
@@ -1,12 +1,14 @@
NAME
- seam (aka seam-gen) - Execute seam code generation. The seam.bat
- (Windows) and seam (Linux/Unix) scripts support commands that use
- Ant build targets to setup a Seam project and generate source code.
- Ant is not required to be on your path to use this script.
+ seam (aka seam-gen) - Execute seam code generation.
+
+ The seam.bat (Windows) and seam (Linux/Unix) scripts support
+ commands that use Ant build targets to set up a Seam project and
+ generate source code. Ant is not required to be on your path to
+ use this script.
JBoss AS must be installed to deploy the project. If you use EJB3
- components, the JBoss server must have the EJB3 module installed.
- (JBoss AS >= 4.2.0.GA recommended)
+ components, the JBoss server must have EJB 3 capabilities.
+ (JBoss AS 4.2 is strongly recommended)
SYNOPSIS
seam COMMAND
16 years, 2 months
- 1
- 0
Seam SVN: r7918 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-13 15:30:56 -0400 (Sun, 13 Apr 2008)
New Revision: 7918
Modified:
trunk/seam-gen/README
Log:
formatting and one spelling error
Modified: trunk/seam-gen/README
===================================================================
--- trunk/seam-gen/README 2008-04-13 12:51:14 UTC (rev 7917)
+++ trunk/seam-gen/README 2008-04-13 19:30:56 UTC (rev 7918)
@@ -1,12 +1,14 @@
NAME
- seam (aka seam-gen) - Execute seam code generation. The seam.bat
- (Windows) and seam (Linux/Unix) scripts support commands that use
- Ant build targets to setup a Seam project and generate source code.
- Ant is not required to be on your path to use this script.
+ seam (aka seam-gen) - Execute seam code generation.
+
+ The seam.bat (Windows) and seam (Linux/Unix) scripts support
+ commands that use Ant build targets to set up a Seam project and
+ generate source code. Ant is not required to be on your path to
+ use this script.
JBoss AS must be installed to deploy the project. If you use EJB3
- components, the JBoss server must have the EJB3 module installed.
- (JBoss AS >= 4.2.0.GA recommended)
+ components, the JBoss server must have EJB 3 capabilities.
+ (JBoss AS 4.2 is strongly recommended)
SYNOPSIS
seam COMMAND
16 years, 2 months
- 1
- 0
Seam SVN: r7917 - trunk/seam-gen/src.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-13 08:51:14 -0400 (Sun, 13 Apr 2008)
New Revision: 7917
Modified:
trunk/seam-gen/src/Action.java
trunk/seam-gen/src/ActionBean.java
trunk/seam-gen/src/ActionJavaBean.java
trunk/seam-gen/src/Authenticator.java
trunk/seam-gen/src/Conversation.java
trunk/seam-gen/src/ConversationBean.java
trunk/seam-gen/src/ConversationJavaBean.java
trunk/seam-gen/src/Entity.java
trunk/seam-gen/src/EntityHome.java
trunk/seam-gen/src/EntityHome.java.ftl
trunk/seam-gen/src/EntityList.java
trunk/seam-gen/src/EntityList.java.ftl
trunk/seam-gen/src/FormAction.java
trunk/seam-gen/src/FormActionBean.java
trunk/seam-gen/src/FormActionJavaBean.java
trunk/seam-gen/src/Query.java
Log:
JBSEAM-2160
Modified: trunk/seam-gen/src/Action.java
===================================================================
--- trunk/seam-gen/src/Action.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/Action.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -3,10 +3,10 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
- //seam-gen method
- public void @methodName@();
-
+public interface @interfaceName@ {
+
+ //seam-gen method
+ public void @methodName@();
+
//add additional interface methods here
}
\ No newline at end of file
Modified: trunk/seam-gen/src/ActionBean.java
===================================================================
--- trunk/seam-gen/src/ActionBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/ActionBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -10,18 +10,18 @@
@Stateless
@Name("@componentName@")
public class @beanName@ implements @interfaceName@ {
-
+
@Logger private Log log;
-
+
@In FacesMessages facesMessages;
-
+
public void @methodName@()
{
//implement your business logic here
log.info("@componentName@.@methodName@() action called");
facesMessages.add("@methodName@");
}
-
+
//add additional action methods
-
+
}
Modified: trunk/seam-gen/src/ActionJavaBean.java
===================================================================
--- trunk/seam-gen/src/ActionJavaBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/ActionJavaBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -8,18 +8,18 @@
@Name("@componentName@")
public class @interfaceName@ {
-
+
@Logger private Log log;
-
+
@In FacesMessages facesMessages;
-
+
public void @methodName@()
{
//implement your business logic here
log.info("@componentName@.@methodName@() action called");
facesMessages.add("@methodName@");
}
-
+
//add additional action methods
-
+
}
Modified: trunk/seam-gen/src/Authenticator.java
===================================================================
--- trunk/seam-gen/src/Authenticator.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/Authenticator.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -11,9 +11,9 @@
public class Authenticator
{
@Logger Log log;
-
+
@In Identity identity;
-
+
public boolean authenticate()
{
log.info("authenticating #0", identity.getUsername());
Modified: trunk/seam-gen/src/Conversation.java
===================================================================
--- trunk/seam-gen/src/Conversation.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/Conversation.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -3,14 +3,14 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
- //seam-gen methods
- public String begin();
- public String increment();
- public String end();
- public int getValue();
- public void destroy();
-
- //add additional interface methods here
+public interface @interfaceName@ {
+
+ //seam-gen methods
+ public String begin();
+ public String increment();
+ public String end();
+ public int getValue();
+ public void destroy();
+
+ //add additional interface methods here
}
\ No newline at end of file
Modified: trunk/seam-gen/src/ConversationBean.java
===================================================================
--- trunk/seam-gen/src/ConversationBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/ConversationBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -12,41 +12,41 @@
@Stateful
@Name("@componentName@")
public class @beanName@ implements @interfaceName@ {
-
+
@Logger private Log log;
-
+
private int value;
-
- @Begin
- public String begin()
- {
- //implement your begin conversation business logic
- log.info("beginning conversation");
- return "success";
- }
-
- public String increment()
- {
- log.info("incrementing");
- value++;
- return "success";
- }
-
- //add additional action methods that participate in this conversation
-
- @End
- public String end()
- {
+
+ @Begin
+ public String begin()
+ {
+ //implement your begin conversation business logic
+ log.info("beginning conversation");
+ return "success";
+ }
+
+ public String increment()
+ {
+ log.info("incrementing");
+ value++;
+ return "success";
+ }
+
+ //add additional action methods that participate in this conversation
+
+ @End
+ public String end()
+ {
//implement your end conversation business logic
log.info("ending conversation");
- return "home";
- }
-
- public int getValue()
- {
- return value;
- }
-
- @Destroy @Remove
- public void destroy() {}
+ return "home";
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ @Destroy @Remove
+ public void destroy() {}
}
Modified: trunk/seam-gen/src/ConversationJavaBean.java
===================================================================
--- trunk/seam-gen/src/ConversationJavaBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/ConversationJavaBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -12,39 +12,39 @@
@Scope(CONVERSATION)
@Name("@componentName@")
public class @interfaceName@ {
-
+
@Logger private Log log;
-
+
private int value;
-
- @Begin
- public String begin()
- {
- //implement your begin conversation business logic
- log.info("beginning conversation");
- return "success";
- }
-
- public String increment()
- {
- log.info("incrementing");
- value++;
- return "success";
- }
-
- //add additional action methods that participate in this conversation
-
- @End
- public String end()
- {
+
+ @Begin
+ public String begin()
+ {
+ //implement your begin conversation business logic
+ log.info("beginning conversation");
+ return "success";
+ }
+
+ public String increment()
+ {
+ log.info("incrementing");
+ value++;
+ return "success";
+ }
+
+ //add additional action methods that participate in this conversation
+
+ @End
+ public String end()
+ {
//implement your end conversation business logic
log.info("ending conversation");
- return "home";
- }
-
- public int getValue()
- {
- return value;
- }
-
+ return "home";
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
}
Modified: trunk/seam-gen/src/Entity.java
===================================================================
--- trunk/seam-gen/src/Entity.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/Entity.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -9,40 +9,40 @@
@Entity
public class @entityName@ implements Serializable {
-
- //seam-gen attributes (you should probably edit these)
- private Long id;
- private Integer version;
- private String name;
-
+
+ //seam-gen attributes (you should probably edit these)
+ private Long id;
+ private Integer version;
+ private String name;
+
//add additional entity attributes
-
- //seam-gen attribute getters/setters with annotations (you probably should edit)
-
- @Id @GeneratedValue
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
-
- @Version
- public Integer getVersion() {
- return version;
- }
+ //seam-gen attribute getters/setters with annotations (you probably should edit)
- private void setVersion(Integer version) {
- this.version = version;
- }
-
- @Length(max=20)
- public String getName() {
- return name;
- }
+ @Id @GeneratedValue
+ public Long getId() {
+ return id;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ private void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ @Length(max=20)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
Modified: trunk/seam-gen/src/EntityHome.java
===================================================================
--- trunk/seam-gen/src/EntityHome.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/EntityHome.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -11,12 +11,12 @@
public class @entityName@Home extends EntityHome<@entityName@>
{
- @RequestParameter
+ @RequestParameter
Long @componentName@Id;
-
+
@Override
- public Object getId()
- {
+ public Object getId()
+ {
if (@componentName@Id==null)
{
return super.getId();
@@ -26,10 +26,10 @@
return @componentName@Id;
}
}
-
+
@Override @Begin
public void create() {
super.create();
}
-
+
}
Modified: trunk/seam-gen/src/EntityHome.java.ftl
===================================================================
--- trunk/seam-gen/src/EntityHome.java.ftl 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/EntityHome.java.ftl 2008-04-13 12:51:14 UTC (rev 7917)
@@ -37,7 +37,7 @@
{
set${idName}( new ${entityName}Id() );
}
-
+
@Override
public boolean isIdDefined()
{
@@ -64,7 +64,7 @@
</#if>
return ${componentName};
}
-
+
public void wire()
{
<#foreach property in pojo.allPropertiesIterator>
@@ -82,7 +82,7 @@
</#if>
</#foreach>
}
-
+
public boolean isWired()
{
<#foreach property in pojo.allPropertiesIterator>
@@ -93,18 +93,18 @@
</#foreach>
return true;
}
-
+
public ${entityName} getDefinedInstance()
{
return isIdDefined() ? getInstance() : null;
}
-
+
<#foreach property in pojo.allPropertiesIterator>
<#assign getter = pojo.getGetterSignature(property)>
<#if c2h.isOneToManyCollection(property)>
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
public ${pojo.importType("java.util.List")}<${childPojo.shortName}> ${getter}() {
- return getInstance() == null ?
+ return getInstance() == null ?
null : new ${pojo.importType("java.util.ArrayList")}<${childPojo.shortName}>( getInstance().${getter}() );
}
</#if>
Modified: trunk/seam-gen/src/EntityList.java
===================================================================
--- trunk/seam-gen/src/EntityList.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/EntityList.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -7,8 +7,8 @@
public class @entityName@List extends EntityQuery
{
@Override
- public String getEjbql()
- {
+ public String getEjbql()
+ {
return "select @componentName@ from @entityName@ @componentName@";
}
}
Modified: trunk/seam-gen/src/EntityList.java.ftl
===================================================================
--- trunk/seam-gen/src/EntityList.java.ftl 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/EntityList.java.ftl 2008-04-13 12:51:14 UTC (rev 7917)
@@ -47,22 +47,22 @@
</#if>
@Override
- public String getEjbql()
- {
+ public String getEjbql()
+ {
return "select ${componentName} from ${entityName} ${componentName}";
}
-
+
@Override
public Integer getMaxResults()
{
- return 25;
+ return 25;
}
-
+
public ${entityName} get${entityName}()
{
return ${componentName};
}
-
+
@Override
public List<String> getRestrictions()
{
Modified: trunk/seam-gen/src/FormAction.java
===================================================================
--- trunk/seam-gen/src/FormAction.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/FormAction.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -3,12 +3,12 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
- public void @methodName@();
- public String getValue();
- public void setValue(String value);
- public void destroy();
-
+public interface @interfaceName@ {
+
+ public void @methodName@();
+ public String getValue();
+ public void setValue(String value);
+ public void destroy();
+
//add additional interface methods here
}
\ No newline at end of file
Modified: trunk/seam-gen/src/FormActionBean.java
===================================================================
--- trunk/seam-gen/src/FormActionBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/FormActionBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -10,25 +10,25 @@
import org.jboss.seam.faces.FacesMessages;
import org.hibernate.validator.Length;
-@Stateful
+@Stateful
@Name("@componentName@")
public class @beanName@ implements @interfaceName@ {
@Logger private Log log;
-
+
@In FacesMessages facesMessages;
-
+
private String value;
-
+
public void @methodName@()
- {
+ {
//implement your business logic here
log.info("@componentName@.@methodName@() action called with: #{@componentName@.value}");
facesMessages.add("@methodName@ #{@componentName@.value}");
- }
-
- //add additional action methods
-
+ }
+
+ //add additional action methods
+
@Length(max=10)
public String getValue()
{
@@ -40,7 +40,7 @@
this.value = value;
}
- @Destroy @Remove
+ @Destroy @Remove
public void destroy() {}
-
+
}
Modified: trunk/seam-gen/src/FormActionJavaBean.java
===================================================================
--- trunk/seam-gen/src/FormActionJavaBean.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/FormActionJavaBean.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -11,29 +11,29 @@
public class @interfaceName@ {
@Logger private Log log;
-
+
@In FacesMessages facesMessages;
-
+
private String value;
-
- public void @methodName@()
- {
- //implement your business logic here
- log.info("@componentName@.@methodName@() action called with: #{@componentName@.value}");
- facesMessages.add("@methodName@ #{@componentName@.value}");
- }
-
- //add additional action methods
-
- @Length(max=10)
- public String getValue()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
+
+ public void @methodName@()
+ {
+ //implement your business logic here
+ log.info("@componentName@.@methodName@() action called with: #{@componentName@.value}");
+ facesMessages.add("@methodName@ #{@componentName@.value}");
+ }
+
+ //add additional action methods
+
+ @Length(max=10)
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
}
Modified: trunk/seam-gen/src/Query.java
===================================================================
--- trunk/seam-gen/src/Query.java 2008-04-13 12:47:56 UTC (rev 7916)
+++ trunk/seam-gen/src/Query.java 2008-04-13 12:51:14 UTC (rev 7917)
@@ -8,8 +8,8 @@
public class @beanName@ extends EntityQuery
{
@Override
- public String getEjbql()
- {
+ public String getEjbql()
+ {
return "@query@";
}
@@ -18,7 +18,7 @@
public void setFirstResult(Integer firstResult) {
super.setFirstResult(firstResult);
}
-
+
@Override
public Integer getMaxResults() {
return 25;
16 years, 2 months
- 1
- 0
Seam SVN: r7916 - in trunk/seam-gen/view: layout and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-13 08:47:56 -0400 (Sun, 13 Apr 2008)
New Revision: 7916
Modified:
trunk/seam-gen/view/action.xhtml
trunk/seam-gen/view/conversation.xhtml
trunk/seam-gen/view/edit.page.xml.ftl
trunk/seam-gen/view/edit.xhtml
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/editproperty.xhtml.ftl
trunk/seam-gen/view/error.xhtml
trunk/seam-gen/view/form.xhtml
trunk/seam-gen/view/home.xhtml
trunk/seam-gen/view/layout/template.xhtml
trunk/seam-gen/view/list.page.xml.ftl
trunk/seam-gen/view/list.xhtml
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/login.xhtml
trunk/seam-gen/view/page.xhtml
trunk/seam-gen/view/query.xhtml
trunk/seam-gen/view/stylesheet/theme.css
trunk/seam-gen/view/view.page.xml.ftl
trunk/seam-gen/view/view.xhtml.ftl
Log:
JBSEAM-2160
Modified: trunk/seam-gen/view/action.xhtml
===================================================================
--- trunk/seam-gen/view/action.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/action.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -8,21 +8,21 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<h:form id="@componentName@Form">
-
- <h:commandButton id="@methodName@" value="@methodName@!"
- action="#{@componentName@.@methodName(a)}"/>
-
+
+ <h:commandButton id="@methodName@" value="@methodName@!"
+ action="#{@componentName@.@methodName(a)}"/>
+
</h:form>
-
+
</rich:panel>
</ui:define>
Modified: trunk/seam-gen/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/view/conversation.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/conversation.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,36 +7,36 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<div class="dialog">
<div class="prop">
<span class="name">Value</span>
<span class="value">#{@componentName@.value}</span>
</div>
</div>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
-
+
<h:form id="@componentName@">
<div class="actionButtons">
- <h:commandButton id="begin" value="Begin"
- action="#{@componentName@.begin}"/>
- <h:commandButton id="inc" value="Increment"
- action="#{@componentName@.increment}"/>
- <h:commandButton id="end" value="End"
- action="#{@componentName@.end}"/>
+ <h:commandButton id="begin" value="Begin"
+ action="#{@componentName@.begin}"/>
+ <h:commandButton id="inc" value="Increment"
+ action="#{@componentName@.increment}"/>
+ <h:commandButton id="end" value="End"
+ action="#{@componentName@.end}"/>
</div>
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/edit.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/edit.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -9,11 +9,11 @@
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
no-conversation-view-id="/${masterPageName}.xhtml"
login-required="true">
-
+
<begin-conversation join="true"/>
-
+
<action execute="${'#'}{${homeName}.wire}"/>
-
+
<param name="${componentName}From"/>
<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
<#if c2j.isComponent(pojo.identifierProperty)>
@@ -33,15 +33,15 @@
<end-conversation/>
<redirect view-id="/${pageName}.xhtml"/>
</navigation>
-
+
<navigation from-action="${'#'}{${homeName}.update}">
<end-conversation/>
<redirect view-id="/${pageName}.xhtml"/>
</navigation>
-
+
<navigation from-action="${'#'}{${homeName}.remove}">
<end-conversation/>
<redirect view-id="/${masterPageName}.xhtml"/>
</navigation>
-
+
</page>
Modified: trunk/seam-gen/view/edit.xhtml
===================================================================
--- trunk/seam-gen/view/edit.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,48 +7,48 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
+
<h:form id="@componentName@Form">
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<s:decorate id="nameDecoration" template="layout/edit.xhtml">
<ui:define name="label">Name</ui:define>
<h:inputText id="name" required="true"
value="#{@homeName@.instance.name}"/>
</s:decorate>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
<div class="actionButtons">
- <h:commandButton id="save"
- value="Save"
+ <h:commandButton id="save"
+ value="Save"
action="#{@homeName@.persist}"
- rendered="#{!@homeName@.managed}"/>
- <h:commandButton id="update"
- value="Save"
+ rendered="#{!@homeName@.managed}"/>
+ <h:commandButton id="update"
+ value="Save"
action="#{@homeName@.update}"
- rendered="#{@homeName@.managed}"/>
- <h:commandButton id="delete"
- value="Delete"
+ rendered="#{@homeName@.managed}"/>
+ <h:commandButton id="delete"
+ value="Delete"
action="#{@homeName@.remove}"
immediate="true"
rendered="#{@homeName@.managed}"/>
- <s:button propagation="end"
- id="done"
+ <s:button propagation="end"
+ id="done"
value="Done"
view="/@masterPageName@.xhtml"/>
</div>
-
+
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
@@ -14,52 +14,52 @@
xmlns:a="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
<h:form id="${componentName}" styleClass="edit">
-
+
<rich:panel>
<f:facet name="header">${'#'}{${homeName}.managed ? 'Edit' : 'Add'} ${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
<#include "editproperty.xhtml.ftl">
</#foreach>
-
+
<div style="clear:both">
- <span class="required">*</span>
+ <span class="required">*</span>
required fields
</div>
-
+
</rich:panel>
-
+
<div class="actionButtons">
- <h:commandButton id="save"
- value="Save"
+ <h:commandButton id="save"
+ value="Save"
action="${'#'}{${homeName}.persist}"
disabled="${'#'}{!${homeName}.wired}"
- rendered="${'#'}{!${homeName}.managed}"/>
-
- <h:commandButton id="update"
- value="Save"
+ rendered="${'#'}{!${homeName}.managed}"/>
+
+ <h:commandButton id="update"
+ value="Save"
action="${'#'}{${homeName}.update}"
rendered="${'#'}{${homeName}.managed}"/>
-
- <h:commandButton id="delete"
- value="Delete"
+
+ <h:commandButton id="delete"
+ value="Delete"
action="${'#'}{${homeName}.remove}"
immediate="true"
rendered="${'#'}{${homeName}.managed}"/>
-
- <s:button id="done"
+
+ <s:button id="done"
value="Done"
propagation="end"
view="/${pageName}.xhtml"
rendered="${'#'}{${homeName}.managed}"/>
-
- <s:button id="cancel"
+
+ <s:button id="cancel"
value="Cancel"
propagation="end"
view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
@@ -82,19 +82,19 @@
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
-
+
<#if property.optional>
<rich:tab label="${property.name}">
<#else>
<rich:tab label="${property.name} *" labelClass="required">
</#if>
<div class="association" id="${property.name}Parent">
-
- <h:outputText value="There is no ${property.name} associated with this ${componentName}."
+
+ <h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
-
- <rich:dataTable var="${parentName}"
- value="${'#'}{${homeName}.instance.${property.name}}"
+
+ <rich:dataTable var="${parentName}"
+ value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
@@ -119,31 +119,31 @@
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${parentPageName}.xhtml"
- id="view${parentName}"
- value="View"
+ <s:link view="/${parentPageName}.xhtml"
+ id="view${parentName}"
+ value="View"
propagation="none">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
@@ -157,7 +157,7 @@
<f:param name="from" value="${pageName}Edit"/>
</s:button>
</div>
-
+
</#if>
</div>
</rich:tab>
@@ -166,17 +166,17 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Children">
-
+
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
<#assign childName = util.lower(childPojo.shortName)>
- <h:outputText value="There are no ${property.name} associated with this ${componentName}."
+ <h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
-
- <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
- rendered="${'#'}{not empty ${homeName}.${property.name}}"
+
+ <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
+ var="${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
@@ -198,33 +198,33 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${childPageName}.xhtml"
- id="select${childName}"
+ <s:link view="/${childPageName}.xhtml"
+ id="select${childName}"
value="Select"
propagation="none">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
-
+
<f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}">
<div class="actionButtons">
- <s:button id="add${childName}"
+ <s:button id="add${childName}"
value="Add ${childName}"
view="/${childEditPageName}.xhtml"
propagation="none">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
Modified: trunk/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
- <rich:calendar id="${componentProperty.name}"
+ <rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -19,7 +19,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -29,7 +29,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
size="16"
<#if !column.nullable>
required="true"
@@ -39,7 +39,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigDecimal(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -48,7 +48,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -91,7 +91,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -125,7 +125,7 @@
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
<#if isDate(property)>
- <rich:calendar id="${property.name}"
+ <rich:calendar id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -134,7 +134,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -144,7 +144,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
size="16"
<#if !column.nullable>
required="true"
@@ -154,7 +154,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigDecimal(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -163,7 +163,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -206,7 +206,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
Modified: trunk/seam-gen/view/error.xhtml
===================================================================
--- trunk/seam-gen/view/error.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/error.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -11,8 +11,8 @@
<h1>Error</h1>
<p>Something bad happened :-(</p>
-
+
<h:messages styleClass="message"/>
-
-</ui:define>
+
+</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/form.xhtml
===================================================================
--- trunk/seam-gen/view/form.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/form.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -8,33 +8,33 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<h:form id="@componentName@Form">
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
-
+
<s:decorate id="valueDecoration" template="layout/edit.xhtml">
<ui:define name="label">Value</ui:define>
<h:inputText id="value" required="true"
value="#{@componentName@.value}"/>
</s:decorate>
-
+
<div style="clear:both"/>
-
+
</rich:panel>
<div class="actionButtons">
- <h:commandButton id="@methodName@" value="@methodName@"
- action="#{@componentName@.@methodName(a)}"/>
+ <h:commandButton id="@methodName@" value="@methodName@"
+ action="#{@componentName@.@methodName(a)}"/>
</div>
</h:form>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/home.xhtml
===================================================================
--- trunk/seam-gen/view/home.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/home.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -11,7 +11,7 @@
<ui:define name="body">
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">Welcome!</f:facet>
<p>This empty shell application includes:</p>
@@ -29,6 +29,6 @@
<li>Internationalization support</li>
</ul>
</rich:panel>
-
-</ui:define>
+
+</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/view/layout/template.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/layout/template.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -19,14 +19,14 @@
<ui:param name="projectName" value="@projectName@"/>
</ui:include>
- <div class="body">
- <ui:insert name="body"/>
- </div>
+ <div class="body">
+ <ui:insert name="body"/>
+ </div>
- <div class="footer">
- Powered by <a href="http://jboss.com/products/seam">Seam</a>.
- Generated by seam-gen.
- </div>
+ <div class="footer">
+ Powered by <a href="http://jboss.com/products/seam">Seam</a>.
+ Generated by seam-gen.
+ </div>
</body>
</html>
Modified: trunk/seam-gen/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/list.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -2,15 +2,15 @@
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
-
-<#include "../util/TypeInfo.ftl">
+
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
<param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
<param name="sort" value="${'#'}{${listName}.orderColumn}"/>
<param name="dir" value="${'#'}{${listName}.orderDirection}"/>
-
+
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/view/list.xhtml
===================================================================
--- trunk/seam-gen/view/list.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -7,21 +7,21 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
+
<rich:panel>
<f:facet name="header">@masterPageName@</f:facet>
-
+
<div class="results">
-
- <h:outputText value="No @componentName@ exists"
+
+ <h:outputText value="No @componentName@ exists"
rendered="#{empty @listName@.resultList}"/>
-
+
<h:dataTable id="@listName@" var="@componentName@"
- value="#{@listName@.resultList}"
+ value="#{@listName@.resultList}"
rendered="#{not empty @listName@.resultList}">
<h:column>
<f:facet name="header">Id</f:facet>
@@ -29,25 +29,25 @@
</h:column>
<h:column>
<f:facet name="header">Name</f:facet>
- <s:link id="@componentName@"
- value="#{@componentName@.name}"
+ <s:link id="@componentName@"
+ value="#{@componentName@.name}"
view="/@pageName@.xhtml">
- <f:param name="@componentName@Id"
+ <f:param name="@componentName@Id"
value="#{@componentName@.id}"/>
</s:link>
</h:column>
</h:dataTable>
-
+
</div>
-
+
</rich:panel>
-
+
<div class="actionButtons">
- <s:button id="done"
+ <s:button id="done"
value="Create @componentName@"
- view="/@pageName@.xhtml"/>
+ view="/@pageName@.xhtml"/>
</div>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,7 +1,7 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<#include "../util/TypeInfo.ftl">
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
@@ -16,15 +16,15 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
+
<h:form id="${componentName}Search" styleClass="edit">
-
+
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
-
+
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
@@ -48,25 +48,25 @@
</#if>
</#if>
</#foreach>
-
+
</rich:simpleTogglePanel>
-
+
<div class="actionButtons">
<h:commandButton id="search" value="Search" action="/${listPageName}.xhtml"/>
</div>
-
+
</h:form>
-
+
<rich:panel>
<f:facet name="header">${entityName} search results</f:facet>
<div class="results" id="${componentName}List">
- <h:outputText value="The ${componentName} search returned no results."
+ <h:outputText value="The ${componentName} search returned no results."
rendered="${'#'}{empty ${listName}.resultList}"/>
-
- <rich:dataTable id="${listName}"
+
+ <rich:dataTable id="${listName}"
var="${componentName}"
- value="${'#'}{${listName}.resultList}"
+ value="${'#'}{${listName}.resultList}"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
@@ -81,7 +81,7 @@
<h:column>
<f:facet name="header">
<s:link styleClass="columnHeader"
- value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
+ value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
<f:param name="sort" value="${property.name}" />
<f:param name="dir" value="${'#'}{${listName}.orderDirection=='asc' ? 'desc' : 'asc'}"/>
</s:link>
@@ -121,16 +121,16 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link view="/${'#'}{empty from ? '${pageName}' : from}.xhtml"
- value="Select"
+ <s:link view="/${'#'}{empty from ? '${pageName}' : from}.xhtml"
+ value="Select"
id="${componentName}">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
- <f:param name="${componentName}${util.upper(componentProperty.name)}"
+ <f:param name="${componentName}${util.upper(componentProperty.name)}"
value="${'#'}{${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
</#if>
</s:link>
@@ -139,45 +139,45 @@
</div>
</rich:panel>
-
+
<div class="tableControl">
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.previousExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.previousExists}"
value="${'#'}{messages.left}${'#'}{messages.left} First Page"
id="firstPage">
<f:param name="firstResult" value="0"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.previousExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.previousExists}"
value="${'#'}{messages.left} Previous Page"
id="previousPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.previousFirstResult}"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.nextExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.nextExists}"
value="Next Page ${'#'}{messages.right}"
id="nextPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.nextFirstResult}"/>
</s:link>
-
- <s:link view="/${listPageName}.xhtml"
- rendered="${'#'}{${listName}.nextExists}"
+
+ <s:link view="/${listPageName}.xhtml"
+ rendered="${'#'}{${listName}.nextExists}"
value="Last Page ${'#'}{messages.right}${'#'}{messages.right}"
id="lastPage">
- <f:param name="firstResult"
+ <f:param name="firstResult"
value="${'#'}{${listName}.lastFirstResult}"/>
</s:link>
-
+
</div>
-
+
<s:div styleClass="actionButtons" rendered="${'#'}{empty from}">
<s:button view="/${editPageName}.xhtml"
- id="create"
+ id="create"
value="Create ${componentName}">
<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
<#if c2j.isComponent(pojo.identifierProperty)>
@@ -190,7 +190,7 @@
</#if>
</s:button>
</s:div>
-
+
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/login.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -9,42 +9,42 @@
template="layout/template.xhtml">
<ui:define name="body">
-
+
<h:messages styleClass="message"/>
-
+
<h:form id="login">
-
+
<rich:panel>
<f:facet name="header">Login</f:facet>
-
+
<p>Please login here</p>
-
+
<div class="dialog">
<h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
<h:outputLabel for="username">Username</h:outputLabel>
- <h:inputText id="username"
+ <h:inputText id="username"
value="#{identity.username}"/>
<h:outputLabel for="password">Password</h:outputLabel>
- <h:inputSecret id="password"
+ <h:inputSecret id="password"
value="#{identity.password}"/>
<h:outputLabel for="rememberMe">Remember me</h:outputLabel>
- <h:selectBooleanCheckbox id="rememberMe"
+ <h:selectBooleanCheckbox id="rememberMe"
value="#{identity.rememberMe}"/>
</h:panelGrid>
</div>
-
+
<p>
<i>Note - </i> Please use demo/password to log in the first time. After logging in you may then
use the User Manager link to manage user accounts.
</p>
-
+
</rich:panel>
-
+
<div class="actionButtons">
<h:commandButton value="Login" action="#{identity.login}"/>
</div>
-
+
</h:form>
- </ui:define>
+ </ui:define>
</ui:composition>
Modified: trunk/seam-gen/view/page.xhtml
===================================================================
--- trunk/seam-gen/view/page.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/page.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
Modified: trunk/seam-gen/view/query.xhtml
===================================================================
--- trunk/seam-gen/view/query.xhtml 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/query.xhtml 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -6,15 +6,15 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
template="layout/template.xhtml">
-
+
<ui:define name="body">
<h1>@beanName@ results</h1>
<p>Generated query page</p>
-
+
<h:messages globalOnly="true" styleClass="message"/>
-
- <h:outputText value="No results from search"
+
+ <h:outputText value="No results from search"
rendered="#{empty @componentName@.resultList}"/>
<f:subview id="results" rendered="#{not empty @componentName@.resultList}">
<h:dataTable id="@componentName@"
Modified: trunk/seam-gen/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/view/stylesheet/theme.css 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/stylesheet/theme.css 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,43 +1,43 @@
body {
- font-size: 12px;
+ font-size: 12px;
}
a:active, a:link, a:visited {
- color: #0D5798;
+ color: #0D5798;
}
a:hover {
- color: #8CAFCD;
+ color: #8CAFCD;
}
input, textarea {
- border: 1px solid #BBBBBB;
- font-size: 10px;
- background: #F0F8FF;
- color: black;
+ border: 1px solid #BBBBBB;
+ font-size: 10px;
+ background: #F0F8FF;
+ color: black;
}
input[type='submit'], input[type='button'] {
- background: #4477AA;
- color: white;
- margin: 5px;
- border-color: gray;
+ background: #4477AA;
+ color: white;
+ margin: 5px;
+ border-color: gray;
}
.tableControl, .actionButtons {
- width: 100%;
+ width: 100%;
}
.tableControl a {
- padding-left: 10px;
+ padding-left: 10px;
}
.tableControl {
- text-align: right;
+ text-align: right;
}
.footer {
- text-align: center;
- font-size: 10px;
+ text-align: center;
+ font-size: 10px;
}
.rich-table {
@@ -45,20 +45,20 @@
}
h1 {
- font-family: Arial,sans-serif;
- color: #578BB8;
- font-size: 1.6em;
- margin-top: 0;
+ font-family: Arial,sans-serif;
+ color: #578BB8;
+ font-size: 1.6em;
+ margin-top: 0;
}
body {
- margin: 0px;
- font-family: Arial,sans-serif;
- color: #616161;
+ margin: 0px;
+ font-family: Arial,sans-serif;
+ color: #616161;
}
.body {
- padding: 30px;
+ padding: 30px;
}
.columnHeader:hover
@@ -67,51 +67,51 @@
}
.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
+ border: 1px solid #FFCC00;
+ padding: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #F0F8FF;
+ font-size: 12px;
}
.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
}
.value {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.error {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.errors {
- color: red;
- vertical-align: middle;
+ color: red;
+ vertical-align: middle;
}
img.errors {
- padding-right: 5px;
+ padding-right: 5px;
}
.errors input {
- border: 1px solid red;
+ border: 1px solid red;
}
.errors textarea {
- border: 1px solid red;
+ border: 1px solid red;
}
.required {
- color: red;
- padding-left: 2px;
+ color: red;
+ padding-left: 2px;
}
.rich-stglpanel-body {
overflow: auto;
-}
+}
Modified: trunk/seam-gen/view/view.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/view.page.xml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/view.page.xml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -2,7 +2,7 @@
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
-
+
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign homeName = componentName + "Home">
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-04-13 12:47:14 UTC (rev 7915)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-04-13 12:47:56 UTC (rev 7916)
@@ -1,4 +1,4 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
@@ -13,11 +13,11 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="layout/template.xhtml">
-
+
<ui:define name="body">
-
+
<h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
+
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
@@ -27,13 +27,13 @@
</#foreach>
<div style="clear:both"/>
-
+
</rich:panel>
-
- <div class="actionButtons">
- <s:button view="/${editPageName}.xhtml"
- id="edit"
+ <div class="actionButtons">
+
+ <s:button view="/${editPageName}.xhtml"
+ id="edit"
value="Edit"/>
<s:button view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
@@ -59,12 +59,12 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Parent">
-
- <h:outputText value="There is no ${property.name} associated with this ${componentName}."
+
+ <h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
-
- <rich:dataTable var="${parentName}"
- value="${'#'}{${homeName}.instance.${property.name}}"
+
+ <rich:dataTable var="${parentName}"
+ value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
@@ -89,36 +89,36 @@
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="view${parentName}"
- value="View"
+ <s:link id="view${parentName}"
+ value="View"
view="/${parentPageName}.xhtml">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
</rich:tab>
</#if>
@@ -126,7 +126,7 @@
<rich:tab label="${property.name}">
<div class="association" id="${property.name}Children">
-
+
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
@@ -134,10 +134,10 @@
<#assign childHomeName = childName + "Home">
<h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
-
- <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
- rendered="${'#'}{not empty ${homeName}.${property.name}}"
+
+ <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
+ var="${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
@@ -159,40 +159,40 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="select${childName}"
- value="Select"
+ <s:link id="select${childName}"
+ value="Select"
view="/${childPageName}.xhtml">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
-
+
</div>
-
+
<div class="actionButtons">
- <s:button
+ <s:button
value="Add ${childName}"
view="/${childEditPageName}.xhtml">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
- </div>
+ </div>
</rich:tab>
</#if>
</#foreach>
<#if hasAssociations>
</rich:tabPanel>
-</#if>
+</#if>
</ui:define>
</ui:composition>
16 years, 2 months
- 1
- 0