January 2008 - seam-commits - Jboss List Archives

Seam SVN: r7194 - trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 13:57:45 -0500 (Tue, 22 Jan 2008) New Revision: 7194 Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java Log: Should be setParameter Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-22 18:35:27 UTC (rev 7193) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-22 18:57:45 UTC (rev 7194) @@ -91,8 +91,8 @@ @Override protected void beforeRequest() { - setPageParameter("name", "Mr_Smiley"); - setPageParameter("blogId", "1"); + setParameter("name", "Mr_Smiley"); + setParameter("blogId", "1"); } @Override

17 years, 1 month

1
0
0 / 0

Seam SVN: r7193 - in trunk: build and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 13:35:27 -0500 (Tue, 22 Jan 2008) New Revision: 7193 Modified: trunk/build.xml trunk/build/classpath.tmpl trunk/build/ioc.pom.xml trunk/build/root.pom.xml Log: Exclude ioc microcontainer from builds, Ales tells me it isn't finished and needs redoing Modified: trunk/build/classpath.tmpl =================================================================== (Binary files differ) Modified: trunk/build/ioc.pom.xml =================================================================== --- trunk/build/ioc.pom.xml 2008-01-22 18:34:37 UTC (rev 7192) +++ trunk/build/ioc.pom.xml 2008-01-22 18:35:27 UTC (rev 7193) @@ -51,7 +51,9 @@ <artifactId>javassist</artifactId> </dependency> - <dependency> +  + +  <dependency> <groupId>javax.persistence</groupId> @@ -94,12 +98,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossxb</artifactId> - <optional>true</optional> - </dependency> - </dependencies> </project> \ No newline at end of file Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-01-22 18:34:37 UTC (rev 7192) +++ trunk/build/root.pom.xml 2008-01-22 18:35:27 UTC (rev 7193) @@ -690,9 +690,9 @@ </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>2.0.0.Beta</version> + <version>2.0.0.Beta9</version> <exclusions> <exclusion> <groupId>apache-httpclient</groupId> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-01-22 18:34:37 UTC (rev 7192) +++ trunk/build.xml 2008-01-22 18:35:27 UTC (rev 7193) @@ -206,7 +206,12 @@ </target> <target name="compileioc" depends="initioc, select-compiler"> - <compile classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" classpath="compile.ioc.path" /> + <javac source="1.5" target="1.5" destdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on"> + <classpath> + <path refid="compile.ioc.path" /> + </classpath> + <exclude name="org/jboss/seam/ioc/microcontainer/**/*" /> + </javac> </target> <target name="jarioc" depends="compileioc" description="Build the distribution .jar file for the IOC package">

17 years, 1 month

1
0
0 / 0

Seam SVN: r7192 - trunk/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 13:34:37 -0500 (Tue, 22 Jan 2008) New Revision: 7192 Modified: trunk/build/core.pom.xml Log: remove workaround Modified: trunk/build/core.pom.xml =================================================================== --- trunk/build/core.pom.xml 2008-01-22 17:56:40 UTC (rev 7191) +++ trunk/build/core.pom.xml 2008-01-22 18:34:37 UTC (rev 7192) @@ -264,13 +264,6 @@ <artifactId>jboss-embedded-api</artifactId> <optional>true</optional> </dependency> - -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-kernel</artifactId> - <optional>true</optional> - </dependency> <dependency> <groupId>quartz</groupId>

17 years, 1 month

1
0
0 / 0

Seam SVN: r7191 - in trunk: seam-gen and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 12:56:40 -0500 (Tue, 22 Jan 2008) New Revision: 7191 Modified: trunk/build.xml trunk/seam-gen/build.xml Log: Don't include jbas5 jar in dist or seam-gen generated project Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-01-22 17:25:59 UTC (rev 7190) +++ trunk/build.xml 2008-01-22 17:56:40 UTC (rev 7191) @@ -455,6 +455,7 @@ <copy todir="${dist.lib.dir}"> <fileset dir="${lib.dir}"> <include name="**/*.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> </copy> @@ -931,6 +932,7 @@ <path refid="compile.pdf.path" /> <path refid="compile.remoting.path" /> <path refid="compile.ui.path" /> + <path refid="compile.jbas5.path" /> </eclipseClasspath> </target> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-01-22 17:25:59 UTC (rev 7190) +++ trunk/seam-gen/build.xml 2008-01-22 17:56:40 UTC (rev 7191) @@ -599,6 +599,7 @@ <exclude name="ajax4jsf*.jar" if="icefaces.property"/> <exclude name="richfaces*.jar" if="icefaces.property"/> <exclude name="jboss-container.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> <exclude name="test/jboss-deplyers.jar" /> <exclude name="test/jboss-embedded-api.jar" /> </fileset>

17 years, 1 month

1
0
0 / 0

