[jbpm-commits] JBoss JBPM SVN: r4165 - in jbpm4/branches/tbaeyens: modules/distro/src/main/resources/config-tool and 4 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-06 03:49:59 -0500 (Fri, 06 Mar 2009) New Revision: 4165 Modified: jbpm4/branches/tbaeyens/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml Log: work Modified: jbpm4/branches/tbaeyens/build.xml =================================================================== --- jbpm4/branches/tbaeyens/build.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/build.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -132,32 +132,22 @@ <target name="update.configurations" description="update the pvm and jpdl test resources by running the config tool"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> + <property name="config.files.dir" value="${basedir}/modules/pvm/src/test/resources" /> + <property name="tmp.dir" value="${basedir}/modules/pvm/target/config-tmp" /> + <property name="jpdl" value="exclude" /> + </ant> + <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> + <property name="config.files.dir" value="${basedir}/modules/jpdl/src/test/resources" /> + <property name="tmp.dir" value="${basedir}/modules/jpdl/target/config-tmp" /> + </ant> + <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> <property name="config.files.dir" value="${basedir}/modules/examples/src/test/resources" /> <property name="tmp.dir" value="${basedir}/modules/examples/target/config-tmp" /> </ant> - <!-- - config.files.dir=config.files - db.scripts.dir=db.scripts - tmp.dir=tmp.files - --> + <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> + <property name="config.files.dir" value="${basedir}/modules/test-db/src/test/resources" /> + <property name="tmp.dir" value="${basedir}/modules/test-db/target/config-tmp" /> + </ant> </target> - <macrodef name="update-config"> - <attribute name="module"/> - <sequential> - <delete dir="modules/@{module}/target/config" /> - <mkdir dir="modules/@{module}/target/config" /> - <copy todir="modules/@{module}/target/config"> - <fileset dir="modules/config/src/main/tool" /> - </copy> - <copy todir="modules/@{module}/target/config" overwrite="true"> - <fileset dir="modules/@{module}/src/main/config" /> - </copy> - - <copy todir="modules/@{module}/src/test/resources" overwrite="true"> - <fileset dir="modules/@{module}/target/config/target/configfiles" /> - </copy> - </sequential> - </macrodef> - </project> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -73,6 +73,8 @@ <antcall target="internal.jpdl.hibernate.mapping.files" /> <antcall target="internal.identity.config.files" /> <antcall target="internal.jdk.logging" /> + + <echo>Created jbpm configuration files in ${config.files.dir}</echo> </target> <target name="create.db.scripts" Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> @@ -20,5 +20,5 @@ <mapping resource="jbpm.history.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> -</hibernate-configuration> + </session-factory> +</hibernate-configuration> Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> @@ -20,5 +20,5 @@ <mapping resource="jbpm.history.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> -</hibernate-configuration> + </session-factory> +</hibernate-configuration> Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> @@ -19,5 +19,5 @@ <mapping resource="jbpm.execution.hbm.xml" /> <mapping resource="jbpm.history.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> - </session-factory> -</hibernate-configuration> + </session-factory> +</hibernate-configuration> Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties 2009-03-06 08:49:59 UTC (rev 4165) @@ -1,19 +1,9 @@ handlers= java.util.logging.ConsoleHandler -# to add the error triggered file handler -# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler - redirect.commons.logging = enabled java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter -# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 -# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF -# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log - -# For example, set the com.xyz.foo logger to only log SEVERE messages: -# com.xyz.foo.level = SEVERE - org.jbpm.level=FINE # org.jbpm.pvm.internal.tx.level=FINE # org.jbpm.pvm.internal.wire.level=FINE @@ -25,4 +15,4 @@ # org.hibernate.SQL.level=FINEST # org.hibernate.type.level=FINEST # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST -# org.hibernate.transaction.level=FINEST +# org.hibernate.transaction.level=FINEST \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:39:41 UTC (rev 4164) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-06 08:49:59 UTC (rev 4165) @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> @@ -20,5 +20,5 @@ <mapping resource="jbpm.history.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> -</hibernate-configuration> + </session-factory> +</hibernate-configuration>