Author: dan.j.allen Date: 2009-03-14 03:34:37 -0400 (Sat, 14 Mar 2009) New Revision: 10165 Modified: trunk/seam-gen/build.xml trunk/seam-gen/ide-project-files/idea/project.ipr Log: Set the encoded database password and unique connection ID in IDEA project file Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2009-03-14 07:33:49 UTC (rev 10164) +++ trunk/seam-gen/build.xml 2009-03-14 07:34:37 UTC (rev 10165) @@ -24,7 +24,10 @@ </condition> <property file="${seam-gen.properties}"/> + <!-- set property defaults for backwards compatibility --> + <property name="jboss.domain" value="default"/> <property name="glassfish.home" value=""/> + <import file="${seam.dir}/build/common.build.xml"/> <target name="init"> @@ -61,6 +64,14 @@ <taskdef name="pathFixer" classname="org.jboss.seam.tool.FixPathTask" classpathref="seam-gen.lib.path"/> + + <taskdef name="encodePassword" + classname="org.jboss.seam.tool.EncodePasswordTask" + classpathref="seam-gen.lib.path"/> + + <taskdef name="randomUUID" + classname="org.jboss.seam.tool.RandomUUIDTask" + classpathref="seam-gen.lib.path"/> </target> <target name="init-properties" depends="init"> @@ -69,6 +80,8 @@ <packageDirectory property="model.dir" package="main/${model.package}"/> <packageDirectory property="test.dir" package="test/${test.package}"/> <pathFilename property="driver.file" path="${driver.jar}"/> + <encodePassword property="hibernate.connection.password.encoded" password="${hibernate.connection.password}"/> + <randomUUID property="hibernate.connection.uuid"/> <!-- we don't want create because that will destroy their database on the next deploy --> <condition property="hibernate.hbm2ddl.auto" value="update"> @@ -141,6 +154,8 @@ <filter token="dataSourceClass" value="${hibernate.connection.dataSource_class}"/> <filter token="username" value="${hibernate.connection.username}"/> <filter token="password" value="${hibernate.connection.password}"/> + <filter token="encodedPassword" value="${hibernate.connection.password.encoded}"/> + <filter token="connectionUUID" value="${hibernate.connection.uuid}"/> <filter token="catalogProperty" value="${catalog.property}"/> <filter token="schemaProperty" value="${schema.property}"/> <filter token="hibernate.dialect" value="${hibernate.dialect}"/> Modified: trunk/seam-gen/ide-project-files/idea/project.ipr =================================================================== --- trunk/seam-gen/ide-project-files/idea/project.ipr 2009-03-14 07:33:49 UTC (rev 10164) +++ trunk/seam-gen/ide-project-files/idea/project.ipr 2009-03-14 07:34:37 UTC (rev 10165) @@ -36,10 +36,10 @@ <option name="DATABASE_URL" value="@jdbcUrl@" /> <option name="DRIVER_PATH" /> <option name="DATBASE_USERNAME" value="@username@" /> - <option name="ENCODED_DATABASE_PASSWORD" value="" /> + <option name="ENCODED_DATABASE_PASSWORD" value="@encodedPassword@" /> <option name="DEFAULT_SCHEMA_NAME" /> <option name="TABLE_PATTERN" value="" /> - <option name="UUID" value="86c824fb-f41b-4fd1-986c-be634e7b9cfc" /> + <option name="UUID" value="@connectionUUID@" /> <option name="NAME" value="@projectName@Datasource" /> <libraries> <library>