Seam SVN: r9063 - branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 00:20:24 -0400 (Sun, 21 Sep 2008)
New Revision: 9063
Modified:
branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Hsearch.xml
Log:
fix invalid package for Lucene Query class
Modified: branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Hsearch.xml
===================================================================
--- branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-09-21 04:20:02 UTC (rev 9062)
+++ branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-09-21 04:20:24 UTC (rev 9063)
@@ -130,7 +130,7 @@
@In FullTextSession session;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
org.hibernate.Query query session.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
.setMaxResults(pageSize + 1)
@@ -156,7 +156,7 @@
@In FullTextEntityManager em;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
javax.persistence.Query query = em.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
.setMaxResults(pageSize + 1)
@@ -188,7 +188,7 @@
@PersistenceContext EntityManager em;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
FullTextEntityManager ftEm = (FullTextEntityManager) em;
javax.persistence.Query query = ftEm.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
15 years, 8 months
Seam SVN: r9062 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 00:20:02 -0400 (Sun, 21 Sep 2008)
New Revision: 9062
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Hsearch.xml
Log:
fix invalid package name for Lucene Query class
Modified: trunk/doc/Seam_Reference_Guide/en-US/Hsearch.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-09-21 03:48:06 UTC (rev 9061)
+++ trunk/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-09-21 04:20:02 UTC (rev 9062)
@@ -130,7 +130,7 @@
@In FullTextSession session;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
org.hibernate.Query query session.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
.setMaxResults(pageSize + 1)
@@ -156,7 +156,7 @@
@In FullTextEntityManager em;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
javax.persistence.Query query = em.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
.setMaxResults(pageSize + 1)
@@ -188,7 +188,7 @@
@PersistenceContext EntityManager em;
public void search(String searchString) {
- org.apache.lucene.query.Query luceneQuery = getLuceneQuery();
+ org.apache.lucene.search.Query luceneQuery = getLuceneQuery();
FullTextEntityManager ftEm = (FullTextEntityManager) em;
javax.persistence.Query query = ftEm.createFullTextQuery(luceneQuery, Product.class);
searchResults = query
15 years, 8 months
Seam SVN: r9061 - branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 23:48:06 -0400 (Sat, 20 Sep 2008)
New Revision: 9061
Modified:
branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml
Log:
minor updates to locales section
Modified: branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:47:55 UTC (rev 9060)
+++ branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:48:06 UTC (rev 9061)
@@ -170,7 +170,8 @@
<f:selectItem itemLabel="Deutsch" itemValue="de"/>
<f:selectItem itemLabel="Francais" itemValue="fr"/>
</h:selectOneMenu>
-<h:commandButton action="#{localeSelector.select}" value="#{messages['ChangeLanguage']}"/></programlisting>
+<h:commandButton action="#{localeSelector.select}"
+ value="#{messages['ChangeLanguage']}"/></programlisting>
<para>Or, if you want a list of all supported locales from <literal>
faces-config.xml</literal>, just use:</para>
@@ -184,7 +185,6 @@
<para>When the user selects an item from the drop-down, then clicks the
command button, the Seam and JSF locales will be overridden for the rest of the
session.</para>
- </section>
<para>The brings us to the question of where the supported locales are
defined. Typically, you provide a list of locales for which you have
@@ -195,16 +195,16 @@
reason, you can configure the supported locales, and the default locale of
the server, using the built-in component named
<literal>org.jboss.seam.international.localeConfig</literal>. To use it,
- you first declare an XML namespace for Seam's international package and
- bind it to the i18n prefix. You then define the default locale and
- supported locales as follows:</para>
+ you first declare an XML namespace for Seam's international package in the
+ Seam component descriptor. You then define the default locale and supported
+ locales as follows:</para>
- <programlisting role="XML"><international:locale-config default-locale="fr_CA"
- supported-locales="en fr_CA fr_FR"/></programlisting>
+ <programlisting role="XML"><international:locale-config default-locale="fr_CA" supported-locales="en fr_CA fr_FR"/></programlisting>
<para>Naturally, if you pronounce that you support a locale, you better
provide a resource bundle to match it! Up next, you'll learn how to define
the language-specific labels.</para>
+ </section>
<section>
<title>Labels<anchor id="labels" /></title>
15 years, 8 months
Seam SVN: r9060 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 23:47:55 -0400 (Sat, 20 Sep 2008)
New Revision: 9060
Modified:
trunk/doc/Seam_Reference_Guide/en-US/I18n.xml
Log:
document the new <locale-config> element
Modified: trunk/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:37:10 UTC (rev 9059)
+++ trunk/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:47:55 UTC (rev 9060)
@@ -170,7 +170,8 @@
<f:selectItem itemLabel="Deutsch" itemValue="de"/>
<f:selectItem itemLabel="Francais" itemValue="fr"/>
</h:selectOneMenu>
-<h:commandButton action="#{localeSelector.select}" value="#{messages['ChangeLanguage']}"/></programlisting>
+<h:commandButton action="#{localeSelector.select}"
+ value="#{messages['ChangeLanguage']}"/></programlisting>
<para>Or, if you want a list of all supported locales from <literal>
faces-config.xml</literal>, just use:</para>
@@ -178,11 +179,31 @@
<programlisting role="XHTML"><h:selectOneMenu value="#{localeSelector.localeString}">
<f:selectItems value="#{localeSelector.supportedLocales}"/>
</h:selectOneMenu>
-<h:commandButton action="#{localeSelector.select}" value="#{messages['ChangeLanguage']}"/></programlisting>
+<h:commandButton action="#{localeSelector.select}"
+ value="#{messages['ChangeLanguage']}"/></programlisting>
- <para>When this use selects an item from the drop-down, and clicks the
- button, the Seam and JSF locales will be overridden for the rest of the
+ <para>When the user selects an item from the drop-down, then clicks the
+ command button, the Seam and JSF locales will be overridden for the rest of the
session.</para>
+
+ <para>The brings us to the question of where the supported locales are
+ defined. Typically, you provide a list of locales for which you have
+ matching resource bundles in the <literal><locale-config></literal>
+ element of the JSF configuration file (/META-INF/faces-config.xml). However,
+ you have learned to appreciate that Seam's component configuration
+ mechanism is more powerful than what is provided in Java EE. For that
+ reason, you can configure the supported locales, and the default locale of
+ the server, using the built-in component named
+ <literal>org.jboss.seam.international.localeConfig</literal>. To use it,
+ you first declare an XML namespace for Seam's international package in the
+ Seam component descriptor. You then define the default locale and supported
+ locales as follows:</para>
+
+ <programlisting role="XML"><international:locale-config default-locale="fr_CA" supported-locales="en fr_CA fr_FR"/></programlisting>
+
+ <para>Naturally, if you pronounce that you support a locale, you better
+ provide a resource bundle to match it! Up next, you'll learn how to define
+ the language-specific labels.</para>
</section>
<section>
@@ -395,4 +416,4 @@
<international:locale-selector cookie-enabled="true"/></programlisting>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
15 years, 8 months
Seam SVN: r9059 - branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 23:37:10 -0400 (Sat, 20 Sep 2008)
New Revision: 9059
Modified:
branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml
Log:
Document the new <locale-config> element.
Modified: branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:36:42 UTC (rev 9058)
+++ branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-09-21 03:37:10 UTC (rev 9059)
@@ -178,13 +178,34 @@
<programlisting role="XHTML"><h:selectOneMenu value="#{localeSelector.localeString}">
<f:selectItems value="#{localeSelector.supportedLocales}"/>
</h:selectOneMenu>
-<h:commandButton action="#{localeSelector.select}" value="#{messages['ChangeLanguage']}"/></programlisting>
+<h:commandButton action="#{localeSelector.select}"
+ value="#{messages['ChangeLanguage']}"/></programlisting>
- <para>When this use selects an item from the drop-down, and clicks the
- button, the Seam and JSF locales will be overridden for the rest of the
+ <para>When the user selects an item from the drop-down, then clicks the
+ command button, the Seam and JSF locales will be overridden for the rest of the
session.</para>
</section>
+ <para>The brings us to the question of where the supported locales are
+ defined. Typically, you provide a list of locales for which you have
+ matching resource bundles in the <literal><locale-config></literal>
+ element of the JSF configuration file (/META-INF/faces-config.xml). However,
+ you have learned to appreciate that Seam's component configuration
+ mechanism is more powerful than what is provided in Java EE. For that
+ reason, you can configure the supported locales, and the default locale of
+ the server, using the built-in component named
+ <literal>org.jboss.seam.international.localeConfig</literal>. To use it,
+ you first declare an XML namespace for Seam's international package and
+ bind it to the i18n prefix. You then define the default locale and
+ supported locales as follows:</para>
+
+ <programlisting role="XML"><international:locale-config default-locale="fr_CA"
+ supported-locales="en fr_CA fr_FR"/></programlisting>
+
+ <para>Naturally, if you pronounce that you support a locale, you better
+ provide a resource bundle to match it! Up next, you'll learn how to define
+ the language-specific labels.</para>
+
<section>
<title>Labels<anchor id="labels" /></title>
@@ -395,4 +416,4 @@
<international:locale-selector cookie-enabled="true"/></programlisting>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
15 years, 8 months
Seam SVN: r9058 - branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 23:36:42 -0400 (Sat, 20 Sep 2008)
New Revision: 9058
Modified:
branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Security.xml
Log:
core:servlet-session should be web:session
Modified: branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Security.xml
===================================================================
--- branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Security.xml 2008-09-21 03:00:05 UTC (rev 9057)
+++ branches/community/Seam_2_0/doc/Seam_Reference_Guide/en-US/Security.xml 2008-09-21 03:36:42 UTC (rev 9058)
@@ -1292,7 +1292,7 @@
changes. Just add this line to <literal>components.xml</literal>:
</para>
- <programlisting role="XML"><![CDATA[<core:servlet-session invalidate-on-scheme-change="true"/>]]></programlisting>
+ <programlisting role="XML"><![CDATA[<web:session invalidate-on-scheme-change="true"/>]]></programlisting>
<para>
This option helps make your system less vulnerable to sniffing of the session id or leakage of
15 years, 8 months
Seam SVN: r9057 - in trunk: seam-gen/icefaces/view and 2 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 23:00:05 -0400 (Sat, 20 Sep 2008)
New Revision: 9057
Modified:
trunk/build/gen.pom.xml
trunk/seam-gen/icefaces/view/edit.xhtml.ftl
trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
trunk/seam-gen/icefaces/view/list.page.xml.ftl
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/icefaces/view/param.xml.ftl
trunk/seam-gen/icefaces/view/view.xhtml.ftl
trunk/seam-gen/src/EntityHome.java.ftl
trunk/seam-gen/src/EntityList.java.ftl
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/editproperty.xhtml.ftl
trunk/seam-gen/view/list.page.xml.ftl
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/param.xml.ftl
trunk/seam-gen/view/view.xhtml.ftl
Log:
JBSEAM-2348
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/build/gen.pom.xml 2008-09-21 03:00:05 UTC (rev 9057)
@@ -23,6 +23,12 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-tools</artifactId>
<scope>runtime</scope>
</dependency>
@@ -67,4 +73,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -75,7 +75,7 @@
</ice:form>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -85,7 +85,7 @@
<ice:panelTabSet id="editPanelTab${homeName}Id" styleClass="componentPanelTabSetLayout" style="margin-bottom:5px;margin-top:10px;">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -106,7 +106,7 @@
columnClasses="allCols"
id="edit${property.name}TableId">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<ice:column id="editColumn${componentProperty.name}Id">
@@ -121,7 +121,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -187,7 +187,7 @@
columnClasses="allCols"
id="edit${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<ice:column id="edit${componentProperty.name}Id">
Modified: trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
Modified: trunk/seam-gen/icefaces/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -18,7 +18,7 @@
<param name="dir" value="${'#'}{${listName}.orderDirection}"/>
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -33,7 +33,7 @@
<ice:panelGroup id="listPanelGroup${entityName}Id" styleClass="edit">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
@@ -85,7 +85,7 @@
columnClasses="allCols"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<ice:column id="list${componentProperty.name}Id">
@@ -107,7 +107,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
Modified: trunk/seam-gen/icefaces/view/param.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/param.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/param.xml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -1,5 +1,5 @@
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if entities.add(parentPojo.shortName)>
<#assign parentComponentName = util.lower(parentPojo.shortName)>
Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -28,7 +28,7 @@
</table>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
@@ -51,7 +51,7 @@
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -63,7 +63,7 @@
style="margin-bottom:5px;margin-top:10px;">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -82,7 +82,7 @@
columnClasses="allCols"
id="view${property.name}TableId">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<ice:column id="viewColumn${componentProperty.name}Id">
@@ -97,7 +97,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -156,7 +156,7 @@
columnClasses="allCols"
id="view${property.name}TableId">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<ice:column id="view${componentProperty.name}Id">
Modified: trunk/seam-gen/src/EntityHome.java.ftl
===================================================================
--- trunk/seam-gen/src/EntityHome.java.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/src/EntityHome.java.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -8,7 +8,7 @@
{
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
@${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
@@ -69,7 +69,7 @@
{
getInstance();
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.shortName!=pojo.shortName>
<#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
@@ -87,7 +87,7 @@
public boolean isWired()
{
<#foreach property in pojo.allPropertiesIterator>
-<#if (c2h.isManyToOne(property) && !property.optional)>
+<#if (util.isToOne(property) && !property.optional)>
<#assign getter = pojo.getGetterSignature(property)>
if ( getInstance().${getter}()==null ) return false;
</#if>
Modified: trunk/seam-gen/src/EntityList.java.ftl
===================================================================
--- trunk/seam-gen/src/EntityList.java.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/src/EntityList.java.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -18,7 +18,7 @@
private static final String[] RESTRICTIONS = {
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
+<#if !c2h.isCollection(property) && !util.isToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -69,7 +69,7 @@
</h:form>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -78,7 +78,7 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -99,7 +99,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
@@ -114,7 +114,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -180,7 +180,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<h:column>
Modified: trunk/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
Modified: trunk/seam-gen/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/list.page.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/list.page.xml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -13,7 +13,7 @@
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -26,7 +26,7 @@
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
@@ -69,7 +69,7 @@
value="${'#'}{${listName}.resultList}"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<h:column>
@@ -90,7 +90,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
Modified: trunk/seam-gen/view/param.xml.ftl
===================================================================
--- trunk/seam-gen/view/param.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/param.xml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -1,5 +1,5 @@
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if entities.add(parentPojo.shortName)>
<#assign parentComponentName = util.lower(parentPojo.shortName)>
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-09-21 03:00:05 UTC (rev 9057)
@@ -21,7 +21,7 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
@@ -43,7 +43,7 @@
</div>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -52,7 +52,7 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -69,7 +69,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
@@ -84,7 +84,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -141,7 +141,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<h:column>
15 years, 8 months
Seam SVN: r9056 - in branches/community/Seam_2_0: seam-gen/icefaces/view and 3 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 22:59:33 -0400 (Sat, 20 Sep 2008)
New Revision: 9056
Modified:
branches/community/Seam_2_0/build/gen.pom.xml
branches/community/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl
branches/community/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl
branches/community/Seam_2_0/seam-gen/icefaces/view/list.page.xml.ftl
branches/community/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl
branches/community/Seam_2_0/seam-gen/icefaces/view/param.xml.ftl
branches/community/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl
branches/community/Seam_2_0/seam-gen/src/EntityHome.java.ftl
branches/community/Seam_2_0/seam-gen/src/EntityList.java.ftl
branches/community/Seam_2_0/seam-gen/view/edit.xhtml.ftl
branches/community/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
branches/community/Seam_2_0/seam-gen/view/list.page.xml.ftl
branches/community/Seam_2_0/seam-gen/view/list.xhtml.ftl
branches/community/Seam_2_0/seam-gen/view/param.xml.ftl
branches/community/Seam_2_0/seam-gen/view/view.xhtml.ftl
branches/community/Seam_2_0/src/gen/org/jboss/seam/tool/Util.java
Log:
JBSEAM-2348
Modified: branches/community/Seam_2_0/build/gen.pom.xml
===================================================================
--- branches/community/Seam_2_0/build/gen.pom.xml 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/build/gen.pom.xml 2008-09-21 02:59:33 UTC (rev 9056)
@@ -23,6 +23,12 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-tools</artifactId>
<scope>runtime</scope>
</dependency>
@@ -66,4 +72,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -75,7 +75,7 @@
</ice:form>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -85,7 +85,7 @@
<ice:panelTabSet id="editPanelTab${homeName}Id" styleClass="componentPanelTabSetLayout" style="margin-bottom:5px;margin-top:10px;">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -106,7 +106,7 @@
columnClasses="allCols"
id="edit${property.name}TableId">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<ice:column id="editColumn${componentProperty.name}Id">
@@ -121,7 +121,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -187,7 +187,7 @@
columnClasses="allCols"
id="edit${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<ice:column id="edit${componentProperty.name}Id">
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/list.page.xml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/list.page.xml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/list.page.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -17,7 +17,7 @@
<param name="order" value="${'#'}{${listName}.order}"/>
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -33,7 +33,7 @@
<ice:panelGroup id="listPanelGroup${entityName}Id" styleClass="edit">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
@@ -85,7 +85,7 @@
columnClasses="allCols"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<ice:column id="list${componentProperty.name}Id">
@@ -106,7 +106,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/param.xml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/param.xml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/param.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -1,5 +1,5 @@
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if entities.add(parentPojo.shortName)>
<#assign parentComponentName = util.lower(parentPojo.shortName)>
Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -28,7 +28,7 @@
</table>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
@@ -51,7 +51,7 @@
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -63,7 +63,7 @@
style="margin-bottom:5px;margin-top:10px;">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -82,7 +82,7 @@
columnClasses="allCols"
id="view${property.name}TableId">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<ice:column id="viewColumn${componentProperty.name}Id">
@@ -97,7 +97,7 @@
</ice:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -156,7 +156,7 @@
columnClasses="allCols"
id="view${property.name}TableId">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<ice:column id="view${componentProperty.name}Id">
Modified: branches/community/Seam_2_0/seam-gen/src/EntityHome.java.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/src/EntityHome.java.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/src/EntityHome.java.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -8,7 +8,7 @@
{
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
@${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
@@ -70,7 +70,7 @@
{
getInstance();
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.shortName!=pojo.shortName>
<#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
@@ -88,7 +88,7 @@
public boolean isWired()
{
<#foreach property in pojo.allPropertiesIterator>
-<#if (c2h.isManyToOne(property) && !property.optional)>
+<#if (util.isToOne(property) && !property.optional)>
<#assign getter = pojo.getGetterSignature(property)>
if ( getInstance().${getter}()==null ) return false;
</#if>
Modified: branches/community/Seam_2_0/seam-gen/src/EntityList.java.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/src/EntityList.java.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/src/EntityList.java.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -18,7 +18,7 @@
private static final String[] RESTRICTIONS = {
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
+<#if !c2h.isCollection(property) && !util.isToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: branches/community/Seam_2_0/seam-gen/view/edit.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/edit.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/edit.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -69,7 +69,7 @@
</h:form>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -78,7 +78,7 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -99,7 +99,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
@@ -114,7 +114,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -180,7 +180,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<h:column>
Modified: branches/community/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
Modified: branches/community/Seam_2_0/seam-gen/view/list.page.xml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/list.page.xml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/list.page.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -11,7 +11,7 @@
<param name="order" value="${'#'}{${listName}.order}"/>
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: branches/community/Seam_2_0/seam-gen/view/list.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/list.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/list.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -26,7 +26,7 @@
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
@@ -69,7 +69,7 @@
value="${'#'}{${listName}.resultList}"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<h:column>
@@ -89,7 +89,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
Modified: branches/community/Seam_2_0/seam-gen/view/param.xml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/param.xml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/param.xml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -1,5 +1,5 @@
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if entities.add(parentPojo.shortName)>
<#assign parentComponentName = util.lower(parentPojo.shortName)>
Modified: branches/community/Seam_2_0/seam-gen/view/view.xhtml.ftl
===================================================================
--- branches/community/Seam_2_0/seam-gen/view/view.xhtml.ftl 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/seam-gen/view/view.xhtml.ftl 2008-09-21 02:59:33 UTC (rev 9056)
@@ -21,7 +21,7 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
@@ -43,7 +43,7 @@
</div>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property) || c2h.isOneToManyCollection(property)>
+<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -52,7 +52,7 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if c2h.isManyToOne(property)>
+<#if util.isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
<#assign parentName = util.lower(parentPojo.shortName)>
@@ -69,7 +69,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
@@ -84,7 +84,7 @@
</h:column>
</#if>
</#if>
-<#if c2h.isManyToOne(parentProperty)>
+<#if util.isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
@@ -141,7 +141,7 @@
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
<h:column>
Modified: branches/community/Seam_2_0/src/gen/org/jboss/seam/tool/Util.java
===================================================================
--- branches/community/Seam_2_0/src/gen/org/jboss/seam/tool/Util.java 2008-09-21 01:19:48 UTC (rev 9055)
+++ branches/community/Seam_2_0/src/gen/org/jboss/seam/tool/Util.java 2008-09-21 02:59:33 UTC (rev 9056)
@@ -3,6 +3,9 @@
import java.util.HashSet;
import java.util.Set;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.ToOne;
+
public class Util
{
public String lower(String name)
@@ -17,4 +20,8 @@
{
return new HashSet();
}
+ public boolean isToOne(Property property)
+ {
+ return (property.getValue() != null) && (property.getValue() instanceof ToOne);
+ }
}
15 years, 8 months
Seam SVN: r9055 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: jacob.orshalick
Date: 2008-09-20 21:19:48 -0400 (Sat, 20 Sep 2008)
New Revision: 9055
Modified:
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-1943 added back root attribute, lost in merge
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-09-21 00:39:20 UTC (rev 9054)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-09-21 01:19:48 UTC (rev 9055)
@@ -286,7 +286,8 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.end-conversation">
- <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
+ <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
+ <xs:attribute name="root" default="false" type="pages:tf-boolean"/>
<xs:attribute name="if" type="pages:boolean-value-expression" />
</xs:attributeGroup>
15 years, 8 months
Seam SVN: r9054 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 20:39:20 -0400 (Sat, 20 Sep 2008)
New Revision: 9054
Modified:
trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
Log:
remove println
Modified: trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-09-20 22:43:25 UTC (rev 9053)
+++ trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-09-21 00:39:20 UTC (rev 9054)
@@ -44,7 +44,6 @@
@Override
public ClassLoader getClassLoader()
{
- System.out.println(classLoader + "/" + super.getClassLoader());
if (classLoader == null && super.getClassLoader() != null)
{
this.classLoader = new GroovyClassLoader(super.getClassLoader());
15 years, 8 months