Seam SVN: r10322 - in trunk/seam-gen: build-scripts and 1 other directory.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-04-06 22:29:03 -0400 (Mon, 06 Apr 2009)
New Revision: 10322
Modified:
trunk/seam-gen/build-scripts/build.properties
trunk/seam-gen/build.xml
Log:
Prompt for GlassFish home directory
Propogate GlassFish domain to project build file
Detect defaults such as JBoss AS home, GlassFish home, and workspace based on environment
Improve settings report
Print settings report at the end of setup
Clean up some sentences
Modified: trunk/seam-gen/build-scripts/build.properties
===================================================================
--- trunk/seam-gen/build-scripts/build.properties 2009-04-06 23:18:07 UTC (rev 10321)
+++ trunk/seam-gen/build-scripts/build.properties 2009-04-07 02:29:03 UTC (rev 10322)
@@ -1,6 +1,6 @@
jboss.home=@jbossHome@
jboss.domain=@jbossDomain@
glassfish.home=@glassfishHome@
-glassfish.domain=domain1
+glassfish.domain=@glassfishDomain@
# Uncomment to stop the build from deploying the datasource to GlassFish
#glassfish.datasource.useDefault=true
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2009-04-06 23:18:07 UTC (rev 10321)
+++ trunk/seam-gen/build.xml 2009-04-07 02:29:03 UTC (rev 10322)
@@ -24,9 +24,20 @@
</condition>
<property file="${seam-gen.properties}"/>
- <!-- set property defaults for backwards compatibility -->
+
+ <property environment="env"/>
+ <!-- set property defaults (also maintains backwards compatibility) -->
+ <condition property="jboss.home" value="${env.JBOSS_HOME}" else="C:/Program Files/jboss-4.2.3.GA">
+ <isset property="env.JBOSS_HOME"/>
+ </condition>
<property name="jboss.domain" value="default"/>
- <property name="glassfish.home" value=""/>
+ <condition property="glassfish.home" value="${env.GLASSFISH_HOME}" else="C:/Program Files/glassfish-v2.1">
+ <isset property="env.GLASSFISH_HOME"/>
+ </condition>
+ <property name="glassfish.domain" value="domain1"/>
+ <condition property="workspace.home" value="C:/Projects" else="${user.home}/projects">
+ <os family="windows"/>
+ </condition>
<import file="${seam.dir}/build/common.build.xml"/>
@@ -172,6 +183,7 @@
<filter token="jbossHome" value="${jboss.home}"/>
<filter token="jbossDomain" value="${jboss.domain}"/>
<filter token="glassfishHome" value="${glassfish.home}"/>
+ <filter token="glassfishDomain" value="${glassfish.domain}"/>
<filter token="iceHome" value="${icefaces.home}"/>
<filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/>
<filter token="driverJar" value="${driver.file}"/>
@@ -208,23 +220,34 @@
<echo message="Welcome to seam-gen ${complete.version} :-)"/>
<echo message="Answer each question or hit ENTER to accept the default (in brackets)"/>
<echo message=""/>
- <property name="old.workspace.home" value="C:/Projects"/>
+ <property name="old.workspace.home" value="${workspace.home}"/>
<input addproperty="workspace.home.new"
- message="Enter your Java project workspace (the directory that contains your Seam projects) [${old.workspace.home}]"
+ message="Enter your project workspace (the directory that contains your Seam projects) [${old.workspace.home}]"
defaultvalue="${old.workspace.home}"/>
<pathFixer property="workspace.home.new"/>
- <property name="old.jboss.home" value="C:/Program Files/jboss-4.2.3.GA"/>
+ <property name="old.jboss.home" value="${jboss.home}"/>
<input addproperty="jboss.home.new"
message="Enter your JBoss AS home directory [${old.jboss.home}]"
defaultvalue="${old.jboss.home}"/>
<pathFixer property="jboss.home.new"/>
- <property name="old.jboss.domain" value="default"/>
+ <property name="old.jboss.domain" value="${jboss.domain}"/>
<input addproperty="jboss.domain.new"
message="Enter your JBoss AS domain [${old.jboss.domain}]"
defaultvalue="${old.jboss.domain}"/>
+ <property name="old.glassfish.home" value="${glassfish.home}"/>
+ <input addproperty="glassfish.home.new"
+ message="Enter your GlassFish V2 or V3 home directory (Ignore if you aren't deploying to GlassFish) [${old.glassfish.home}]"
+ defaultvalue="${old.glassfish.home}"/>
+ <pathFixer property="glassfish.home.new"/>
+
+ <property name="old.glassfish.domain" value="${glassfish.domain}"/>
+ <input addproperty="glassfish.domain.new"
+ message="Enter your GlassFish domain (Ignore if you aren't deploying to GlassFish) [${old.glassfish.domain}]"
+ defaultvalue="${old.glassfish.domain}"/>
+
<property name="old.project.name" value="myproject"/>
<input addproperty="project.name.new"
message="Enter the project name [${old.project.name}]"
@@ -234,7 +257,7 @@
<property name="old.icefaces" value="n"/>
<input addproperty="icefaces.new"
- message="Do you want to use ICEfaces instead of RichFaces [${old.icefaces}]"
+ message="Do you want to use ICEfaces instead of RichFaces? [${old.icefaces}]"
validargs="y,n"
defaultvalue="${old.icefaces}"/>
@@ -244,7 +267,7 @@
<property name="old.icefaces.home" value=""/>
<input addproperty="icefaces.home.new"
- message="By default, seam-gen will download the recommended ICEfaces. If you want to use a specific version of ICEfaces, enter the path to icefaces here [${old.icefaces.home}]"
+ message="By default, seam-gen will download the recommended ICEfaces. If you want to use a specific version of ICEfaces, enter the path to ICEfaces [${old.icefaces.home}]"
defaultvalue="${old.icefaces.home}"/>
<condition property="richfaces.skin.new" value="">
@@ -257,9 +280,9 @@
validargs="blueSky,classic,deepMarine,DEFAULT,emeraldTown,japanCherry,ruby,wine"
defaultvalue="${old.richfaces.skin}"/>
- <property name="old.project.type" value="ear"/>
+ <property name="old.project.type" value="war"/>
<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}]"
+ message="Is this project deployed as an EAR (with EJB components) or a WAR (with no EJB support)? [${old.project.type}]"
validargs="ear,war"
defaultvalue="${old.project.type}"/>
@@ -493,7 +516,7 @@
<equals arg1="${database.type.new}" arg2="mysql"/>
</condition>
<input addproperty="hibernate.default_schema.entered"
- message="Enter the database schema name (Enter - to clear value) [${old.hibernate.default_schema}]"
+ message="Enter the database schema name (Enter '-' to clear previous value) [${old.hibernate.default_schema}]"
defaultvalue="${old.hibernate.default_schema}"/>
<uppercaseProperty name="hibernate.default_schema.uppercase" value="${hibernate.default_schema.entered}"/>
<condition property="hibernate.default_schema.new" value="${hibernate.default_schema.uppercase}" else="${hibernate.default_schema.entered}">
@@ -505,7 +528,7 @@
<equals arg1="${database.type.new}" arg2="oracle"/>
</condition>
<input addproperty="hibernate.default_catalog.entered"
- message="Enter the database catalog name (Enter - to clear value) [${old.hibernate.default_catalog}]"
+ message="Enter the database catalog name (Enter '-' to clear previous value) [${old.hibernate.default_catalog}]"
defaultvalue="${old.hibernate.default_catalog}"/>
<property name="old.database.exists" value="n"/>
@@ -516,7 +539,7 @@
<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}]"
+ message="Do you want to recreate the database tables and execute import.sql each time you deploy? [${old.database.drop}]"
validargs="y,n"
defaultvalue="${old.database.drop}"/>
@@ -550,6 +573,8 @@
<entry key="project.type" value="${project.type.new}"/>
<entry key="jboss.home" value="${jboss.home.new}"/>
<entry key="jboss.domain" value="${jboss.domain.new}"/>
+ <entry key="glassfish.home" value="${glassfish.home.new}"/>
+ <entry key="glassfish.domain" value="${glassfish.domain.new}"/>
<entry key="icefaces" value="${icefaces.new}"/>
<entry key="icefaces.home" value="${icefaces.home.new}"/>
<entry key="action.package" value="${action.package.new}"/>
@@ -586,6 +611,8 @@
</fileset>
</copy>
+ <antcall target="settings"/>
+ <echo/>
<echo message="Type '${seam.cmd} create-project' to create the new project"/>
</target>
@@ -1650,15 +1677,19 @@
<target name="settings" depends="validate-project"
description="Print the settings">
- <echo message="Java project workspace: ${workspace.home}"/>
<echo message="JBoss AS home: ${jboss.home}"/>
- <echo message="IceFaces: ${icefaces}"/>
+ <echo message="GlassFish home: ${glassfish.home}"/>
<echo message="Project name: ${project.name}"/>
+ <echo message="Project location: ${workspace.home}/${project.name}"/>
<echo message="Project type: ${project.type}"/>
+ <echo message="IceFaces: ${icefaces}"/>
+ <echo message="Action package: ${action.package}"/>
+ <echo message="Model package: ${model.package}"/>
+ <echo message="Test package: ${test.package}"/>
+ <echo message="JDBC driver class: ${hibernate.connection.driver_class}"/>
+ <echo message="JDBC DataSource class: ${hibernate.connection.dataSource_class}"/>
<echo message="Hibernate dialect: ${hibernate.dialect}"/>
<echo message="JDBC URL: ${hibernate.connection.url}"/>
- <echo message="JDBC driver class: ${hibernate.connection.driver_class}"/>
- <echo message="JDBC DataSource class: ${hibernate.connection.dataSource_class}"/>
<echo message="Database username: ${hibernate.connection.username}"/>
<echo message="Database password: ${hibernate.connection.password}"/>
</target>
15 years, 7 months
Seam SVN: r10321 - in trunk/seam-gen: resources/META-INF and 1 other directories.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-04-06 19:18:07 -0400 (Mon, 06 Apr 2009)
New Revision: 10321
Added:
trunk/seam-gen/resources/WEB-INF/components-war-tokenized.xml
Modified:
trunk/seam-gen/build.xml
trunk/seam-gen/resources/META-INF/persistence-dev-war.xml
trunk/seam-gen/resources/WEB-INF/components-war.xml
trunk/seam-gen/resources/WEB-INF/components.xml
Log:
JBSEAM-1619 fix breakage in JBoss Tools (I didn't realize it used some of these templates)
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2009-04-06 23:13:11 UTC (rev 10320)
+++ trunk/seam-gen/build.xml 2009-04-06 23:18:07 UTC (rev 10321)
@@ -836,8 +836,7 @@
<copy todir="${project.home}/resources">
<fileset dir="${templates.dir}/resources">
<include name="META-INF/orm.xml"/>
- <include name="META-INF/persistence*-war.xml"/>
- <include name="WEB-INF/components-war.xml"/>
+ <include name="META-INF/persistence-*-war.xml"/>
<include name="WEB-INF/jboss-web.xml"/>
</fileset>
<filterset refid="project"/>
@@ -846,10 +845,14 @@
<replacestring from="-war.xml" to=".xml"/>
</filtermapper>
</copy>
- <!--
- <copy todir="${project.home}/src/hot" file="${templates.dir}/resources/seam.properties"/>
- <copy todir="${project.home}/src/main" file="${templates.dir}/resources/seam.properties"/>
- -->
+ <replace file="${project.home}/resources/META-INF/persistence-dev.xml">
+ <replacefilter token="org.hibernate.transaction.JBossTransactionManagerLookup" value="@transactionManagerLookupClass@"/>
+ </replace>
+ <copy tofile="${project.home}/resources/WEB-INF/components.xml"
+ file="${templates.dir}/resources/WEB-INF/components-war-tokenized.xml">
+ <filterset refid="project"/>
+ <filterset refid="jdbc"/>
+ </copy>
</target>
<target name="file-copy-ear" unless="project.war">
@@ -876,13 +879,16 @@
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/jboss-app.xml"/>
<include name="META-INF/orm.xml"/>
- <include name="META-INF/persistence*.xml"/>
- <exclude name="META-INF/persistence*-war.xml"/>
+ <include name="META-INF/persistence-*.xml"/>
+ <exclude name="META-INF/persistence-*-war.xml"/>
<include name="WEB-INF/components.xml"/>
</fileset>
<filterset refid="project"/>
<filterset refid="jdbc"/>
</copy>
+ <replace file="${project.home}/resources/WEB-INF/components.xml">
+ <replacefilter token="java:/${project.name}EntityManagerFactory" value="@puJndiName@"/>
+ </replace>
</target>
<target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters">
@@ -1009,12 +1015,6 @@
file="${templates.dir}/ide-project-files/idea/module.iml">
<filterset refid="project"/>
</copy>
- <!--
- <copy tofile="${project.home}/${project.name}.iws"
- file="${templates.dir}/ide-project-files/idea/workspace.iws">
- <filterset refid="project"/>
- </copy>
- -->
<!-- NetBeans project files -->
<mkdir dir="${project.home}/nbproject"/>
Modified: trunk/seam-gen/resources/META-INF/persistence-dev-war.xml
===================================================================
--- trunk/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-04-06 23:13:11 UTC (rev 10320)
+++ trunk/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-04-06 23:18:07 UTC (rev 10321)
@@ -14,7 +14,7 @@
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>@catalogProperty@@schemaProperty@
<!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) -->
- <property name="hibernate.transaction.manager_lookup_class" value="@transactionManagerLookupClass@"/>
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
</properties>
</persistence-unit>
Added: trunk/seam-gen/resources/WEB-INF/components-war-tokenized.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components-war-tokenized.xml (rev 0)
+++ trunk/seam-gen/resources/WEB-INF/components-war-tokenized.xml 2009-04-06 23:18:07 UTC (rev 10321)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:persistence="http://jboss.com/products/seam/persistence"
+ xmlns:drools="http://jboss.com/products/seam/drools"
+ xmlns:bpm="http://jboss.com/products/seam/bpm"
+ xmlns:security="http://jboss.com/products/seam/security"
+ xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:web="http://jboss.com/products/seam/web"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd
+ http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
+
+ <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
+
+ <core:manager concurrent-request-timeout="500"
+ conversation-timeout="120000"
+ conversation-id-parameter="cid"
+ parent-conversation-id-parameter="pid"/>
+
+ <!-- Make sure this URL pattern is the same as that used by the Faces Servlet -->
+ <web:hot-deploy-filter url-pattern="*.seam"/>
+
+ <persistence:entity-manager-factory name="entityManagerFactory"
+ persistence-unit-name="@projectName@"
+ installed="@seamBootstrapsPu@"/>
+
+ <persistence:managed-persistence-context name="entityManager" auto-create="true"
+ entity-manager-factory="@seamEmfRef@"
+ persistence-unit-jndi-name="@puJndiName@"/>
+
+ <drools:rule-base name="securityRules">
+ <drools:rule-files><value>/security.drl</value></drools:rule-files>
+ </drools:rule-base>
+
+ <security:rule-based-permission-resolver security-rules="#{securityRules}"/>
+
+ <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/>
+
+ <event type="org.jboss.seam.security.notLoggedIn">
+ <action execute="#{redirect.captureCurrentView}"/>
+ </event>
+ <event type="org.jboss.seam.security.loginSuccessful">
+ <action execute="#{redirect.returnToCapturedView}"/>
+ </event>
+
+ <mail:mail-session host="localhost" port="25"/>
+
+ <!-- For use with jBPM pageflow or process management -->
+ <!--
+ <bpm:jbpm>
+ <bpm:process-definitions></bpm:process-definitions>
+ <bpm:pageflow-definitions></bpm:pageflow-definitions>
+ </bpm:jbpm>
+ -->
+
+</components>
Modified: trunk/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components-war.xml 2009-04-06 23:13:11 UTC (rev 10320)
+++ trunk/seam-gen/resources/WEB-INF/components-war.xml 2009-04-06 23:18:07 UTC (rev 10321)
@@ -29,12 +29,10 @@
<web:hot-deploy-filter url-pattern="*.seam"/>
<persistence:entity-manager-factory name="entityManagerFactory"
- persistence-unit-name="@projectName@"
- installed="@seamBootstrapsPu@"/>
+ persistence-unit-name="@projectName@"/>
<persistence:managed-persistence-context name="entityManager" auto-create="true"
- entity-manager-factory="@seamEmfRef@"
- persistence-unit-jndi-name="@puJndiName@"/>
+ entity-manager-factory="#{entityManagerFactory}"/>
<drools:rule-base name="securityRules">
<drools:rule-files><value>/security.drl</value></drools:rule-files>
Modified: trunk/seam-gen/resources/WEB-INF/components.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components.xml 2009-04-06 23:13:11 UTC (rev 10320)
+++ trunk/seam-gen/resources/WEB-INF/components.xml 2009-04-06 23:18:07 UTC (rev 10321)
@@ -29,7 +29,7 @@
<web:hot-deploy-filter url-pattern="*.seam"/>
<persistence:managed-persistence-context name="entityManager" auto-create="true"
- persistence-unit-jndi-name="@puJndiName@"/>
+ persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/>
<drools:rule-base name="securityRules">
<drools:rule-files>
15 years, 7 months
Seam SVN: r10320 - trunk/seam-gen/resources.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-04-06 19:13:11 -0400 (Mon, 06 Apr 2009)
New Revision: 10320
Modified:
trunk/seam-gen/resources/import.sql
Log:
add a note in this file about when the statements are executed
Modified: trunk/seam-gen/resources/import.sql
===================================================================
--- trunk/seam-gen/resources/import.sql 2009-04-06 22:41:28 UTC (rev 10319)
+++ trunk/seam-gen/resources/import.sql 2009-04-06 23:13:11 UTC (rev 10320)
@@ -0,0 +1 @@
+-- SQL statements which are executed at application startup if hibernate.hbm2ddl.auto is 'create' or 'create-drop'
15 years, 7 months
Seam SVN: r10319 - trunk/examples.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-04-06 18:41:28 -0400 (Mon, 06 Apr 2009)
New Revision: 10319
Modified:
trunk/examples/build.xml
Log:
JBSEAM-3732
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2009-04-06 22:40:47 UTC (rev 10318)
+++ trunk/examples/build.xml 2009-04-06 22:41:28 UTC (rev 10319)
@@ -664,6 +664,7 @@
<fileset refid="seam.excel.jar" />
<fileset refid="seam.rss.jar" />
<fileset refid="seam.pdf.jar" />
+ <fileset refid="seam.remoting.jar" />
<fileset refid="seam.ui.jar" />
<fileset refid="facelets.jar" />
<fileset refid="urlrewrite.jar" />
15 years, 7 months
Seam SVN: r10318 - trunk/examples/seambay/view.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-04-06 18:40:47 -0400 (Mon, 06 Apr 2009)
New Revision: 10318
Modified:
trunk/examples/seambay/view/sell2.xhtml
Log:
JBSEAM-3732
Modified: trunk/examples/seambay/view/sell2.xhtml
===================================================================
--- trunk/examples/seambay/view/sell2.xhtml 2009-04-06 22:03:01 UTC (rev 10317)
+++ trunk/examples/seambay/view/sell2.xhtml 2009-04-06 22:40:47 UTC (rev 10318)
@@ -67,7 +67,6 @@
<s:remote include="categoryAction"/>
<script type="text/javascript">
- // Make a remoting call to load the categories
Seam.Component.getInstance("categoryAction").getAllCategories(loadCategories);
</script>
</body>
15 years, 7 months
Seam SVN: r10317 - trunk/examples.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-04-06 18:03:01 -0400 (Mon, 06 Apr 2009)
New Revision: 10317
Modified:
trunk/examples/readme.txt
Log:
typo
Modified: trunk/examples/readme.txt
===================================================================
--- trunk/examples/readme.txt 2009-04-06 21:54:33 UTC (rev 10316)
+++ trunk/examples/readme.txt 2009-04-06 22:03:01 UTC (rev 10317)
@@ -161,7 +161,7 @@
install of Tomcat.
2. Install Embedded JBoss as described in the "Configuration" chapter of the
- Seam reerence documentation.
+ Seam reference documentation.
3. Make sure you have an up to date version of Seam:
15 years, 7 months
Seam SVN: r10316 - trunk/examples/seambay/view.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-04-06 17:54:33 -0400 (Mon, 06 Apr 2009)
New Revision: 10316
Modified:
trunk/examples/seambay/view/register.xhtml
Log:
JBSEAM-3893
Modified: trunk/examples/seambay/view/register.xhtml
===================================================================
--- trunk/examples/seambay/view/register.xhtml 2009-04-06 21:44:47 UTC (rev 10315)
+++ trunk/examples/seambay/view/register.xhtml 2009-04-06 21:54:33 UTC (rev 10316)
@@ -43,30 +43,32 @@
</div>
<h:form id="registration">
- <p>
- <b>seamBay User ID</b><br/>
- <h:inputText id="username" value="#{newuser.username}"/>
- <div class="validationError"><h:message id="usernameMessage" for="username"/></div>
- </p>
-
- <p>
- <b>Password</b><br/>
- <h:inputSecret id="password" value="#{newuser.password}"/>
- <div class="validationError"><h:message id="passwordMessage" for="password"/></div>
- </p>
-
- <p>
- <b>Confirm Password</b><br/>
- <h:inputSecret id="confirm" value="#{registerAction.confirm}"/>
- <div class="validationError"><h:message id="confirmMessage" for="confirm"/></div>
- </p>
-
- <p>
- <b>Location</b><br/>
- <h:inputText id="location" class="location" value="#{newuser.account.location}"/>
- <div class="validationError"><h:message id="locationMessage" for="location"/></div>
- </p>
-
+ <s:validateAll>
+ <p>
+ <b>seamBay User ID</b><br/>
+ <h:inputText id="username" value="#{newuser.username}" required="true"/>
+ <div class="validationError"><h:message id="usernameMessage" for="username"/></div>
+ </p>
+
+ <p>
+ <b>Password</b><br/>
+ <h:inputSecret id="password" value="#{newuser.password}" required="true"/>
+ <div class="validationError"><h:message id="passwordMessage" for="password"/></div>
+ </p>
+
+ <p>
+ <b>Confirm Password</b><br/>
+ <h:inputSecret id="confirm" value="#{registerAction.confirm}" required="true"/>
+ <div class="validationError"><h:message id="confirmMessage" for="confirm"/></div>
+ </p>
+
+ <p>
+ <b>Location</b><br/>
+ <h:inputText id="location" class="location" value="#{newuser.account.location}" required="true"/>
+ <div class="validationError"><h:message id="locationMessage" for="location"/></div>
+ </p>
+ </s:validateAll>
+
<h:commandButton id="submit" value="Register >" action="#{registerAction.register}"/>
</h:form>
15 years, 7 months
Seam SVN: r10315 - trunk/examples/seambay/resources.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-04-06 17:44:47 -0400 (Mon, 06 Apr 2009)
New Revision: 10315
Modified:
trunk/examples/seambay/resources/import.sql
Log:
encoding
Modified: trunk/examples/seambay/resources/import.sql
===================================================================
--- trunk/examples/seambay/resources/import.sql 2009-04-06 21:39:24 UTC (rev 10314)
+++ trunk/examples/seambay/resources/import.sql 2009-04-06 21:44:47 UTC (rev 10315)
@@ -89,7 +89,7 @@
insert into account (accountId, name, feedbackScore, feedbackPercent, memberSince, location) values (2, 'bob', 0, 0, CURRENT_TIMESTAMP, 'Brisbane, QLD, Australia');
insert into user (userId, username, password, account_id) values (2, 'bob', 'bob', 2);
-insert into auction (auctionId, account_id, title, description, category_Id, startingPrice, bids, endDate, status, version) values (19264723, 1, 'Whistler''s Mother, original painting by James McNeill Whistler', '+Whistler''s Mother'+char(10)+'*Arrangement in Grey and Black*: The Artist''s Mother, famous under its colloquial name Whistler''s Mother, is an 1871 oil-on-canvas painting by American-born painter James McNeill Whistler. The painting is 56.81 x 63.94 inches (144.3 x 162.4 cm), displayed in a frame of Whistler''s own design, and is currently owned by the Mus�e d''Orsay in Paris.', 2, 5999999.00, 0, CURRENT_TIMESTAMP, 1, 0);
+insert into auction (auctionId, account_id, title, description, category_Id, startingPrice, bids, endDate, status, version) values (19264723, 1, 'Whistler''s Mother, original painting by James McNeill Whistler', '+Whistler''s Mother'+char(10)+'*Arrangement in Grey and Black*: The Artist''s Mother, famous under its colloquial name Whistler''s Mother, is an 1871 oil-on-canvas painting by American-born painter James McNeill Whistler. The painting is 56.81 x 63.94 inches (144.3 x 162.4 cm), displayed in a frame of Whistler''s own design, and is currently owned by the Musee d''Orsay in Paris.', 2, 5999999.00, 0, CURRENT_TIMESTAMP, 1, 0);
insert into auction (auctionId, account_id, title, description, category_Id, startingPrice, bids, endDate, status, version) values (62748261, 1, 'Lost Tales Volume 1 by J.R.R. Tolkien', 'THE BOOK OF LOST TALES, I, stands at the beginning of the entire conception of Middle-earth and Valinor. Here is the whole, glorious history of Middle-earth that J.R.R. Tolkien brought to mythic and dramatic life with his classic fantasy novels of the Ring Cycle.', 3, 4.50, 0, CURRENT_TIMESTAMP, 1, 0);
insert into auction (auctionId, account_id, title, description, category_Id, startingPrice, bids, endDate, status, version) values (71234567, 1, 'Nikon D80 Digital Camera', 'The D80 features a new 10.2 effective megapixel DX Format CCD image sensor, bringing a new level of high resolution and sharp detail to the class while also providing plenty of freedom to crop creatively and print impressive enlargements. Nikon''s DX Format sensor and Nikon F bayonet lens mount design assure unprecedented compatibility across the comprehensive assortment of AF Nikkor lenses and DX Nikkor lenses designed exclusively for Nikon digital SLR cameras.', 4001, 899, 0, CURRENT_TIMESTAMP, 1, 0);
insert into auction (auctionId, account_id, title, description, category_Id, startingPrice, bids, endDate, status, version) values (73219532, 1, 'Pontiac Firebird Trans Am T-top', 'In good condition, this car has had some custom work done on it.', 5001, 199000, 0, CURRENT_TIMESTAMP, 1, 0);
15 years, 7 months
Seam SVN: r10314 - trunk/seam-gen/resources/WEB-INF.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-04-06 17:39:24 -0400 (Mon, 06 Apr 2009)
New Revision: 10314
Modified:
trunk/seam-gen/resources/WEB-INF/components-war.xml
trunk/seam-gen/resources/WEB-INF/components.xml
Log:
use default mta settings that work out of the box (at least on *nix)
Modified: trunk/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components-war.xml 2009-04-06 20:28:30 UTC (rev 10313)
+++ trunk/seam-gen/resources/WEB-INF/components-war.xml 2009-04-06 21:39:24 UTC (rev 10314)
@@ -51,7 +51,7 @@
<action execute="#{redirect.returnToCapturedView}"/>
</event>
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
+ <mail:mail-session host="localhost" port="25"/>
<!-- For use with jBPM pageflow or process management -->
<!--
Modified: trunk/seam-gen/resources/WEB-INF/components.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components.xml 2009-04-06 20:28:30 UTC (rev 10313)
+++ trunk/seam-gen/resources/WEB-INF/components.xml 2009-04-06 21:39:24 UTC (rev 10314)
@@ -48,7 +48,7 @@
<action execute="#{redirect.returnToCapturedView}"/>
</event>
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
+ <mail:mail-session host="localhost" port="25"/>
<!-- For use with jBPM pageflow or process management -->
<!--
15 years, 7 months
Seam SVN: r10313 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-06 16:28:30 -0400 (Mon, 06 Apr 2009)
New Revision: 10313
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Conversations.xml
trunk/doc/Seam_Reference_Guide/en-US/Tutorial.xml
Log:
JBSEAM-4084
Modified: trunk/doc/Seam_Reference_Guide/en-US/Conversations.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Conversations.xml 2009-04-06 20:16:40 UTC (rev 10312)
+++ trunk/doc/Seam_Reference_Guide/en-US/Conversations.xml 2009-04-06 20:28:30 UTC (rev 10313)
@@ -526,7 +526,7 @@
pageflow="EditDocument"/>]]></programlisting>
<para>
- The <literal>taskInstance</literal> attribute if for use in jBPM task lists:
+ The <literal>taskInstance</literal> attribute is for use in jBPM task lists:
</para>
<programlisting role="XHTML"><![CDATA[<s:link action="#{documentApproval.approveOrReject}" taskInstance="#{task}"/>]]></programlisting>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Tutorial.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Tutorial.xml 2009-04-06 20:16:40 UTC (rev 10312)
+++ trunk/doc/Seam_Reference_Guide/en-US/Tutorial.xml 2009-04-06 20:28:30 UTC (rev 10313)
@@ -2722,7 +2722,7 @@
</programlistingco>
</example>
- <para>When we being a nested conversation it is pushed onto the conversation stack. In the <varname>nestedbooking</varname>
+ <para>When we begin a nested conversation it is pushed onto the conversation stack. In the <varname>nestedbooking</varname>
example, the conversation stack consists of the outer long-running conversation (the booking) and each of the nested conversations (room
selections).</para>
15 years, 7 months