Seam SVN: r7190 - in trunk/seam-gen: build-scripts and 7 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 12:25:59 -0500 (Tue, 22 Jan 2008) New Revision: 7190 Added: trunk/seam-gen/src/Authenticator.java Removed: trunk/seam-gen/src/UserAccount.java trunk/seam-gen/src/UserAction.java trunk/seam-gen/src/UserSearch.java trunk/seam-gen/view/img/btn_newuser.png trunk/seam-gen/view/img/checkmark.png trunk/seam-gen/view/img/cross.png trunk/seam-gen/view/userdetail.xhtml trunk/seam-gen/view/usermanager.xhtml Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/build.xml trunk/seam-gen/resources/WEB-INF/components.xml trunk/seam-gen/resources/WEB-INF/pages.xml trunk/seam-gen/resources/import.sql trunk/seam-gen/resources/security.drl trunk/seam-gen/view/layout/menu.xhtml trunk/seam-gen/view/stylesheet/theme.css Log: JBSEAM-2521 and fixes needed for jbas5 module Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-01-22 17:25:59 UTC (rev 7190) @@ -185,6 +185,7 @@ <include name="jsf-facelets.jar" /> <include name="jboss-seam-*.jar" /> <exclude name="jboss-seam-gen.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> <include name="drools-*.jar"/> <include name="core.jar"/> <include name="janino*.jar"/> Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/build-scripts/build.xml 2008-01-22 17:25:59 UTC (rev 7190) @@ -130,6 +130,7 @@ <include name="jsf-facelets.jar" /> <include name="jboss-seam-*.jar" /> <exclude name="jboss-seam-gen.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> </copy> <copy todir="${war.dir}/WEB-INF/classes"> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/build.xml 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,1303 +1,1235 @@ <?xml version="1.0"?> -<project name="seam-gen" default="help" basedir="." xmlns:artifact="urn:maven-artifact-ant"> -  - <property name="seam.dir" value="${ant.file.seam-gen}/../../" /> - <import file="${seam.dir}/build/common.build.xml" /> - - <target name="init"> - <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> +<project name="seam-gen" default="help" basedir="." xmlns:artifact="urn:maven-artifact-ant"> +  + <property name="seam.dir" value="${ant.file.seam-gen}/../../" /> + <import file="${seam.dir}/build/common.build.xml" /> + + <target name="init"> + <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> -  - <taskdef name="normalizeProjectName" - classname="org.jboss.seam.tool.NormalizeProjectNameTask" - classpathref="seam-gen.path"/> - - <taskdef name="packageDirectory" - classname="org.jboss.seam.tool.PackageDirectoryTask" - classpathref="seam-gen.path"/> +  + <taskdef name="normalizeProjectName" + classname="org.jboss.seam.tool.NormalizeProjectNameTask" + classpathref="seam-gen.path"/> + + <taskdef name="packageDirectory" + classname="org.jboss.seam.tool.PackageDirectoryTask" + classpathref="seam-gen.path"/> + + <taskdef name="pathFilename" + classname="org.jboss.seam.tool.PathFilenameTask" + classpathref="seam-gen.path"/> + + <taskdef name="lowercaseProperty" + classname="org.jboss.seam.tool.LowercasePropertyTask" + classpathref="seam-gen.path"/> + + <taskdef name="uppercaseProperty" + classname="org.jboss.seam.tool.UppercasePropertyTask" + classpathref="seam-gen.path"/> + + <taskdef name="print" + classname="org.jboss.seam.tool.PrintTask" + classpathref="seam-gen.path"/> + + <taskdef name="pathFixer" + classname="org.jboss.seam.tool.FixPathTask" + classpathref="seam-gen.path"/> + </target> - <taskdef name="pathFilename" - classname="org.jboss.seam.tool.PathFilenameTask" - classpathref="seam-gen.path"/> - - <taskdef name="lowercaseProperty" - classname="org.jboss.seam.tool.LowercasePropertyTask" - classpathref="seam-gen.path"/> - - <taskdef name="uppercaseProperty" - classname="org.jboss.seam.tool.UppercasePropertyTask" - classpathref="seam-gen.path"/> - - <taskdef name="print" - classname="org.jboss.seam.tool.PrintTask" - classpathref="seam-gen.path"/> - - <taskdef name="pathFixer" - classname="org.jboss.seam.tool.FixPathTask" - classpathref="seam-gen.path"/> - </target> - - <target name="init-properties" depends="init"> - <property file="./build.properties" /> + <target name="init-properties" depends="init"> + <property file="./build.properties" /> - <packageDirectory property="action.dir" package="action/${action.package}"/> - <packageDirectory property="model.dir" package="model/${model.package}"/> - <packageDirectory property="test.dir" package="test/${test.package}"/> - <pathFilename property="driver.file" path="${driver.jar}"/> - - <condition property="hibernate.hbm2ddl.auto" value="update"> - <and> - <equals arg1="${database.exists}" arg2="n"/> - <equals arg1="${database.drop}" arg2="n"/> - </and> - </condition> - - <condition property="hibernate.hbm2ddl.auto" value="validate"> - <and> - <equals arg1="${database.exists}" arg2="y"/> - <equals arg1="${database.drop}" arg2="n"/> - </and> - </condition> - - <condition property="hibernate.hbm2ddl.auto" value="create-drop"> - <equals arg1="${database.drop}" arg2="y"/> - </condition> - - <condition property="project.war" value="true"> - <equals arg1="${project.type}" arg2="war"/> - </condition> - - <condition property="project.ear" value="true"> - <equals arg1="${project.type}" arg2="ear"/> - </condition> - - <property name="project.home" value="${workspace.home}/${project.name}"/> + <packageDirectory property="action.dir" package="action/${action.package}"/> + <packageDirectory property="model.dir" package="model/${model.package}"/> + <packageDirectory property="test.dir" package="test/${test.package}"/> + <pathFilename property="driver.file" path="${driver.jar}"/> -  + <condition property="hibernate.hbm2ddl.auto" value="update"> + <and> + <equals arg1="${database.exists}" arg2="n"/> + <equals arg1="${database.drop}" arg2="n"/> + </and> + </condition> + <condition property="hibernate.hbm2ddl.auto" value="validate"> + <and> + <equals arg1="${database.exists}" arg2="y"/> + <equals arg1="${database.drop}" arg2="n"/> + </and> + </condition> + <condition property="hibernate.hbm2ddl.auto" value="create-drop"> + <equals arg1="${database.drop}" arg2="y"/> + </condition> + <condition property="project.war" value="true"> + <equals arg1="${project.type}" arg2="war"/> + </condition> + <condition property="project.ear" value="true"> + <equals arg1="${project.type}" arg2="ear"/> + </condition> + <property name="project.home" value="${workspace.home}/${project.name}"/> - <condition property="schema.property" value="
 <property name="hibernate.default_schema" value="${hibernate.default_schema}"/>"> - <isset property="hibernate.default_schema"/> - </condition> - - <condition property="schema.property" value=""> - <not><isset property="hibernate.default_schema"/></not> - </condition> - - <condition property="catalog.property" value="
 <property name="hibernate.default_catalog" value="${hibernate.default_catalog}"/>"> - <isset property="hibernate.default_catalog"/> - </condition> - - <condition property="catalog.property" value=""> - <not><isset property="hibernate.default_catalog"/></not> - </condition> +  - <condition property="base.dir" value="icefaces-staging" else="."> - <equals arg1="${icefaces}" arg2="y"/> - </condition> + <condition property="schema.property" value="
 <property name="hibernate.default_schema" value="${hibernate.default_schema}"/>"> + <isset property="hibernate.default_schema"/> + </condition> + <condition property="schema.property" value=""> + <not><isset property="hibernate.default_schema"/></not> + </condition> + + <condition property="catalog.property" value="
 <property name="hibernate.default_catalog" value="${hibernate.default_catalog}"/>"> + <isset property="hibernate.default_catalog"/> + </condition> + <condition property="catalog.property" value=""> + <not><isset property="hibernate.default_catalog"/></not> + </condition> + + <condition property="base.dir" value="icefaces-staging" else="."> + <equals arg1="${icefaces}" arg2="y"/> + </condition> - <condition property="icefaces.lib" value="${icefaces.home}/lib" else="../lib"> - <and> - <equals arg1="${icefaces}" arg2="y"/> - <not> - <equals arg1="${icefaces.home}" arg2=""/> - </not> - </and> - </condition> + <condition property="icefaces.lib" value="${icefaces.home}/lib" else="../lib"> + <and> + <equals arg1="${icefaces}" arg2="y"/> + <not> + <equals arg1="${icefaces.home}" arg2=""/> + </not> + </and> + </condition> - <condition property="icefaces.property"> - <equals arg1="${icefaces}" arg2="y"/> - </condition> - - <condition property="icefaces.lib.property"> - <and> - <equals arg1="${icefaces}" arg2="y"/> - <not> - <equals arg1="${icefaces.home}" arg2=""/> - </not> - </and> - </condition> + <condition property="icefaces.property"> + <equals arg1="${icefaces}" arg2="y"/> + </condition> + + <condition property="icefaces.lib.property"> + <and> + <equals arg1="${icefaces}" arg2="y"/> + <not> + <equals arg1="${icefaces.home}" arg2=""/> + </not> + </and> + </condition> - <filterset id="jdbc"> - <filter token="jdbcUrl" value="${hibernate.connection.url}"/> - <filter token="driverClass" value="${hibernate.connection.driver_class}"/> - <filter token="username" value="${hibernate.connection.username}"/> - <filter token="password" value="${hibernate.connection.password}"/> - <filter token="catalogProperty" value="${catalog.property}"/> - <filter token="schemaProperty" value="${schema.property}"/> - <filter token="hibernate.dialect" value="${hibernate.dialect}"/> - </filterset> - - <echo message="${jboss.home}"/> + <filterset id="jdbc"> + <filter token="jdbcUrl" value="${hibernate.connection.url}"/> + <filter token="driverClass" value="${hibernate.connection.driver_class}"/> + <filter token="username" value="${hibernate.connection.username}"/> + <filter token="password" value="${hibernate.connection.password}"/> + <filter token="catalogProperty" value="${catalog.property}"/> + <filter token="schemaProperty" value="${schema.property}"/> + <filter token="hibernate.dialect" value="${hibernate.dialect}"/> + </filterset> + + <echo message="${jboss.home}"/> - <filterset id="project"> - <filter token="projectName" value="${project.name}" /> - <filter token="jbossHome" value="${jboss.home}" /> - <filter token="iceHome" value="${icefaces.home}" /> - <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/> - <filter token="driverJar" value="${driver.file}"/> - <filter token="skin" value="${richfaces.skin}" /> - <filter token="schemaVersion" value="${version}" /> - </filterset> + <filterset id="project"> + <filter token="projectName" value="${project.name}" /> + <filter token="jbossHome" value="${jboss.home}" /> + <filter token="iceHome" value="${icefaces.home}" /> + <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/> + <filter token="driverJar" value="${driver.file}"/> + <filter token="skin" value="${richfaces.skin}" /> + <filter token="schemaVersion" value="${version}" /> + </filterset> - </target> + </target> -  +  - <target name="setup-filters"> + <target name="setup-filters"> - <filterset id="filters"> - <filter token="interfaceName" value="${interface.name}"/> - <filter token="beanName" value="${bean.name}"/> - <filter token="entityName" value="${entity.name}"/> - <filter token="methodName" value="${method.name}"/> - <filter token="componentName" value="${component.name}"/> - <filter token="pageName" value="${page.name}"/> - <filter token="masterPageName" value="${masterPage.name}"/> - <filter token="actionPackage" value="${action.package}"/> - <filter token="modelPackage" value="${model.package}"/> - <filter token="testPackage" value="${test.package}"/> - <filter token="listName" value="${component.name}List"/> - <filter token="homeName" value="${component.name}Home"/> - <filter token="query" value="${query.text}"/> - </filterset> + <filterset id="filters"> + <filter token="interfaceName" value="${interface.name}"/> + <filter token="beanName" value="${bean.name}"/> + <filter token="entityName" value="${entity.name}"/> + <filter token="methodName" value="${method.name}"/> + <filter token="componentName" value="${component.name}"/> + <filter token="pageName" value="${page.name}"/> + <filter token="masterPageName" value="${masterPage.name}"/> + <filter token="actionPackage" value="${action.package}"/> + <filter token="modelPackage" value="${model.package}"/> + <filter token="testPackage" value="${test.package}"/> + <filter token="listName" value="${component.name}List"/> + <filter token="homeName" value="${component.name}Home"/> + <filter token="query" value="${query.text}"/> + </filterset> - </target> + </target> - <target name="setup" - description="Prompt for settings" depends="init"> - <property file="./build.properties" prefix="old" /> + <target name="setup" + description="Prompt for settings" depends="init"> + <property file="./build.properties" prefix="old" /> - <echo message="Welcome to seam-gen :-)"/> - <property name="old.workspace.home" value="C:/Projects"/> - <input addproperty="workspace.home.new" - message="Enter your Java project workspace (the directory that contains your Seam projects) [${old.workspace.home}]" - defaultvalue="${old.workspace.home}"/> - - <pathFixer property="workspace.home.new" /> + <echo message="Welcome to seam-gen :-)"/> + <property name="old.workspace.home" value="C:/Projects"/> + <input addproperty="workspace.home.new" + message="Enter your Java 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.2.GA"/> + <property name="old.jboss.home" value="C:/Program Files/jboss-4.2.2.GA"/> + <input addproperty="jboss.home.new" + message="Enter your JBoss home directory [${old.jboss.home}]" + defaultvalue="${old.jboss.home}"/> + <pathFixer property="jboss.home.new" /> + + <property name="old.project.name" value="myproject"/> + <input addproperty="project.name.new" + message="Enter the project name [${old.project.name}]" + defaultvalue="${old.project.name}"/> + <normalizeProjectName property="project.name.new" /> + <echo message="Accepted project name as: ${project.name.new}" /> + + <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," + defaultvalue="${old.icefaces}" /> + + <condition property="icefaces.home.new" value=""> + <equals arg1="${icefaces.new}" arg2="n"/> + </condition> + + <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}]" + defaultvalue="${old.icefaces.home}" /> - <input addproperty="jboss.home.new" - message="Enter your JBoss home directory [${old.jboss.home}]" - defaultvalue="${old.jboss.home}"/> + <condition property="richfaces.skin.new" value=""> + <equals arg1="${icefaces.new}" arg2="y"/> + </condition> - <pathFixer property="jboss.home.new" /> + <property name="old.richfaces.skin" value="blueSky"/> + <input addproperty="richfaces.skin.new" + message="Select a RichFaces skin [${old.richfaces.skin}]" + validargs="blueSky,classic,ruby,wine,deepMarine,emeraldTown,sakura,DEFAULT" + defaultvalue="${old.richfaces.skin}"/> - <property name="old.project.name" value="myproject"/> + <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," + defaultvalue="${old.project.type}"/> + + <property name="old.action.package" value="com.mydomain.${project.name.new}"/> + <input addproperty="action.package.new" + message="Enter the Java package name for your session beans [${old.action.package}]" + defaultvalue="${old.action.package}"/> + + <property name="old.model.package" value="${action.package.new}"/> + <input addproperty="model.package.new" + message="Enter the Java package name for your entity beans [${old.model.package}]" + defaultvalue="${old.model.package}"/> + + <property name="old.test.package" value="${action.package.new}.test"/> + <input addproperty="test.package.new" + message="Enter the Java package name for your test cases [${old.test.package}]" + defaultvalue="${old.test.package}"/> + + <condition property="database.type.default" value="${old.database.type}"> + <isset property="old.database.type"/> + </condition> + <property name="database.type.default" value="hsql"/> + <input addproperty="database.type.new" + message="What kind of database are you using? [${database.type.default}] " + validargs="hsql,mysql,oracle,postgres,mssql,db2,sybase,enterprisedb,h2" + defaultvalue="${database.type.default}"/> + +  + + <condition property="hibernate.dialect.default" value="${old.hibernate.dialect}"> + <equals arg1="${old.database.type}" arg2="${database.type.new}"/> + </condition> + <condition property="hibernate.connection.url.default" value="${old.hibernate.connection.url}"> + <equals arg1="${old.database.type}" arg2="${database.type.new}"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="${old.hibernate.connection.driver_class}"> + <equals arg1="${old.database.type}" arg2="${database.type.new}"/> + </condition> + +  + + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.H2Dialect"> + <equals arg1="${database.type.new}" arg2="h2"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.HSQLDialect"> + <equals arg1="${database.type.new}" arg2="hsql"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.MySQLDialect"> + <equals arg1="${database.type.new}" arg2="mysql"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.OracleDialect"> + <equals arg1="${database.type.new}" arg2="oracle"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.PostgreSQLDialect"> + <equals arg1="${database.type.new}" arg2="postgres"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.SQLServerDialect"> + <equals arg1="${database.type.new}" arg2="mssql"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.DB2Dialect"> + <equals arg1="${database.type.new}" arg2="db2"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.SybaseDialect"> + <equals arg1="${database.type.new}" arg2="sybase"/> + </condition> + <condition property="hibernate.dialect.default" value="org.hibernate.dialect.PostgreSQLDialect"> + <equals arg1="${database.type.new}" arg2="enterprisedb"/> + </condition> - <input addproperty="project.name.new" - message="Enter the project name [${old.project.name}]" - defaultvalue="${old.project.name}"/> - <normalizeProjectName property="project.name.new" /> - <echo message="Accepted project name as: ${project.name.new}" /> - - <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," - defaultvalue="${old.icefaces}" /> - - <condition property="icefaces.home.new" value=""> - <equals arg1="${icefaces.new}" arg2="n"/> - </condition> - - <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}]" - defaultvalue="${old.icefaces.home}" /> +  +  - <condition property="richfaces.skin.new" value=""> - <equals arg1="${icefaces.new}" arg2="y"/> - </condition> + <condition property="hibernate.connection.driver_class.default" value="org.h2.Driver"> + <equals arg1="${database.type.new}" arg2="h2"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="org.hsqldb.jdbcDriver"> + <equals arg1="${database.type.new}" arg2="hsql"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="com.mysql.jdbc.Driver"> + <equals arg1="${database.type.new}" arg2="mysql"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="oracle.jdbc.driver.OracleDriver"> + <equals arg1="${database.type.new}" arg2="oracle"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="org.postgresql.Driver"> + <equals arg1="${database.type.new}" arg2="postgres"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="com.microsoft.sqlserver.jdbc.SQLServerDriver"> + <equals arg1="${database.type.new}" arg2="mssql"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="COM.ibm.db2.jdbc.app.DB2Driver"> + <equals arg1="${database.type.new}" arg2="db2"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="com.sybase.jdbc2.jdbc.SybDriver"> + <equals arg1="${database.type.new}" arg2="sybase"/> + </condition> + <condition property="hibernate.connection.driver_class.default" value="com.edb.Driver"> + <equals arg1="${database.type.new}" arg2="enterprisedb"/> + </condition> - <property name="old.richfaces.skin" value="blueSky"/> - <input addproperty="richfaces.skin.new" - message="Select a RichFaces skin [${old.richfaces.skin}]" - validargs="blueSky,classic,ruby,wine,deepMarine,emeraldTown,sakura,DEFAULT" - defaultvalue="${old.richfaces.skin}"/> - - <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," - defaultvalue="${old.project.type}"/> - - <property name="old.action.package" value="com.mydomain.${project.name.new}"/> - <input addproperty="action.package.new" - message="Enter the Java package name for your session beans [${old.action.package}]" - defaultvalue="${old.action.package}"/> - - <property name="old.model.package" value="${action.package.new}"/> - <input addproperty="model.package.new" - message="Enter the Java package name for your entity beans [${old.model.package}]" - defaultvalue="${old.model.package}"/> - - <property name="old.test.package" value="${action.package.new}.test"/> - <input addproperty="test.package.new" - message="Enter the Java package name for your test cases [${old.test.package}]" - defaultvalue="${old.test.package}"/> - - <condition property="database.type.default" value="${old.database.type}"> - <isset property="old.database.type"/> - </condition> + <condition property="hibernate.connection.url.default" value="jdbc:h2:."> + <equals arg1="${database.type.new}" arg2="h2"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:hsqldb:."> + <equals arg1="${database.type.new}" arg2="hsql"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:mysql:///test"> + <equals arg1="${database.type.new}" arg2="mysql"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:oracle:thin:@localhost:1521:test"> + <equals arg1="${database.type.new}" arg2="oracle"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:postgresql:template1"> + <equals arg1="${database.type.new}" arg2="postgres"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:sqlserver://localhost"> + <equals arg1="${database.type.new}" arg2="mssql"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:db2:test"> + <equals arg1="${database.type.new}" arg2="db2"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:sybase:Tds:localhost:5000/test"> + <equals arg1="${database.type.new}" arg2="sybase"/> + </condition> + <condition property="hibernate.connection.url.default" value="jdbc:edb://localhost:5444/edb"> + <equals arg1="${database.type.new}" arg2="enterprisedb"/> + </condition> + +  + + <property name="hibernate.dialect.default" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.connection.driver_class.default" value="org.hsqldb.jdbcDriver"/> + <property name="hibernate.connection.url.default" value="jdbc:hsqldb:."/> + + <input addproperty="hibernate.dialect.new" + message="Enter the Hibernate dialect for your database [${hibernate.dialect.default}]" + defaultvalue="${hibernate.dialect.default}"/> + + <property name="old.driver.jar" value="lib/hsqldb.jar"/> + <input addproperty="driver.jar.new" + message="Enter the filesystem path to the JDBC driver jar [${old.driver.jar}]" + defaultvalue="${old.driver.jar}"/> + + <input addproperty="hibernate.connection.driver_class.new" + message="Enter JDBC driver class for your database [${hibernate.connection.driver_class.default}]" + defaultvalue="${hibernate.connection.driver_class.default}"/> + + <input addproperty="hibernate.connection.url.new" + message="Enter the JDBC URL for your database [${hibernate.connection.url.default}]" + defaultvalue="${hibernate.connection.url.default}"/> + + <property name="old.hibernate.connection.username" value="sa"/> + <input addproperty="hibernate.connection.username.new" + message="Enter database username [${old.hibernate.connection.username}]" + defaultvalue="${old.hibernate.connection.username}"/> + + <property name="old.hibernate.connection.password" value=""/> + <input addproperty="hibernate.connection.password.new" + message="Enter database password [${old.hibernate.connection.password}]" + defaultvalue="${old.hibernate.connection.password}"/> + + <property name="old.hibernate.default_schema" value=""/> + <condition property="hibernate.default_schema.new" value=""> + <equals arg1="${database.type.new}" arg2="mysql"/> + </condition> + <input addproperty="hibernate.default_schema.new" + message="Enter the database schema name (it is OK to leave this blank) [${old.hibernate.default_schema}]" + defaultvalue="${old.hibernate.default_schema}"/> + + <property name="old.hibernate.default_catalog" value=""/> + <input addproperty="hibernate.default_catalog.new" + message="Enter the database catalog name (it is OK to leave this blank) [${old.hibernate.default_catalog}]" + defaultvalue="${old.hibernate.default_catalog}"/> + + <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," + defaultvalue="${old.database.exists}"/> - <property name="database.type.default" value="hsql"/> - <input addproperty="database.type.new" - message="What kind of database are you using? [${database.type.default}] " - validargs="hsql,mysql,oracle,postgres,mssql,db2,sybase,enterprisedb,h2" - defaultvalue="${database.type.default}"/> - -  - - <condition property="hibernate.dialect.default" value="${old.hibernate.dialect}"> - <equals arg1="${old.database.type}" arg2="${database.type.new}"/> - </condition> + <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," + defaultvalue="${old.database.drop}"/> + + <condition property="hibernate.default_schema.key" value="hibernate.default_schema"> + <not><equals arg1="${hibernate.default_schema.new}" arg2=""/></not> + </condition> + <condition property="hibernate.default_schema.key" value="hibernate.default_schema.null"> + <equals arg1="${hibernate.default_schema.new}" arg2=""/> + </condition> + + <condition property="hibernate.default_catalog.key" value="hibernate.default_catalog"> + <not><equals arg1="${hibernate.default_catalog.new}" arg2=""/></not> + </condition> + <condition property="hibernate.default_catalog.key" value="hibernate.default_catalog.null"> + <equals arg1="${hibernate.default_catalog.new}" arg2=""/> + </condition> - <condition property="hibernate.connection.url.default" value="${old.hibernate.connection.url}"> - <equals arg1="${old.database.type}" arg2="${database.type.new}"/> - </condition> +  - <condition property="hibernate.connection.driver_class.default" value="${old.hibernate.connection.driver_class}"> - <equals arg1="${old.database.type}" arg2="${database.type.new}"/> - </condition> - -  - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.H2Dialect"> - <equals arg1="${database.type.new}" arg2="h2"/> - </condition> + <delete file="build.properties"/> + <propertyfile file="build.properties" comment="Generated by seam setup"> + <entry key="workspace.home" value="${workspace.home.new}"/> + <entry key="project.name" value="${project.name.new}"/> + <entry key="richfaces.skin" value="${richfaces.skin.new}"/> + <entry key="project.type" value="${project.type.new}"/> + <entry key="jboss.home" value="${jboss.home.new}"/> + <entry key="icefaces" value="${icefaces.new}"/> + <entry key="icefaces.home" value="${icefaces.home.new}"/> + <entry key="action.package" value="${action.package.new}"/> + <entry key="model.package" value="${model.package.new}"/> + <entry key="test.package" value="${test.package.new}"/> + <entry key="database.type" value="${database.type.new}"/> + <entry key="database.exists" value="${database.exists.new}"/> + <entry key="database.drop" value="${database.drop.new}"/> + <entry key="driver.jar" value="${driver.jar.new}"/> + <entry key="hibernate.dialect" value="${hibernate.dialect.new}"/> +  + <entry key="hibernate.connection.driver_class" value="${hibernate.connection.driver_class.new}"/> + <entry key="hibernate.connection.url" value="${hibernate.connection.url.new}"/> + <entry key="hibernate.connection.username" value="${hibernate.connection.username.new}"/> + <entry key="hibernate.connection.password" value="${hibernate.connection.password.new}"/> + <entry key="hibernate.connection.password" value="${hibernate.connection.password.new}"/> + <entry key="${hibernate.default_schema.key}" value="${hibernate.default_schema.new}"/> + <entry key="${hibernate.default_catalog.key}" value="${hibernate.default_catalog.new}"/> + <entry key="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>  + </propertyfile> + + <echo message="Installing JDBC driver jar to JBoss server"/> + <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/default/lib"/> - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.HSQLDialect"> - <equals arg1="${database.type.new}" arg2="hsql"/> - </condition> + <echo message="Type 'seam create-project' to create the new project"/> + </target> - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.MySQLDialect"> - <equals arg1="${database.type.new}" arg2="mysql"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.OracleDialect"> - <equals arg1="${database.type.new}" arg2="oracle"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.PostgreSQLDialect"> - <equals arg1="${database.type.new}" arg2="postgres"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.SQLServerDialect"> - <equals arg1="${database.type.new}" arg2="mssql"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.DB2Dialect"> - <equals arg1="${database.type.new}" arg2="db2"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.SybaseDialect"> - <equals arg1="${database.type.new}" arg2="sybase"/> - </condition> - - <condition property="hibernate.dialect.default" value="org.hibernate.dialect.PostgreSQLDialect"> - <equals arg1="${database.type.new}" arg2="enterprisedb"/> - </condition> - -  -  - - <condition property="hibernate.connection.driver_class.default" value="org.h2.Driver"> - <equals arg1="${database.type.new}" arg2="h2"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="org.hsqldb.jdbcDriver"> - <equals arg1="${database.type.new}" arg2="hsql"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="com.mysql.jdbc.Driver"> - <equals arg1="${database.type.new}" arg2="mysql"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="oracle.jdbc.driver.OracleDriver"> - <equals arg1="${database.type.new}" arg2="oracle"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="org.postgresql.Driver"> - <equals arg1="${database.type.new}" arg2="postgres"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="com.microsoft.sqlserver.jdbc.SQLServerDriver"> - <equals arg1="${database.type.new}" arg2="mssql"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="COM.ibm.db2.jdbc.app.DB2Driver"> - <equals arg1="${database.type.new}" arg2="db2"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="com.sybase.jdbc2.jdbc.SybDriver"> - <equals arg1="${database.type.new}" arg2="sybase"/> - </condition> - - <condition property="hibernate.connection.driver_class.default" value="com.edb.Driver"> - <equals arg1="${database.type.new}" arg2="enterprisedb"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:h2:."> - <equals arg1="${database.type.new}" arg2="h2"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:hsqldb:."> - <equals arg1="${database.type.new}" arg2="hsql"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:mysql:///test"> - <equals arg1="${database.type.new}" arg2="mysql"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:oracle:thin:@localhost:1521:test"> - <equals arg1="${database.type.new}" arg2="oracle"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:postgresql:template1"> - <equals arg1="${database.type.new}" arg2="postgres"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:sqlserver://localhost"> - <equals arg1="${database.type.new}" arg2="mssql"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:db2:test"> - <equals arg1="${database.type.new}" arg2="db2"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:sybase:Tds:localhost:5000/test"> - <equals arg1="${database.type.new}" arg2="sybase"/> - </condition> - - <condition property="hibernate.connection.url.default" value="jdbc:edb://localhost:5444/edb"> - <equals arg1="${database.type.new}" arg2="enterprisedb"/> - </condition> - -  + <target name="icefaces-staging-copy" if="icefaces.property"> + <echo message="Set up the icefaces directory"/> + <copy todir="icefaces-staging"> + <fileset dir="."> + <include name="build-scripts/**"/> + <include name="hibernatetools/**"/> + <include name="lib/**"/> + <include name="resources/**"/> + <include name="pojo/**"/> + <include name="src/**"/> + <include name="test/**"/> + <include name="view/**"/> + <include name="nbproject/**"/> + <include name="util/**"/> + </fileset> + </copy> + <copy todir="icefaces-staging" overwrite="true"> + <fileset dir="icefaces"> + <include name="build-scripts/**"/> + <include name="resources/**"/> + <include name="src/**"/> + <include name="view/**"/> + </fileset> + </copy> + </target> - <property name="hibernate.dialect.default" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class.default" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.url.default" value="jdbc:hsqldb:."/> - - <input addproperty="hibernate.dialect.new" - message="Enter the Hibernate dialect for your database [${hibernate.dialect.default}]" - defaultvalue="${hibernate.dialect.default}"/> - - <property name="old.driver.jar" value="lib/hsqldb.jar"/> - <input addproperty="driver.jar.new" - message="Enter the filesystem path to the JDBC driver jar [${old.driver.jar}]" - defaultvalue="${old.driver.jar}"/> - - <input addproperty="hibernate.connection.driver_class.new" - message="Enter JDBC driver class for your database [${hibernate.connection.driver_class.default}]" - defaultvalue="${hibernate.connection.driver_class.default}"/> - - <input addproperty="hibernate.connection.url.new" - message="Enter the JDBC URL for your database [${hibernate.connection.url.default}]" - defaultvalue="${hibernate.connection.url.default}"/> - - <property name="old.hibernate.connection.username" value="sa"/> - <input addproperty="hibernate.connection.username.new" - message="Enter database username [${old.hibernate.connection.username}]" - defaultvalue="${old.hibernate.connection.username}"/> - - <property name="old.hibernate.connection.password" value=""/> - <input addproperty="hibernate.connection.password.new" - message="Enter database password [${old.hibernate.connection.password}]" - defaultvalue="${old.hibernate.connection.password}"/> - - <property name="old.hibernate.default_schema" value=""/> - <condition property="hibernate.default_schema.new" value=""> - <equals arg1="${database.type.new}" arg2="mysql"/> - </condition> + <target name="action-input" depends="init"> + + <input addproperty="component.name" message="Enter the Seam component name"/> + + <uppercaseProperty name="interface.name.default" value="${component.name}"/> + <input message="Enter the local interface name [${interface.name.default}]" + addproperty="interface.name" + defaultvalue="${interface.name.default}"/> + + <uppercaseProperty name="bean.name.default" value="${component.name}Bean"/> + <input message="Enter the bean class name [${bean.name.default}]" + addproperty="bean.name" + defaultvalue="${bean.name.default}"/> + + <lowercaseProperty name="method.name.default" value="${component.name}"/> + <input message="Enter the action method name [${method.name.default}]" + addproperty="method.name" + defaultvalue="${method.name.default}"/> + + <lowercaseProperty name="page.name.default" value="${component.name}"/> + <input message="Enter the page name [${page.name.default}]" + addproperty="page.name" + defaultvalue="${page.name.default}"/> + + <property name="bean.file" value="${project.home}/src/${action.dir}/${bean.name}.java"/> + <property name="interface.file" value="${project.home}/src/${action.dir}/${interface.name}.java"/> + <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> + <property name="test.file" value="${project.home}/src/${test.dir}/${interface.name}Test.java"/> + <property name="testng.file" value="${project.home}/src/${test.dir}/${interface.name}Test.xml"/> - <input addproperty="hibernate.default_schema.new" - message="Enter the database schema name (it is OK to leave this blank) [${old.hibernate.default_schema}]" - defaultvalue="${old.hibernate.default_schema}"/> - - <property name="old.hibernate.default_catalog" value=""/> - <input addproperty="hibernate.default_catalog.new" - message="Enter the database catalog name (it is OK to leave this blank) [${old.hibernate.default_catalog}]" - defaultvalue="${old.hibernate.default_catalog}"/> - - <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," - 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," - defaultvalue="${old.database.drop}"/> + </target> - <condition property="hibernate.default_schema.key" value="hibernate.default_schema"> - <not><equals arg1="${hibernate.default_schema.new}" arg2=""/></not> - </condition> - - <condition property="hibernate.default_schema.key" value="hibernate.default_schema.null"> - <equals arg1="${hibernate.default_schema.new}" arg2=""/> - </condition> + <target name="entity-input" depends="init"> - <condition property="hibernate.default_catalog.key" value="hibernate.default_catalog"> - <not><equals arg1="${hibernate.default_catalog.new}" arg2=""/></not> - </condition> + <input addproperty="entity.name" message="Enter the entity class name"/> + <lowercaseProperty name="component.name" value="${entity.name}"/> + + <lowercaseProperty name="masterPage.name.default" value="${component.name}List"/> + <input message="Enter the master page name [${masterPage.name.default}]" + addproperty="masterPage.name" + defaultvalue="${masterPage.name.default}"/> + + <lowercaseProperty name="page.name.default" value="${component.name}"/> + <input message="Enter the detail page name [${page.name.default}]" + addproperty="page.name" + defaultvalue="${page.name.default}"/> + + <property name="entity.file" value="${project.home}/src/${model.dir}/${entity.name}.java"/> + <property name="home.file" value="${project.home}/src/${action.dir}/${entity.name}Home.java"/> + <property name="list.file" value="${project.home}/src/${action.dir}/${entity.name}List.java"/> + <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> + <property name="masterPage.file" value="${project.home}/view/${masterPage.name}.xhtml"/> - <condition property="hibernate.default_catalog.key" value="hibernate.default_catalog.null"> - <equals arg1="${hibernate.default_catalog.new}" arg2=""/> - </condition> - -  - - <delete file="build.properties"/> - - <propertyfile file="build.properties" comment="Generated by seam setup"> - <entry key="workspace.home" value="${workspace.home.new}"/> - <entry key="project.name" value="${project.name.new}"/> - <entry key="richfaces.skin" value="${richfaces.skin.new}"/> - <entry key="project.type" value="${project.type.new}"/> - <entry key="jboss.home" value="${jboss.home.new}"/> - <entry key="icefaces" value="${icefaces.new}"/> - <entry key="icefaces.home" value="${icefaces.home.new}"/> - <entry key="action.package" value="${action.package.new}"/> - <entry key="model.package" value="${model.package.new}"/> - <entry key="test.package" value="${test.package.new}"/> - <entry key="database.type" value="${database.type.new}"/> - <entry key="database.exists" value="${database.exists.new}"/> - <entry key="database.drop" value="${database.drop.new}"/> - <entry key="driver.jar" value="${driver.jar.new}"/> - <entry key="hibernate.dialect" value="${hibernate.dialect.new}"/> -  - <entry key="hibernate.connection.driver_class" value="${hibernate.connection.driver_class.new}"/> - <entry key="hibernate.connection.url" value="${hibernate.connection.url.new}"/> - <entry key="hibernate.connection.username" value="${hibernate.connection.username.new}"/> - <entry key="hibernate.connection.password" value="${hibernate.connection.password.new}"/> - <entry key="hibernate.connection.password" value="${hibernate.connection.password.new}"/> - <entry key="${hibernate.default_schema.key}" value="${hibernate.default_schema.new}"/> - <entry key="${hibernate.default_catalog.key}" value="${hibernate.default_catalog.new}"/> - <entry key="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>  - </propertyfile> + </target> - <echo message="Installing JDBC driver jar to JBoss server"/> - <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/default/lib"/> + <target name="query-input"> + <property name="entity.name.default" value="Entity" /> + <input addproperty="entity.name" + message="Enter the entity class to search for [${entity.name.default}] " + defaultvalue="${entity.name}"/> - <echo message="Type 'seam create-project' to create the new project"/> - </target> + <property name="entity.file" value="${project.home}/src/${model.dir}/${entity.name}.java" /> + <available property="entity.present" file="${entity.file}" /> + <fail unless="entity.present"> + The entity ${entity.name} was not found. It was expected to be in ${entity.file}. + </fail> - <target name="icefaces-staging-copy" if="icefaces.property"> - <echo message="Set up the icefaces directory"/> - <copy todir="icefaces-staging"> - <fileset dir="."> - <include name="build-scripts/**"/> - <include name="hibernatetools/**"/> - <include name="lib/**"/> - <include name="resources/**"/> - <include name="pojo/**"/> - <include name="src/**"/> - <include name="test/**"/> - <include name="view/**"/> - <include name="nbproject/**"/> - <include name="util/**"/> - </fileset> - </copy> - - <copy todir="icefaces-staging" overwrite="true"> - <fileset dir="icefaces"> - <include name="build-scripts/**"/> - <include name="resources/**"/> - <include name="src/**"/> - <include name="view/**"/> - </fileset> - </copy> - </target> - - <target name="action-input" depends="init"> - <input addproperty="component.name" message="Enter the Seam component name"/> - - <uppercaseProperty name="interface.name.default" value="${component.name}"/> - <input message="Enter the local interface name [${interface.name.default}]" - addproperty="interface.name" - defaultvalue="${interface.name.default}"/> - - <uppercaseProperty name="bean.name.default" value="${component.name}Bean"/> - <input message="Enter the bean class name [${bean.name.default}]" - addproperty="bean.name" - defaultvalue="${bean.name.default}"/> - - <lowercaseProperty name="method.name.default" value="${component.name}"/> - <input message="Enter the action method name [${method.name.default}]" - addproperty="method.name" - defaultvalue="${method.name.default}"/> - - <lowercaseProperty name="page.name.default" value="${component.name}"/> - <input message="Enter the page name [${page.name.default}]" - addproperty="page.name" - defaultvalue="${page.name.default}"/> - <property name="bean.file" value="${project.home}/src/${action.dir}/${bean.name}.java"/> - <property name="interface.file" value="${project.home}/src/${action.dir}/${interface.name}.java"/> - <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> - <property name="test.file" value="${project.home}/src/${test.dir}/${interface.name}Test.java"/> - <property name="testng.file" value="${project.home}/src/${test.dir}/${interface.name}Test.xml"/> + <lowercaseProperty name="component.name.default" value="${entity.name}Query" /> + <input addproperty="component.name" + message="Enter the Seam query component name [${component.name.default}]" + defaultvalue="${component.name.default}" /> + + <uppercaseProperty name="bean.name.default" value="${component.name}"/> + <input message="Enter the query class name [${bean.name.default}]" + addproperty="bean.name" + defaultvalue="${bean.name.default}"/> + + <property name="query.default" + value="select o from ${entity.name} o" /> + <input message="Enter the EJBQL query string [${query.default}]" + addproperty="query.text" + defaultvalue="${query.default}" /> - </target> - - <target name="entity-input" depends="init"> - <input addproperty="entity.name" message="Enter the entity class name"/> - <lowercaseProperty name="component.name" value="${entity.name}"/> - - <lowercaseProperty name="masterPage.name.default" value="${component.name}List"/> - <input message="Enter the master page name [${masterPage.name.default}]" - addproperty="masterPage.name" - defaultvalue="${masterPage.name.default}"/> - - <lowercaseProperty name="page.name.default" value="${component.name}"/> - <input message="Enter the detail page name [${page.name.default}]" - addproperty="page.name" - defaultvalue="${page.name.default}"/> - - <property name="entity.file" value="${project.home}/src/${model.dir}/${entity.name}.java"/> - <property name="home.file" value="${project.home}/src/${action.dir}/${entity.name}Home.java"/> - <property name="list.file" value="${project.home}/src/${action.dir}/${entity.name}List.java"/> - <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> - <property name="masterPage.file" value="${project.home}/view/${masterPage.name}.xhtml"/> - </target> - - <target name="query-input"> - <property name="entity.name.default" value="Entity" /> - <input addproperty="entity.name" - message="Enter the entity class to search for [${entity.name.default}] " - defaultvalue="${entity.name}"/> - - <property name="entity.file" value="${project.home}/src/${model.dir}/${entity.name}.java" /> - <available property="entity.present" file="${entity.file}" /> - <fail unless="entity.present"> - The entity ${entity.name} was not found. It was expected to be in ${entity.file}. - </fail> + <lowercaseProperty name="page.name.default" value="${component.name}"/> + <input message="Enter the query resuls page name [${page.name.default}]" + addproperty="page.name" + defaultvalue="${page.name.default}"/> - <lowercaseProperty name="component.name.default" value="${entity.name}Query" /> - <input addproperty="component.name" - message="Enter the Seam query component name [${component.name.default}]" - defaultvalue="${component.name.default}" /> - - <uppercaseProperty name="bean.name.default" value="${component.name}"/> - <input message="Enter the query class name [${bean.name.default}]" - addproperty="bean.name" - defaultvalue="${bean.name.default}"/> - - <property name="query.default" - value="select o from ${entity.name} o" /> - <input message="Enter the EJBQL query string [${query.default}]" - addproperty="query.text" - defaultvalue="${query.default}" /> + <property name="query.file" value="${project.home}/src/${action.dir}/${bean.name}.java"/> + <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> + </target> - <lowercaseProperty name="page.name.default" value="${component.name}"/> - <input message="Enter the query resuls page name [${page.name.default}]" - addproperty="page.name" - defaultvalue="${page.name.default}"/> - - <property name="query.file" value="${project.home}/src/${action.dir}/${bean.name}.java"/> - <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/> - </target> - <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces-home, copy-icefaces-maven"> - <echo message="Copying Seam and dependencies to the ${project.home}/lib directory..." /> - - <copy todir="${project.home}/lib" overwrite="true"> - <fileset dir="../lib"> - <exclude name="jsf-facelets.jar" if="icefaces.property"/> - <exclude name="ajax4jsf*.jar" if="icefaces.property"/> - <exclude name="richfaces*.jar" if="icefaces.property"/> - <exclude name="jboss-container.jar" /> - <exclude name="test/jboss-deplyers.jar" /> - <exclude name="test/jboss-embedded-api.jar" /> - </fileset> - <fileset file="${driver.jar}"/> - </copy> - <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..." /> - - <copy todir="${project.home}/bootstrap" overwrite="true"> - <fileset dir="../bootstrap" /> - </copy> - - </target> - - <target name="copy-icefaces-maven" if="icefaces.property" unless="icefaces.lib.property"> - <artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions"> - <dependency groupId="org.icefaces" artifactId="icefaces" version="1.6.1"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.6.1"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.6.1"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <remoteRepository refId="repository.jboss.org" /> - </artifact:dependencies> - <copy todir="${project.home}/lib" overwrite="true"> - <fileset refid="icefaces.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${icefaces.versions}" to="flatten" /> - </copy> - </target> - - <target name="copy-icefaces-home" if="icefaces.lib.property"> - <copy todir="${project.home}/lib" overwrite="true"> - <fileset dir="${icefaces.lib}" > - <include name="icefaces*.jar"/> - <include name="backport-util-concurrent.jar"/> - <include name="commons-fileupload.jar"/> - <include name="commons-digester.jar"/> - </fileset> - </copy> - </target> - - <target name="file-copy-war" if="project.war"> - <echo message="Copying resources needed for WAR deployment to the ${project.home}/resources directory..." /> + <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces-home, copy-icefaces-maven"> + <echo message="Copying Seam and depdencies to the ${project.home}/lib directory..." /> + + <copy todir="${project.home}/lib" overwrite="true"> + <fileset dir="../lib"> + <exclude name="jsf-facelets.jar" if="icefaces.property"/> + <exclude name="ajax4jsf*.jar" if="icefaces.property"/> + <exclude name="richfaces*.jar" if="icefaces.property"/> + <exclude name="jboss-container.jar" /> + <exclude name="test/jboss-deplyers.jar" /> + <exclude name="test/jboss-embedded-api.jar" /> + </fileset> + <fileset file="${driver.jar}"/> + </copy> - <copy tofile="${project.home}/resources/WEB-INF/components.xml" - file="${base.dir}/resources/WEB-INF/components-war.xml"> - <filterset refid="project"/> - <filterset refid="filters"/> - </copy> + <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..." /> + <copy todir="${project.home}/bootstrap" overwrite="true"> + <fileset dir="../bootstrap" /> + </copy> + + </target> + + <target name="copy-icefaces-maven" if="icefaces.property" unless="icefaces.lib.property"> + <artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions"> + <dependency groupId="org.icefaces" artifactId="icefaces" version="1.6.1"> + <exclusion groupId="javax.el" artifactId="el-api" /> + </dependency> + <dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.6.1"> + <exclusion groupId="javax.el" artifactId="el-api" /> + </dependency> + <dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.6.1"> + <exclusion groupId="javax.el" artifactId="el-api" /> + </dependency> + <remoteRepository refId="repository.jboss.org" /> + </artifact:dependencies> + <copy todir="${project.home}/lib" overwrite="true"> + <fileset refid="icefaces.fileset" /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${icefaces.versions}" to="flatten" /> + </copy> + </target> + + <target name="copy-icefaces-home" if="icefaces.lib.property"> + <copy todir="${project.home}/lib" overwrite="true"> + <fileset dir="${icefaces.lib}" > + <include name="icefaces*.jar"/> + <include name="backport-util-concurrent.jar"/> + <include name="commons-fileupload.jar"/> + <include name="commons-digester.jar"/> + </fileset> + </copy> + </target> + + <target name="file-copy-war" if="project.war"> + <echo message="Copying resources needed for WAR deployment to the ${project.home}/resources directory..." /> - <copy tofile="${project.home}/build.xml" - file="${base.dir}/build-scripts/build-war.xml"> - <filterset refid="project"/> - </copy> - - <copy todir="${project.home}/resources"> - <fileset dir="${base.dir}/resources/"> - <include name="META-INF/persistence*-war.xml"/> - <include name="WEB-INF/jboss-web.xml"/> - </fileset> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy todir="${project.home}/src/action" file="${base.dir}/resources/seam.properties"/> - <copy todir="${project.home}/src/model" file="${base.dir}/resources/seam.properties"/> - </target> + <copy tofile="${project.home}/resources/WEB-INF/components.xml" + file="${base.dir}/resources/WEB-INF/components-war.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.xml" + file="${base.dir}/build-scripts/build-war.xml"> + <filterset refid="project"/> + </copy> + <copy todir="${project.home}/resources"> + <fileset dir="${base.dir}/resources/"> + <include name="META-INF/persistence*-war.xml"/> + <include name="WEB-INF/jboss-web.xml"/> + </fileset> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + <copy todir="${project.home}/src/action" file="${base.dir}/resources/seam.properties"/> + <copy todir="${project.home}/src/model" file="${base.dir}/resources/seam.properties"/> + </target> - <target name="file-copy-ear" unless="project.war" depends="setup-filters"> - <echo message="Copying resources needed for EAR deployment to the ${project.home}/resources directory..." /> + <target name="file-copy-ear" unless="project.war"> + <echo message="Copying resources needed for EAR deployment to the ${project.home}/resources directory..." /> + + <copy tofile="${project.home}/resources/WEB-INF/components.xml" + file="${base.dir}/resources/WEB-INF/components.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.xml" + file="${base.dir}/build-scripts/build.xml"> + <filterset refid="project"/> + </copy> + <copy todir="${project.home}" overwrite="true"> + <fileset file="../validate.xml"/> + </copy> + <copy todir="${project.home}/resources"> + <fileset dir="${base.dir}/resources/"> + <include name="META-INF/application.xml"/> + <include name="META-INF/jboss-app.xml"/> + <include name="META-INF/ejb-jar.xml"/> + <include name="META-INF/persistence*.xml"/> + <exclude name="META-INF/persistence*-war.xml"/> + </fileset> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + </target> - <copy tofile="${project.home}/resources/WEB-INF/components.xml" - file="${base.dir}/resources/WEB-INF/components.xml"> - <filterset refid="project"/> - <filterset refid="filters"/> - </copy> - - <copy tofile="${project.home}/build.xml" - file="${base.dir}/build-scripts/build.xml"> - <filterset refid="project"/> - </copy> - - <copy todir="${project.home}" overwrite="true"> - <fileset file="../validate.xml"/> - </copy> - - <copy todir="${project.home}/resources"> - <fileset dir="${base.dir}/resources/"> - <include name="META-INF/application.xml"/> - <include name="META-INF/jboss-app.xml"/> - <include name="META-INF/ejb-jar.xml"/> - <include name="META-INF/persistence*.xml"/> - <exclude name="META-INF/persistence*-war.xml"/> - </fileset> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - </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"/> - <exclude name="import.sql"/> - <exclude name="WEB-INF/components*.xml"/> - <exclude name="META-INF/persistence*.xml"/> - <exclude name="META-INF/application.xml"/> - <exclude name="META-INF/jboss-app.xml"/> - <exclude name="META-INF/ejb-jar.xml"/> - <exclude name="WEB-INF/jboss-web.xml"/> - </fileset> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> + <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"/> + <exclude name="import.sql"/> + <exclude name="WEB-INF/components*.xml"/> + <exclude name="META-INF/persistence*.xml"/> + <exclude name="META-INF/application.xml"/> + <exclude name="META-INF/jboss-app.xml"/> + <exclude name="META-INF/ejb-jar.xml"/> + <exclude name="WEB-INF/jboss-web.xml"/> + </fileset> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> - <copy tofile="${project.home}/debug-jboss-${project.name}.launch" - file="${base.dir}/build-scripts/debug-jboss.launch"> - <filterset refid="project"/> - </copy> + <copy tofile="${project.home}/debug-jboss-${project.name}.launch" + file="${base.dir}/build-scripts/debug-jboss.launch"> + <filterset refid="project"/> + </copy> - <copy tofile="${project.home}/${project.name}.launch" - file="${base.dir}/hibernatetools/hibernate-console.launch"> - <filterset refid="project"/> - </copy> + <copy tofile="${project.home}/${project.name}.launch" + file="${base.dir}/hibernatetools/hibernate-console.launch"> + <filterset refid="project"/> + </copy> - <copy tofile="${project.home}/hibernate-console.properties" - file="${base.dir}/hibernatetools/hibernate-console.properties"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - <filterset> - <filter token="hibernate.dialect" value="${hibernate.dialect}"/> - </filterset> - </copy> + <copy tofile="${project.home}/hibernate-console.properties" + file="${base.dir}/hibernatetools/hibernate-console.properties"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + <filterset> + <filter token="hibernate.dialect" value="${hibernate.dialect}"/> + </filterset> + </copy> - <copy tofile="${project.home}/resources/seam-gen.reveng.xml" - file="${base.dir}/hibernatetools/seam-gen.reveng.xml"> - <filterset refid="project"/> - </copy> + <copy tofile="${project.home}/resources/seam-gen.reveng.xml" + file="${base.dir}/hibernatetools/seam-gen.reveng.xml"> + <filterset refid="project"/> + </copy> - <copy tofile="${project.home}/.settings/org.hibernate.eclipse.console.prefs" - file="${base.dir}/hibernatetools/.settings/org.hibernate.eclipse.console.prefs"> - <filterset refid="project"/> - </copy> + <copy tofile="${project.home}/.settings/org.hibernate.eclipse.console.prefs" + file="${base.dir}/hibernatetools/.settings/org.hibernate.eclipse.console.prefs"> + <filterset refid="project"/> + </copy> - <copy tofile="${project.home}/resources/${project.name}-dev-ds.xml" - file="${base.dir}/resources/datasource-ds.xml"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy tofile="${project.home}/resources/${project.name}-prod-ds.xml" - file="${base.dir}/resources/datasource-ds.xml"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy tofile="${project.home}/resources/import-dev.sql" - file="${base.dir}/resources/import.sql"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy tofile="${project.home}/resources/import-prod.sql" - file="${base.dir}/resources/import.sql"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy tofile="${project.home}/resources/import-test.sql" - file="${base.dir}/resources/import.sql"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy todir="${project.home}/view"> - <fileset id="view" dir="${base.dir}/view"> - <include name="home.xhtml"/> - <include name="error.xhtml"/> - <include name="login.xhtml"/> - <include name="login.page.xml"/> - <include name="index.html"/> -  - <include name="layout/*"/> - <include name="stylesheet/*"/> - <exclude name="**/*.ftl"/> - </fileset> - <filterset refid="project"/> - </copy> + <copy tofile="${project.home}/resources/${project.name}-dev-ds.xml" + file="${base.dir}/resources/datasource-ds.xml"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + + <copy tofile="${project.home}/resources/${project.name}-prod-ds.xml" + file="${base.dir}/resources/datasource-ds.xml"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + + <copy tofile="${project.home}/resources/import-dev.sql" + file="${base.dir}/resources/import.sql"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + + <copy tofile="${project.home}/resources/import-prod.sql" + file="${base.dir}/resources/import.sql"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + + <copy tofile="${project.home}/resources/import-test.sql" + file="${base.dir}/resources/import.sql"> + <filterset refid="project"/> + <filterset refid="jdbc"/> + </copy> + + <copy todir="${project.home}/view"> + <fileset id="view" dir="${base.dir}/view"> + <include name="home.xhtml"/> + <include name="error.xhtml"/> + <include name="login.xhtml"/> + <include name="login.page.xml"/> + <include name="index.html"/> + <include name="layout/*"/> + <include name="stylesheet/*"/> + <exclude name="**/*.ftl"/> + </fileset> + <filterset refid="project"/> + </copy> +  + <copy todir="${project.home}/view"> + <fileset id="view" dir="${base.dir}/view"> + <include name="img/*"/> + </fileset> + </copy> + + <copy todir="${project.home}/src/${action.dir}"> + <fileset dir="${base.dir}/src/"> + <include name="Authenticator.java"/> + <include name="Timer*.java" if="icefaces.property"/> + </fileset> + <filterset refid="filters"/> + </copy> + + <copy todir="${project.home}"> + <fileset dir="${base.dir}/build-scripts"> + <exclude name="build*.xml"/> + <exclude name="debug-jboss.launch"/> + </fileset> + <filterset refid="project"/> + </copy> + + <mkdir dir="${project.home}/src/model"/> + <mkdir dir="${project.home}/src/action"/> + <mkdir dir="${project.home}/src/test"/> + + <copy todir="${project.home}/src/test" file="${base.dir}/test/readme.txt" /> -  - <copy todir="${project.home}/view"> - <fileset id="view" dir="${base.dir}/view"> - <include name="img/*"/> - </fileset> - </copy> - - <copy todir="${project.home}/src/${action.dir}"> - <fileset dir="${base.dir}/src/"> - <include name="Authenticator.java"/> - <include name="UserSearch.java"/> - <include name="UserAction.java"/> - <include name="Timer*.java" if="icefaces.property"/> - </fileset> - <filterset refid="filters"/> - </copy> - - <copy todir="${project.home}"> - <fileset dir="${base.dir}/build-scripts"> - <exclude name="build*.xml"/> - <exclude name="debug-jboss.launch"/> - </fileset> - <filterset refid="project"/> - </copy> - - <mkdir dir="${project.home}/src/model"/> - <mkdir dir="${project.home}/src/action"/> - <mkdir dir="${project.home}/src/test"/> - -  - - <copy todir="${project.home}/src/test" file="${base.dir}/test/readme.txt" /> + <mkdir dir="${project.home}/nbproject"/> + <copy todir="${project.home}/nbproject"> + <fileset dir="${base.dir}/nbproject" /> + <filterset refid="project"/> + </copy> - <mkdir dir="${project.home}/nbproject"/> - - <copy todir="${project.home}/nbproject"> - <fileset dir="${base.dir}/nbproject" /> - <filterset refid="project"/> - </copy> - - </target> + </target> - <target name="validate-project" depends="init-properties, validate-workspace"> - <fail message="No project name specified (run 'seam create-project' first)"> - <condition> - <or> - <not><isset property="project.name"/></not> - <equals arg1="${project.name}" arg2=""/> - </or> - </condition> - </fail> + <target name="validate-project" depends="init-properties, validate-workspace"> + <fail message="No project name specified (run 'seam create-project' first)"> + <condition> + <or> + <not><isset property="project.name"/></not> + <equals arg1="${project.name}" arg2=""/> + </or> + </condition> + </fail> + <fail message="Invalid package combination. If the default package is used, then all classes (action, model, and test) must be in the default package"> + <condition> + <and> + <or> + <equals arg1="${action.package}" arg2="" /> + <equals arg1="${model.package}" arg2="" /> + <equals arg1="${test.package}" arg2="" /> + </or> + <or> + <not><equals arg1="${action.package}" arg2="" /></not> + <not><equals arg1="${model.package}" arg2="" /></not> + <not><equals arg1="${test.package}" arg2="" /></not> + </or> + </and> + </condition> + </fail> + </target> - <fail message="Invalid package combination. If the default package is used, then all classes (action, model, and test) must be in the default package"> - <condition> - <and> - <or> - <equals arg1="${action.package}" arg2="" /> - <equals arg1="${model.package}" arg2="" /> - <equals arg1="${test.package}" arg2="" /> - </or> - <or> - <not><equals arg1="${action.package}" arg2="" /></not> - <not><equals arg1="${model.package}" arg2="" /></not> - <not><equals arg1="${test.package}" arg2="" /></not> - </or> - </and> - </condition> - </fail> - </target> + <target name="validate-workspace"> + <fail message="No project workspace specified (run 'seam setup' first)"> + <condition> + <or> + <not><isset property="workspace.home"/></not> + <equals arg1="${workspace.home}" arg2=""/> + </or> + </condition> + </fail> + </target> + +  + <target name="new-project" depends="create-project" /> + <target name="create-project" depends="validate-project,icefaces-staging-copy,copy-lib,file-copy" + description="Create a new project"> + <echo message="A new Seam project named '${project.name}' was created in the ${workspace.home} directory"/> + <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}"/> + <echo message="Eclipse Users: Add the project into Eclipse using File > New > Project and select General > Project (not Java Project)"/> + <echo message="NetBeans Users: Open the project in NetBeans"/> + </target> - <target name="validate-workspace"> - <fail message="No project workspace specified (run 'seam setup' first)"> - <condition> - <or> - <not><isset property="workspace.home"/></not> - <equals arg1="${workspace.home}" arg2=""/> - </or> - </condition> - </fail> - </target> - -  - <target name="new-project" depends="create-project" /> + <target name="update-project" depends="validate-project,copy-lib" + description="Update project dependencies"> + <echo message="Updated project '${project.name}' with the latest Seam jars" /> + <echo message="Type 'seam restart' to update the exploded deployment"/> + </target> - <target name="create-project" depends="validate-project,icefaces-staging-copy,copy-lib,file-copy" - description="Create a new project"> - <echo message="A new Seam project named '${project.name}' was created in the ${workspace.home} directory"/> - <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}"/> - <echo message="Eclipse Users: Add the project into Eclipse using File > New > Project and select General > Project (not Java Project)"/> - <echo message="NetBeans Users: Open the project in NetBeans"/> - </target> + <target name="delete-project" depends="validate-project,unexplode,undeploy" + description="Delete the project"> + <echo message="Deleting the entire project in ${project.home}" /> + <delete dir="${project.home}" /> + </target> + + <target name="new-action" depends="new-action-ear,new-action-war" + description="Create a new action"/> + <target name="new-form" depends="new-form-ear,new-form-war" + description="Create a new form action"/> + <target name="new-conversation" depends="new-conversation-ear,new-conversation-war" + description="Create a new conversation controller"/> - <target name="update-project" depends="validate-project,copy-lib" - description="Update project dependencies"> - <echo message="Updated project '${project.name}' with the latest Seam jars" /> - <echo message="Type 'seam restart' to update the exploded deployment"/> - </target> + <target name="new-action-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> + <echo message="Creating a new stateless session bean component with an action method" /> + <copy file="${base.dir}/src/ActionBean.java" tofile="${bean.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/src/Action.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/ActionTest.java" tofile="${test.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/action.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <target name="delete-project" depends="validate-project,unexplode,undeploy" - description="Delete the project"> - <echo message="Deleting the entire project in ${project.home}" /> - <delete dir="${project.home}" /> - </target> - - <target name="new-action" depends="new-action-ear,new-action-war" - description="Create a new action"/> - - <target name="new-form" depends="new-form-ear,new-form-war" - description="Create a new form action"/> - - <target name="new-conversation" depends="new-conversation-ear,new-conversation-war" - description="Create a new conversation controller"/> + <target name="new-action-war" depends="validate-project,action-input,setup-filters" if="project.war"> + <echo message="Creating a new JavaBean component with an action method" /> + <copy file="${base.dir}/src/ActionJavaBean.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/ActionTest.java" tofile="${test.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/action.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <target name="new-action-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> - <echo message="Creating a new stateless session bean component with an action method" /> - <copy file="${base.dir}/src/ActionBean.java" tofile="${bean.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/src/Action.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/ActionTest.java" tofile="${test.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/action.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> + <target name="new-form-war" depends="validate-project,action-input,setup-filters" if="project.war"> + <echo message="Creating a new JavaBean component with an action method" /> + <copy file="${base.dir}/src/FormActionJavaBean.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/FormTest.java" tofile="${test.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/form.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <target name="new-action-war" depends="validate-project,action-input,setup-filters" if="project.war"> - <echo message="Creating a new JavaBean component with an action method" /> - <copy file="${base.dir}/src/ActionJavaBean.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/ActionTest.java" tofile="${test.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/action.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> + <target name="new-form-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> + <echo message="Creating a new stateful session bean component with an action method" /> + <copy file="${base.dir}/src/FormActionBean.java" tofile="${bean.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/src/FormAction.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/FormTest.java" tofile="${test.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/form.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <target name="new-form-war" depends="validate-project,action-input,setup-filters" if="project.war"> - <echo message="Creating a new JavaBean component with an action method" /> - <copy file="${base.dir}/src/FormActionJavaBean.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/FormTest.java" tofile="${test.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/form.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> + <target name="new-query" depends="validate-project,query-input,setup-filters"> + <echo message="Creating a new query" /> + <copy file="${base.dir}/src/Query.java" tofile="${query.file}"> + <filterset refid="filters"/> + </copy> - <target name="new-form-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> - <echo message="Creating a new stateful session bean component with an action method" /> - <copy file="${base.dir}/src/FormActionBean.java" tofile="${bean.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/src/FormAction.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/FormTest.java" tofile="${test.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/form.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/test/testng.xml" tofile="${testng.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> + <copy file="${base.dir}/view/query.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> - <target name="new-query" depends="validate-project,query-input,setup-filters"> - <echo message="Creating a new query" /> - <copy file="${base.dir}/src/Query.java" tofile="${query.file}"> - <filterset refid="filters"/> - </copy> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <copy file="${base.dir}/view/query.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> + <target name="new-conversation-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> + <echo message="Creating a new stateful session bean component with @Begin and @End methods" /> + <copy file="${base.dir}/src/ConversationBean.java" tofile="${bean.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/src/Conversation.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/conversation.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> + <target name="new-conversation-war" depends="validate-project,action-input,setup-filters" if="project.war"> + <echo message="Creating a new JavaBean component with @Begin and @End methods" /> + <copy file="${base.dir}/src/ConversationJavaBean.java" tofile="${interface.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/conversation.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> + </target> - <target name="new-conversation-ear" depends="validate-project,action-input,setup-filters" unless="project.war"> - <echo message="Creating a new stateful session bean component with @Begin and @End methods" /> - <copy file="${base.dir}/src/ConversationBean.java" tofile="${bean.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/src/Conversation.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/conversation.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> - - <target name="new-conversation-war" depends="validate-project,action-input,setup-filters" if="project.war"> - <echo message="Creating a new JavaBean component with @Begin and @End methods" /> - <copy file="${base.dir}/src/ConversationJavaBean.java" tofile="${interface.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/conversation.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> - </target> - - <target name="new-entity" depends="validate-project,entity-input,setup-filters" - description="Create a new entity"> - <echo message="Creating a new entity bean, with home and list components" /> - <copy file="${base.dir}/src/Entity.java" tofile="${entity.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/src/EntityHome.java" tofile="${home.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/src/EntityList.java" tofile="${list.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/edit.xhtml" tofile="${page.file}"> - <filterset refid="filters"/> - </copy> - <copy file="${base.dir}/view/list.xhtml" tofile="${masterPage.file}"> - <filterset refid="filters"/> - </copy> - <replace file="${project.home}/view/layout/menu.xhtml"> - <replacetoken><![CDATA[]]></replacetoken> - <replacevalue><![CDATA[<s:link view="/@masterPageName@.xhtml" value="@entityName@ List" propagation="none"/> + <target name="new-entity" depends="validate-project,entity-input,setup-filters" + description="Create a new entity"> + <echo message="Creating a new entity bean, with home and list components" /> + <copy file="${base.dir}/src/Entity.java" tofile="${entity.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/src/EntityHome.java" tofile="${home.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/src/EntityList.java" tofile="${list.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/edit.xhtml" tofile="${page.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${base.dir}/view/list.xhtml" tofile="${masterPage.file}"> + <filterset refid="filters"/> + </copy> + <replace file="${project.home}/view/layout/menu.xhtml"> + <replacetoken><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[<s:link view="/@masterPageName@.xhtml" value="@entityName@ List" propagation="none"/> ]]></replacevalue> - </replace> - <replace file="${project.home}/view/layout/menu.xhtml"> - <replacefilter token="@masterPageName@" value="${masterPage.name}" /> - <replacefilter token="@entityName@" value="${entity.name}" /> - </replace> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/> - </target> + </replace> + <replace file="${project.home}/view/layout/menu.xhtml"> + <replacefilter token="@masterPageName@" value="${masterPage.name}" /> + <replacefilter token="@entityName@" value="${entity.name}" /> + </replace> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/> + </target> -  - <target name="generate-entities" depends="generate" /> - - <target name="generate" depends="validate-project,generate-model,generate-ui" - description="Reverse engineer entities from the database"> - </target> - - <target name="init-generate"> - <path id="htools.classpath"> - <fileset dir="lib"> - <include name="*.jar"/> - </fileset> - <pathelement path="../lib/dom4j.jar" /> - <pathelement path="../lib/persistence-api.jar" /> - <pathelement path="../lib/hibernate.jar" /> - <pathelement path="../lib/hibernate-commons-annotations.jar" /> - <pathelement path="../lib/hibernate-annotations.jar" /> - <pathelement path="../lib/hibernate-entitymanager.jar" /> - <pathelement path="../lib/commons-collections.jar" /> - <pathelement path="../lib/commons-logging.jar" /> - <pathelement path="../lib/javassist.jar" /> - <pathelement path="../lib/cglib.jar" /> - <pathelement path="../lib/asm.jar" /> - <pathelement path="../lib/core.jar" /> - <pathelement path="../lib/jboss-common-core.jar" /> - <pathelement path="${driver.jar}"/> - <pathelement path="../lib/jboss-seam-gen.jar"/> - </path> +  + <target name="generate-entities" depends="generate" /> + <target name="generate" depends="validate-project,generate-model,generate-ui" + description="Reverse engineer entities from the database"> + </target> + + <target name="init-generate"> + <path id="htools.classpath"> + <fileset dir="lib"> + <include name="*.jar"/> + </fileset> + <pathelement path="../lib/dom4j.jar" /> + <pathelement path="../lib/persistence-api.jar" /> + <pathelement path="../lib/hibernate.jar" /> + <pathelement path="../lib/hibernate-commons-annotations.jar" /> + <pathelement path="../lib/hibernate-annotations.jar" /> + <pathelement path="../lib/hibernate-entitymanager.jar" /> + <pathelement path="../lib/commons-collections.jar" /> + <pathelement path="../lib/commons-logging.jar" /> + <pathelement path="../lib/javassist.jar" /> + <pathelement path="../lib/cglib.jar" /> + <pathelement path="../lib/asm.jar" /> + <pathelement path="../lib/core.jar" /> + <pathelement path="../lib/jboss-common-core.jar" /> + <pathelement path="${driver.jar}"/> + <pathelement path="../lib/jboss-seam-gen.jar"/> + </path> + <taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/> + </target> + + <target name="generate-model" depends="validate-project,init-generate"> + <echo message="Reverse engineering database using JDBC driver ${driver.jar}"/> + <echo>project=${project.home}</echo> + <echo>model=${model.package}</echo> + <hibernate templatepath="${base.dir}"> + <jdbcconfiguration propertyfile="build.properties" + packagename="${model.package}" + revengfile="${project.home}/resources/seam-gen.reveng.xml" + detectmanytomany="false"/> + + <property key="hibernatetool.util.toolclass" + value="org.jboss.seam.tool.Util"/> + + <hbm2java jdk5="true" ejb3="true" destdir="${project.home}/src/model"/> + </hibernate> - <taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/> - </target> - - <target name="generate-model" depends="validate-project,init-generate"> - <echo message="Reverse engineering database using JDBC driver ${driver.jar}"/> - <echo>project=${project.home}</echo> - <echo>model=${model.package}</echo> - - <hibernate templatepath="${base.dir}"> - <jdbcconfiguration propertyfile="build.properties" - packagename="${model.package}" - revengfile="${project.home}/resources/seam-gen.reveng.xml" - detectmanytomany="false"/> - - <property key="hibernatetool.util.toolclass" - value="org.jboss.seam.tool.Util"/> - - <hbm2java jdk5="true" ejb3="true" destdir="${project.home}/src/model"/> - </hibernate> + <taskdef name="javaformatter" + classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="htools.classpath"/> - <taskdef name="javaformatter" - classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="htools.classpath"/> + <javaformatter> + <fileset dir="${project.home}/src/model"> + <include name="**/*.java"/> + </fileset> + </javaformatter> - <javaformatter> - <fileset dir="${project.home}/src/model"> - <include name="**/*.java"/> - </fileset> - </javaformatter> + </target> + + <target name="generate-ui" depends="validate-project,init-generate" description="Build the ui based on existing entities"> + <echo message="Building project '${project.name}' to generate views and controllers" /> - </target> - - <target name="generate-ui" depends="validate-project,init-generate" description="Build the ui based on existing entities"> - <echo message="Building project '${project.name}' to generate views and controllers" /> + <condition property="project.jar.target" value="jar"> + <equals arg1="${project.type}" arg2="ear" /> + </condition> + <condition property="project.jar.target" value="war"> + <equals arg1="${project.type}" arg2="war" /> + </condition> - <condition property="project.jar.target" value="jar"> - <equals arg1="${project.type}" arg2="ear" /> - </condition> - - <condition property="project.jar.target" value="war"> - <equals arg1="${project.type}" arg2="war" /> - </condition> + <ant antfile="${project.home}/build.xml" target="${project.jar.target}" inheritall="false"/> + <hibernate templatepath="${base.dir}"> + + <jpaconfiguration persistenceunit="${project.name}" /> + <classpath> + <dirset dir="${project.home}/exploded-archives"> + <include name="*.war/WEB-INF/classes" if="project.war" /> + <include name="*.war/WEB-INF/dev" if="project.war" /> + <include name="*.jar" if="project.ear" /> + </dirset> + </classpath> + <property key="hibernatetool.util.toolclass" value="org.jboss.seam.tool.Util"/> + <hbmtemplate filepattern="{class-name}List.xhtml" + template="view/list.xhtml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="{class-name}.xhtml" + template="view/view.xhtml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="{class-name}.page.xml" + template="view/view.page.xml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="{class-name}Edit.xhtml" + template="view/edit.xhtml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="{class-name}Edit.page.xml" + template="view/edit.page.xml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="${action.dir}/{class-name}List.java" + template="src/EntityList.java.ftl" + destdir="${project.home}/src" + foreach="entity"> + <property key="actionPackage" value="${action.package}" /> + </hbmtemplate> + <hbmtemplate filepattern="{class-name}List.page.xml" + template="view/list.page.xml.ftl" + destdir="${project.home}/view" + foreach="entity"/> + <hbmtemplate filepattern="${action.dir}/{class-name}Home.java" + template="src/EntityHome.java.ftl" + destdir="${project.home}/src" + foreach="entity"> + <property key="actionPackage" value="${action.package}" /> + </hbmtemplate> + <hbmtemplate filepattern="menu.xhtml" + template="view/layout/menu.xhtml.ftl" + destdir="${project.home}/view/layout" + foreach="entity"/> + </hibernate> - <ant antfile="${project.home}/build.xml" target="${project.jar.target}" inheritall="false"/> + <taskdef name="javaformatter" + classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="htools.classpath"/> - <hibernate templatepath="${base.dir}"> - <jpaconfiguration persistenceunit="${project.name}" /> - - <classpath> - <dirset dir="${project.home}/exploded-archives"> - <include name="*.war/WEB-INF/classes" if="project.war" /> - <include name="*.war/WEB-INF/dev" if="project.war" /> - <include name="*.jar" if="project.ear" /> - </dirset> - </classpath> - - <property key="hibernatetool.util.toolclass" value="org.jboss.seam.tool.Util"/> - <hbmtemplate filepattern="{class-name}List.xhtml" - template="view/list.xhtml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="{class-name}.xhtml" - template="view/view.xhtml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="{class-name}.page.xml" - template="view/view.page.xml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="{class-name}Edit.xhtml" - template="view/edit.xhtml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="{class-name}Edit.page.xml" - template="view/edit.page.xml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="${action.dir}/{class-name}List.java" - template="src/EntityList.java.ftl" - destdir="${project.home}/src" - foreach="entity"> - <property key="actionPackage" value="${action.package}" /> - </hbmtemplate> - <hbmtemplate filepattern="{class-name}List.page.xml" - template="view/list.page.xml.ftl" - destdir="${project.home}/view" - foreach="entity"/> - <hbmtemplate filepattern="${action.dir}/{class-name}Home.java" - template="src/EntityHome.java.ftl" - destdir="${project.home}/src" - foreach="entity"> - <property key="actionPackage" value="${action.package}" /> - </hbmtemplate> - <hbmtemplate filepattern="menu.xhtml" - template="view/layout/menu.xhtml.ftl" - destdir="${project.home}/view/layout" - foreach="entity"/> - </hibernate> + <javaformatter> + <fileset dir="${project.home}/src/action"> + <include name="**/*.java"/> + </fileset> + </javaformatter> - <taskdef name="javaformatter" - classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="htools.classpath"/> + <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}"/> - <javaformatter> - <fileset dir="${project.home}/src/action"> - <include name="**/*.java"/> - </fileset> - </javaformatter> + </target> + + <target name="archive" depends="validate-project" + description="Create the EAR or WAR archive"> + <echo message="Building ${project.type} archive for '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="archive" inheritall="false"/> + </target> - <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}"/> + <target name="deploy" depends="validate-project" + description="Deploy the EAR or WAR"> + <echo message="Deploying project '${project.name}' to JBoss" /> + <ant antfile="${project.home}/build.xml" target="deploy" inheritall="false"/> + </target> - </target> - - <target name="archive" depends="validate-project" - description="Create the EAR or WAR archive"> - <echo message="Building ${project.type} archive for '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="archive" inheritall="false"/> - </target> + <target name="undeploy" depends="validate-project" + description="Undeploy the EAR or WAR archive"> + <echo message="Undeploying project '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="undeploy" inheritall="false"/> + </target> - <target name="deploy" depends="validate-project" - description="Deploy the EAR or WAR"> - <echo message="Deploying project '${project.name}' to JBoss" /> - <ant antfile="${project.home}/build.xml" target="deploy" inheritall="false"/> - </target> + <target name="explode" depends="validate-project" + description="Deploy the project as an exploded directory"> + <echo message="Deploying project '${project.name}' to JBoss as an exploded directory" /> + <ant antfile="${project.home}/build.xml" target="explode" inheritall="false"/> + </target> - <target name="undeploy" depends="validate-project" - description="Undeploy the EAR or WAR archive"> - <echo message="Undeploying project '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="undeploy" inheritall="false"/> - </target> + <target name="restart" depends="validate-project" + description="Restart the exploded directory"> + <echo message="Restarting project '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="restart" inheritall="false"/> + </target> - <target name="explode" depends="validate-project" - description="Deploy the project as an exploded directory"> - <echo message="Deploying project '${project.name}' to JBoss as an exploded directory" /> - <ant antfile="${project.home}/build.xml" target="explode" inheritall="false"/> - </target> + <target name="unexplode" depends="validate-project" + description="Undeploy the exploded directory"> + <echo message="Undeploying exploded directory for project '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="unexplode" inheritall="false"/> + </target> + + <target name="test" depends="validate-project" + description="Run the automated tests"> + <echo message="Running tests for project '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="test" inheritall="false"/> + </target> - <target name="restart" depends="validate-project" - description="Restart the exploded directory"> - <echo message="Restarting project '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="restart" inheritall="false"/> - </target> + <target name="clean" depends="validate-project" + description="Clean the project directory"> + <echo message="Cleaning project '${project.name}'" /> + <ant antfile="${project.home}/build.xml" target="clean" inheritall="false"/> + </target> - <target name="unexplode" depends="validate-project" - description="Undeploy the exploded directory"> - <echo message="Undeploying exploded directory for project '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="unexplode" inheritall="false"/> - </target> - - <target name="test" depends="validate-project" - description="Run the automated tests"> - <echo message="Running tests for project '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="test" inheritall="false"/> - </target> - - <target name="clean" depends="validate-project" - description="Clean the project directory"> - <echo message="Cleaning project '${project.name}'" /> - <ant antfile="${project.home}/build.xml" target="clean" inheritall="false"/> - </target> - - <target name="reset" - description="Delete the settings"> - <delete file="build.properties"/> - </target> + <target name="reset" + description="Delete the settings"> + <delete file="build.properties"/> + </target> - <target name="settings" depends="init-properties" - description="Print the settings"> - <echo message="Java project workspace: ${workspace.home}"/> - <echo message="JBoss home: ${jboss.home}"/> - <echo message="IceFaces: ${icefaces}"/> - <echo message="Project name: ${project.name}"/> - <echo message="Project type: ${project.type}"/> - <echo message="Hibernate dialect: ${hibernate.dialect}"/> - <echo message="JDBC URL: ${hibernate.connection.url}"/> - <echo message="JDBC driver class: ${hibernate.connection.driver_class}"/> - <echo message="Database username: ${hibernate.connection.username}"/> - <echo message="Database password: ${hibernate.connection.password}"/> - </target> - - <target name="help" depends="init"> - <print file="README"/> - </target> + <target name="settings" depends="init-properties" + description="Print the settings"> + <echo message="Java project workspace: ${workspace.home}"/> + <echo message="JBoss home: ${jboss.home}"/> + <echo message="IceFaces: ${icefaces}"/> + <echo message="Project name: ${project.name}"/> + <echo message="Project type: ${project.type}"/> + <echo message="Hibernate dialect: ${hibernate.dialect}"/> + <echo message="JDBC URL: ${hibernate.connection.url}"/> + <echo message="JDBC driver class: ${hibernate.connection.driver_class}"/> + <echo message="Database username: ${hibernate.connection.username}"/> + <echo message="Database password: ${hibernate.connection.password}"/> + </target> + + <target name="help" depends="init"> + <print file="README"/> + </target> </project> Modified: trunk/seam-gen/resources/WEB-INF/components.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/components.xml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/resources/WEB-INF/components.xml 2008-01-22 17:25:59 UTC (rev 7190) @@ -5,7 +5,6 @@ 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:identity-management="http://jboss.com/products/seam/security/management" xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= @@ -14,7 +13,6 @@ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/security/management http://jboss.com/products/seam/identity-management-2.0.xsd http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> @@ -26,9 +24,7 @@ <persistence:managed-persistence-context name="entityManager" auto-create="true" - persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> - - <identity-management:jpa-identity-store name="identityStore" account-class="@modelPackage@.UserAccount"/> + persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> <drools:rule-base name="securityRules"> <drools:rule-files> Modified: trunk/seam-gen/resources/WEB-INF/pages.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/pages.xml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/resources/WEB-INF/pages.xml 2008-01-22 17:25:59 UTC (rev 7190) @@ -12,27 +12,7 @@ <redirect view-id="/home.xhtml"/> </rule> </navigation> - </page> - - <page view-id="/usermanager.xhtml" action="#{userSearch.loadUsers}"> - <restrict>#{s:hasRole('admin')}</restrict> - - <navigation from-action="#{userAction.createUser}"> - <redirect view-id="/userdetail.xhtml"/> - </navigation> - - <navigation from-action="#{userAction.editUser(userSearch.selectedUser)}"> - <redirect view-id="/userdetail.xhtml"/> - </navigation> - </page> - - <page view-id="/userdetail.xhtml"> - <navigation from-action="#{userAction.save}"> - <rule if-outcome="success"> - <redirect view-id="/usermanager.xhtml"/> - </rule> - </navigation> - </page> + </page> <exception class="org.jboss.seam.framework.EntityNotFoundException"> <redirect view-id="/error.xhtml"> Modified: trunk/seam-gen/resources/import.sql =================================================================== --- trunk/seam-gen/resources/import.sql 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/resources/import.sql 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,4 +0,0 @@ -insert into UserAccount (accountid, username, enabled, accounttype) values (1, 'admin', 1, 1); -insert into UserAccount (accountid, username, passwordhash, enabled, accounttype) values (2, 'demo', '04ac53975612d07ad97107ef524589e5', 1, 0); - -insert into AccountMembership (accountid, memberof) values (2, 1); \ No newline at end of file Modified: trunk/seam-gen/resources/security.drl =================================================================== --- trunk/seam-gen/resources/security.drl 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/resources/security.drl 2008-01-22 17:25:59 UTC (rev 7190) @@ -3,44 +3,4 @@ import java.security.Principal; import org.jboss.seam.security.PermissionCheck; -import org.jboss.seam.security.Role; - -rule CreateAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "create", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule ReadAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "read", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule UpdateAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "update", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule DeleteAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "delete", granted == false) - Role(name == "admin") -then - check.grant(); -end \ No newline at end of file +import org.jboss.seam.security.Role; \ No newline at end of file Added: trunk/seam-gen/src/Authenticator.java =================================================================== --- trunk/seam-gen/src/Authenticator.java (rev 0) +++ trunk/seam-gen/src/Authenticator.java 2008-01-22 17:25:59 UTC (rev 7190) @@ -0,0 +1,26 @@ +package @actionPackage@; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.log.Log; +import org.jboss.seam.security.Identity; + + +@Name("authenticator") +public class Authenticator +{ + @Logger Log log; + + @In Identity identity; + + public boolean authenticate() + { + log.info("authenticating #0", identity.getUsername()); + //write your authentication logic here, + //return true if the authentication was + //successful, false otherwise + identity.addRole("admin"); + return true; + } +} Property changes on: trunk/seam-gen/src/Authenticator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/seam-gen/src/UserAccount.java =================================================================== --- trunk/seam-gen/src/UserAccount.java 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/src/UserAccount.java 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,108 +0,0 @@ -package @modelPackage@; - -import java.io.Serializable; -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.validator.NotNull; - -@Entity -@Table(uniqueConstraints = @UniqueConstraint(columnNames = "username")) -public class UserAccount extends org.jboss.seam.security.management.UserAccount implements Serializable -{ - private static final long serialVersionUID = 6368734442192368866L; - - private Integer accountId; - private String username; - private String passwordHash; - private boolean enabled; - private AccountType accountType; - private Set<org.jboss.seam.security.management.UserAccount> memberships; - - @Id @GeneratedValue - public Integer getAccountId() - { - return accountId; - } - - public void setAccountId(Integer accountId) - { - this.accountId = accountId; - } - - @NotNull - @Override - public String getUsername() - { - return username; - } - - @Override - public void setUsername(String username) - { - this.username = username; - } - - @Override - public String getPasswordHash() - { - return passwordHash; - } - - @Override - public void setPasswordHash(String passwordHash) - { - this.passwordHash = passwordHash; - } - - @Override - public AccountType getAccountType() - { - return accountType; - } - - @Override - public void setAccountType(AccountType accountType) - { - this.accountType = accountType; - } - - @Override - public boolean isEnabled() - { - return enabled; - } - - - @Override - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } - - @ManyToMany(targetEntity = UserAccount.class) - @JoinTable(name = "AccountMembership", - joinColumns = @JoinColumn(name = "AccountId"), - inverseJoinColumns = @JoinColumn(name = "MemberOf") - ) - @Override - public Set<org.jboss.seam.security.management.UserAccount> getMemberships() - { - return memberships; - } - - @Override - public void setMemberships(Set<org.jboss.seam.security.management.UserAccount> memberships) - { - this.memberships = memberships; - } -} Deleted: trunk/seam-gen/src/UserAction.java =================================================================== --- trunk/seam-gen/src/UserAction.java 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/src/UserAction.java 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,172 +0,0 @@ -package @actionPackage@; - -import static org.jboss.seam.ScopeType.CONVERSATION; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.security.management.IdentityManager; - -@Name("userAction") -@Scope(CONVERSATION) -public class UserAction -{ - private String username; - private String password; - private String confirm; - private List<String> roles; - private boolean enabled; - - @In IdentityManager identityManager; - - @Begin - public void createUser() - { - roles = new ArrayList<String>(); - } - - @Begin - public void editUser(String username) - { - this.username = username; - roles = identityManager.getGrantedRoles(username); - enabled = identityManager.isEnabled(username); - } - - public String save() - { - if (identityManager.accountExists(username)) - { - return saveExistingUser(); - } - else - { - return saveNewUser(); - } - } - - private String saveNewUser() - { - if (!password.equals(confirm)) - { - FacesMessages.instance().addToControl("password", "Passwords do not match"); - return "failure"; - } - - boolean success = identityManager.createAccount(username, password); - - if (success) - { - for (String role : roles) - { - identityManager.grantRole(username, role); - } - - if (!enabled) - { - identityManager.disableAccount(username); - } - - Conversation.instance().end(); - } - - return "success"; - } - - private String saveExistingUser() - { - // Check if a new password has been entered - if (password != null && !"".equals(password)) - { - if (!password.equals(confirm)) - { - FacesMessages.instance().addToControl("password", "Passwords do not match"); - return "failure"; - } - else - { - identityManager.changePassword(username, password); - } - } - - List<String> grantedRoles = identityManager.getGrantedRoles(username); - - for (String role : grantedRoles) - { - if (!roles.contains(role)) identityManager.revokeRole(username, role); - } - - for (String role : roles) - { - if (!grantedRoles.contains(role)) identityManager.grantRole(username, role); - } - - if (enabled) - { - identityManager.enableAccount(username); - } - else - { - identityManager.disableAccount(username); - } - - Conversation.instance().end(); - return "success"; - } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getConfirm() - { - return confirm; - } - - public void setConfirm(String confirm) - { - this.confirm = confirm; - } - - public List<String> getRoles() - { - return roles; - } - - public void setRoles(List<String> roles) - { - this.roles = roles; - } - - public boolean isEnabled() - { - return enabled; - } - - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } -} Deleted: trunk/seam-gen/src/UserSearch.java =================================================================== --- trunk/seam-gen/src/UserSearch.java 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/src/UserSearch.java 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,51 +0,0 @@ -package @actionPackage@; - -import static org.jboss.seam.ScopeType.SESSION; - -import java.io.Serializable; -import java.util.List; - -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.datamodel.DataModel; -import org.jboss.seam.annotations.datamodel.DataModelSelection; -import org.jboss.seam.security.management.IdentityManager; - -@Name("userSearch") -@Scope(SESSION) -public class UserSearch implements Serializable -{ - private static final long serialVersionUID = 8592034786339372510L; - - @DataModel - List<String> users; - - @DataModelSelection - String selectedUser; - - @In IdentityManager identityManager; - - public void loadUsers() - { - users = identityManager.listUsers(); - } - - public String getUserRoles(String username) - { - List<String> roles = identityManager.getGrantedRoles(username); - StringBuilder sb = new StringBuilder(); - - for (String role : roles) - { - sb.append((sb.length() > 0 ? ", " : "") + role); - } - - return sb.toString(); - } - - public String getSelectedUser() - { - return selectedUser; - } -} \ No newline at end of file Deleted: trunk/seam-gen/view/img/btn_newuser.png =================================================================== (Binary files differ) Deleted: trunk/seam-gen/view/img/checkmark.png =================================================================== (Binary files differ) Deleted: trunk/seam-gen/view/img/cross.png =================================================================== (Binary files differ) Modified: trunk/seam-gen/view/layout/menu.xhtml =================================================================== --- trunk/seam-gen/view/layout/menu.xhtml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/view/layout/menu.xhtml 2008-01-22 17:25:59 UTC (rev 7190) @@ -8,7 +8,6 @@ <rich:toolBarGroup> <h:outputText value="#{projectName}:"/> <s:link view="/home.xhtml" value="Home"/> -  </rich:toolBarGroup>  <rich:toolBarGroup location="right"> Modified: trunk/seam-gen/view/stylesheet/theme.css =================================================================== --- trunk/seam-gen/view/stylesheet/theme.css 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/view/stylesheet/theme.css 2008-01-22 17:25:59 UTC (rev 7190) @@ -115,83 +115,3 @@ .rich-stglpanel-body { overflow: auto; } - -/* User Manager */ - -div.formRow { - padding-top: 2px; - padding-bottom: 2px; - clear: both; -} - -div.formRow label { - float: left; - width: 120px; - padding: 2px 2px 2px 2px; -} - -div.formRow input[type='text'] { - width: 120px; -} - -div.formRow input[type='password'] { - width: 120px; -} - -div.validationError { - margin-left: 120px; - font-weight: bold; - color: #ff0000; -} - -table.userlist { - width: 600px; -} - -input.newuser { - background: url(../img/btn_newuser.png) top left no-repeat; - height: 24px; - width: 80px; - margin: 4px 4px 4px 4px; - border: 0px; - cursor: pointer; -} - -.roles { - width: 120px; - border: 1px solid #7F9DB9; - background-color: #E7EDF7; -} - -div.selectMany label { - float: none; -} - -div.formButtons { - float: right; - padding: 4px 8px 16px 2px; -} - -div.checkmark { - background: url(../img/checkmark.png) top left no-repeat; - width: 14px; - height: 15px; - margin-left: auto; - margin-right: auto; -} - -div.cross { - background: url(../img/cross.png) top left no-repeat; - width: 14px; - height: 15px; - margin-left: auto; - margin-right: auto; -} - -td.enabled { - text-align: center; -} - -td.action { - text-align: right; -} \ No newline at end of file Deleted: trunk/seam-gen/view/userdetail.xhtml =================================================================== --- trunk/seam-gen/view/userdetail.xhtml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/view/userdetail.xhtml 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,64 +0,0 @@ -<!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" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - 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"/> - - <h2>User Details</h2> - - <h:messages globalOnly="true"/> - - <h:form> - - <div class="formRow"> - <h:outputLabel for="username" value="Username" styleClass="formLabel"/> - <h:inputText id="username" value="#{userAction.username}" readonly="#{identityManager.accountExists(userAction.username)}"/> - <div class="validationError"><h:message for="username"/></div> - </div> - - <div class="formRow"> - <h:outputLabel for="password" value="Password" styleClass="formLabel"/> - <h:inputSecret id="password" value="#{userAction.password}"/> - <div class="validationError"><h:message for="password"/></div> - </div> - - <div class="formRow"> - <h:outputLabel for="confirm" value="Confirm password" styleClass="formLabel"/> - <h:inputSecret id="confirm" value="#{userAction.confirm}"/> - </div> - - <div class="formRow"> - <h:outputLabel for="roles" value="Member of" styleClass="formLabel"/> - <div class="selectMany"> - <h:selectManyCheckbox id="roles" value="#{userAction.roles}" layout="pageDirection" styleClass="roles"> - <s:selectItems value="#{identityManager.listRoles()}" var="role" label="#{role}"/> - </h:selectManyCheckbox> - </div> - <div class="validationError"><h:message for="roles"/></div> - </div> - - <div class="formRow"> - <h:outputLabel for="enabled" value="Account enabled" styleClass="formLabel"/> - <h:selectBooleanCheckbox id="enabled" value="#{userAction.enabled}"/> - </div> - - <div class="formButtons"> - <h:commandButton value="Save" action="#{userAction.save}"/> - <s:button view="/usermanager.xhtml" value="Cancel" propagation="end"/> - </div> - - <br class="clear"/> - - </h:form> - - </ui:define> - -</ui:composition> Deleted: trunk/seam-gen/view/usermanager.xhtml =================================================================== --- trunk/seam-gen/view/usermanager.xhtml 2008-01-22 17:16:09 UTC (rev 7189) +++ trunk/seam-gen/view/usermanager.xhtml 2008-01-22 17:25:59 UTC (rev 7190) @@ -1,72 +0,0 @@ -<!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" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - 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"/> - - <script type="text/javascript"> - function confirmDelete() - { - return confirm("Are you sure you wish to delete this user? This action cannot be undone."); - } - </script> - - <div id="contentMain"> - - <h2>User Manager</h2> - - <s:button action="#{userAction.createUser}" styleClass="newuser" rendered="#{s:hasPermission('seam.account', 'create', null)}"/> - - <rich:dataTable - id="threads" - value="#{users}" - var="user" - styleClass="userlist" - columnClasses=",,enabled,action"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column width="auto"> - User name - </rich:column> - <rich:column width="auto"> - Member Of - </rich:column> - <rich:column width="auto"> - Enabled - </rich:column> - <rich:column width="auto"> - Action - </rich:column> - </rich:columnGroup> - </f:facet> - <rich:column width="auto"> - #{user} - </rich:column> - <rich:column width="auto"> - #{userSearch.getUserRoles(user)} - </rich:column> - <rich:column width="auto"> - <div class="#{identityManager.isEnabled(user) ? 'checkmark' : 'cross'}"/> - </rich:column> - <rich:column width="auto"> - <s:fragment rendered="#{s:hasPermission('seam.account', 'update', null)}"> - <s:link value="Edit" action="#{userAction.editUser(userSearch.selectedUser)}"/><span> | </span> - </s:fragment> - <s:link value="Delete" action="#{identityManager.deleteAccount(userSearch.selectedUser)}" - rendered="#{s:hasPermission('seam.account', 'delete', null)}" - onclick="return confirmDelete()"/> - </rich:column> - </rich:dataTable> - </div> - - </ui:define> - -</ui:composition>

17 years, 1 month

1
0
0 / 0

Seam SVN: r7189 - trunk/src/jbas5/org/jboss/seam/as5/vfs.

by seam-commits＠lists.jboss.org

Author: alesj Date: 2008-01-22 12:16:09 -0500 (Tue, 22 Jan 2008) New Revision: 7189 Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java Log: Fixing the root depth. Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java =================================================================== --- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-22 16:47:03 UTC (rev 7188) +++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-22 17:16:09 UTC (rev 7189) @@ -48,14 +48,79 @@ super(deploymentStrategy); } + /** + * Get the virtual file root. + * + * @param url the root URL + * @param parentDepth level of parent depth + * @return actual virtual file from url param + * @throws IOException for any error + */ + protected static VirtualFile getRoot(URL url, int parentDepth) throws IOException + { + boolean trace = log.isTraceEnabled(); + + if (trace) + log.trace("Root url: " + url); + + String urlString = url.toString(); + int p = urlString.indexOf(":"); + String file = urlString.substring(p + 1); + URL vfsurl = null; + String relative; + File fp = new File(file); + if (trace) + log.trace("File: " + fp); + + if (fp.exists()) + { + vfsurl = fp.getParentFile().toURL(); + relative = fp.getName(); + } + else + { + File curr = fp; + relative = fp.getName(); + while ((curr = curr.getParentFile()) != null) + { + if (curr.exists()) + { + vfsurl = curr.toURL(); + break; + } + else + { + relative = curr.getName() + "/" + relative; + } + } + } + + if (trace) + log.trace("URL: " + vfsurl + ", relative: " + relative); + + VirtualFile top = VFS.getRoot(vfsurl); + top = top.getChild(relative); + while(parentDepth > 0) + { + if (top == null) + throw new IllegalArgumentException("Null parent: " + vfsurl); + top = top.getParent(); + parentDepth--; + } + return top; + } + public void scanDirectories(File[] directories) { for (File dir : directories) { try { - VirtualFile root = VFS.getRoot(dir.toURI()); - handleRoot(root); + VirtualFile root = getRoot(dir.toURL(), 0); + if (root != null) + handleRoot(root); + else if (log.isTraceEnabled()) + log.trace("Null root: " + dir); } catch (IOException e) { @@ -74,8 +139,11 @@ while (urlEnum.hasMoreElements()) { URL url = urlEnum.nextElement(); - VirtualFile root = VFS.getRoot(url); - handleRoot(root); + VirtualFile root = getRoot(url, resourceName.lastIndexOf('/') > 0 ? 2 : 1); + if (root != null) + handleRoot(root); + else if (log.isTraceEnabled()) + log.trace("Null root: " + url); } } catch (IOException ioe) @@ -93,12 +161,19 @@ */ protected void handleRoot(VirtualFile file) throws IOException { - List<VirtualFile> children = file.getChildrenRecursively(); - for (VirtualFile child : children) + if (file.isLeaf()) { - if (child.isLeaf()) + getDeploymentStrategy().handle(file.getPathName()); + } + else + { + List<VirtualFile> children = file.getChildrenRecursively(); + for (VirtualFile child : children) { - getDeploymentStrategy().handle(child.getPathName()); + if (child.isLeaf()) + { + getDeploymentStrategy().handle(child.getPathName()); + } } } }

17 years, 1 month

1
0
0 / 0

Seam SVN: r7188 - in trunk: examples/wiki and 1 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 11:47:03 -0500 (Tue, 22 Jan 2008) New Revision: 7188 Modified: trunk/examples/build.xml trunk/examples/wiki/build.xml trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml Log: Fix testsuite Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-01-22 16:46:38 UTC (rev 7187) +++ trunk/examples/build.xml 2008-01-22 16:47:03 UTC (rev 7188) @@ -431,8 +431,9 @@ <include name="*.jar" /> </fileset> <fileset dir="${lib.dir}"> -  +  <exclude name="jboss-seam-ui.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> <path path="${eejb.conf.dir}" /> <path refid="test.classpath.extras" /> Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-01-22 16:46:38 UTC (rev 7187) +++ trunk/examples/wiki/build.xml 2008-01-22 16:47:03 UTC (rev 7188) @@ -71,6 +71,7 @@ <include name="*.jar" />  <exclude name="hibernate*.jar"/> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> <fileset dir="${local.lib.dir}">  Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-01-22 16:46:38 UTC (rev 7187) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-01-22 16:47:03 UTC (rev 7188) @@ -30,6 +30,7 @@ <fileset id="lib" dir="${lib.dir}"> <include name="*.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> <path id="build.classpath"> Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-01-22 16:46:38 UTC (rev 7187) +++ trunk/seam-gen/build-scripts/build.xml 2008-01-22 16:47:03 UTC (rev 7188) @@ -37,6 +37,7 @@ <fileset id="lib" dir="${lib.dir}"> <include name="*.jar" /> + <exclude name="jboss-seam-jbas5.jar" /> </fileset> <path id="build.classpath">

17 years, 1 month

1
0
0 / 0

Seam SVN: r7187 - trunk/src/main/org/jboss/seam/deployment.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-22 11:46:38 -0500 (Tue, 22 Jan 2008) New Revision: 7187 Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java Log: minor Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-22 15:17:34 UTC (rev 7186) +++ trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-22 16:46:38 UTC (rev 7187) @@ -115,7 +115,7 @@ private Scanner getScannerFromResource() { - // Load scanner.properties from the classpath, try to + // Load seam-scanner.properties from the classpath, try to // load any scanners specified there try {

17 years, 1 month

1
0
0 / 0

Seam SVN: r7186 - in trunk/examples/wiki: src/etc/META-INF and 12 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-01-22 10:17:34 -0500 (Tue, 22 Jan 2008) New Revision: 7186 Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregateCache.java Modified: trunk/examples/wiki/src/etc/META-INF/wiki.taglib.xml trunk/examples/wiki/src/etc/WEB-INF/urlrewrite.xml trunk/examples/wiki/src/etc/messages_en.properties trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/cache/ConnectorCache.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/RomeFeedConnector.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregator.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/connector/FeedConnectorTest.java trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml trunk/examples/wiki/view/themes/default/css/feedAggregator.css trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css Log: Implemented subscription for aggregated feeds Modified: trunk/examples/wiki/src/etc/META-INF/wiki.taglib.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/wiki.taglib.xml 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/etc/META-INF/wiki.taglib.xml 2008-01-22 15:17:34 UTC (rev 7186) @@ -13,6 +13,12 @@ </function> <function> + <function-name>renderAggregateFeedURL</function-name> + <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class> + <function-signature>java.lang.String renderAggregateFeedURL(java.lang.String)</function-signature> + </function> + + <function> <function-name>renderFeedURL</function-name> <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class> <function-signature>java.lang.String renderFeedURL(org.jboss.seam.wiki.core.model.Feed,java.lang.String,java.lang.String)</function-signature> Modified: trunk/examples/wiki/src/etc/WEB-INF/urlrewrite.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/urlrewrite.xml 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/etc/WEB-INF/urlrewrite.xml 2008-01-22 15:17:34 UTC (rev 7186) @@ -32,10 +32,10 @@ <to last="true">/wiki.seam?nodeId=$1</to> </rule> -  +  <rule> - <from casesensitive="true">^/service/Feed/atom(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Comments/([a-z]+))?(?:/Tag/(.+))?$</from> - <to last="true">/servlets/feeds/atom.seam?areaName=$1&nodeName=$2&comments=$3&tag=$4</to> + <from casesensitive="true">^/service/Feed/atom(?:/Area/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Node/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Comments/([a-z]+))?(?:/Tag/(.+))?(?:/Aggregate/(.+))?$</from> + <to last="true">/servlets/feeds/atom.seam?areaName=$1&nodeName=$2&comments=$3&tag=$4&aggregate=$5</to> </rule>  Modified: trunk/examples/wiki/src/etc/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_en.properties 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/etc/messages_en.properties 2008-01-22 15:17:34 UTC (rev 7186) @@ -640,6 +640,7 @@ lacewiki.msg.AccessDenied=Access Denied lacewiki.msg.FatalError=An unrecoverable error occured! lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted. +lacewiki.msg.AutomaticallyGeneratedFeed=Aggregated Feed # Preferences Editors lacewiki.preferences.editor.SelectNone=(None) Modified: trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties 2008-01-22 15:17:34 UTC (rev 7186) @@ -8,7 +8,9 @@ feedAggregator.preferences.HideFeedInfo=Hide link to feed feedAggregator.preferences.HideDescription=Hide feed entry text feedAggregator.preferences.HideTitle=Hide feed entry title +feedAggregator.preferences.AggregateId=Identifier for aggregate (enables subscription) feedAggregator.label.More=more... feedAggregator.label.By=by +feedAggregator.label.Subscribe=Subscribe feedAggregator.label.NoEntriesFound=No feed entries found. \ No newline at end of file Modified: trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-01-22 15:17:34 UTC (rev 7186) @@ -4,4 +4,4 @@ lastModifiedDocuments.preferences.DocumentTitleLength=Truncate document titles after characters lastModifiedDocuments.label.Last=Last -lastModifiedDocuments.label.ModifiedDocuments=Updates +lastModifiedDocuments.label.ModifiedDocuments=Site Updates Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/cache/ConnectorCache.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/cache/ConnectorCache.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/cache/ConnectorCache.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -38,12 +38,12 @@ List<T> result = Collections.EMPTY_LIST; if (cacheKey == null) { - log.debug("cache miss, retrieving it from connector, asynchronously: " + isCacheMissResolvedAsynchronously()); + log.debug("cache miss, retrieving it from connector, asynchronously: " + isFirstCacheMissResolvedAsynchronously()); // The following operations modify the structure of the cache map, which is ok because this // method is synchronized by Seam. The write triggered (later) by the AysncUpdater is not // synchronized, but we never modify the structure of the cache map then, only now. - if (isCacheMissResolvedAsynchronously()) { + if (getAsyncUpdater() != null && isFirstCacheMissResolvedAsynchronously()) { // Write an empty list into the cache write(key, Collections.EMPTY_LIST, currentTime); @@ -59,22 +59,26 @@ } } else { - log.debug("cache hit, checking age of cached entry"); + log.debug("cache hit"); - // Check updateTimestamp of cached entry - if (currentTime - cacheKey.getUpdateTimestamp() > (getUpdateTimeoutSeconds()*1000) ) { - log.debug("cached entry is older than maximum cache time, refreshing..."); + if (getUpdateTimeoutSeconds() != 0) { - // Start asynchronous updating, might take a while - but should never take longer than cache timeout! - getAsyncUpdater().updateCacheAsynchronously(this, cacheKey); + log.debug("checking age of cached entry against update timeout"); + // Check updateTimestamp of cached entry + if (currentTime - cacheKey.getUpdateTimestamp() > (getUpdateTimeoutSeconds()*1000) ) { + log.debug("cached entry is older than maximum cache time, refreshing..."); - // Meanwhile, update the timestamp so that the next caller doesn't also start asynchronous updating - // .. we expect to be finished with that before the next caller runs into a cache timeout again! - cacheKey.setAccessTimestamp(currentTime); - cacheKey.setUpdateTimestamp(currentTime); + // Start asynchronous updating, might take a while - but should never take longer than cache timeout! + getAsyncUpdater().updateCacheAsynchronously(this, cacheKey); - } else { - log.debug("cached entry is still inside maximum cache time"); + // Meanwhile, update the timestamp so that the next caller doesn't also start asynchronous updating + // .. we expect to be finished with that before the next caller runs into a cache timeout again! + cacheKey.setAccessTimestamp(currentTime); + cacheKey.setUpdateTimestamp(currentTime); + + } else { + log.debug("cached entry is still inside maximum cache time"); + } } // Read the value from the cache @@ -116,17 +120,17 @@ return (ConnectorCacheAsyncUpdater<T, K>) Component.getInstance(getAsyncUpdaterClass()); }; - private ConnectorCacheKey<K> findKey(ConnectorCacheKey<K> key) { + protected ConnectorCacheKey<K> findKey(ConnectorCacheKey<K> key) { for (ConnectorCacheKey keyOfMap : cache.keySet()) { if (keyOfMap.equals(key)) return keyOfMap; } return null; } - protected abstract long getUpdateTimeoutSeconds(); + protected long getUpdateTimeoutSeconds() { return 0; } protected abstract long getIdleTimeoutSeconds(); - protected abstract Class<? extends ConnectorCacheAsyncUpdater<T, K>> getAsyncUpdaterClass(); - protected boolean isCacheMissResolvedAsynchronously() { return true; } + protected Class<? extends ConnectorCacheAsyncUpdater<T, K>> getAsyncUpdaterClass() { return null; }; + protected boolean isFirstCacheMissResolvedAsynchronously() { return true; } protected List<T> udpateCacheSynchronously(ConnectorCache<T, K> cache, ConnectorCacheKey<K> key) { return Collections.EMPTY_LIST; }; Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregateCache.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregateCache.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregateCache.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.connectors.feed; + +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Synchronized; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.ScopeType; +import org.jboss.seam.wiki.connectors.cache.ConnectorCache; +import org.jboss.seam.wiki.connectors.cache.ConnectorCacheKey; +import org.jboss.seam.wiki.core.model.Feed; +import org.jboss.seam.wiki.core.model.FeedEntry; + +import java.net.URL; +import java.util.List; +import java.util.HashMap; +import java.util.Map; +import java.util.Collections; +import java.io.Serializable; + +/** + * Caches transient feeds. + * + * TODO: Maybe we should use a simple synchronized collection instead, but Seam does the job. + * + * @author Christian Bauer + */ +@Name("feedAggregateCache") +(a)Scope(ScopeType.APPLICATION) +@Synchronized +@AutoCreate +public class FeedAggregateCache extends ConnectorCache<FeedEntryDTO, FeedAggregateCache.FeedAggregateCacheKey> { + + public void put(String aggregateId, List<FeedEntryDTO> feedEntries) { + long currentTime = System.currentTimeMillis(); + FeedAggregateCacheKey newKey = new FeedAggregateCacheKey(aggregateId); + + write(new ConnectorCacheKey<FeedAggregateCacheKey>(newKey), feedEntries, currentTime); + purge(currentTime); + } + + public List<FeedEntryDTO> get(String aggregateId) { + long currentTime = System.currentTimeMillis(); + FeedAggregateCacheKey newKey = new FeedAggregateCacheKey(aggregateId); + + List<FeedEntryDTO> result = read(new ConnectorCacheKey<FeedAggregateCacheKey>(newKey), currentTime); + purge(currentTime); + return result; + } + + protected long getIdleTimeoutSeconds() { + return 36000; + } + + public static class FeedAggregateCacheKey implements Serializable { + private String aggregateId; + + public FeedAggregateCacheKey(String aggregateId) { + this.aggregateId = aggregateId; + } + + public String getAggregateId() { + return aggregateId; + } + + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + FeedAggregateCacheKey that = (FeedAggregateCacheKey) o; + + if (!aggregateId.equals(that.aggregateId)) return false; + + return true; + } + + public int hashCode() { + return aggregateId.hashCode(); + } + } + + +} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -7,11 +7,13 @@ package org.jboss.seam.wiki.connectors.feed; import org.jboss.seam.ScopeType; +import org.jboss.seam.wiki.core.model.Feed; import org.jboss.seam.annotations.*; import org.jboss.seam.log.Log; import java.util.*; import java.io.Serializable; +import java.net.URL; /** * @author Christian Bauer @@ -27,16 +29,23 @@ @In("feedConnectorCache") FeedConnector feedConnector; - public List<FeedEntryDTO> getLatestFeedEntries(int numberOfFeedEntries, String[] feedURLs) { + @In + FeedAggregateCache feedAggregateCache; + + public List<FeedEntryDTO> getLatestFeedEntries(int numberOfFeedEntries, URL[] feedURLs) { + return getLatestFeedEntries(numberOfFeedEntries, feedURLs, null); + } + + public List<FeedEntryDTO> getLatestFeedEntries(int numberOfFeedEntries, URL[] feedURLs, String aggregateId) { if (feedURLs == null) return Collections.EMPTY_LIST; List<FeedEntryDTO> feedEntries = new ArrayList<FeedEntryDTO>(); - for (String feedURL : feedURLs) { + for (URL feedURL : feedURLs) { // For each feed, get the feed entries and put them in a sorted collection, // so we get overall sorting log.debug("retrieving feed entries from connector for feed URL: " + feedURL); - List<FeedEntryDTO> result = feedConnector.getFeedEntries(feedURL); + List<FeedEntryDTO> result = feedConnector.getFeedEntries(feedURL.toString()); log.debug("retrieved feed entries: " + result.size()); feedEntries.addAll(result); log.debug("number of aggregated feed entries so far: " + feedEntries.size()); @@ -56,6 +65,12 @@ } ); + if (aggregateId != null) { + log.debug("caching aggregated feed entries under id: " + aggregateId); + // Cache the result for later requests through FeedServlet (by aggregateId) + feedAggregateCache.put(aggregateId, feedEntries); + } + return feedEntries.size() > numberOfFeedEntries ? new ArrayList<FeedEntryDTO>(feedEntries).subList(0, numberOfFeedEntries) : new ArrayList<FeedEntryDTO>(feedEntries); Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/RomeFeedConnector.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/RomeFeedConnector.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/RomeFeedConnector.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -73,7 +73,11 @@ SyndEntry syndEntry = (SyndEntry)o; FeedEntry fe = convertSyndEntry(syndEntry); - // Linking it in our model makes it persistable + // Append some information on the title + fe.setTitlePrefix("(" + feed.getTitle() + ") "); + //fe.setTitleSuffix(" (" + fe.getAuthor() + ")"); + + // Linking it in our model makes it persistable/cachable feed.getFeedEntries().add(fe); // Now project them so the client has a unified view without iterating collections of Feeds @@ -121,7 +125,8 @@ if (syndEntry.getDescription() != null) { SyndContent description = syndEntry.getDescription(); - feedEntry.setDescriptionType(description.getType()); + // TODO: Hardcode 'html', otherwise the ROME stuff craps out and kills Firefox feed renderer... + feedEntry.setDescriptionType("html"); feedEntry.setDescriptionValue(description.getValue()); } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -42,6 +42,12 @@ @Length(min = 3, max = 1024) private String title; + @Transient + private String titlePrefix = ""; + + @Transient + private String titleSuffix = ""; + @Column(name = "AUTHOR", nullable = false) @Length(min = 3, max = 255) private String author; @@ -81,6 +87,22 @@ return title; } + public String getTitlePrefix() { + return titlePrefix; + } + + public void setTitlePrefix(String titlePrefix) { + this.titlePrefix = titlePrefix; + } + + public String getTitleSuffix() { + return titleSuffix; + } + + public void setTitleSuffix(String titleSuffix) { + this.titleSuffix = titleSuffix; + } + public String getTitleStripped() { return stripHTMLTags(title); } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -39,6 +39,13 @@ } public String getURL() { - return directory.getWikiURL().length() > 0 ? "/"+directory.getWikiURL() : ""; + if (directory.getWikiURL().length() >0) { + if (directory.getArea().getWikiname().equals(directory.getWikiname())) { + return "/Area/"+directory.getArea().getWikiname(); + } else { + return "/Area/"+directory.getArea().getWikiname() + "/Node/" + directory.getWikiname(); + } + } + return ""; // Root, no area or node } } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -18,6 +18,8 @@ import org.jboss.seam.wiki.core.dao.WikiNodeFactory; import org.jboss.seam.wiki.util.WikiUtil; import org.jboss.seam.wiki.preferences.Preferences; +import org.jboss.seam.wiki.connectors.feed.FeedAggregateCache; +import org.jboss.seam.wiki.connectors.feed.FeedEntryDTO; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; @@ -79,17 +81,8 @@ String feedIdParam = request.getParameter("feedId"); String areaNameParam = request.getParameter("areaName"); String nodeNameParam = request.getParameter("nodeName"); + String aggregateParam = request.getParameter("aggregate"); log.debug(">>> feed request id: '" + feedIdParam + "' area name: '" + areaNameParam + "' node name: '" + nodeNameParam + "'"); - log.debug("full request URL: " + request.getRequestURL().toString()); - if (log.isDebugEnabled()) { - Map<String,String[]> params = (Map<String,String[]>)request.getParameterMap(); - for (Map.Entry<String, String[]> entry : params.entrySet()) { - log.debug("request param: " + entry.getKey()); - for (String s : entry.getValue()) { - log.debug("value: '" +s + "'"); - } - } - } // Feed type String pathInfo = request.getPathInfo(); @@ -120,6 +113,7 @@ } // TODO: Seam should use its transaction interceptor for java beans: http://jira.jboss.com/jira/browse/JBSEAM-957 + // and that would allow us to break up this gigantic if/then/else clause easily... UserTransaction userTx = null; boolean startedTx = false; try { @@ -132,8 +126,26 @@ Feed feed = null; // Find the feed, depending on variations of request parameters - if (feedIdParam != null && feedIdParam.length() >0) { + if (aggregateParam != null && aggregateParam.length() > 0) { + + log.debug("trying to retrieve aggregated feed from cache: " + aggregateParam); + + FeedAggregateCache aggregateCache = (FeedAggregateCache)Component.getInstance(FeedAggregateCache.class); + List<FeedEntryDTO> result = aggregateCache.get(aggregateParam); + if (result != null) { + feed = new Feed(); + feed.setAuthor(Messages.instance().get("lacewiki.msg.AutomaticallyGeneratedFeed")); + feed.setTitle(Messages.instance().get("lacewiki.msg.AutomaticallyGeneratedFeed") + ": " + aggregateParam); + feed.setPublishedDate(new Date()); + feed.setLink( ((WikiPreferences) Preferences.getInstance("Wiki")).getBaseUrl() ); + for (FeedEntryDTO feedEntryDTO : result) { + feed.getFeedEntries().add(feedEntryDTO.getFeedEntry()); + } + } + + } else if (feedIdParam != null && feedIdParam.length() >0) { try { + log.debug("trying to retrieve feed for id: " + feedIdParam); Long feedId = Long.valueOf(feedIdParam); FeedDAO feedDAO = (FeedDAO)Component.getInstance(FeedDAO.class); @@ -142,6 +154,8 @@ log.debug("feed identifier couldn't be converted to java.lang.Long"); response.sendError(HttpServletResponse.SC_NOT_FOUND, "Feed " + feedIdParam); } + + } else if (areaNameParam != null && areaNameParam.matches("^[A-Z0-9]+.*")) { log.debug("trying to retrieve area: " + areaNameParam); WikiNodeDAO nodeDAO = (WikiNodeDAO)Component.getInstance(WikiNodeDAO.class); @@ -189,8 +203,18 @@ } } + // TODO: Refactor this mess a little log.debug("finally rendering feed"); - SyndFeed syndFeed = createSyndFeed(request.getRequestURL().toString(), syndFeedType, feed, currentAccessLevel, tag, comments); + SyndFeed syndFeed = + createSyndFeed( + request.getRequestURL().toString(), + syndFeedType, + feed, + currentAccessLevel, + tag, + comments, + aggregateParam + ); // Write feed to output response.setContentType(syndFeedType.contentType); @@ -214,16 +238,26 @@ } public SyndFeed createSyndFeed(String baseURI, SyndFeedType syndFeedType, Feed feed, Integer currentAccessLevel) { - return createSyndFeed(baseURI, syndFeedType, feed, currentAccessLevel, null, Comments.include); + return createSyndFeed(baseURI, syndFeedType, feed, currentAccessLevel, null, Comments.include, null); } - public SyndFeed createSyndFeed(String baseURI, SyndFeedType syndFeedType, Feed feed, Integer currentAccessLevel, String tag, Comments comments) { + public SyndFeed createSyndFeed(String baseURI, + SyndFeedType syndFeedType, + Feed feed, + Integer currentAccessLevel, + String tag, + Comments comments, + String aggregateParam) { WikiPreferences prefs = (WikiPreferences) Preferences.getInstance("Wiki"); // Create feed SyndFeed syndFeed = new SyndFeedImpl(); - syndFeed.setUri(baseURI + "?feedId=" + feed.getId()); + String feedUri = + feed.getId() != null + ? "?feedId="+feed.getId() + : "?aggregate="+WikiUtil.encodeURL(aggregateParam); + syndFeed.setUri(baseURI + feedUri); syndFeed.setFeedType(syndFeedType.feedType); syndFeed.setTitle(prefs.getFeedTitlePrefix() + feed.getTitle()); if (tag != null) { @@ -251,7 +285,7 @@ SyndEntry syndEntry; syndEntry = new SyndEntryImpl(); - syndEntry.setTitle(entry.getTitle()); + syndEntry.setTitle(entry.getTitlePrefix() + entry.getTitle() + entry.getTitleSuffix()); syndEntry.setLink(entry.getLink()); syndEntry.setUri(entry.getLink()); syndEntry.setAuthor(entry.getAuthor()); Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregator.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregator.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregator.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -6,17 +6,17 @@ */ package org.jboss.seam.wiki.plugin.feedAggregator; +import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.*; -import org.jboss.seam.ScopeType; import org.jboss.seam.log.Log; import org.jboss.seam.wiki.connectors.feed.FeedAggregatorDAO; import org.jboss.seam.wiki.connectors.feed.FeedEntryDTO; +import java.io.Serializable; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; -import java.net.URL; -import java.net.MalformedURLException; -import java.io.Serializable; /** * @author Christian Bauer @@ -46,31 +46,47 @@ if (prefs.getUrls() == null || prefs.getUrls().length() < 8) return; + List<URL> validURLs = getValidURLs(prefs.getUrls()); + log.debug("aggregating feeds: " + validURLs.size()); + + String aggregateId = + prefs.getAggregateId() != null && prefs.getAggregateId().length() > 0 + ? prefs.getAggregateId() + : null; + + if (aggregateId != null) { + log.debug("aggregating under subscribable identifier: "+ aggregateId); + } + + feedEntries = + feedAggregatorDAO.getLatestFeedEntries( + prefs.getNumberOfFeedEntries().intValue(), + validURLs.toArray(new URL[validURLs.size()]), + aggregateId + ); + } + + private List<URL> getValidURLs(String spaceSeparatedURLs) { + // Split the URLs by space - String[] urls = prefs.getUrls().split(" "); + String[] urls = spaceSeparatedURLs.split(" "); // First check if the URLs are valid, if not we might as well just skip it... - List<String> validUrls = new ArrayList<String>(); + List<URL> validUrls = new ArrayList<URL>(); for (String url : urls) { try { - URL testUrl = new URL(url); - if (!testUrl.getProtocol().equals("http")) { + URL u = new URL(url); + if (!u.getProtocol().equals("http")) { log.debug("skipping URL with unsupported protocol: " + url); continue; } + validUrls.add(u); } catch (MalformedURLException e) { log.debug("skipping invalid URL: " + url); continue; } - validUrls.add(url); } - - log.debug("aggregating feeds: " + validUrls.size()); - feedEntries = - feedAggregatorDAO.getLatestFeedEntries( - prefs.getNumberOfFeedEntries().intValue(), - validUrls.toArray(new String[validUrls.size()]) - ); + return validUrls; } } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -55,6 +55,14 @@ private Long truncateDescription; @PreferenceProperty( + description = "#{messages['feedAggregator.preferences.AggregateId']}", + visibility = {PreferenceVisibility.INSTANCE}, + editorIncludeName = "NumberRange" + ) + @Length(min = 0, max = 255) + private String aggregateId; + + @PreferenceProperty( description = "#{messages['feedAggregator.preferences.HideDate']}", visibility = {PreferenceVisibility.INSTANCE} ) @@ -100,6 +108,10 @@ return truncateDescription; } + public String getAggregateId() { + return aggregateId; + } + public Boolean getHideDate() { return hideDate; } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -23,6 +23,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.net.URLEncoder; +import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Collections; @@ -96,6 +97,15 @@ accessLevels.indexOf(new Role.AccessLevel(accessLevel, null)) ); } + + public static String renderAggregateFeedURL(String aggregateId) { + if (aggregateId == null) return ""; + StringBuilder url = new StringBuilder(); + url.append(Component.getInstance("basePath")) + .append("/service/Feed/atom/Aggregate/") + .append(aggregateId); + return url.toString(); + } public static String renderFeedURL(Feed feed, String tag, String comments) { if (feed == null || feed.getId() == null) return ""; @@ -158,6 +168,14 @@ } } + public static String decodeURL(String string) { + try { + return URLDecoder.decode(string, "UTF-8"); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + public static String escapeEmailURL(String string) { WikiPreferences wikiPrefs = (WikiPreferences) Preferences.getInstance("Wiki"); return string.length() >= 7 && string.substring(0, 7).equals("mailto:") Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-22 15:17:34 UTC (rev 7186) @@ -262,7 +262,7 @@ <WIKI_FILE NODE_ID="8" FILE_REVISION="0"/> <WIKI_DOCUMENT - NODE_ID="8" CONTENT="Testdocument Three

<div class="homepageNews">
[<=feedAggregator[truncateDescription=250][numberOfFeedEntries=10][urls=http://rss.slashdot.org/Slashdot/slashdot http://feeds.engadget.com/weblogsinc/engadget]]
</div>
" + NODE_ID="8" CONTENT="Testdocument Three

<div class="homepageNews">
[<=feedAggregator[truncateDescription=250][numberOfFeedEntries=10][aggregateId=My Aggregated Feed][urls=http://rss.slashdot.org/Slashdot/slashdot http://feeds.engadget.com/weblogsinc/engadget]]
</div>
" HEADER="[NULL]" FOOTER="[NULL]" HEADER_MACROS="[NULL]" CONTENT_MACROS="feedAggregator" FOOTER_MACROS="[NULL]" NAME_AS_TITLE="true" ENABLE_COMMENTS="true" ENABLE_COMMENT_FORM="true" ENABLE_COMMENTS_ON_FEEDS="true"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/connector/FeedConnectorTest.java =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/connector/FeedConnectorTest.java 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/connector/FeedConnectorTest.java 2008-01-22 15:17:34 UTC (rev 7186) @@ -23,6 +23,7 @@ import java.util.List; import java.util.ArrayList; import java.util.Date; +import java.net.URL; /** * @author Christian Bauer @@ -42,8 +43,8 @@ protected void renderResponse() throws Exception { FeedAggregatorDAO dao = (FeedAggregatorDAO)getInstance(FeedAggregatorDAO.class); - String[] feedURLs = { - "http://foo", "http://bar", "http:WrongURL" + URL[] feedURLs = { + new URL("http://foo"), new URL("http://bar") }; List<FeedEntryDTO> dtos = dao.getLatestFeedEntries(30, feedURLs); Modified: trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-22 15:17:34 UTC (rev 7186) @@ -9,10 +9,29 @@ <s:div styleClass="feedAggregator box"> - <s:div styleClass="boxHeader"> + + <s:div styleClass="boxHeader" rendered="#{empty preferences.get('FeedAggregator', currentMacro).aggregateId}"> <h:outputText value="#{preferences.get('FeedAggregator', currentMacro).title}"/> </s:div> + + <h:panelGrid rendered="#{not empty preferences.get('FeedAggregator', currentMacro).aggregateId}" + columns="2" cellpadding="0" cellspacing="0" border="0" + columnClasses="feedAggregatorSubscribe, feedAggregatorTitle" + styleClass="boxHeader fullWidth"> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}"> + <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> + </h:outputLink> + <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}"> + <h:outputText value="#{messages['feedAggregator.label.Subscribe']}"/> + </h:outputLink> + </h:panelGrid> + + <h:outputText value="#{preferences.get('FeedAggregator', currentMacro).title}"/> + + </h:panelGrid> + <div class="boxContent"> <h:dataTable value="#{feedAggregator.feedEntries}" var="feDTO" rendered="#{not empty feedAggregator.feedEntries and feedAggregator.feedEntries.size() > 0}" Modified: trunk/examples/wiki/view/themes/default/css/feedAggregator.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/feedAggregator.css 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/view/themes/default/css/feedAggregator.css 2008-01-22 15:17:34 UTC (rev 7186) @@ -1,3 +1,11 @@ +.feedAggregatorTitle { + text-align: right; +} + +.feedAggregatorSubscribe { + text-align: left; +} + .feedEntryColumn { padding: 10px; } Modified: trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css 2008-01-22 15:17:34 UTC (rev 7186) @@ -1,3 +1,11 @@ +.feedAggregatorTitle { + text-align: right; +} + +.feedAggregatorSubscribe { + text-align: left; +} + .feedEntryColumn { padding: 10px; } @@ -13,4 +21,4 @@ .feedEntryBody { line-height: 130%; -} \ No newline at end of file +} Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-22 15:16:57 UTC (rev 7185) +++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-22 15:17:34 UTC (rev 7186) @@ -280,6 +280,7 @@ border-bottom: 1px solid #b6b6b6; padding-left: 0; padding-bottom: 5px; + text-align: right; } .homepageNews .boxContent { @@ -294,6 +295,10 @@ padding-left: 0; } +.homepageNews .feedAggregatorSubscribe { + font-size: 110%; +} + .homepageNews .feedEntryColumn { padding: 0; }

17 years, 1 month

1
0
0 / 0

Seam SVN: r7185 - in trunk/src/jbas5: META-INF and 1 other directory.

by seam-commits＠lists.jboss.org

Author: alesj Date: 2008-01-22 10:16:57 -0500 (Tue, 22 Jan 2008) New Revision: 7185 Added: trunk/src/jbas5/META-INF/ trunk/src/jbas5/META-INF/seam-scanner.properties Log: Forcing VFSScanner usage. Added: trunk/src/jbas5/META-INF/seam-scanner.properties =================================================================== --- trunk/src/jbas5/META-INF/seam-scanner.properties (rev 0) +++ trunk/src/jbas5/META-INF/seam-scanner.properties 2008-01-22 15:16:57 UTC (rev 7185) @@ -0,0 +1 @@ +org.jboss.seam.deployment.scanners=org.jboss.seam.as5.vfs.VFSScanner:org.jboss.seam.deployment.URLScanner

17 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits January 2008